loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.216 and 1.386

-version 1.216, 2002/05/08 17:40:03
+version 1.386, 2003/07/03 19:26:21
  Line 47
  # 09/01 Guy Albertelli
  # 09/01,10/01,11/01 Gerd Kortemeyer
  # YEAR=2001
- # 02/27/01 Scott Harrison
  # 3/2 Gerd Kortemeyer
- # 3/15,3/19 Scott Harrison
  # 3/19,3/20 Gerd Kortemeyer
- # 3/22,3/27,4/2,4/16,4/17 Scott Harrison
  # 5/26,5/28 Gerd Kortemeyer
  # 5/30 H. K. Ng
  # 6/1 Gerd Kortemeyer
  # July Guy Albertelli
  # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26,
  # 10/2 Gerd Kortemeyer
- # 10/5,10/10,11/13,11/15 Scott Harrison
  # 11/17,11/20,11/22,11/29 Gerd Kortemeyer
  # 12/5 Matthew Hall
  # 12/5 Guy Albertelli
  # 12/6,12/7,12/12 Gerd Kortemeyer
- # 12/18 Scott Harrison
  # 12/21,12/22,12/27,12/28 Gerd Kortemeyer
  # YEAR=2002
  # 1/4,2/4,2/7 Gerd Kortemeyer
- Line 77  use Apache::File;
+ Line 72  use Apache::File;
  use LWP::UserAgent();
  use HTTP::Headers;
  use vars
- qw(%perlvar %hostname %homecache %hostip %spareid %hostdom
+ qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom
-    %libserv %pr %prp %metacache %packagetab
+    %libserv %pr %prp %metacache %packagetab %titlecache
-    %courselogs %accesshash $processmarker $dumpcount
+    %courselogs %accesshash %userrolehash $processmarker $dumpcount
-    %coursedombuf %coursehombuf %courseresdatacache);
+    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseresdatacache
+    %domaindescription %domain_auth_def %domain_auth_arg_def $tmpdir);
  use IO::Socket;
  use GDBM_File;
  use Apache::Constants qw(:common :http);
  use HTML::LCParser;
  use Fcntl qw(:flock);
+ use Apache::loncoursedata;
  my $readit;
  # --------------------------------------------------------------------- Logging
- Line 140  sub reply {
+ Line 138  sub reply {
      unless (defined($hostname{$server})) { return 'no_such_host'; }
      my $answer=subreply($cmd,$server);
      if ($answer eq 'con_lost') {
-        sleep 5;
+         #sleep 5;
-        $answer=subreply($cmd,$server);
+         #$answer=subreply($cmd,$server);
-        if ($answer eq 'con_lost') {
+         #if ($answer eq 'con_lost') {
- 	   &logthis("Second attempt con_lost on $server");
+ 	#   &logthis("Second attempt con_lost on $server");
-            my $peerfile="$perlvar{'lonSockDir'}/$server";
+         #   my $peerfile="$perlvar{'lonSockDir'}/$server";
-            my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+         #   my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-                                             Type    => SOCK_STREAM,
+         #                                    Type    => SOCK_STREAM,
-                                             Timeout => 10)
+         #                                    Timeout => 10)
-                       or return "con_lost";
+         #              or return "con_lost";
-            &logthis("Killing socket");
+         #   &logthis("Killing socket");
-            print $client "close_connection_exit\n";
+         #   print $client "close_connection_exit\n";
-            sleep 5;
+            #sleep 5;
-            $answer=subreply($cmd,$server);
+         #   $answer=subreply($cmd,$server);
-        }
+        #}
      }
      if (($answer=~/^refused/) || ($answer=~/^rejected/)) {
         &logthis("<font color=blue>WARNING:".
- Line 213  sub critical {
+ Line 211  sub critical {
              $middlename=substr($middlename,0,16);
              $middlename=~s/\W//g;
              my $dfilename=
-              "$perlvar{'lonSockDir'}/delayed/$now.$middlename.$server";
+       "$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server";
+             $dumpcount++;
              {
               my $dfh;
               if ($dfh=Apache::File->new(">$dfilename")) {
- Line 244  sub critical {
+ Line 243  sub critical {
      }
      return $answer;
  }
+ # ------------------------------------------- Transfer profile into environment
+ sub transfer_profile_to_env {
+     my ($lonidsdir,$handle)=@_;
+     my @profile;
+     {
+ 	my $idf=Apache::File->new("$lonidsdir/$handle.id");
+ 	flock($idf,LOCK_SH);
+ 	@profile=<$idf>;
+ 	$idf->close();
+     }
+     my $envi;
+     for ($envi=0;$envi<=$#profile;$envi++) {
+ 	chomp($profile[$envi]);
+ 	my ($envname,$envvalue)=split(/=/,$profile[$envi]);
+ 	$ENV{$envname} = $envvalue;
+     }
+     $ENV{'user.environment'} = "$lonidsdir/$handle.id";
+ }
  # ---------------------------------------------------------- Append Environment
- Line 348  sub delenv {
+ Line 367  sub delenv {
      return 'ok';
  }
+ # ------------------------------------------ Find out current server userload
+ # there is a copy in lond
+ sub userload {
+     my $numusers=0;
+     {
+ 	opendir(LONIDS,$perlvar{'lonIDsDir'});
+ 	my $filename;
+ 	my $curtime=time;
+ 	while ($filename=readdir(LONIDS)) {
+ 	    if ($filename eq '.' || $filename eq '..') {next;}
+ 	    my ($atime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[8];
+ 	    if ($curtime-$atime < 3600) { $numusers++; }
+ 	}
+ 	closedir(LONIDS);
+     }
+     my $userloadpercent=0;
+     my $maxuserload=$perlvar{'lonUserLoadLim'};
+     if ($maxuserload) {
+ 	$userloadpercent=100*$numusers/$maxuserload;
+     }
+     $userloadpercent=sprintf("%.2f",$userloadpercent);
+     return $userloadpercent;
+ }
+ # ------------------------------------------ Fight off request when overloaded
+ sub overloaderror {
+     my ($r,$checkserver)=@_;
+     unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; }
+     my $loadavg;
+     if ($checkserver eq $perlvar{'lonHostID'}) {
+        my $loadfile=Apache::File->new('/proc/loadavg');
+        $loadavg=<$loadfile>;
+        $loadavg =~ s/\s.*//g;
+        $loadavg = 100*$loadavg/$perlvar{'lonLoadLim'};
+     } else {
+        $loadavg=&reply('load',$checkserver);
+     }
+     my $overload=$loadavg-100;
+     if ($overload>0) {
+ 	$r->err_headers_out->{'Retry-After'}=$overload;
+         $r->log_error('Overload of '.$overload.' on '.$checkserver);
+         return 413;
+     }
+     return '';
+ }
  # ------------------------------ Find server with least workload from spare.tab
  sub spareserver {
+     my ($loadpercent,$userloadpercent) = @_;
      my $tryserver;
      my $spareserver='';
-     my $lowestserver=100;
+     if ($userloadpercent !~ /\d/) { $userloadpercent=0; }
+     my $lowestserver=$loadpercent > $userloadpercent?
+ 	             $loadpercent :  $userloadpercent;
      foreach $tryserver (keys %spareid) {
-        my $answer=reply('load',$tryserver);
+        my $loadans=reply('load',$tryserver);
+        my $userloadans=reply('userload',$tryserver);
+        if ($userloadans !~ /\d/) { $userloadans=0; }
+        my $answer=$loadans > $userloadans?
+                   $loadans :  $userloadans;
         if (($answer =~ /\d/) && ($answer<$lowestserver)) {
  	   $spareserver="http://$hostname{$tryserver}";
             $lowestserver=$answer;
         }
      }
      return $spareserver;
  }
- Line 481  sub authenticate {
+ Line 554  sub authenticate {
  # ---------------------- Find the homebase for a user from domain's lib servers
  sub homeserver {
-     my ($uname,$udom)=@_;
+     my ($uname,$udom,$ignoreBadCache)=@_;
      my $index="$uname:$udom";
-     if ($homecache{$index}) { return "$homecache{$index}"; }
+     if ($homecache{$index}) {
+         return "$homecache{$index}";
+     }
      my $tryserver;
      foreach $tryserver (keys %libserv) {
+         next if ($ignoreBadCache ne 'true' &&
+ 		 exists($badServerCache{$tryserver}));
  	if ($hostdom{$tryserver} eq $udom) {
             my $answer=reply("home:$udom:$uname",$tryserver);
             if ($answer eq 'found') {
- 	      $homecache{$index}=$tryserver;
+               $homecache{$index}=$tryserver;
                return $tryserver;
- 	   }
+            } elsif ($answer eq 'no_host') {
+ 	       $badServerCache{$tryserver}=1;
+            }
         }
      }
      return 'no_host';
- Line 561  sub idput {
+ Line 638  sub idput {
      }
  }
+ # --------------------------------------------------- Assign a key to a student
+ sub assign_access_key {
+ #
+ # a valid key looks like uname:udom#comments
+ # comments are being appended
+ #
+     my ($ckey,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     $udom=$ENV{'user.name'} unless (defined($udom));
+     $uname=$ENV{'user.domain'} unless (defined($uname));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     if (($existing{$ckey}=~/^\#(.*)$/) || # - new key
+         ($existing{$ckey}=~/^$uname\:$udom\#(.*)$/)) {
+                                                   # assigned to this person
+                                                   # - this should not happen,
+                                                   # unless something went wrong
+                                                   # the first time around
+ # ready to assign
+         $logentry=$1.'; '.$logentry;
+         if (&put('accesskey',{$ckey=>$uname.':'.$udom.'#'.$logentry},
+                                                  $cdom,$cnum) eq 'ok') {
+ # key now belongs to user
+ 	    my $envkey='key.'.$cdom.'_'.$cnum;
+             if (&put('environment',{$envkey => $ckey}) eq 'ok') {
+                 &appenv('environment.'.$envkey => $ckey);
+                 return 'ok';
+             } else {
+                 return
+   'error: Count not permanently assign key, will need to be re-entered later.';
+ 	    }
+         } else {
+             return 'error: Could not assign key, try again later.';
+         }
+     } elsif (!$existing{$ckey}) {
+ # the key does not exist
+ 	return 'error: The key does not exist';
+     } else {
+ # the key is somebody else's
+ 	return 'error: The key is already in use';
+     }
+ }
+ # ------------------------------------------ put an additional comment on a key
+ sub comment_access_key {
+ #
+ # a valid key looks like uname:udom#comments
+ # comments are being appended
+ #
+     my ($ckey,$cdom,$cnum,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     if ($existing{$ckey}) {
+         $existing{$ckey}.='; '.$logentry;
+ # ready to assign
+         if (&put('accesskeys',{$ckey=>$existing{$ckey}},
+                                                  $cdom,$cnum) eq 'ok') {
+ 	    return 'ok';
+         } else {
+ 	    return 'error: Count not store comment.';
+         }
+     } else {
+ # the key does not exist
+ 	return 'error: The key does not exist';
+     }
+ }
+ # ------------------------------------------------------ Generate a set of keys
+ sub generate_access_keys {
+     my ($number,$cdom,$cnum,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     unless (&allowed('mky',$cdom)) { return 0; }
+     unless (($cdom) && ($cnum)) { return 0; }
+     if ($number>10000) { return 0; }
+     sleep(2); # make sure don't get same seed twice
+     srand(time()^($$+($$<<15))); # from "Programming Perl"
+     my $total=0;
+     for (my $i=1;$i<=$number;$i++) {
+        my $newkey=sprintf("%lx",int(100000*rand)).'-'.
+                   sprintf("%lx",int(100000*rand)).'-'.
+                   sprintf("%lx",int(100000*rand));
+        $newkey=~s/1/g/g; # folks mix up 1 and l
+        $newkey=~s/0/h/g; # and also 0 and O
+        my %existing=&get('accesskeys',[$newkey],$cdom,$cnum);
+        if ($existing{$newkey}) {
+            $i--;
+        } else {
+ 	  if (&put('accesskeys',
+               { $newkey => '# generated '.localtime().
+                            ' by '.$ENV{'user.name'}.'@'.$ENV{'user.domain'}.
+                            '; '.$logentry },
+ 		   $cdom,$cnum) eq 'ok') {
+               $total++;
+ 	  }
+        }
+     }
+     &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.home'},
+          'Generated '.$total.' keys for '.$cnum.' at '.$cdom);
+     return $total;
+ }
+ # ------------------------------------------------------- Validate an accesskey
+ sub validate_access_key {
+     my ($ckey,$cdom,$cnum,$udom,$uname)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     $udom=$ENV{'user.name'} unless (defined($udom));
+     $uname=$ENV{'user.domain'} unless (defined($uname));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     return ($existing{$ckey}=~/^$uname\:$udom\#/);
+ }
  # ------------------------------------- Find the section of student in a course
+ sub getsection {
+     my ($udom,$unam,$courseid)=@_;
+     $courseid=~s/\_/\//g;
+     $courseid=~s/^(\w)/\/$1/;
+     my %Pending;
+     my %Expired;
+     #
+     # Each role can either have not started yet (pending), be active,
+     #    or have expired.
+     #
+     # If there is an active role, we are done.
+     #
+     # If there is more than one role which has not started yet,
+     #     choose the one which will start sooner
+     # If there is one role which has not started yet, return it.
+     #
+     # If there is more than one expired role, choose the one which ended last.
+     # If there is a role which has expired, return it.
+     #
+     foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
+                         &homeserver($unam,$udom)))) {
+         my ($key,$value)=split(/\=/,$_);
+         $key=&unescape($key);
+         next if ($key !~/^$courseid(?:\/)*(\w+)*\_st$/);
+         my $section=$1;
+         if ($key eq $courseid.'_st') { $section=''; }
+         my ($dummy,$end,$start)=split(/\_/,&unescape($value));
+         my $now=time;
+         if (defined($end) && ($now > $end)) {
+             $Expired{$end}=$section;
+             next;
+         }
+         if (defined($start) && ($now < $start)) {
+             $Pending{$start}=$section;
+             next;
+         }
+         return $section;
+     }
+     #
+     # Presumedly there will be few matching roles from the above
+     # loop and the sorting time will be negligible.
+     if (scalar(keys(%Pending))) {
+         my ($time) = sort {$a <=> $b} keys(%Pending);
+         return $Pending{$time};
+     }
+     if (scalar(keys(%Expired))) {
+         my @sorted = sort {$a <=> $b} keys(%Expired);
+         my $time = pop(@sorted);
+         return $Expired{$time};
+     }
+     return '-1';
+ }
  sub usection {
      my ($udom,$unam,$courseid)=@_;
      $courseid=~s/\_/\//g;
- Line 604  sub userenvironment {
+ Line 860  sub userenvironment {
      return %returnhash;
  }
+ # -------------------------------------------------------------------- New chat
+ sub chatsend {
+     my ($newentry,$anon)=@_;
+     my $cnum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     my $chome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     &reply('chatsend:'.$cdom.':'.$cnum.':'.
+ 	   &escape($ENV{'user.domain'}.':'.$ENV{'user.name'}.':'.$anon.':'.
+ 		   &escape($newentry)),$chome);
+ }
+ # ------------------------------------------ Find current version of a resource
+ sub getversion {
+     my $fname=&clutter(shift);
+     unless ($fname=~/^\/res\//) { return -1; }
+     return &currentversion(&filelocation('',$fname));
+ }
+ sub currentversion {
+     my $fname=shift;
+     my $author=$fname;
+     $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
+     my ($udom,$uname)=split(/\//,$author);
+     my $home=homeserver($uname,$udom);
+     if ($home eq 'no_host') {
+         return -1;
+     }
+     my $answer=reply("currentversion:$fname",$home);
+     if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
+ 	return -1;
+     }
+     return $answer;
+ }
  # ----------------------------- Subscribe to a resource, return URL if possible
  sub subscribe {
      my $fname=shift;
+     if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; }
      my $author=$fname;
      $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
      my ($udom,$uname)=split(/\//,$author);
      my $home=homeserver($uname,$udom);
-     if (($home eq 'no_host') || ($home eq $perlvar{'lonHostID'})) {
+     if ($home eq 'no_host') {
          return 'not_found';
      }
      my $answer=reply("sub:$fname",$home);
      if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
- Line 643  sub repcopy {
+ Line 936  sub repcopy {
      } elsif ($remoteurl eq 'directory') {
             return OK;
      } else {
+         my $author=$filename;
+         $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
+         my ($udom,$uname)=split(/\//,$author);
+         my $home=homeserver($uname,$udom);
+         unless ($home eq $perlvar{'lonHostID'}) {
             my @parts=split(/\//,$filename);
             my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
             if ($path ne "$perlvar{'lonDocRoot'}/res") {
- Line 678  sub repcopy {
+ Line 976  sub repcopy {
                 rename($transname,$filename);
                 return OK;
             }
+        }
      }
  }
+ # ------------------------------------------------ Get server side include body
+ sub ssi_body {
+     my ($filelink,%form)=@_;
+     my $output=($filelink=~/^http\:/?&externalssi($filelink):
+                                      &ssi($filelink,%form));
+     $output=~s/^.*\<body[^\>]*\>//si;
+     $output=~s/\<\/body\s*\>.*$//si;
+     $output=~
+             s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
+     return $output;
+ }
  # --------------------------------------------------------- Server Side Include
  sub ssi {
- Line 704  sub ssi {
+ Line 1015  sub ssi {
      return $response->content;
  }
+ sub externalssi {
+     my ($url)=@_;
+     my $ua=new LWP::UserAgent;
+     my $request=new HTTP::Request('GET',$url);
+     my $response=$ua->request($request);
+     return $response->content;
+ }
+ # ------- Add a token to a remote URI's query string to vouch for access rights
+ sub tokenwrapper {
+     my $uri=shift;
+     $uri=~s/^http\:\/\/([^\/]+)//;
+     $uri=~s/^\///;
+     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
+     my $token=$1;
+     if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
+ 	&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
+         return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
+                (($uri=~/\?/)?'&':'?').'token='.$token.
+                                '&tokenissued='.$perlvar{'lonHostID'};
+     } else {
+ 	return '/adm/notfound.html';
+     }
+ }
+ # --------------- Take an uploaded file and put it into the userfiles directory
+ # input: name of form element, coursedoc=1 means this is for the course
+ # output: url of file in userspace
+ sub userfileupload {
+     my ($formname,$coursedoc)=@_;
+     my $fname=$ENV{'form.'.$formname.'.filename'};
+ # Replace Windows backslashes by forward slashes
+     $fname=~s/\\/\//g;
+ # Get rid of everything but the actual filename
+     $fname=~s/^.*\/([^\/]+)$/$1/;
+ # Replace spaces by underscores
+     $fname=~s/\s+/\_/g;
+ # Replace all other weird characters by nothing
+     $fname=~s/[^\w\.\-]//g;
+ # See if there is anything left
+     unless ($fname) { return 'error: no uploaded file'; }
+     chop($ENV{'form.'.$formname});
+ # Create the directory if not present
+     my $docuname='';
+     my $docudom='';
+     my $docuhome='';
+     if ($coursedoc) {
+ 	$docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ 	$docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ 	$docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     } else {
+         $docuname=$ENV{'user.name'};
+         $docudom=$ENV{'user.domain'};
+         $docuhome=$ENV{'user.home'};
+     }
+     return
+         &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
+ }
+ sub finishuserfileupload {
+     my ($docuname,$docudom,$docuhome,$formname,$fname)=@_;
+     my $path=$docudom.'/'.$docuname.'/';
+     my $filepath=$perlvar{'lonDocRoot'};
+     my @parts=split(/\//,$filepath.'/userfiles/'.$path);
+     my $count;
+     for ($count=4;$count<=$#parts;$count++) {
+         $filepath.="/$parts[$count]";
+         if ((-e $filepath)!=1) {
+ 	    mkdir($filepath,0777);
+         }
+     }
+ # Save the file
+     {
+        my $fh=Apache::File->new('>'.$filepath.'/'.$fname);
+        print $fh $ENV{'form.'.$formname};
+     }
+ # Notify homeserver to grep it
+ #
+     my $fetchresult=
+  &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,$docuhome);
+     if ($fetchresult eq 'ok') {
+ #
+ # Return the URL to it
+         return '/uploaded/'.$path.$fname;
+     } else {
+         &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$fname.
+          ' to host '.$docuhome.': '.$fetchresult);
+         return '/adm/notfound.html';
+     }
+ }
  # ------------------------------------------------------------------------- Log
  sub log {
- Line 712  sub log {
+ Line 1117  sub log {
  }
  # ------------------------------------------------------------------ Course Log
+ #
+ # This routine flushes several buffers of non-mission-critical nature
+ #
  sub flushcourselogs {
-     &logthis('Flushing course log buffers');
+     &logthis('Flushing log buffers');
+ #
+ # course logs
+ # This is a log of all transactions in a course, which can be used
+ # for data mining purposes
+ #
+ # It also collects the courseid database, which lists last transaction
+ # times and course titles for all courseids
+ #
+     my %courseidbuffer=();
      foreach (keys %courselogs) {
          my $crsid=$_;
-         if (&reply('log:'.$coursedombuf{$crsid}.':'.
+         if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'.
  		          &escape($courselogs{$crsid}),
  		          $coursehombuf{$crsid}) eq 'ok') {
  	    delete $courselogs{$crsid};
- Line 728  sub flushcourselogs {
+ Line 1145  sub flushcourselogs {
                          " exceeded maximum size, deleting.</font>");
                 delete $courselogs{$crsid};
              }
          }
+         if ($courseidbuffer{$coursehombuf{$crsid}}) {
+            $courseidbuffer{$coursehombuf{$crsid}}.='&'.
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+         } else {
+            $courseidbuffer{$coursehombuf{$crsid}}=
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+         }
      }
-     &logthis('Flushing access logs');
+ #
+ # Write course id database (reverse lookup) to homeserver of courses
+ # Is used in pickcourse
+ #
+     foreach (keys %courseidbuffer) {
+         &courseidput($hostdom{$_},$courseidbuffer{$_},$_);
+     }
+ #
+ # File accesses
+ # Writes to the dynamic metadata of resources to get hit counts, etc.
+ #
      foreach (keys %accesshash) {
          my $entry=$_;
          $entry=~/\_\_\_(\w+)\/(\w+)\/(.*)\_\_\_(\w+)$/;
          my %temphash=($entry => $accesshash{$entry});
-         if (&Apache::lonnet::put('resevaldata',\%temphash,$1,$2) eq 'ok') {
+         if (&Apache::lonnet::put('nohist_resevaldata',\%temphash,$1,$2) eq 'ok') {
  	    delete $accesshash{$entry};
          }
      }
+ #
+ # Roles
+ # Reverse lookup of user roles for course faculty/staff and co-authorship
+ #
+     foreach (keys %userrolehash) {
+         my $entry=$_;
+         my ($role,$uname,$udom,$runame,$rudom,$rsec)=
+ 	    split(/\:/,$entry);
+         if (&Apache::lonnet::put('nohist_userroles',
+              { $role.':'.$uname.':'.$udom.':'.$rsec => $userrolehash{$entry} },
+                 $rudom,$runame) eq 'ok') {
+ 	    delete $userrolehash{$entry};
+         }
+     }
      $dumpcount++;
  }
- Line 747  sub courselog {
+ Line 1195  sub courselog {
      $what=time.':'.$what;
      unless ($ENV{'request.course.id'}) { return ''; }
      $coursedombuf{$ENV{'request.course.id'}}=
-        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     $coursenumbuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
      $coursehombuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     $coursedescrbuf{$ENV{'request.course.id'}}=
+        $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
      if (defined $courselogs{$ENV{'request.course.id'}}) {
  	$courselogs{$ENV{'request.course.id'}}.='&'.$what;
      } else {
- Line 780  sub countacc {
+ Line 1231  sub countacc {
      my $url=&declutter(shift);
      unless ($ENV{'request.course.id'}) { return ''; }
      $accesshash{$ENV{'request.course.id'}.'___'.$url.'___course'}=1;
-     my $key=$processmarker.'_'.$dumpcount.'___'.$url.'___count';
+     my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count';
      if (defined($accesshash{$key})) {
  	$accesshash{$key}++;
      } else {
          $accesshash{$key}=1;
      }
  }
+ sub linklog {
+     my ($from,$to)=@_;
+     $from=&declutter($from);
+     $to=&declutter($to);
+     $accesshash{$from.'___'.$to.'___comefrom'}=1;
+     $accesshash{$to.'___'.$from.'___goto'}=1;
+ }
+ sub userrolelog {
+     my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
+     if (($trole=~/^ca/) || ($trole=~/^in/) ||
+         ($trole=~/^cc/) || ($trole=~/^ep/) ||
+         ($trole=~/^cr/)) {
+        my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
+        $userrolehash
+          {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
+                     =$tend.':'.$tstart;
+    }
+ }
+ sub get_course_adv_roles {
+     my $cid=shift;
+     $cid=$ENV{'request.course.id'} unless (defined($cid));
+     my %coursehash=&coursedescription($cid);
+     my %returnhash=();
+     my %dumphash=
+             &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
+     my $now=time;
+     foreach (keys %dumphash) {
+ 	my ($tend,$tstart)=split(/\:/,$dumphash{$_});
+         if (($tstart) && ($tstart<0)) { next; }
+         if (($tend) && ($tend<$now)) { next; }
+         if (($tstart) && ($now<$tstart)) { next; }
+         my ($role,$username,$domain,$section)=split(/\:/,$_);
+         my $key=&plaintext($role);
+         if ($section) { $key.=' (Sec/Grp '.$section.')'; }
+         if ($returnhash{$key}) {
+ 	    $returnhash{$key}.=','.$username.':'.$domain;
+         } else {
+             $returnhash{$key}=$username.':'.$domain;
+         }
+      }
+     return %returnhash;
+ }
+ # ---------------------------------------------------------- Course ID routines
+ # Deal with domain's nohist_courseid.db files
+ #
+ sub courseidput {
+     my ($domain,$what,$coursehome)=@_;
+     return &reply('courseidput:'.$domain.':'.$what,$coursehome);
+ }
+ sub courseiddump {
+     my ($domfilter,$descfilter,$sincefilter)=@_;
+     my %returnhash=();
+     unless ($domfilter) { $domfilter=''; }
+     foreach my $tryserver (keys %libserv) {
+ 	if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+ 	    foreach (
+              split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+ 			       $sincefilter.':'.&escape($descfilter),
+                                $tryserver))) {
+ 		my ($key,$value)=split(/\=/,$_);
+                 if (($key) && ($value)) {
+ 		    $returnhash{&unescape($key)}=&unescape($value);
+                 }
+             }
+         }
+     }
+     return %returnhash;
+ }
+ #
  # ----------------------------------------------------------- Check out an item
  sub checkout {
- Line 795  sub checkout {
+ Line 1322  sub checkout {
      my $now=time;
      my $lonhost=$perlvar{'lonHostID'};
      my $infostr=&escape(
+                  'CHECKOUTTOKEN&'.
                   $tuname.'&'.
                   $tudom.'&'.
                   $tcrsid.'&'.
- Line 844  sub checkin {
+ Line 1372  sub checkin {
      $lonhost=~tr/A-Z/a-z/;
      my $dtoken=$ta.'_'.$hostip{$lonhost}.'_'.$tb;
      $dtoken=~s/\W/\_/g;
-     my ($tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
+     my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
                   split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
      unless (($tuname) && ($tudom)) {
- Line 894  sub expirespread {
+ Line 1422  sub expirespread {
  # ----------------------------------------------------- Devalidate Spreadsheets
  sub devalidate {
-     my $symb=shift;
+     my ($symb,$uname,$udom)=@_;
      my $cid=$ENV{'request.course.id'};
      if ($cid) {
- 	my $key=$ENV{'user.name'}.':'.$ENV{'user.domain'}.':';
+ # delete the stored spreadsheets for
+ # - the student level sheet of this user in course's homespace
+ # - the assessment level sheet for this resource
+ #   for this user in user's homespace
+ 	my $key=$uname.':'.$udom.':';
          my $status=
- 	    &del('nohist_calculatedsheet',
+ 	    &del('nohist_calculatedsheets',
  		 [$key.'studentcalc'],
  		 $ENV{'course.'.$cid.'.domain'},
  		 $ENV{'course.'.$cid.'.num'})
- Line 908  sub devalidate {
+ Line 1440  sub devalidate {
  		 [$key.'assesscalc:'.$symb]);
          unless ($status eq 'ok ok') {
             &logthis('Could not devalidate spreadsheet '.
-                     $ENV{'user.name'}.' at '.$ENV{'user.domain'}.' for '.
+                     $uname.' at '.$udom.' for '.
  		    $symb.': '.$status);
          }
      }
  }
+ sub get_scalar {
+     my ($string,$end) = @_;
+     my $value;
+     if ($$string =~ s/^([^&]*?)($end)/$2/) {
+ 	$value = $1;
+     } elsif ($$string =~ s/^([^&]*?)&//) {
+ 	$value = $1;
+     }
+     return &unescape($value);
+ }
+ sub array2str {
+   my (@array) = @_;
+   my $result=&arrayref2str(\@array);
+   $result=~s/^__ARRAY_REF__//;
+   $result=~s/__END_ARRAY_REF__$//;
+   return $result;
+ }
  sub arrayref2str {
    my ($arrayref) = @_;
-   my $result='_ARRAY_REF__';
+   my $result='__ARRAY_REF__';
    foreach my $elem (@$arrayref) {
-     if (ref($elem) eq 'ARRAY') {
+     if(ref($elem) eq 'ARRAY') {
-       $result.=&escape(&arrayref2str($elem)).'&';
+       $result.=&arrayref2str($elem).'&';
-     } elsif (ref($elem) eq 'HASH') {
+     } elsif(ref($elem) eq 'HASH') {
-       $result.=&escape(&hashref2str($elem)).'&';
+       $result.=&hashref2str($elem).'&';
-     } elsif (ref($elem)) {
+     } elsif(ref($elem)) {
-       &logthis("Got a ref of ".(ref($elem))." skipping.");
+       #print("Got a ref of ".(ref($elem))." skipping.");
      } else {
        $result.=&escape($elem).'&';
      }
    }
    $result=~s/\&$//;
+   $result .= '__END_ARRAY_REF__';
    return $result;
  }
  sub hash2str {
    my (%hash) = @_;
    my $result=&hashref2str(\%hash);
-   $result=~s/^_HASH_REF__//;
+   $result=~s/^__HASH_REF__//;
+   $result=~s/__END_HASH_REF__$//;
    return $result;
  }
  sub hashref2str {
    my ($hashref)=@_;
-   my $result='_HASH_REF__';
+   my $result='__HASH_REF__';
    foreach (keys(%$hashref)) {
      if (ref($_) eq 'ARRAY') {
-       $result.=&escape(&arrayref2str($_)).'=';
+       $result.=&arrayref2str($_).'=';
      } elsif (ref($_) eq 'HASH') {
-       $result.=&escape(&hashref2str($_)).'=';
+       $result.=&hashref2str($_).'=';
      } elsif (ref($_)) {
-       &logthis("Got a ref of ".(ref($_))." skipping.");
+       $result.='=';
+       #print("Got a ref of ".(ref($_))." skipping.");
      } else {
-       $result.=&escape($_).'=';
+ 	if ($_) {$result.=&escape($_).'=';} else { last; }
      }
-     if (ref($$hashref{$_}) eq 'ARRAY') {
+     if(ref($hashref->{$_}) eq 'ARRAY') {
-       $result.=&escape(&arrayref2str($$hashref{$_})).'&';
+       $result.=&arrayref2str($hashref->{$_}).'&';
-     } elsif (ref($$hashref{$_}) eq 'HASH') {
+     } elsif(ref($hashref->{$_}) eq 'HASH') {
-       $result.=&escape(&hashref2str($$hashref{$_})).'&';
+       $result.=&hashref2str($hashref->{$_}).'&';
-     } elsif (ref($$hashref{$_})) {
+     } elsif(ref($hashref->{$_})) {
-       &logthis("Got a ref of ".(ref($$hashref{$_}))." skipping.");
+        $result.='&';
+       #print("Got a ref of ".(ref($hashref->{$_}))." skipping.");
      } else {
-       $result.=&escape($$hashref{$_}).'&';
+       $result.=&escape($hashref->{$_}).'&';
      }
    }
    $result=~s/\&$//;
+   $result .= '__END_HASH_REF__';
    return $result;
  }
  sub str2hash {
+     my ($string)=@_;
+     my ($hash)=&str2hashref('__HASH_REF__'.$string.'__END_HASH_REF__');
+     return %$hash;
+ }
+ sub str2hashref {
    my ($string) = @_;
-   my %returnhash;
-   foreach (split(/\&/,$string)) {
+   my %hash;
-     my ($name,$value)=split(/\=/,$_);
-     $name=&unescape($name);
+   if($string !~ /^__HASH_REF__/) {
-     $value=&unescape($value);
+       if (! ($string eq '' || !defined($string))) {
-     if ($value =~ /^_HASH_REF__/) {
+ 	  $hash{'error'}='Not hash reference';
-       $value =~ s/^_HASH_REF__//;
+       }
-       my %hash=&str2hash($value);
+       return (\%hash, $string);
-       $value=\%hash;
-     } elsif ($value =~ /^_ARRAY_REF__/) {
-       $value =~ s/^_ARRAY_REF__//;
-       my @array=&str2array($value);
-       $value=\@array;
-     }
-     $returnhash{$name}=$value;
    }
-   return (%returnhash);
+   $string =~ s/^__HASH_REF__//;
+   while($string !~ /^__END_HASH_REF__/) {
+       #key
+       my $key='';
+       if($string =~ /^__HASH_REF__/) {
+           ($key, $string)=&str2hashref($string);
+           if(defined($key->{'error'})) {
+               $hash{'error'}='Bad data';
+               return (\%hash, $string);
+           }
+       } elsif($string =~ /^__ARRAY_REF__/) {
+           ($key, $string)=&str2arrayref($string);
+           if($key->[0] eq 'Array reference error') {
+               $hash{'error'}='Bad data';
+               return (\%hash, $string);
+           }
+       } else {
+           $string =~ s/^(.*?)=//;
+ 	  $key=&unescape($1);
+       }
+       $string =~ s/^=//;
+       #value
+       my $value='';
+       if($string =~ /^__HASH_REF__/) {
+           ($value, $string)=&str2hashref($string);
+           if(defined($value->{'error'})) {
+               $hash{'error'}='Bad data';
+               return (\%hash, $string);
+           }
+       } elsif($string =~ /^__ARRAY_REF__/) {
+           ($value, $string)=&str2arrayref($string);
+           if($value->[0] eq 'Array reference error') {
+               $hash{'error'}='Bad data';
+               return (\%hash, $string);
+           }
+       } else {
+ 	  $value=&get_scalar(\$string,'__END_HASH_REF__');
+       }
+       $string =~ s/^&//;
+       $hash{$key}=$value;
+   }
+   $string =~ s/^__END_HASH_REF__//;
+   return (\%hash, $string);
  }
  sub str2array {
+     my ($string)=@_;
+     my ($array)=&str2arrayref('__ARRAY_REF__'.$string.'__END_ARRAY_REF__');
+     return @$array;
+ }
+ sub str2arrayref {
    my ($string) = @_;
-   my @returnarray;
+   my @array;
-   foreach my $value (split(/\&/,$string)) {
-     $value=&unescape($value);
+   if($string !~ /^__ARRAY_REF__/) {
-     if ($value =~ /^_HASH_REF__/) {
+       if (! ($string eq '' || !defined($string))) {
-       $value =~ s/^_HASH_REF__//;
+ 	  $array[0]='Array reference error';
-       my %hash=&str2hash($value);
+       }
-       $value=\%hash;
+       return (\@array, $string);
-     } elsif ($value =~ /^_ARRAY_REF__/) {
-       $value =~ s/^_ARRAY_REF__//;
-       my @array=&str2array($value);
-       $value=\@array;
-     }
-     push(@returnarray,$value);
    }
-   return (@returnarray);
+   $string =~ s/^__ARRAY_REF__//;
+   while($string !~ /^__END_ARRAY_REF__/) {
+       my $value='';
+       if($string =~ /^__HASH_REF__/) {
+           ($value, $string)=&str2hashref($string);
+           if(defined($value->{'error'})) {
+               $array[0] ='Array reference error';
+               return (\@array, $string);
+           }
+       } elsif($string =~ /^__ARRAY_REF__/) {
+           ($value, $string)=&str2arrayref($string);
+           if($value->[0] eq 'Array reference error') {
+               $array[0] ='Array reference error';
+               return (\@array, $string);
+           }
+       } else {
+ 	  $value=&get_scalar(\$string,'__END_ARRAY_REF__');
+       }
+       $string =~ s/^&//;
+       push(@array, $value);
+   }
+   $string =~ s/^__END_ARRAY_REF__//;
+   return (\@array, $string);
  }
  # -------------------------------------------------------------------Temp Store
- Line 1013  sub tmpreset {
+ Line 1643  sub tmpreset {
    my ($symb,$namespace,$domain,$stuname) = @_;
    if (!$symb) {
      $symb=&symbread();
-     if (!$symb) { $symb= $ENV{'REQUEST_URI'}; }
+     if (!$symb) { $symb= $ENV{'request.url'}; }
    }
    $symb=escape($symb);
- Line 1028  sub tmpreset {
+ Line 1658  sub tmpreset {
    my %hash;
    if (tie(%hash,'GDBM_File',
  	  $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db',
- 	  &GDBM_WRCREAT,0640)) {
+ 	  &GDBM_WRCREAT(),0640)) {
      foreach my $key (keys %hash) {
        if ($key=~ /:$symb/) {
  	delete($hash{$key});
- Line 1064  sub tmpstore {
+ Line 1694  sub tmpstore {
    my $path=$perlvar{'lonDaemons'}.'/tmp';
    if (tie(%hash,'GDBM_File',
  	  $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db',
- 	  &GDBM_WRCREAT,0640)) {
+ 	  &GDBM_WRCREAT(),0640)) {
      $hash{"version:$symb"}++;
      my $version=$hash{"version:$symb"};
      my $allkeys='';
- Line 1108  sub tmprestore {
+ Line 1738  sub tmprestore {
    my $path=$perlvar{'lonDaemons'}.'/tmp';
    if (tie(%hash,'GDBM_File',
  	  $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db',
- 	  &GDBM_READER,0640)) {
+ 	  &GDBM_READER(),0640)) {
      my $version=$hash{"version:$symb"};
      $returnhash{'version'}=$version;
      my $scope;
- Line 1142  sub store {
+ Line 1772  sub store {
      $symb=&symbclean($symb);
      if (!$symb) { unless ($symb=&symbread()) { return ''; } }
-     &devalidate($symb);
+     if (!$domain) { $domain=$ENV{'user.domain'}; }
+     if (!$stuname) { $stuname=$ENV{'user.name'}; }
+     &devalidate($symb,$stuname,$domain);
      $symb=escape($symb);
      if (!$namespace) {
- Line 1150  sub store {
+ Line 1783  sub store {
            return '';
         }
      }
-     if (!$domain) { $domain=$ENV{'user.domain'}; }
-     if (!$stuname) { $stuname=$ENV{'user.name'}; }
      if (!$home) { $home=$ENV{'user.home'}; }
      my $namevalue='';
      foreach (keys %$storehash) {
- Line 1173  sub cstore {
+ Line 1804  sub cstore {
      $symb=&symbclean($symb);
      if (!$symb) { unless ($symb=&symbread()) { return ''; } }
-     &devalidate($symb);
+     if (!$domain) { $domain=$ENV{'user.domain'}; }
+     if (!$stuname) { $stuname=$ENV{'user.name'}; }
+     &devalidate($symb,$stuname,$domain);
      $symb=escape($symb);
      if (!$namespace) {
- Line 1181  sub cstore {
+ Line 1815  sub cstore {
            return '';
         }
      }
-     if (!$domain) { $domain=$ENV{'user.domain'}; }
-     if (!$stuname) { $stuname=$ENV{'user.name'}; }
      if (!$home) { $home=$ENV{'user.home'}; }
      my $namevalue='';
- Line 1240  sub coursedescription {
+ Line 1872  sub coursedescription {
      $courseid=~s/\_/\//g;
      my ($cdomain,$cnum)=split(/\//,$courseid);
      my $chome=&homeserver($cnum,$cdomain);
+     my $normalid=$cdomain.'_'.$cnum;
+     # need to always cache even if we get errors otherwise we keep
+     # trying and trying and trying to get the course description.
+     my %envhash=();
+     my %returnhash=();
+     $envhash{'course.'.$normalid.'.last_cache'}=time;
      if ($chome ne 'no_host') {
-        my %returnhash=&dump('environment',$cdomain,$cnum);
+        %returnhash=&dump('environment',$cdomain,$cnum);
         if (!exists($returnhash{'con_lost'})) {
-            my $normalid=$cdomain.'_'.$cnum;
-            my %envhash=();
             $returnhash{'home'}= $chome;
  	   $returnhash{'domain'} = $cdomain;
  	   $returnhash{'num'} = $cnum;
             while (my ($name,$value) = each %returnhash) {
                 $envhash{'course.'.$normalid.'.'.$name}=$value;
             }
-            $returnhash{'url'}='/res/'.declutter($returnhash{'url'});
+            $returnhash{'url'}=&clutter($returnhash{'url'});
             $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'.
  	       $ENV{'user.name'}.'_'.$cdomain.'_'.$cnum;
-            $envhash{'course.'.$normalid.'.last_cache'}=time;
             $envhash{'course.'.$normalid.'.home'}=$chome;
             $envhash{'course.'.$normalid.'.domain'}=$cdomain;
             $envhash{'course.'.$normalid.'.num'}=$cnum;
-            &appenv(%envhash);
-            return %returnhash;
         }
      }
-     return ();
+     &appenv(%envhash);
+     return %returnhash;
  }
  # -------------------------------------------------------- Get user privileges
- Line 1285  sub rolesinit {
+ Line 1919  sub rolesinit {
              my ($trole,$tend,$tstart)=split(/_/,$role);
              $userroles.='user.role.'.$trole.'.'.$area.'='.
                          $tstart.'.'.$tend."\n";
+ # log the associated role with the area
+             &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
              if ($tend!=0) {
  	        if ($tend<$now) {
  	            $trole='';
- Line 1296  sub rolesinit {
+ Line 1932  sub rolesinit {
                  }
              }
              if (($area ne '') && ($trole ne '')) {
- 	       my $spec=$trole.'.'.$area;
+ 		my $spec=$trole.'.'.$area;
-                my ($tdummy,$tdomain,$trest)=split(/\//,$area);
+ 		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
-                if ($trole =~ /^cr\//) {
+ 		if ($trole =~ /^cr\//) {
- 		   my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+ 		    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
-                    my $homsvr=homeserver($rauthor,$rdomain);
+ 		    my $homsvr=homeserver($rauthor,$rdomain);
-                    if ($hostname{$homsvr} ne '') {
+ 		    if ($hostname{$homsvr} ne '') {
-                       my $roledef=
+ 			my $roledef=
- 			  reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole",
+ 			    reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole",
-                                 $homsvr);
+ 				  $homsvr);
-                       if (($roledef ne 'con_lost') && ($roledef ne '')) {
+ 			if (($roledef ne 'con_lost') && ($roledef ne '')) {
-                          my ($syspriv,$dompriv,$coursepriv)=
+ 			    my ($syspriv,$dompriv,$coursepriv)=
- 			     split(/\_/,unescape($roledef));
+ 				split(/\_/,unescape($roledef));
-  	                 $allroles{'cm./'}.=':'.$syspriv;
+ 			    if (defined($syspriv)) {
-                          $allroles{$spec.'./'}.=':'.$syspriv;
+ 				$allroles{'cm./'}.=':'.$syspriv;
-                          if ($tdomain ne '') {
+ 				$allroles{$spec.'./'}.=':'.$syspriv;
-                              $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+ 			    }
-                              $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
+ 			    if ($tdomain ne '') {
-                              if ($trest ne '') {
+ 				if (defined($dompriv)) {
- 		                $allroles{'cm.'.$area}.=':'.$coursepriv;
+ 				    $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
- 		                $allroles{$spec.'.'.$area}.=':'.$coursepriv;
+ 				    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
-                              }
+ 				}
- 	                 }
+ 				if ($trest ne '') {
-                       }
+ 				    if (defined($coursepriv)) {
-                    }
+ 					$allroles{'cm.'.$area}.=':'.$coursepriv;
-                } else {
+ 					$allroles{$spec.'.'.$area}.=':'.$coursepriv;
- 	           $allroles{'cm./'}.=':'.$pr{$trole.':s'};
+ 				    }
- 	           $allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
+ 				}
-                    if ($tdomain ne '') {
+ 			    }
-                      $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			}
-                      $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 		    }
-                       if ($trest ne '') {
+ 		} else {
- 		          $allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+ 		    if (defined($pr{$trole.':s'})) {
- 		          $allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+ 			$allroles{'cm./'}.=':'.$pr{$trole.':s'};
-                       }
+ 			$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
- 	           }
+ 		    }
- 	       }
+ 		    if ($tdomain ne '') {
+ 			if (defined($pr{$trole.':d'})) {
+ 			    $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			}
+ 			if ($trest ne '') {
+ 			    if (defined($pr{$trole.':c'})) {
+ 				$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+ 				$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+ 			    }
+ 			}
+ 		    }
+ 		}
              }
            }
          }
- Line 1379  sub get {
+ Line 2027  sub get {
     my $rep=&reply("get:$udomain:$uname:$namespace:$items",$uhome);
     my @pairs=split(/\&/,$rep);
+    if ( $#pairs==0 && $pairs[0] =~ /^(con_lost|error|no_such_host)/i) {
+      return @pairs;
+    }
     my %returnhash=();
     my $i=0;
     foreach (@$storearr) {
- Line 1426  sub dump {
+ Line 2077  sub dump {
     return %returnhash;
  }
+ # --------------------------------------------------------------- currentdump
+ sub currentdump {
+    my ($courseid,$sdom,$sname)=@_;
+    $courseid = $ENV{'request.course.id'} if (! defined($courseid));
+    $sdom     = $ENV{'user.domain'}       if (! defined($sdom));
+    $sname    = $ENV{'user.name'}         if (! defined($sname));
+    my $uhome = &homeserver($sname,$sdom);
+    my $rep=reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome);
+    return if ($rep =~ /^(error:|no_such_host)/);
+    #
+    my %returnhash=();
+    #
+    if ($rep eq "unknown_cmd") {
+        # an old lond will not know currentdump
+        # Do a dump and make it look like a currentdump
+        my @tmp = &dump($courseid,$sdom,$sname,'.');
+        return if ($tmp[0] =~ /^(error:|no_such_host)/);
+        my %hash = @tmp;
+        @tmp=();
+        # Code ripped from lond, essentially.  The only difference
+        # here is the unescaping done by lonnet::dump().  Conceivably
+        # we might run in to problems with parameter names =~ /^v\./
+        while (my ($key,$value) = each(%hash)) {
+            my ($v,$symb,$param) = split(/:/,$key);
+            next if ($v eq 'version' || $symb eq 'keys');
+            next if (exists($returnhash{$symb}) &&
+                     exists($returnhash{$symb}->{$param}) &&
+                     $returnhash{$symb}->{'v.'.$param} > $v);
+            $returnhash{$symb}->{$param}=$value;
+            $returnhash{$symb}->{'v.'.$param}=$v;
+        }
+        #
+        # Remove all of the keys in the hashes which keep track of
+        # the version of the parameter.
+        while (my ($symb,$param_hash) = each(%returnhash)) {
+            # use a foreach because we are going to delete from the hash.
+            foreach my $key (keys(%$param_hash)) {
+                delete($param_hash->{$key}) if ($key =~ /^v\./);
+            }
+        }
+    } else {
+        my @pairs=split(/\&/,$rep);
+        foreach (@pairs) {
+            my ($key,$value)=split(/=/,$_);
+            my ($symb,$param) = split(/:/,$key);
+            $returnhash{&unescape($symb)}->{&unescape($param)} =
+                                                           &unescape($value);
+        }
+    }
+    return %returnhash;
+ }
  # --------------------------------------------------------------- put interface
  sub put {
- Line 1479  sub eget {
+ Line 2182  sub eget {
     return %returnhash;
  }
+ # ---------------------------------------------- Custom access rule evaluation
+ sub customaccess {
+     my ($priv,$uri)=@_;
+     my ($urole,$urealm)=split(/\./,$ENV{'request.role'});
+     $urealm=~s/^\W//;
+     my ($udom,$ucrs,$usec)=split(/\//,$urealm);
+     my $access=0;
+     foreach (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) {
+ 	my ($effect,$realm,$role)=split(/\:/,$_);
+         if ($role) {
+ 	   if ($role ne $urole) { next; }
+         }
+         foreach (split(/\s*\,\s*/,$realm)) {
+             my ($tdom,$tcrs,$tsec)=split(/\_/,$_);
+             if ($tdom) {
+ 		if ($tdom ne $udom) { next; }
+             }
+             if ($tcrs) {
+ 		if ($tcrs ne $ucrs) { next; }
+             }
+             if ($tsec) {
+ 		if ($tsec ne $usec) { next; }
+             }
+             $access=($effect eq 'allow');
+             last;
+         }
+     }
+     return $access;
+ }
  # ------------------------------------------------- Check for a user privilege
  sub allowed {
- Line 1496  sub allowed {
+ Line 2230  sub allowed {
  # Free bre to public access
      if ($priv eq 'bre') {
- 	if (&metadata($uri,'copyright') eq 'public') { return 'F'; }
+         my $copyright=&metadata($uri,'copyright');
+ 	if (($copyright eq 'public') && (!$ENV{'request.course.id'})) {
+            return 'F';
+         }
+         if ($copyright eq 'priv') {
+             $uri=~/([^\/]+)\/([^\/]+)\//;
+ 	    unless (($ENV{'user.name'} eq $2) && ($ENV{'user.domain'} eq $1)) {
+ 		return '';
+             }
+         }
+         if ($copyright eq 'domain') {
+             $uri=~/([^\/]+)\/([^\/]+)\//;
+ 	    unless (($ENV{'user.domain'} eq $1) ||
+                  ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'} eq $1)) {
+ 		return '';
+             }
+         }
+         if ($ENV{'request.role'}=~ /li\.\//) {
+             # Library role, so allow browsing of resources in this domain.
+             return 'F';
+         }
+         if ($copyright eq 'custom') {
+ 	    unless (&customaccess($priv,$uri)) { return ''; }
+         }
+     }
+     # Domain coordinator is trying to create a course
+     if (($priv eq 'ccc') && ($ENV{'request.role'} =~ /^dc\./)) {
+         # uri is the requested domain in this case.
+         # comparison to 'request.role.domain' shows if the user has selected
+         # a role of dc for the domain in question.
+         return 'F' if ($uri eq $ENV{'request.role.domain'});
      }
      my $thisallowed='';
- Line 1526  sub allowed {
+ Line 2290  sub allowed {
         $thisallowed.=$1;
      }
+ # URI is an uploaded document for this course
+     if (($priv eq 'bre') &&
+         ($uri=~/^uploaded\/$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}\/$ENV{'course.'.$ENV{'request.course.id'}.'.num'}/)) {
+         return 'F';
+     }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
- Line 1544  sub allowed {
+ Line 2314  sub allowed {
  # the course
      if ($ENV{'request.course.id'}) {
         $courseprivid=$ENV{'request.course.id'};
         if ($ENV{'request.course.sec'}) {
            $courseprivid.='/'.$ENV{'request.course.sec'};
         }
         $courseprivid=~s/\_/\//;
         my $checkreferer=1;
-        my @uriparts=split(/\//,$uri);
+        my ($match,$cond)=&is_on_map($uri);
-        my $filename=$uriparts[$#uriparts];
+        if ($match) {
-        my $pathname=$uri;
+            $statecond=$cond;
-        $pathname=~s/\/$filename$//;
-        if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
-            /\&$filename\:([\d\|]+)\&/) {
-            $statecond=$1;
             if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
                 =~/$priv\&([^\:]*)/) {
                 $thisallowed.=$1;
- Line 1566  sub allowed {
+ Line 2333  sub allowed {
         if ($checkreferer) {
  	  my $refuri=$ENV{'httpref.'.$orguri};
              unless ($refuri) {
                  foreach (keys %ENV) {
  		    if ($_=~/^httpref\..*\*/) {
- Line 1580  sub allowed {
+ Line 2346  sub allowed {
                      }
                  }
              }
           if ($refuri) {
  	  $refuri=&declutter($refuri);
-           my @uriparts=split(/\//,$refuri);
+           my ($match,$cond)=&is_on_map($refuri);
-           my $filename=$uriparts[$#uriparts];
+             if ($match) {
-           my $pathname=$refuri;
+               my $refstatecond=$cond;
-           $pathname=~s/\/$filename$//;
-             if ($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
-               /\&$filename\:([\d\|]+)\&/) {
-               my $refstatecond=$1;
                if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
                    =~/$priv\&([^\:]*)/) {
                    $thisallowed.=$1;
- Line 1647  sub allowed {
+ Line 2410  sub allowed {
                  || ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
  		   if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) {
                         &log($ENV{'user.domain'},$ENV{'user.name'},
-                             $ENV{'user.host'},
+                             $ENV{'user.home'},
                              'Locked by res: '.$priv.' for '.$uri.' due to '.
                              $cdom.'/'.$cnum.'/'.$csec.' expire '.
                              $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
- Line 1658  sub allowed {
+ Line 2421  sub allowed {
                  || ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) {
  		   if ($ENV{'priv.'.$priv.'.lock.expire'}>time) {
                         &log($ENV{'user.domain'},$ENV{'user.name'},
-                             $ENV{'user.host'},
+                             $ENV{'user.home'},
                              'Locked by priv: '.$priv.' for '.$uri.' due to '.
                              $cdom.'/'.$cnum.'/'.$csec.' expire '.
                              $ENV{$prefix.'priv.'.$priv.'.lock.expire'});
- Line 1686  sub allowed {
+ Line 2449  sub allowed {
     if ($thisallowed=~/C/) {
         my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
+        my $unamedom=$ENV{'user.name'}.':'.$ENV{'user.domain'};
         if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.roles.denied'}
  	   =~/$rolecode/) {
             &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
- Line 1693  sub allowed {
+ Line 2457  sub allowed {
                  $ENV{'request.course.id'});
             return '';
         }
+        if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.users.denied'}
+ 	   =~/$unamedom/) {
+            &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
+                 'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '.
+                 $ENV{'request.course.id'});
+            return '';
+        }
     }
  # Resource preferences
     if ($thisallowed=~/R/) {
         my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
-        my $filename=$perlvar{'lonDocRoot'}.'/res/'.$uri.'.meta';
+        if (&metadata($uri,'roledeny')=~/$rolecode/) {
-        if (-e $filename) {
+ 	  &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
-            my @content;
-            {
- 	     my $fh=Apache::File->new($filename);
-              @content=<$fh>;
- 	   }
-            if (join('',@content)=~
-                     /\<roledeny[^\>]*\>[^\<]*$rolecode[^\<]*\<\/roledeny\>/) {
- 	       &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                      'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
-            return '';
+           return '';
-            }
         }
     }
- # Restricted by state?
+ # Restricted by state or randomout?
     if ($thisallowed=~/X/) {
+       if ($ENV{'acc.randomout'}) {
+          my $symb=&symbread($uri,1);
+          if (($symb) && ($ENV{'acc.randomout'}=~/\&$symb\&/)) {
+             return '';
+          }
+       }
        if (&condval($statecond)) {
  	 return '2';
        } else {
- Line 1729  sub allowed {
+ Line 2497  sub allowed {
     return 'F';
  }
+ # --------------------------------------------------- Is a resource on the map?
+ sub is_on_map {
+     my $uri=&declutter(shift);
+     my @uriparts=split(/\//,$uri);
+     my $filename=$uriparts[$#uriparts];
+     my $pathname=$uri;
+     $pathname=~s|/\Q$filename\E$||;
+     $pathname=~s/^adm\/wrapper\///;
+     #Trying to find the conditional for the file
+     my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
+ 	       /\&\Q$filename\E\:([\d\|]+)\&/);
+     if ($match) {
+ 	return (1,$1);
+     } else {
+ 	return (0,0);
+     }
+ }
  # ----------------------------------------------------------------- Define Role
  sub definerole {
- Line 1774  sub definerole {
+ Line 2561  sub definerole {
  # ---------------- Make a metadata query against the network of library servers
  sub metadata_query {
-     my ($query,$custom,$customshow)=@_;
+     my ($query,$custom,$customshow,$server_array)=@_;
      my %rhash;
-     for my $server (keys %libserv) {
+     my @server_list = (defined($server_array) ? @$server_array
+                                               : keys(%libserv) );
+     for my $server (@server_list) {
  	unless ($custom or $customshow) {
  	    my $reply=&reply("querysend:".&escape($query),$server);
  	    $rhash{$server}=$reply;
- Line 1791  sub metadata_query {
+ Line 2580  sub metadata_query {
      return \%rhash;
  }
+ # ----------------------------------------- Send log queries and wait for reply
+ sub log_query {
+     my ($uname,$udom,$query,%filters)=@_;
+     my $uhome=&homeserver($uname,$udom);
+     if ($uhome eq 'no_host') { return 'error: no_host'; }
+     my $uhost=$hostname{$uhome};
+     my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters));
+     my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command,
+                        $uhome);
+     unless ($queryid=~/^$uhost\_/) { return 'error: '.$queryid; }
+     return get_query_reply($queryid);
+ }
+ sub get_query_reply {
+     my $queryid=shift;
+     my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid;
+     my $reply='';
+     for (1..100) {
+ 	sleep 2;
+         if (-e $replyfile.'.end') {
+ 	    if (my $fh=Apache::File->new($replyfile)) {
+                $reply.=<$fh>;
+                $fh->close;
+ 	   } else { return 'error: reply_file_error'; }
+            return &unescape($reply);
+ 	}
+     }
+     return 'timeout:'.$queryid;
+ }
+ sub courselog_query {
+ #
+ # possible filters:
+ # url: url or symb
+ # username
+ # domain
+ # action: view, submit, grade
+ # start: timestamp
+ # end: timestamp
+ #
+     my (%filters)=@_;
+     unless ($ENV{'request.course.id'}) { return 'no_course'; }
+     if ($filters{'url'}) {
+ 	$filters{'url'}=&symbclean(&declutter($filters{'url'}));
+         $filters{'url'}=~s/\.(\w+)$/(\\.\\d+)*\\.$1/;
+         $filters{'url'}=~s/\.(\w+)\_\_\_/(\\.\\d+)*\\.$1/;
+     }
+     my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+     my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     return &log_query($cname,$cdom,'courselog',%filters);
+ }
+ sub userlog_query {
+     my ($uname,$udom,%filters)=@_;
+     return &log_query($uname,$udom,'userlog',%filters);
+ }
  # ------------------------------------------------------------------ Plain Text
  sub plaintext {
- Line 1801  sub plaintext {
+ Line 2648  sub plaintext {
  # ----------------------------------------------------------------- Assign Role
  sub assignrole {
-     my ($udom,$uname,$url,$role,$end,$start)=@_;
+     my ($udom,$uname,$url,$role,$end,$start,$deleteflag)=@_;
      my $mrole;
      if ($role =~ /^cr\//) {
  	unless (&allowed('ccr',$url)) {
- Line 1814  sub assignrole {
+ Line 2661  sub assignrole {
      } else {
          my $cwosec=$url;
          $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
-         unless (&allowed('c'.$role,$cwosec)) {
+         unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) {
             &logthis('Refused assignrole: '.
               $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
  		    $ENV{'user.name'}.' at '.$ENV{'user.domain'});
- Line 1832  sub assignrole {
+ Line 2679  sub assignrole {
             $command.='_0_'.$start;
          }
      }
-     return &reply($command,&homeserver($uname,$udom));
+ # actually delete
+     if ($deleteflag) {
+ 	if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) {
+ # modify command to delete the role
+            $command="encrypt:rolesdel:$ENV{'user.domain'}:$ENV{'user.name'}:".
+                 "$udom:$uname:$url".'_'."$mrole";
+ 	   &logthis("$ENV{'user.name'} at $ENV{'user.domain'} deletes $mrole in $url for $uname at $udom");
+ # set start and finish to negative values for userrolelog
+            $start=-1;
+            $end=-1;
+         }
+     }
+ # send command
+     my $answer=&reply($command,&homeserver($uname,$udom));
+ # log new user role if status is ok
+     if ($answer eq 'ok') {
+ 	&userrolelog($mrole,$uname,$udom,$url,$start,$end);
+     }
+     return $answer;
  }
  # -------------------------------------------------- Modify user authentication
- Line 1843  sub modifyuserauth {
+ Line 2708  sub modifyuserauth {
      my $uhome=&homeserver($uname,$udom);
      unless (&allowed('mau',$udom)) { return 'refused'; }
      &logthis('Call to modify user authentication '.$udom.', '.$uname.', '.
-              $umode.' by '.$ENV{'user.name'}.' at '.$ENV{'user.domain'});
+              $umode.' by '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+              ' in domain '.$ENV{'request.role.domain'});
      my $reply=&reply('encrypt:changeuserauth:'.$udom.':'.$uname.':'.$umode.':'.
  		     &escape($upass),$uhome);
      &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.home'},
- Line 1874  sub modifyuser {
+ Line 2740  sub modifyuser {
  	     $last.', '.$gene.'(forceid: '.$forceid.')'.
               (defined($desiredhome) ? ' desiredhome = '.$desiredhome :
                                       ' desiredhome not specified').
-              ' by '.$ENV{'user.name'}.' at '.$ENV{'user.domain'});
+              ' by '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
-     my $uhome=&homeserver($uname,$udom);
+              ' in domain '.$ENV{'request.role.domain'});
+     my $uhome=&homeserver($uname,$udom,'true');
  # ----------------------------------------------------------------- Create User
      if (($uhome eq 'no_host') && ($umode) && ($upass)) {
          my $unhome='';
- Line 1905  sub modifyuser {
+ Line 2772  sub modifyuser {
  	unless ($reply eq 'ok') {
              return 'error: '.$reply;
          }
-         $uhome=&homeserver($uname,$udom);
+         $uhome=&homeserver($uname,$udom,'true');
          if (($uhome eq '') || ($uhome eq 'no_host') || ($uhome ne $unhome)) {
- 	    return 'error: verify home';
+ 	    return 'error: unable verify users home machine.';
          }
      }   # End of creation of new user
  # ---------------------------------------------------------------------- Add ID
- Line 1917  sub modifyuser {
+ Line 2784  sub modifyuser {
         if (($uidhash{$uname}) && ($uidhash{$uname}!~/error\:/)
           && (!$forceid)) {
  	  unless ($uid eq $uidhash{$uname}) {
- 	      return 'error: mismatch '.$uidhash{$uname}.' versus '.$uid;
+ 	      return 'error: user id "'.$uid.'" does not match '.
+                   'current user id "'.$uidhash{$uname}.'".';
            }
         } else {
  	  &idput($udom,($uname => $uid));
         }
      }
  # -------------------------------------------------------------- Add names, etc
-     my %names=&get('environment',
+     my @tmp=&get('environment',
  		   ['firstname','middlename','lastname','generation'],
  		   $udom,$uname);
-     if ($names{'firstname'} =~ m/^error:.*/) { %names=(); }
+     my %names;
-     if ($first)  { $names{'firstname'}  = $first; }
+     if ($tmp[0] =~ m/^error:.*/) {
-     if ($middle) { $names{'middlename'} = $middle; }
+         %names=();
-     if ($last)   { $names{'lastname'}   = $last; }
+     } else {
-     if ($gene)   { $names{'generation'} = $gene; }
+         %names = @tmp;
+     }
+     if (defined($first))  { $names{'firstname'}  = $first; }
+     if (defined($middle)) { $names{'middlename'} = $middle; }
+     if (defined($last))   { $names{'lastname'}   = $last; }
+     if (defined($gene))   { $names{'generation'} = $gene; }
      my $reply = &put('environment', \%names, $udom,$uname);
      if ($reply ne 'ok') { return 'error: '.$reply; }
      &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
- Line 1955  sub modifystudent {
+ Line 2828  sub modifystudent {
  	($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid,
           $desiredhome);
      unless ($reply eq 'ok') { return $reply; }
+     # This will cause &modify_student_enrollment to get the uid from the
+     # students environment
+     $uid = undef if (!$forceid);
+     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,
+                                         $last,$gene,$usec,$end,$start);
+     return $reply;
+ }
+ sub modify_student_enrollment {
+     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start) = @_;
+     # Get the course id from the environment
+     my $cid='';
+     unless ($cid=$ENV{'request.course.id'}) {
+ 	return 'not_in_class';
+     }
+     # Make sure the user exists
      my $uhome=&homeserver($uname,$udom);
      if (($uhome eq '') || ($uhome eq 'no_host')) {
  	return 'error: no such user';
      }
- # -------------------------------------------------- Add student to course list
+     #
-     $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+     # Get student data if we were not given enough information
+     if (!defined($first)  || $first  eq '' ||
+         !defined($last)   || $last   eq '' ||
+         !defined($uid)    || $uid    eq '' ||
+         !defined($middle) || $middle eq '' ||
+         !defined($gene)   || $gene   eq '') {
+         # They did not supply us with enough data to enroll the student, so
+         # we need to pick up more information.
+         my %tmp = &get('environment',
+                        ['firstname','middlename','lastname', 'generation','id']
+                        ,$udom,$uname);
+         foreach (keys(%tmp)) {
+             &logthis("key $_ = ".$tmp{$_});
+         }
+         $first  = $tmp{'firstname'}  if (!defined($first)  || $first  eq '');
+         $middle = $tmp{'middlename'} if (!defined($middle) || $middle eq '');
+         $last   = $tmp{'lastname'}   if (!defined($last)   || $last eq '');
+         $gene   = $tmp{'generation'} if (!defined($gene)   || $gene eq '');
+         $uid    = $tmp{'id'}         if (!defined($uid)    || $uid  eq '');
+     }
+     my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene,
+                                                            $first,$middle);
+     my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
  	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
                        &escape($uname.':'.$udom).'='.
-                       &escape($end.':'.$start),
+                       &escape(join(':',$end,$start,$uid,$usec,$fullname)),
  	              $ENV{'course.'.$cid.'.home'});
      unless (($reply eq 'ok') || ($reply eq 'delayed')) {
  	return 'error: '.$reply;
      }
- # ---------------------------------------------------- Add student role to user
+     # Add student role to user
      my $uurl='/'.$cid;
      $uurl=~s/\_/\//g;
      if ($usec) {
- Line 1999  sub writecoursepref {
+ Line 2911  sub writecoursepref {
  # ---------------------------------------------------------- Make/modify course
  sub createcourse {
-     my ($udom,$description,$url)=@_;
+     my ($udom,$description,$url,$course_server,$nonstandard)=@_;
      $url=&declutter($url);
      my $cid='';
-     unless (&allowed('ccc',$ENV{'user.domain'})) {
+     unless (&allowed('ccc',$udom)) {
-         return 'refused';
-     }
-     unless ($udom eq $ENV{'user.domain'}) {
          return 'refused';
      }
  # ------------------------------------------------------------------- Create ID
     my $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
         unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
  # ----------------------------------------------- Make sure that does not exist
-    my $uhome=&homeserver($uname,$udom);
+    my $uhome=&homeserver($uname,$udom,'true');
     unless (($uhome eq '') || ($uhome eq 'no_host')) {
         $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
          unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
-        $uhome=&homeserver($uname,$udom);
+        $uhome=&homeserver($uname,$udom,'true');
         unless (($uhome eq '') || ($uhome eq 'no_host')) {
             return 'error: unable to generate unique course-ID';
         }
     }
+ # ------------------------------------------------ Check supplied server name
+     $course_server = $ENV{'user.homeserver'} if (! defined($course_server));
+     if (! exists($libserv{$course_server})) {
+         return 'error:bad server name '.$course_server;
+     }
  # ------------------------------------------------------------- Make the course
      my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::',
-                       $ENV{'user.home'});
+                       $course_server);
      unless ($reply eq 'ok') { return 'error: '.$reply; }
-     $uhome=&homeserver($uname,$udom);
+     $uhome=&homeserver($uname,$udom,'true');
      if (($uhome eq '') || ($uhome eq 'no_host')) {
  	return 'error: no such course';
      }
+ # ----------------------------------------------------------------- Course made
+ # log existance
+     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description),
+                  $uhome);
+     &flushcourselogs();
+ # set toplevel url
+     my $topurl=$url;
+     unless ($nonstandard) {
+ # ------------------------------------------ For standard courses, make top url
+         my $mapurl=&clutter($url);
+         if ($mapurl eq '/res/') { $mapurl=''; }
+         $ENV{'form.initmap'}=(<<ENDINITMAP);
+ <map>
+ <resource id="1" type="start"></resource>
+ <resource id="2" src="$mapurl"></resource>
+ <resource id="3" type="finish"></resource>
+ <link index="1" from="1" to="2"></link>
+ <link index="2" from="2" to="3"></link>
+ </map>
+ ENDINITMAP
+         $topurl=&declutter(
+         &finishuserfileupload($uname,$udom,$uhome,'initmap','default.sequence')
+                           );
+     }
+ # ----------------------------------------------------------- Write preferences
      &writecoursepref($udom.'_'.$uname,
                       ('description' => $description,
-                       'url'         => $url));
+                       'url'         => $topurl));
      return '/'.$udom.'/'.$uname;
  }
  # ---------------------------------------------------------- Assign Custom Role
  sub assigncustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag)=@_;
      return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename,
-                        $end,$start);
+                        $end,$start,$deleteflag);
  }
  # ----------------------------------------------------------------- Revoke Role
  sub revokerole {
-     my ($udom,$uname,$url,$role)=@_;
+     my ($udom,$uname,$url,$role,$deleteflag)=@_;
      my $now=time;
-     return &assignrole($udom,$uname,$url,$role,$now);
+     return &assignrole($udom,$uname,$url,$role,$now,$deleteflag);
  }
  # ---------------------------------------------------------- Revoke Custom Role
  sub revokecustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag)=@_;
      my $now=time;
-     return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now);
+     return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now,
+            $deleteflag);
  }
  # ------------------------------------------------------------ Directory lister
  sub dirlist {
-     my $uri=shift;
+     my ($uri,$userdomain,$username,$alternateDirectoryRoot)=@_;
      $uri=~s/^\///;
      $uri=~s/\/$//;
-     my ($res,$udom,$uname,@rest)=split(/\//,$uri);
+     my ($udom, $uname);
-     if ($udom) {
+     (undef,$udom,$uname)=split(/\//,$uri);
-      if ($uname) {
+     if(defined($userdomain)) {
-        my $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/'.$uri,
+         $udom = $userdomain;
-                       homeserver($uname,$udom));
+     }
-        return split(/:/,$listing);
+     if(defined($username)) {
-      } else {
+         $uname = $username;
-        my $tryserver;
+     }
-        my %allusers=();
-        foreach $tryserver (keys %libserv) {
+     my $dirRoot = $perlvar{'lonDocRoot'};
- 	  if ($hostdom{$tryserver} eq $udom) {
+     if(defined($alternateDirectoryRoot)) {
-              my $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.$udom,
+         $dirRoot = $alternateDirectoryRoot;
- 			       $tryserver);
+         $dirRoot =~ s/\/$//;
-              if (($listing ne 'no_such_dir') && ($listing ne 'empty')
+     }
-               && ($listing ne 'con_lost')) {
-                 foreach (split(/:/,$listing)) {
+     if($udom) {
-                   my ($entry,@stat)=split(/&/,$_);
+         if($uname) {
-                   $allusers{$entry}=1;
+             my $listing=reply('ls:'.$dirRoot.'/'.$uri,
+                               homeserver($uname,$udom));
+             return split(/:/,$listing);
+         } elsif(!defined($alternateDirectoryRoot)) {
+             my $tryserver;
+             my %allusers=();
+             foreach $tryserver (keys %libserv) {
+                 if($hostdom{$tryserver} eq $udom) {
+                     my $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.
+                                       $udom, $tryserver);
+                     if (($listing ne 'no_such_dir') && ($listing ne 'empty')
+                         && ($listing ne 'con_lost')) {
+                         foreach (split(/:/,$listing)) {
+                             my ($entry,@stat)=split(/&/,$_);
+                             $allusers{$entry}=1;
+                         }
+                     }
                  }
-              }
+             }
- 	  }
+             my $alluserstr='';
-        }
+             foreach (sort keys %allusers) {
-        my $alluserstr='';
+                 $alluserstr.=$_.'&user:';
-        foreach (sort keys %allusers) {
+             }
-            $alluserstr.=$_.'&user:';
+             $alluserstr=~s/:$//;
-        }
+             return split(/:/,$alluserstr);
-        $alluserstr=~s/:$//;
+         } else {
-        return split(/:/,$alluserstr);
+             my @emptyResults = ();
-      }
+             push(@emptyResults, 'missing user name');
-    } else {
+             return split(':',@emptyResults);
-        my $tryserver;
+         }
-        my %alldom=();
+     } elsif(!defined($alternateDirectoryRoot)) {
-        foreach $tryserver (keys %libserv) {
+         my $tryserver;
- 	   $alldom{$hostdom{$tryserver}}=1;
+         my %alldom=();
-        }
+         foreach $tryserver (keys %libserv) {
-        my $alldomstr='';
+             $alldom{$hostdom{$tryserver}}=1;
-        foreach (sort keys %alldom) {
+         }
-           $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:';
+         my $alldomstr='';
-        }
+         foreach (sort keys %alldom) {
-        $alldomstr=~s/:$//;
+             $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:';
-        return split(/:/,$alldomstr);
+         }
-    }
+         $alldomstr=~s/:$//;
+         return split(/:/,$alldomstr);
+     } else {
+         my @emptyResults = ();
+         push(@emptyResults, 'missing domain');
+         return split(':',@emptyResults);
+     }
+ }
+ # --------------------------------------------- GetFileTimestamp
+ # This function utilizes dirlist and returns the date stamp for
+ # when it was last modified.  It will also return an error of -1
+ # if an error occurs
+ sub GetFileTimestamp {
+     my ($studentDomain,$studentName,$filename,$root)=@_;
+     $studentDomain=~s/\W//g;
+     $studentName=~s/\W//g;
+     my $subdir=$studentName.'__';
+     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+     my $proname="$studentDomain/$subdir/$studentName";
+     $proname .= '/'.$filename;
+     my ($fileStat) = &Apache::lonnet::dirlist($proname, $studentDomain,
+                                               $studentName, $root);
+     my @stats = split('&', $fileStat);
+     if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
+         # @stats contains first the filename, then the stat output
+         return $stats[10]; # so this is 10 instead of 9.
+     } else {
+         return -1;
+     }
  }
  # -------------------------------------------------------- Value of a Condition
- Line 2161  sub condval {
+ Line 3148  sub condval {
      return $result;
  }
+ # ---------------------------------------------------- Devalidate courseresdata
+ sub devalidatecourseresdata {
+     my ($coursenum,$coursedomain)=@_;
+     my $hashid=$coursenum.':'.$coursedomain;
+     delete $courseresdatacache{$hashid.'.time'};
+ }
  # --------------------------------------------------- Course Resourcedata Query
  sub courseresdata {
      my ($coursenum,$coursedomain,@which)=@_;
      my $coursehom=&homeserver($coursenum,$coursedomain);
      my $hashid=$coursenum.':'.$coursedomain;
-     unless (defined($courseresdatacache{$hashid.'.time'})) {
+     my $dodump=0;
- 	unless (time-$courseresdatacache{$hashid.'.time'}<300) {
+     if (!defined($courseresdatacache{$hashid.'.time'})) {
-            my $coursehom=&homeserver($coursenum,$coursedomain);
+ 	$dodump=1;
-            if ($coursehom) {
+     } else {
-               my $dumpreply=&reply('dump:'.$coursedomain.':'.$coursenum.
+ 	if (time-$courseresdatacache{$hashid.'.time'}>300) { $dodump=1; }
- 			     ':resourcedata:.',$coursehom);
- 	      unless ($dumpreply=~/^error\:/) {
- 	         $courseresdatacache{$hashid.'.time'}=time;
-                  $courseresdatacache{$hashid}=$dumpreply;
- 	     }
- 	  }
-        }
      }
-    my @pairs=split(/\&/,$courseresdatacache{$hashid});
+     if ($dodump) {
-    my %returnhash=();
+ 	my %dumpreply=&dump('resourcedata',$coursedomain,$coursenum);
-    foreach (@pairs) {
+ 	my ($tmp) = keys(%dumpreply);
-       my ($key,$value)=split(/=/,$_);
+ 	if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-       $returnhash{unescape($key)}=unescape($value);
+ 	    $courseresdatacache{$hashid.'.time'}=time;
-    }
+ 	    $courseresdatacache{$hashid}=\%dumpreply;
-     my $item;
+ 	} elsif ($tmp =~ /^(con_lost|no_such_host)/) {
-    foreach $item (@which) {
+ 	    return $tmp;
-        if ($returnhash{$item}) { return $returnhash{$item}; }
+ 	}
-    }
+     }
-    return '';
+     foreach my $item (@which) {
+ 	if (defined($courseresdatacache{$hashid}->{$item})) {
+ 	    return $courseresdatacache{$hashid}->{$item};
+ 	}
+     }
+     return undef;
  }
- # --------------------------------------------------------- Value of a Variable
+ #
+ # EXT resource caching routines
+ #
+ sub clear_EXT_cache_status {
+     &delenv('cache.EXT.');
+ }
+ sub EXT_cache_status {
+     my ($target_domain,$target_user) = @_;
+     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
+     if (exists($ENV{$cachename}) && ($ENV{$cachename}+1800) > time) {
+         # We know already the user has no data
+         return 1;
+     } else {
+         return 0;
+     }
+ }
+ sub EXT_cache_set {
+     my ($target_domain,$target_user) = @_;
+     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
+     &appenv($cachename => time);
+ }
+ # --------------------------------------------------------- Value of a Variable
  sub EXT {
-     my ($varname,$symbparm)=@_;
+     my ($varname,$symbparm,$udom,$uname,$usection)=@_;
      unless ($varname) { return ''; }
+     #get real user name/domain, courseid and symb
+     my $courseid;
+     my $publicuser;
+     if (!($uname && $udom)) {
+       (my $cursymb,$courseid,$udom,$uname,$publicuser)=
+ 	  &Apache::lonxml::whichuser($symbparm);
+       if (!$symbparm) {	$symbparm=$cursymb; }
+     } else {
+ 	$courseid=$ENV{'request.course.id'};
+     }
      my ($realm,$space,$qualifier,@therest)=split(/\./,$varname);
      my $rest;
-     if ($therest[0]) {
+     if (defined($therest[0])) {
         $rest=join('.',@therest);
      } else {
         $rest='';
      }
      my $qualifierrest=$qualifier;
      if ($rest) { $qualifierrest.='.'.$rest; }
      my $spacequalifierrest=$space;
- Line 2212  sub EXT {
+ Line 3241  sub EXT {
      if ($realm eq 'user') {
  # --------------------------------------------------------------- user.resource
  	if ($space eq 'resource') {
- 	    my %restored=&restore();
+ 	    if (defined($Apache::lonhomework::parsing_a_problem)) {
-             return $restored{$qualifierrest};
+ 		return $Apache::lonhomework::history{$qualifierrest};
+ 	    } else {
+ 		my %restored;
+ 		if ($publicuser || $ENV{'request.state'} eq 'construct') {
+ 		    %restored=&tmprestore($symbparm,$courseid,$udom,$uname);
+ 		} else {
+ 		    %restored=&restore($symbparm,$courseid,$udom,$uname);
+ 		}
+ 		return $restored{$qualifierrest};
+ 	    }
  # ----------------------------------------------------------------- user.access
          } elsif ($space eq 'access') {
+ 	    # FIXME - not supporting calls for a specific user
              return &allowed($qualifier,$rest);
  # ------------------------------------------ user.preferences, user.environment
          } elsif (($space eq 'preferences') || ($space eq 'environment')) {
-             return $ENV{join('.',('environment',$qualifierrest))};
+ 	    if (($uname eq $ENV{'user.name'}) &&
+ 		($udom eq $ENV{'user.domain'})) {
+ 		return $ENV{join('.',('environment',$qualifierrest))};
+ 	    } else {
+ 		my %returnhash;
+ 		if (!$publicuser) {
+ 		    %returnhash=&userenvironment($udom,$uname,
+ 						 $qualifierrest);
+ 		}
+ 		return $returnhash{$qualifierrest};
+ 	    }
  # ----------------------------------------------------------------- user.course
          } elsif ($space eq 'course') {
+ 	    # FIXME - not supporting calls for a specific user
              return $ENV{join('.',('request.course',$qualifier))};
  # ------------------------------------------------------------------- user.role
          } elsif ($space eq 'role') {
+ 	    # FIXME - not supporting calls for a specific user
              my ($role,$where)=split(/\./,$ENV{'request.role'});
              if ($qualifier eq 'value') {
  		return $role;
- Line 2233  sub EXT {
+ Line 3284  sub EXT {
              }
  # ----------------------------------------------------------------- user.domain
          } elsif ($space eq 'domain') {
-             return $ENV{'user.domain'};
+             return $udom;
  # ------------------------------------------------------------------- user.name
          } elsif ($space eq 'name') {
-             return $ENV{'user.name'};
+             return $uname;
  # ---------------------------------------------------- Any other user namespace
          } else {
-             my $item=($rest)?$qualifier.'.'.$rest:$qualifier;
+ 	    my %reply;
-             my %reply=&get($space,[$item]);
+ 	    if (!$publicuser) {
-             return $reply{$item};
+ 		%reply=&get($space,[$qualifierrest],$udom,$uname);
+ 	    }
+ 	    return $reply{$qualifierrest};
          }
-     } elsif ($realm eq 'request') {
+     } elsif ($realm eq 'query') {
+ # ---------------------------------------------- pull stuff out of query string
+         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ 						[$spacequalifierrest]);
+ 	return $ENV{'form.'.$spacequalifierrest};
+    } elsif ($realm eq 'request') {
  # ------------------------------------------------------------- request.browser
          if ($space eq 'browser') {
  	    return $ENV{'browser.'.$qualifier};
- Line 2253  sub EXT {
+ Line 3311  sub EXT {
          }
      } elsif ($realm eq 'course') {
  # ---------------------------------------------------------- course.description
-         return $ENV{'course.'.$ENV{'request.course.id'}.'.'.
+         return $ENV{'course.'.$courseid.'.'.$spacequalifierrest};
-                               $spacequalifierrest};
      } elsif ($realm eq 'resource') {
-        if ($ENV{'request.course.id'}) {
- #	   print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
+ 	if (defined($courseid) && $courseid eq $ENV{'request.course.id'}) {
+ 	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
  # ----------------------------------------------------- Cascading lookup scheme
-          my $symbp;
+ 	    if (!$symbparm) { $symbparm=&symbread(); }
-          if ($symbparm) {
+ 	    my $symbp=$symbparm;
-             $symbp=$symbparm;
+ 	    my $mapp=(split(/\_\_\_/,$symbp))[0];
- 	 } else {
-             $symbp=&symbread();
+ 	    my $symbparm=$symbp.'.'.$spacequalifierrest;
-          }
+ 	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
-          my $mapp=(split(/\_\_\_/,$symbp))[0];
+ 	    my $section;
-          my $symbparm=$symbp.'.'.$spacequalifierrest;
+ 	    if (($ENV{'user.name'} eq $uname) &&
-          my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
+ 		($ENV{'user.domain'} eq $udom)) {
+ 		$section=$ENV{'request.course.sec'};
-          my $seclevel=
+ 	    } else {
-             $ENV{'request.course.id'}.'.['.
+                 if (! defined($usection)) {
- 		$ENV{'request.course.sec'}.'].'.$spacequalifierrest;
+                     $section=&usection($udom,$uname,$courseid);
-          my $seclevelr=
+                 } else {
-             $ENV{'request.course.id'}.'.['.
+                     $section = $usection;
- 		$ENV{'request.course.sec'}.'].'.$symbparm;
+                 }
-          my $seclevelm=
+ 	    }
-             $ENV{'request.course.id'}.'.['.
- 		$ENV{'request.course.sec'}.'].'.$mapparm;
-          my $courselevel=
-             $ENV{'request.course.id'}.'.'.$spacequalifierrest;
-          my $courselevelr=
-             $ENV{'request.course.id'}.'.'.$symbparm;
-          my $courselevelm=
-             $ENV{'request.course.id'}.'.'.$mapparm;
- # ----------------------------------------------------------- first, check user
+ 	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
-          my %resourcedata=get('resourcedata',
+ 	    my $seclevelr=$courseid.'.['.$section.'].'.$symbparm;
-                            [$courselevelr,$courselevelm,$courselevel]);
+ 	    my $seclevelm=$courseid.'.['.$section.'].'.$mapparm;
-          if (($resourcedata{$courselevelr}!~/^error\:/) &&
-              ($resourcedata{$courselevelr}!~/^con_lost/)) {
+ 	    my $courselevel=$courseid.'.'.$spacequalifierrest;
+ 	    my $courselevelr=$courseid.'.'.$symbparm;
-          if ($resourcedata{$courselevelr}) {
+ 	    my $courselevelm=$courseid.'.'.$mapparm;
-             return $resourcedata{$courselevelr}; }
-          if ($resourcedata{$courselevelm}) {
-             return $resourcedata{$courselevelm}; }
-          if ($resourcedata{$courselevel}) { return $resourcedata{$courselevel}; }
-       } else {
+ # ----------------------------------------------------------- first, check user
- 	  if ($resourcedata{$courselevelr}!~/No such file/) {
+ 	    #most student don\'t have any data set, check if there is some data
- 	    &logthis("<font color=blue>WARNING:".
+             #every thirty minutes
- 		   " Trying to get resource data for ".$ENV{'user.name'}." at "
+ 	    if (! &EXT_cache_status($udom,$uname)) {
-                    .$ENV{'user.domain'}.": ".$resourcedata{$courselevelr}.
+ 		my %resourcedata=&get('resourcedata',
-                  "</font>");
+ 				      [$courselevelr,$courselevelm,$courselevel],
- 	  }
+ 				      $udom,$uname);
-       }
+ 		my ($tmp)=keys(%resourcedata);
+ 		if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) {
+ 		    if ($resourcedata{$courselevelr}) {
+ 			return $resourcedata{$courselevelr}; }
+ 		    if ($resourcedata{$courselevelm}) {
+ 			return $resourcedata{$courselevelm}; }
+ 		    if ($resourcedata{$courselevel}) {
+ 			return $resourcedata{$courselevel}; }
+ 		} else {
+ 		    if ($tmp!~/No such file/) {
+ 			&logthis("<font color=blue>WARNING:".
+ 				 " Trying to get resource data for ".
+ 				 $uname." at ".$udom.": ".
+ 				 $tmp."</font>");
+ 		    } elsif ($tmp=~/error:No such file/) {
+                         &EXT_cache_set($udom,$uname);
+ 		    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
+ 			return $tmp;
+ 		    }
+ 		}
+ 	    }
  # -------------------------------------------------------- second, check course
-         my $coursereply=&courseresdata(
+ 	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+ 					  $ENV{'course.'.$courseid.'.domain'},
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ 					  ($seclevelr,$seclevelm,$seclevel,
-                         ($seclevelr,$seclevelm,$seclevel,
+ 					   $courselevelr,$courselevelm,
-                          $courselevelr,$courselevelm,$courselevel));
+ 					   $courselevel));
-         if ($coursereply) { return $coursereply; }
+ 	    if (defined($coursereply)) { return $coursereply; }
  # ------------------------------------------------------ third, check map parms
-        my %parmhash=();
+ 	    my %parmhash=();
-        my $thisparm='';
+ 	    my $thisparm='';
-        if (tie(%parmhash,'GDBM_File',
+ 	    if (tie(%parmhash,'GDBM_File',
-           $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER,0640)) {
+ 		    $ENV{'request.course.fn'}.'_parms.db',
-            $thisparm=$parmhash{$symbparm};
+ 		    &GDBM_READER(),0640)) {
- 	   untie(%parmhash);
+ 		$thisparm=$parmhash{$symbparm};
-        }
+ 		untie(%parmhash);
-        if ($thisparm) { return $thisparm; }
+ 	    }
-      }
+ 	    if ($thisparm) { return $thisparm; }
+ 	}
  # --------------------------------------------- last, look in resource metadata
-       $spacequalifierrest=~s/\./\_/;
+ 	$spacequalifierrest=~s/\./\_/;
-       my $metadata=&metadata($ENV{'request.filename'},$spacequalifierrest);
+ 	my $filename;
-       if ($metadata) { return $metadata; }
+ 	if (!$symbparm) { $symbparm=&symbread(); }
-       $metadata=&metadata($ENV{'request.filename'},
+ 	if ($symbparm) {
-                                          'parameter_'.$spacequalifierrest);
+ 	    $filename=(split(/\_\_\_/,$symbparm))[2];
-       if ($metadata) { return $metadata; }
+ 	} else {
+ 	    $filename=$ENV{'request.filename'};
+ 	}
+ 	my $metadata=&metadata($filename,$spacequalifierrest);
+ 	if (defined($metadata)) { return $metadata; }
+ 	$metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
+ 	if (defined($metadata)) { return $metadata; }
  # ------------------------------------------------------------------ Cascade up
+ 	unless ($space eq '0') {
-       unless ($space eq '0') {
+ 	    my @parts=split(/_/,$space);
-           my ($part,$id)=split(/\_/,$space);
+ 	    my $id=pop(@parts);
-           if ($id) {
+ 	    my $part=join('_',@parts);
- 	      my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
+ 	    if ($part eq '') { $part='0'; }
-                                    $symbparm);
+ 	    my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
-               if ($partgeneral) { return $partgeneral; }
+ 				 $symbparm,$udom,$uname);
-           } else {
+ 	    if (defined($partgeneral)) { return $partgeneral; }
-               my $resourcegeneral=&EXT('resource.0.'.$qualifierrest,
+ 	}
-                                        $symbparm);
-               if ($resourcegeneral) { return $resourcegeneral; }
-           }
-       }
  # ---------------------------------------------------- Any other user namespace
      } elsif ($realm eq 'environment') {
  # ----------------------------------------------------------------- environment
-         return $ENV{'environment.'.$spacequalifierrest};
+ 	if (($uname eq $ENV{'user.name'})&&($udom eq $ENV{'user.domain'})) {
+ 	    return $ENV{'environment.'.$spacequalifierrest};
+ 	} else {
+ 	    my %returnhash=&userenvironment($udom,$uname,
+ 					    $spacequalifierrest);
+ 	    return $returnhash{$spacequalifierrest};
+ 	}
      } elsif ($realm eq 'system') {
  # ----------------------------------------------------------------- system.time
  	if ($space eq 'time') {
- Line 2368  sub EXT {
+ Line 3440  sub EXT {
      return '';
  }
+ sub add_prefix_and_part {
+     my ($prefix,$part)=@_;
+     my $keyroot;
+     if (defined($prefix) && $prefix !~ /^__/) {
+ 	# prefix that has a part already
+ 	$keyroot=$prefix;
+     } elsif (defined($prefix)) {
+ 	# prefix that is missing a part
+ 	if (defined($part)) { $keyroot='_'.$part.substr($prefix,1); }
+     } else {
+ 	# no prefix at all
+ 	if (defined($part)) { $keyroot='_'.$part; }
+     }
+     return $keyroot;
+ }
  # ---------------------------------------------------------------- Get metadata
  sub metadata {
      my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
      $uri=&declutter($uri);
+     # if it is a non metadata possible uri return quickly
+     if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) ||
+         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|)) {
+ 	return '';
+     }
      my $filename=$uri;
      $uri=~s/\.meta$//;
  #
- Line 2381  sub metadata {
+ Line 3474  sub metadata {
  # Look at timestamp of caching
  # Everything is cached by the main uri, libraries are never directly cached
  #
-     unless (abs($metacache{$uri.':cachedtimestamp'}-time)<600) {
+     unless (abs($metacache{$uri.':cachedtimestamp'}-time)<600 && !defined($liburi)) {
  #
  # Is this a recursive call for a library?
  #
- Line 2391  sub metadata {
+ Line 3484  sub metadata {
          }
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
- 	my $metastring=&getfile($perlvar{'lonDocRoot'}.'/res/'.$filename);
+ 	my $metastring=&getfile(&filelocation('',&clutter($filename)));
          my $parser=HTML::LCParser->new(\$metastring);
          my $token;
          undef %metathesekeys;
+ 	delete($metacache{$uri.':packages'});
          while ($token=$parser->get_token) {
-            if ($token->[0] eq 'S') {
+ 	    if ($token->[0] eq 'S') {
- 	     if (defined($token->[2]->{'package'})) {
+ 		if (defined($token->[2]->{'package'})) {
  #
  # This is a package - get package info
  #
- 	      my $package=$token->[2]->{'package'};
+ 		    my $package=$token->[2]->{'package'};
- 	      my $keyroot='';
+ 		    my $keyroot=&add_prefix_and_part($prefix,$token->[2]->{'part'});
-               if ($prefix) {
+ 		    if (defined($token->[2]->{'id'})) {
- 		  $keyroot.='_'.$prefix;
+ 			$keyroot.='_'.$token->[2]->{'id'};
-               } else {
+ 		    }
-                 if (defined($token->[2]->{'part'})) {
+ 		    if ($metacache{$uri.':packages'}) {
-                    $keyroot.='_'.$token->[2]->{'part'};
+ 			$metacache{$uri.':packages'}.=','.$package.$keyroot;
- 	        }
+ 		    } else {
- 	      }
+ 			$metacache{$uri.':packages'}=$package.$keyroot;
-               if (defined($token->[2]->{'id'})) {
+ 		    }
-                  $keyroot.='_'.$token->[2]->{'id'};
+ 		    foreach (keys %packagetab) {
- 	      }
+ 			if ($_=~/^$package\&/) {
-               if ($metacache{$uri.':packages'}) {
+ 			    my ($pack,$name,$subp)=split(/\&/,$_);
-                  $metacache{$uri.':packages'}.=','.$package.$keyroot;
+ 			    my $value=$packagetab{$_};
-               } else {
+ 			    my $part=$keyroot;
-                  $metacache{$uri.':packages'}=$package.$keyroot;
+ 			    $part=~s/^\_//;
- 	      }
+ 			    if ($subp eq 'display') {
-               foreach (keys %packagetab) {
+ 				$value.=' [Part: '.$part.']';
- 		  if ($_=~/^$package\&/) {
+ 			    }
- 		      my ($pack,$name,$subp)=split(/\&/,$_);
+ 			    my $unikey='parameter'.$keyroot.'_'.$name;
-                       my $value=$packagetab{$_};
+ 			    if ($subp eq 'default') {
- 		      my $part=$keyroot;
+ 				$unikey='parameter_0_'.$name;
-                       $part=~s/^\_//;
+ 				$metacache{$uri.':'.$unikey.'.part'}='0';
-                       if ($subp eq 'display') {
+ 			    } else {
- 			  $value.=' [Part: '.$part.']';
+ 				$metacache{$uri.':'.$unikey.'.part'}=$part;
-                       }
+ 				$metathesekeys{$unikey}=1;
-                       my $unikey='parameter'.$keyroot.'_'.$name;
+ 			    }
-                       $metathesekeys{$unikey}=1;
+ 			    unless (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
-                       $metacache{$uri.':'.$unikey.'.part'}=$part;
+ 				$metacache{$uri.':'.$unikey.'.'.$subp}=$value;
-                       unless
+ 			    }
-                        (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
+ 			    if (defined($metacache{$uri.':'.$unikey.'.default'})) {
-                          $metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+ 				$metacache{$uri.':'.$unikey}=
- 		      }
+ 				    $metacache{$uri.':'.$unikey.'.default'};
-                   }
+ 			    }
-               }
+ 			}
-              } else {
+ 		    }
+ 		} else {
  #
  # This is not a package - some other kind of start tag
  #
-               my $entry=$token->[1];
+ 		    my $entry=$token->[1];
-               my $unikey;
+ 		    my $unikey;
-               if ($entry eq 'import') {
+ 		    if ($entry eq 'import') {
-                  $unikey='';
+ 			$unikey='';
-               } else {
+ 		    } else {
-                  $unikey=$entry;
+ 			$unikey=$entry;
- 	      }
+ 		    }
-               if ($prefix) {
+ 		    $unikey.=&add_prefix_and_part($prefix,$token->[2]->{'part'});
- 		  $unikey.=$prefix;
-               } else {
+ 		    if (defined($token->[2]->{'id'})) {
-                 if (defined($token->[2]->{'part'})) {
+ 			$unikey.='_'.$token->[2]->{'id'};
-                    $unikey.='_'.$token->[2]->{'part'};
+ 		    }
- 	        }
- 	      }
-               if (defined($token->[2]->{'id'})) {
-                  $unikey.='_'.$token->[2]->{'id'};
- 	      }
-              if ($entry eq 'import') {
+ 		    if ($entry eq 'import') {
  #
  # Importing a library here
  #
- 		 if (defined($depthcount)) { $depthcount++; } else
+ 			if ($depthcount<20) {
-                                            { $depthcount=0; }
+ 			    my $location=$parser->get_text('/import');
-                  if ($depthcount<20) {
+ 			    my $dir=$filename;
- 		     foreach (split(/\,/,&metadata($uri,'keys',
+ 			    $dir=~s|[^/]*$||;
-                                   $parser->get_text('/import'),$unikey,
+ 			    $location=&filelocation($dir,$location);
-                                   $depthcount))) {
+ 			    foreach (sort(split(/\,/,&metadata($uri,'keys',
-                          $metathesekeys{$_}=1;
+ 							       $location,$unikey,
- 		     }
+ 							       $depthcount+1)))) {
- 		 }
+ 				$metathesekeys{$_}=1;
-              } else {
+ 			    }
+ 			}
-               if (defined($token->[2]->{'name'})) {
+ 		    } else {
-                  $unikey.='_'.$token->[2]->{'name'};
- 	      }
+ 			if (defined($token->[2]->{'name'})) {
-               $metathesekeys{$unikey}=1;
+ 			    $unikey.='_'.$token->[2]->{'name'};
-               foreach (@{$token->[3]}) {
+ 			}
- 		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
+ 			$metathesekeys{$unikey}=1;
-               }
+ 			foreach (@{$token->[3]}) {
-               unless (
+ 			    $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
-                  $metacache{$uri.':'.$unikey}=&HTML::Entities::decode($parser->get_text('/'.$entry))
+ 			}
- 		      ) { $metacache{$uri.':'.$unikey}=
+ 			my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
- 			      $metacache{$uri.':'.$unikey.'.default'};
+ 			my $default=$metacache{$uri.':'.$unikey.'.default'};
- 		      }
+ 			if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) {
+ 		 # only ws inside the tag, and not in default, so use default
+ 		 # as value
+ 			    $metacache{$uri.':'.$unikey}=$default;
+ 			} else {
+ 		  # either something interesting inside the tag or default
+                   # uninteresting
+ 			    $metacache{$uri.':'.$unikey}=$internaltext;
+ 			}
  # end of not-a-package not-a-library import
- 	   }
+ 		    }
  # end of not-a-package start tag
- 	  }
+ 		}
  # the next is the end of "start tag"
- 	 }
+ 	    }
-        }
+ 	}
-        $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
+ # are there custom rights to evaluate
-        $metacache{$uri.':cachedtimestamp'}=time;
+ 	if ($metacache{$uri.':copyright'} eq 'custom') {
+     #
+     # Importing a rights file here
+     #
+ 	    unless ($depthcount) {
+ 		my $location=$metacache{$uri.':customdistributionfile'};
+ 		my $dir=$filename;
+ 		$dir=~s|[^/]*$||;
+ 		$location=&filelocation($dir,$location);
+ 		foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 						   $location,'_rights',
+ 						   $depthcount+1)))) {
+ 		    $metathesekeys{$_}=1;
+ 		}
+ 	    }
+ 	}
+ 	$metacache{$uri.':keys'}=join(',',keys %metathesekeys);
+ 	&metadata_generate_part0(\%metathesekeys,\%metacache,$uri);
+ 	$metacache{$uri.':allpossiblekeys'}=join(',',keys %metathesekeys);
+ 	$metacache{$uri.':cachedtimestamp'}=time;
  # this is the end of "was not already recently cached
      }
      return $metacache{$uri.':'.$what};
  }
+ sub metadata_generate_part0 {
+     my ($metadata,$metacache,$uri) = @_;
+     my %allnames;
+     foreach my $metakey (sort keys %$metadata) {
+ 	if ($metakey=~/^parameter\_(.*)/) {
+ 	  my $part=$$metacache{$uri.':'.$metakey.'.part'};
+ 	  my $name=$$metacache{$uri.':'.$metakey.'.name'};
+ 	  if (! exists($$metadata{'parameter_0_'.$name.'.name'})) {
+ 	    $allnames{$name}=$part;
+ 	  }
+ 	}
+     }
+     foreach my $name (keys(%allnames)) {
+       $$metadata{"parameter_0_$name"}=1;
+       my $key="$uri:parameter_0_$name";
+       $$metacache{"$key.part"}='0';
+       $$metacache{"$key.name"}=$name;
+       $$metacache{"$key.type"}=$$metacache{$uri.':parameter_'.
+ 					   $allnames{$name}.'_'.$name.
+ 					   '.type'};
+       my $olddis=$$metacache{$uri.':parameter_'.$allnames{$name}.'_'.$name.
+ 			     '.display'};
+       my $expr='\\[Part: '.$allnames{$name}.'\\]';
+       $olddis=~s/$expr/\[Part: 0\]/;
+       $$metacache{"$key.display"}=$olddis;
+     }
+ }
+ # ------------------------------------------------- Get the title of a resource
+ sub gettitle {
+     my $urlsymb=shift;
+     my $symb=&symbread($urlsymb);
+     unless ($symb) {
+ 	unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; }
+         return &metadata($urlsymb,'title');
+     }
+     if ($titlecache{$symb}) {
+ 	if (time < ($titlecache{$symb}[1] + 600)) {
+ 	    return $titlecache{$symb}[0];
+ 	} else {
+ 	    delete($titlecache{$symb});
+ 	}
+     }
+     my ($map,$resid,$url)=split(/\_\_\_/,$symb);
+     my $title='';
+     my %bighash;
+     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                             &GDBM_READER(),0640)) {
+         my $mapid=$bighash{'map_pc_'.&clutter($map)};
+         $title=$bighash{'title_'.$mapid.'.'.$resid};
+         untie %bighash;
+     }
+     $title=~s/\&colon\;/\:/gs;
+     if ($title) {
+         $titlecache{$symb}=[$title,time];
+         return $title;
+     } else {
+ 	return &metadata($urlsymb,'title');
+     }
+ }
  # ------------------------------------------------- Update symbolic store links
  sub symblist {
- Line 2507  sub symblist {
+ Line 3687  sub symblist {
      my %hash;
      if (($ENV{'request.course.fn'}) && (%newhash)) {
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                       &GDBM_WRCREAT,0640)) {
+                       &GDBM_WRCREAT(),0640)) {
  	    foreach (keys %newhash) {
                  $hash{declutter($_)}=$mapname.'___'.$newhash{$_};
              }
- Line 2535  sub symbverify {
+ Line 3715  sub symbverify {
      my %bighash;
      my $okay=0;
      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                             &GDBM_READER,0640)) {
+                             &GDBM_READER(),0640)) {
-         my $ids=$bighash{'ids_/res/'.$thisfn};
+         my $ids=$bighash{'ids_'.&clutter($thisfn)};
          unless ($ids) {
             $ids=$bighash{'ids_/'.$thisfn};
          }
- Line 2573  sub symbclean {
+ Line 3753  sub symbclean {
  # ------------------------------------------------------ Return symb list entry
  sub symbread {
-     my $thisfn=shift;
+     my ($thisfn,$donotrecurse)=@_;
+ # no filename provided? try from environment
      unless ($thisfn) {
          if ($ENV{'request.symb'}) { return &symbclean($ENV{'request.symb'}); }
  	$thisfn=$ENV{'request.filename'};
      }
+ # is that filename actually a symb? Verify, clean, and return
+     if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) {
+ 	if (&symbverify($thisfn,$1)) { return &symbclean($thisfn); }
+     }
      $thisfn=declutter($thisfn);
      my %hash;
      my %bighash;
      my $syval='';
      if (($ENV{'request.course.fn'}) && ($thisfn)) {
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
-                       &GDBM_READER,0640)) {
+                       &GDBM_READER(),0640)) {
  	    $syval=$hash{$thisfn};
              untie(%hash);
          }
- Line 2600  sub symbread {
+ Line 3785  sub symbread {
          } else {
  # ------------------------------------------------------- Was not in symb table
             if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-                             &GDBM_READER,0640)) {
+                             &GDBM_READER(),0640)) {
  # ---------------------------------------------- Get ID(s) for current resource
-               my $ids=$bighash{'ids_/res/'.$thisfn};
+               my $ids=$bighash{'ids_'.&clutter($thisfn)};
                unless ($ids) {
                   $ids=$bighash{'ids_/'.$thisfn};
                }
+               unless ($ids) {
+ # alias?
+ 		  $ids=$bighash{'mapalias_'.$thisfn};
+               }
                if ($ids) {
  # ------------------------------------------------------------------- Has ID(s)
                   my @possibilities=split(/\,/,$ids);
- Line 2613  sub symbread {
+ Line 3802  sub symbread {
  # ----------------------------------------------- There is only one possibility
  		     my ($mapid,$resid)=split(/\./,$ids);
                       $syval=declutter($bighash{'map_id_'.$mapid}).'___'.$resid;
-                  } else {
+                  } elsif (!$donotrecurse) {
  # ------------------------------------------ There is more than one possibility
                       my $realpossible=0;
                       foreach (@possibilities) {
- Line 2628  sub symbread {
+ Line 3817  sub symbread {
  			 }
                       }
  		     if ($realpossible!=1) { $syval=''; }
+                  } else {
+                      $syval='';
                   }
  	      }
                untie(%bighash)
- Line 2653  sub numval {
+ Line 3844  sub numval {
      $txt=~tr/u-z/0-5/;
      $txt=~s/\D//g;
      return int($txt);
  }
+ sub latest_rnd_algorithm_id {
+     return '64bit';
+ }
  sub rndseed {
      my ($symb,$courseid,$domain,$username)=@_;
+     my ($wsymb,$wcourseid,$wdomain,$wusername)=&Apache::lonxml::whichuser();
      if (!$symb) {
-       unless ($symb=&symbread()) { return time; }
+ 	unless ($symb=$wsymb) { return time; }
+     }
+     if (!$courseid) { $courseid=$wcourseid; }
+     if (!$domain) { $domain=$wdomain; }
+     if (!$username) { $username=$wusername }
+     my $which=$ENV{"course.$courseid.rndseed"};
+     my $CODE=$ENV{'scantron.CODE'};
+     if (defined($CODE)) {
+ 	&rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit') {
+ 	return &rndseed_64bit($symb,$courseid,$domain,$username);
+     }
+     return &rndseed_32bit($symb,$courseid,$domain,$username);
+ }
+ sub rndseed_32bit {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	my $symbchck=unpack("%32C*",$symb) << 27;
+ 	my $symbseed=numval($symb) << 22;
+ 	my $namechck=unpack("%32C*",$username) << 17;
+ 	my $nameseed=numval($username) << 12;
+ 	my $domainseed=unpack("%32C*",$domain) << 7;
+ 	my $courseseed=unpack("%32C*",$courseid);
+ 	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	return $num;
      }
-     if (!$courseid) { $courseid=$ENV{'request.course.id'};}
+ }
-     if (!$domain) {$domain=$ENV{'user.domain'};}
-     if (!$username) {$username=$ENV{'user.name'};}
+ sub rndseed_64bit {
+     my ($symb,$courseid,$domain,$username)=@_;
      {
-       use integer;
+ 	use integer;
-       my $symbchck=unpack("%32C*",$symb) << 27;
+ 	my $symbchck=unpack("%32S*",$symb) << 21;
-       my $symbseed=numval($symb) << 22;
+ 	my $symbseed=numval($symb) << 10;
-       my $namechck=unpack("%32C*",$username) << 17;
+ 	my $namechck=unpack("%32S*",$username);
-       my $nameseed=numval($username) << 12;
-       my $domainseed=unpack("%32C*",$domain) << 7;
+ 	my $nameseed=numval($username) << 21;
-       my $courseseed=unpack("%32C*",$courseid);
+ 	my $domainseed=unpack("%32S*",$domain) << 10;
-       my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
+ 	my $courseseed=unpack("%32S*",$courseid);
-       #uncommenting these lines can break things!
-       #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	my $num1=$symbchck+$symbseed+$namechck;
-       #&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	my $num2=$nameseed+$domainseed+$courseseed;
-       return $num;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	return "$num1,$num2";
+     }
+ }
+ sub rndseed_CODE_64bit {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	my $symbchck=unpack("%32S*",$symb) << 16;
+ 	my $symbseed=numval($symb);
+ 	my $CODEseed=numval($ENV{'scantron.CODE'}) << 16;
+ 	my $courseseed=unpack("%32S*",$courseid);
+ 	my $num1=$symbseed+$CODEseed;
+ 	my $num2=$courseseed+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$CODEseed|$courseseed:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
+ 	return "$num1,$num2";
+     }
+ }
+ sub setup_random_from_rndseed {
+     my ($rndseed)=@_;
+     if ($rndseed =~/,/) {
+ 	my ($num1,$num2)=split(/,/,$rndseed);
+ 	&Math::Random::random_set_seed(abs($num1),abs($num2));
+     } else {
+ 	&Math::Random::random_set_seed_from_phrase($rndseed);
      }
  }
- Line 2696  sub ireceipt {
+ Line 3950  sub ireceipt {
  }
  sub receipt {
-     return &ireceipt($ENV{'user.name'},$ENV{'user.domain'},
+   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-                      $ENV{'request.course.id'},&symbread());
+   return &ireceipt($name,$domain,$courseid,$symb);
  }
  # ------------------------------------------------------------ Serves up a file
  # returns either the contents of the file or a -1
  sub getfile {
-   my $file=shift;
+  my $file=shift;
+  if ($file=~/^\/*uploaded\//) { # user file
+     my $ua=new LWP::UserAgent;
+     my $request=new HTTP::Request('GET',&tokenwrapper($file));
+     my $response=$ua->request($request);
+     if ($response->is_success()) {
+        return $response->content;
+     } else {
+        return -1;
+     }
+  } else { # normal file from res space
    &repcopy($file);
    if (! -e $file ) { return -1; };
    my $fh=Apache::File->new($file);
    my $a='';
    while (<$fh>) { $a .=$_; }
-   return $a
+   return $a;
+  }
  }
  sub filelocation {
- Line 2719  sub filelocation {
+ Line 3984  sub filelocation {
    if ($file=~m:^/~:) { # is a contruction space reference
      $location = $file;
      $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
+   } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
+     $location=$file;
    } else {
      $file=~s/^$perlvar{'lonDocRoot'}//;
      $file=~s:^/*res::;
- Line 2738  sub hreflocation {
+ Line 4005  sub hreflocation {
      unless (($file=~/^http:\/\//i) || ($file=~/^\//)) {
         my $finalpath=filelocation($dir,$file);
         $finalpath=~s/^\/home\/httpd\/html//;
+        $finalpath=~s-/home/(\w+)/public_html/-/~$1/-;
         return $finalpath;
      } else {
         return $file;
- Line 2751  sub declutter {
+ Line 4019  sub declutter {
      $thisfn=~s/^$perlvar{'lonDocRoot'}//;
      $thisfn=~s/^\///;
      $thisfn=~s/^res\///;
+     $thisfn=~s/\?.+$//;
+     return $thisfn;
+ }
+ # ------------------------------------------------------------- Clutter up URLs
+ sub clutter {
+     my $thisfn='/'.&declutter(shift);
+     unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv)\//) {
+        $thisfn='/res'.$thisfn;
+     }
      return $thisfn;
  }
- Line 2776  sub goodbye {
+ Line 4055  sub goodbye {
     &logthis("Starting Shut down");
     &flushcourselogs();
     &logthis("Shutting down");
+    return DONE;
  }
  BEGIN {
- # ------------------------------------------------------------ Read access.conf
+ # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
      unless ($readit) {
  {
-     my $config=Apache::File->new("/etc/httpd/conf/access.conf");
+     my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");
      while (my $configline=<$config>) {
-         if ($configline =~ /PerlSetVar/) {
+         if ($configline =~ /^[^\#]*PerlSetVar/) {
  	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
             chomp($varvalue);
             $perlvar{$varname}=$varvalue;
          }
      }
  }
+ {
+     my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");
+     while (my $configline=<$config>) {
+         if ($configline =~ /^[^\#]*PerlSetVar/) {
+ 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+            chomp($varvalue);
+            $perlvar{$varname}=$varvalue;
+         }
+     }
+ }
+ # ------------------------------------------------------------ Read domain file
+ {
+     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+                             '/domain.tab');
+     %domaindescription = ();
+     %domain_auth_def = ();
+     %domain_auth_arg_def = ();
+     if ($fh) {
+        while (<$fh>) {
+            next if /^\#/;
+            chomp;
+            my ($domain, $domain_description, $def_auth, $def_auth_arg)
+                = split(/:/,$_,4);
+            $domain_auth_def{$domain}=$def_auth;
+            $domain_auth_arg_def{$domain}=$def_auth_arg;
+            $domaindescription{$domain}=$domain_description;
+ #          &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}");
+ #          &logthis("Domain.tab: $domain ".$domaindescription{$domain} );
+        }
+     }
+ }
  # ------------------------------------------------------------- Read hosts file
  {
      my $config=Apache::File->new("$perlvar{'lonTabDir'}/hosts.tab");
      while (my $configline=<$config>) {
+        next if ($configline =~ /^(\#|\s*$)/);
         chomp($configline);
-        my ($id,$domain,$role,$name,$ip)=split(/:/,$configline);
+        my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
-        $hostname{$id}=$name;
+        if ($id && $domain && $role && $name && $ip) {
-        $hostdom{$id}=$domain;
+ 	 $hostname{$id}=$name;
-        $hostip{$id}=$ip;
+ 	 $hostdom{$id}=$domain;
-        if ($role eq 'library') { $libserv{$id}=$name; }
+ 	 $hostip{$id}=$ip;
+ 	 $iphost{$ip}=$id;
+ 	 if ($role eq 'library') { $libserv{$id}=$name; }
+        } else {
+ 	 if ($configline) {
+ 	   &logthis("Skipping hosts.tab line -$configline-");
+ 	 }
+        }
      }
  }
- Line 2813  BEGIN {
+ Line 4135  BEGIN {
      while (my $configline=<$config>) {
         chomp($configline);
-        if (($configline) && ($configline ne $perlvar{'lonHostID'})) {
+        if ($configline) {
            $spareid{$configline}=1;
         }
      }
- Line 2859  BEGIN {
+ Line 4181  BEGIN {
      }
  }
+ # ------------- set up temporary directory
+ {
+     $tmpdir = $perlvar{'lonDaemons'}.'/tmp/';
+ }
  %metacache=();
- $processmarker=$$.'_'.time.'_'.$perlvar{'lonHostID'};
+ $processmarker='_'.time.'_'.$perlvar{'lonHostID'};
  $dumpcount=0;
  &logtouch();
- Line 2873  $readit=1;
+ Line 4201  $readit=1;
 ;
  __END__
+ =pod
  =head1 NAME
- Apache::lonnet - TCP networking package
+ Apache::lonnet - Subroutines to ask questions about things in the network.
  =head1 SYNOPSIS
- Invoked by other LON-CAPA modules.
+ Invoked by other LON-CAPA modules, when they need to talk to or about objects in the network.
   &Apache::lonnet::SUBROUTINENAME(ARGUMENTS);
+ Common parameters:
+ =over 4
+ =item *
+ $uname : an internal username (if $cname expecting a course Id specifically)
+ =item *
+ $udom : a domain (if $cdom expecting a course's domain specifically)
+ =item *
+ $symb : a resource instance identifier
+ =item *
+ $namespace : the name of a .db file that contains the data needed or
+ being set.
+ =back
  =head1 INTRODUCTION
  This module provides subroutines which interact with the
- lonc/lond (TCP) network layer of LON-CAPA.
+ lonc/lond (TCP) network layer of LON-CAPA. And Can be used to ask about
+ - classes
+ - users
+ - resources
+ For many of these objects you can also use this to store data about
+ them or modify them in various ways.
  This is part of the LearningOnline Network with CAPA project
  described at http://www.lon-capa.org.
- =head1 HANDLER SUBROUTINE
+ =head1 RETURN MESSAGES
- There is no handler routine for this module.
- =head1 OTHER SUBROUTINES
  =over 4
  =item *
- logtouch() : make sure the logfile, lonnet.log, exists
+ con_lost : unable to contact remote host
  =item *
- logthis() : append message to lonnet.log
+ con_delayed : unable to contact remote host, message will be delivered
+ when the connection is brought back up
  =item *
- logperm() : append a permanent message to lonnet.perm.log
+ con_failed : unable to contact remote host and unable to save message
+ for later delivery
  =item *
- subreply() : non-critical communication, called by &reply
+ error: : an error a occured, a description of the error follows the :
  =item *
- reply() : makes two attempts to pass message; logs refusals and rejections
+ no_such_host : unable to fund a host associated with the user/domain
+ that was requested
- =item *
+ =back
- reconlonc() : tries to reconnect lonc client processes.
+ =head1 PUBLIC SUBROUTINES
- =item *
+ =head2 Session Environment Functions
- critical() : passes a critical message to another server; if cannot get
+ =over 4
- through then place message in connection buffer
  =item *
- appenv(%hash) : read in current user environment, append new environment
+ appenv(%hash) : the value of %hash is written to the user envirnoment
- values to make new user environment
+ file, and will be restored for each access this user makes during this
+ session, also modifies the %ENV for the current process
  =item *
- delenv($varname) : read in current user environment, remove all values
+ delenv($regexp) : removes all items from the session environment file that matches the regular expression in $regexp. The values are also delted from the current processes %ENV.
- beginning with $varname, write new user environment (note: flock is used
- to prevent conflicting shared read/writes with file)
- =item *
+ =back
- spareserver() : find server with least workload from spare.tab
+ =head2 User Information
+ =over 4
  =item *
- Line 2951  authentication scheme
+ Line 4309  authentication scheme
  =item *
  authenticate($uname,$upass,$udom) : try to authenticate user from domain's lib
- servers (first use the current one)
+ servers (first use the current one), $upass should be the users password
  =item *
- homeserver($uname,$udom) : find the homebase for a user from domain's lib
+ homeserver($uname,$udom) : find the server which has the user's
- servers
+ directory and files (there must be only one), this caches the answer,
+ and also caches if there is a borken connection.
  =item *
- idget($udom,@ids) : find the usernames behind a list of IDs (returns hash:
+ idget($udom,@ids) : find the usernames behind a list of IDs (IDs are a
+ unique resource in a domain, there must be only 1 ID per username, and
+ only 1 username per ID in a specific domain) (returns hash:
  id=>name,id=>name)
  =item *
- Line 2974  idput($udom,%ids) : store away a list of
+ Line 4335  idput($udom,%ids) : store away a list of
  =item *
- usection($domain,$user,$courseid) : output of section name/number or '' for
+ rolesinit($udom,$username,$authhost) : get user privileges
- "not in course" and '-1' for "no section"
  =item *
- userenvironment($domain,$user,$what) : puts out any environment parameter
+ usection($udom,$uname,$cname) : finds the section of student in the
- for a user
+ course $cname, return section name/number or '' for "not in course"
+ and '-1' for "no section"
  =item *
- subscribe($fname) : subscribe to a resource, return URL if possible
+ userenvironment($udom,$uname,@what) : gets the values of the keys
+ passed in @what from the requested user's environment, returns a hash
+ =back
+ =head2 User Roles
+ =over 4
  =item *
- repcopy($filename) : replicate file
+ allowed($priv,$uri) : check for a user privilege; returns codes for allowed
+ actions
+  F: full access
+  U,I,K: authentication modes (cxx only)
+  '': forbidden
+: user needs to choose course
+: browse allowed
  =item *
- ssi($url,%hash) : server side include, does a complete request cycle on url to
+ definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
- localhost, posts hash
+ role rolename set privileges in format of lonTabs/roles.tab for system, domain,
+ and course level
  =item *
- log($domain,$name,$home,$message) : write to permanent log for user; use
+ plaintext($short) : return value in %prp hash (rolesplain.tab); plain text
- critical subroutine
+ explanation of a user role term
+ =back
+ =head2 User Modification
+ =over 4
  =item *
- flushcourselogs() : flush (save) buffer logs and access logs
+ assignrole($udom,$uname,$url,$role,$end,$start) : assign role; give a role to a
+ user for the level given by URL.  Optional start and end dates (leave empty
+ string or zero for "no date")
  =item *
- courselog($what) : save message for course in hash
+ changepass($uname,$udom,$currentpass,$newpass,$server) : attempts to
+ change a users, password, possible return values are: ok,
+ pwchange_failure, non_authorized, auth_mode_error, unknown_user,
+ refused
  =item *
- courseacclog($what) : save message for course using &courselog().  Perform
+ modifyuserauth($udom,$uname,$umode,$upass) : modify user authentication
- special processing for specific resource types (problems, exams, quizzes, etc).
  =item *
- countacc($url) : count the number of accesses to a given URL
+ modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene) :
+ modify user
  =item *
- sub checkout($symb,$tuname,$tudom,$tcrsid) : check out an item
+ modifystudent
+ modify a students enrollment and identification information.
+ The course id is resolved based on the current users environment.
+ This means the envoking user must be a course coordinator or otherwise
+ associated with a course.
+ This call is essentially a wrapper for lonnet::modifyuser and
+ lonnet::modify_student_enrollment
+ Inputs:
+ =over 4
+ =item B<$udom> Students loncapa domain
+ =item B<$uname> Students loncapa login name
+ =item B<$uid> Students id/student number
+ =item B<$umode> Students authentication mode
+ =item B<$upass> Students password
+ =item B<$first> Students first name
+ =item B<$middle> Students middle name
+ =item B<$last> Students last name
+ =item B<$gene> Students generation
+ =item B<$usec> Students section in course
+ =item B<$end> Unix time of the roles expiration
+ =item B<$start> Unix time of the roles start date
+ =item B<$forceid> If defined, allow $uid to be changed
+ =item B<$desiredhome> server to use as home server for student
+ =back
  =item *
- sub checkin($token) : check in an item
+ modify_student_enrollment
+ Change a students enrollment status in a class.  The environment variable
+ 'role.request.course' must be defined for this function to proceed.
+ Inputs:
+ =over 4
+ =item $udom, students domain
+ =item $uname, students name
+ =item $uid, students user id
+ =item $first, students first name
+ =item $middle
+ =item $last
+ =item $gene
+ =item $usec
+ =item $end
+ =item $start
+ =back
  =item *
- sub expirespread($uname,$udom,$stype,$usymb) : set expire date for spreadsheet
+ assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start) : assign
+ custom role; give a custom role to a user for the level given by URL.  Specify
+ name and domain of role author, and role name
  =item *
- devalidate($symb) : devalidate spreadsheets
+ revokerole($udom,$uname,$url,$role) : revoke a role for url
  =item *
- hash2str(%hash) : convert a hash into a string complete with escaping and '='
+ revokecustomrole($udom,$uname,$url,$role) : revoke a custom role
- and '&' separators, supports elements that are arrayrefs and hashrefs
+ =back
+ =head2 Course Infomation
+ =over 4
  =item *
- hashref2str($hashref) : convert a hashref into a string complete with
+ coursedescription($courseid) : course description
- escaping and '=' and '&' separators, supports elements that are
- arrayrefs and hashrefs
  =item *
- arrayref2str($arrayref) : convert an arrayref into a string complete
+ courseresdata($coursenum,$coursedomain,@which) : request for current
- with escaping and '&' separators, supports elements that are arrayrefs
+ parameter setting for a specific course, @what should be a list of
- and hashrefs
+ parameters to ask about. This routine caches answers for 5 minutes.
+ =back
+ =head2 Course Modification
+ =over 4
  =item *
- str2hash($string) : convert string to hash using unescaping and
+ writecoursepref($courseid,%prefs) : write preferences (environment
- splitting on '=' and '&', supports elements that are arrayrefs and
+ database) for a course
- hashrefs
  =item *
- str2array($string) : convert string to hash using unescaping and
+ createcourse($udom,$description,$url) : make/modify course
- splitting on '&', supports elements that are arrayrefs and hashrefs
+ =back
+ =head2 Resource Subroutines
+ =over 4
  =item *
- tmpreset($symb,$namespace,$domain,$stuname) : temporary storage
+ subscribe($fname) : subscribe to a resource, returns URL if possible (probably should use repcopy instead)
  =item *
- tmprestore($symb,$namespace,$domain,$stuname) : temporary restore
+ repcopy($filename) : subscribes to the requested file, and attempts to
+ replicate from the owning library server, Might return
+ HTTP_SERVICE_UNAVAILABLE, HTTP_NOT_FOUND, FORBIDDEN, OK, or
+ HTTP_BAD_REQUEST, also attempts to grab the metadata for the
+ resource. Expects the local filesystem pathname
+ (/home/httpd/html/res/....)
+ =back
+ =head2 Resource Information
+ =over 4
  =item *
- store($storehash,$symb,$namespace,$domain,$stuname) : stores hash permanently
+ EXT($varname,$symb,$udom,$uname) : evaluates and returns the value of
- for this url; hashref needs to be given and should be a \%hashname; the
+ a vairety of different possible values, $varname should be a request
- remaining args aren't required and if they aren't passed or are '' they will
+ string, and the other parameters can be used to specify who and what
- be derived from the ENV
+ one is asking about.
+ Possible values for $varname are environment.lastname (or other item
+ from the envirnment hash), user.name (or someother aspect about the
+ user), resource.0.maxtries (or some other part and parameter of a
+ resource)
  =item *
- cstore($storehash,$symb,$namespace,$domain,$stuname) : same as store but
+ directcondval($number) : get current value of a condition; reads from a state
- uses critical subroutine
+ string
  =item *
- restore($symb,$namespace,$domain,$stuname) : returns hash for this symb;
+ condval($condidx) : value of condition index based on state
- all args are optional
  =item *
- coursedescription($courseid) : course description
+ metadata($uri,$what,$liburi,$prefix,$depthcount) : request a
+ resource's metadata, $what should be either a specific key, or either
+ 'keys' (to get a list of possible keys) or 'packages' to get a list of
+ packages that this resource currently uses, the last 3 arguments are only used internally for recursive metadata.
+ this function automatically caches all requests
  =item *
- rolesinit($domain,$username,$authhost) : get user privileges
+ metadata_query($query,$custom,$customshow) : make a metadata query against the
+ network of library servers; returns file handle of where SQL and regex results
+ will be stored for query
  =item *
- get($namespace,$storearr,$udomain,$uname) : returns hash with keys from array
+ symbread($filename) : return symbolic list entry (filename argument optional);
- reference filled in from namesp ($udomain and $uname are optional)
+ returns the data handle
  =item *
- del($namespace,$storearr,$udomain,$uname) : deletes keys out of array from
+ symbverify($symb,$thisfn) : verifies that $symb actually exists and is
- namesp ($udomain and $uname are optional)
+ a possible symb for the URL in $thisfn, returns a 1 on success, 0 on
+ failure, user must be in a course, as it assumes the existance of the
+ course initi hash, and uses $ENV('request.course.id'}
  =item *
- dump($namespace,$udomain,$uname,$regexp) :
+ symbclean($symb) : removes versions numbers from a symb, returns the
- dumps the complete (or key matching regexp) namespace into a hash
+ cleaned symb
- ($udomain, $uname and $regexp are optional)
  =item *
- put($namespace,$storehash,$udomain,$uname) : stores hash in namesp
+ is_on_map($uri) : checks if the $uri is somewhere on the current
- ($udomain and $uname are optional)
+ course map, user must be in a course for it to work.
  =item *
- cput($namespace,$storehash,$udomain,$uname) : critical put
+ numval($salt) : return random seed value (addend for rndseed)
- ($udomain and $uname are optional)
  =item *
- eget($namespace,$storearr,$udomain,$uname) : returns hash with keys from array
+ rndseed($symb,$courseid,$udom,$uname) : create a random sum; returns
- reference filled in from namesp (encrypts the return communication)
+ a random seed, all arguments are optional, if they aren't sent it uses the
- ($udomain and $uname are optional)
+ environment to derive them. Note: if symb isn't sent and it can't get one
+ from &symbread it will use the current time as its return value
  =item *
- allowed($priv,$uri) : check for a user privilege; returns codes for allowed
+ ireceipt($funame,$fudom,$fucourseid,$fusymb) : return unique,
- actions
+ unfakeable, receipt
-  F: full access
-  U,I,K: authentication modes (cxx only)
-  '': forbidden
-: user needs to choose course
-: browse allowed
  =item *
- definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
+ receipt() : API to ireceipt working off of ENV values; given out to users
- role rolename set privileges in format of lonTabs/roles.tab for system, domain,
- and course level
  =item *
- metadata_query($query,$custom,$customshow) : make a metadata query against the
+ countacc($url) : count the number of accesses to a given URL
- network of library servers; returns file handle of where SQL and regex results
- will be stored for query
  =item *
- plaintext($short) : return value in %prp hash (rolesplain.tab); plain text
+ checkout($symb,$tuname,$tudom,$tcrsid) :  creates a record of a user having looked at an item, most likely printed out or otherwise using a resource
- explanation of a user role term
  =item *
- assignrole($udom,$uname,$url,$role,$end,$start) : assign role; give a role to a
+ checkin($token) : updates that a resource has beeen returned (a hard copy version for instance) and returns the data that $token was Checkout with ($symb, $tuname, $tudom, and $tcrsid)
- user for the level given by URL.  Optional start and end dates (leave empty
- string or zero for "no date")
  =item *
- modifyuserauth($udom,$uname,$umode,$upass) : modify user authentication
+ expirespread($uname,$udom,$stype,$usymb) : set expire date for spreadsheet
  =item *
- modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene) :
+ devalidate($symb) : devalidate temporary spreadsheet calculations,
- modify user
+ forcing spreadsheet to reevaluate the resource scores next time.
+ =back
+ =head2 Storing/Retreiving Data
+ =over 4
+ =item *
+ store($storehash,$symb,$namespace,$udom,$uname) : stores hash permanently
+ for this url; hashref needs to be given and should be a \%hashname; the
+ remaining args aren't required and if they aren't passed or are '' they will
+ be derived from the ENV
  =item *
- modifystudent($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
+ cstore($storehash,$symb,$namespace,$udom,$uname) : same as store but
- $end,$start) : modify student
+ uses critical subroutine
  =item *
- writecoursepref($courseid,%prefs) : write preferences for a course
+ restore($symb,$namespace,$udom,$uname) : returns hash for this symb;
+ all args are optional
  =item *
- createcourse($udom,$description,$url) : make/modify course
+ tmpstore($storehash,$symb,$namespace,$udom,$uname) : storage that
+ works very similar to store/cstore, but all data is stored in a
+ temporary location and can be reset using tmpreset, $storehash should
+ be a hash reference, returns nothing on success
  =item *
- assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start) : assign
+ tmprestore($symb,$namespace,$udom,$uname) : storage that works very
- custom role; give a custom role to a user for the level given by URL.  Specify
+ similar to restore, but all data is stored in a temporary location and
- name and domain of role author, and role name
+ can be reset using tmpreset. Returns a hash of values on success,
+ error string otherwise.
  =item *
- revokerole($udom,$uname,$url,$role) : revoke a role for url
+ tmpreset($symb,$namespace,$udom,$uname) : temporary storage reset,
+ deltes all keys for $symb form the temporary storage hash.
  =item *
- revokecustomrole($udom,$uname,$url,$role) : revoke a custom role
+ get($namespace,$storearr,$udom,$uname) : returns hash with keys from array
+ reference filled in from namesp ($udom and $uname are optional)
+ =item *
+ del($namespace,$storearr,$udom,$uname) : deletes keys out of array from
+ namesp ($udom and $uname are optional)
+ =item *
+ dump($namespace,$udom,$uname,$regexp) :
+ dumps the complete (or key matching regexp) namespace into a hash
+ ($udom, $uname and $regexp are optional)
+ =item *
+ put($namespace,$storehash,$udom,$uname) : stores hash in namesp
+ ($udom and $uname are optional)
+ =item *
+ cput($namespace,$storehash,$udom,$uname) : critical put
+ ($udom and $uname are optional)
+ =item *
+ eget($namespace,$storearr,$udom,$uname) : returns hash with keys from array
+ reference filled in from namesp (encrypts the return communication)
+ ($udom and $uname are optional)
+ =item *
+ log($udom,$name,$home,$message) : write to permanent log for user; use
+ critical subroutine
+ =back
+ =head2 Network Status Functions
+ =over 4
  =item *
- Line 3201  dirlist($uri) : return directory list ba
+ Line 4744  dirlist($uri) : return directory list ba
  =item *
- directcondval($number) : get current value of a condition; reads from a state
+ spareserver() : find server with least workload from spare.tab
- string
+ =back
+ =head2 Apache Request
+ =over 4
  =item *
- condval($condidx) : value of condition index based on state
+ ssi($url,%hash) : server side include, does a complete request cycle on url to
+ localhost, posts hash
+ =back
+ =head2 Data to String to Data
+ =over 4
  =item *
- EXT($varname,$symbparm) : value of a variable
+ hash2str(%hash) : convert a hash into a string complete with escaping and '='
+ and '&' separators, supports elements that are arrayrefs and hashrefs
  =item *
- metadata($uri,$what,$liburi,$prefix,$depthcount) : get metadata; returns the
+ hashref2str($hashref) : convert a hashref into a string complete with
- metadata entry for a file; entry='keys', returns a comma separated list of keys
+ escaping and '=' and '&' separators, supports elements that are
+ arrayrefs and hashrefs
  =item *
- symblist($mapname,%newhash) : update symbolic storage links
+ arrayref2str($arrayref) : convert an arrayref into a string complete
+ with escaping and '&' separators, supports elements that are arrayrefs
+ and hashrefs
  =item *
- symbread($filename) : return symbolic list entry (filename argument optional);
+ str2hash($string) : convert string to hash using unescaping and
- returns the data handle
+ splitting on '=' and '&', supports elements that are arrayrefs and
+ hashrefs
  =item *
- numval($salt) : return random seed value (addend for rndseed)
+ str2array($string) : convert string to hash using unescaping and
+ splitting on '&', supports elements that are arrayrefs and hashrefs
+ =back
+ =head2 Logging Routines
+ =over 4
+ These routines allow one to make log messages in the lonnet.log and
+ lonnet.perm logfiles.
  =item *
- rndseed($symb,$courseid,$domain,$username) : create a random sum; returns
+ logtouch() : make sure the logfile, lonnet.log, exists
- a random seed, all arguments are optional, if they aren't sent it uses the
- environment to derive them. Note: if symb isn't sent and it can't get one
- from &symbread it will use the current time as its return value
  =item *
- ireceipt($funame,$fudom,$fucourseid,$fusymb) : return unique,
+ logthis() : append message to the normal lonnet.log file, it gets
- unfakeable, receipt
+ preiodically rolled over and deleted.
  =item *
- receipt() : API to ireceipt working off of ENV values; given out to users
+ logperm() : append a permanent message to lonnet.perm.log, this log
+ file never gets deleted by any automated portion of the system, only
+ messages of critical importance should go in here.
+ =back
+ =head2 General File Helper Routines
+ =over 4
  =item *
- getfile($file) : serves up a file, returns the contents of a file or -1;
+ getfile($file) : returns the entire contents of a file or -1; it
- replicates and subscribes to the file
+ properly subscribes to and replicates the file if neccessary.
  =item *
- filelocation($dir,$file) : returns file system location of a file based on URI;
+ filelocation($dir,$file) : returns file system location of a file
- meant to be "fairly clean" absolute reference
+ based on URI; meant to be "fairly clean" absolute reference, $dir is a
+ directory that relative $file lookups are to looked in ($dir of /a/dir
+ and a file of ../bob will become /a/bob)
  =item *
- Line 3265  filelocation except for hrefs
+ Line 4842  filelocation except for hrefs
  declutter() : declutters URLs (remove docroot, beginning slashes, 'res' etc)
+ =back
+ =head2 HTTP Helper Routines
+ =over 4
  =item *
  escape() : unpack non-word characters into CGI-compatible hex codes
- Line 3273  escape() : unpack non-word characters in
+ Line 4856  escape() : unpack non-word characters in
  unescape() : pack CGI-compatible hex codes into actual non-word ASCII character
+ =back
+ =head1 PRIVATE SUBROUTINES
+ =head2 Underlying communication routines (Shouldn't call)
+ =over 4
+ =item *
+ subreply() : tries to pass a message to lonc, returns con_lost if incapable
+ =item *
+ reply() : uses subreply to send a message to remote machine, logs all failures
+ =item *
+ critical() : passes a critical message to another server; if cannot
+ get through then place message in connection buffer directory and
+ returns con_delayed, if incapable of saving message, returns
+ con_failed
+ =item *
+ reconlonc() : tries to reconnect lonc client processes.
+ =back
+ =head2 Resource Access Logging
+ =over 4
+ =item *
+ flushcourselogs() : flush (save) buffer logs and access logs
+ =item *
+ courselog($what) : save message for course in hash
+ =item *
+ courseacclog($what) : save message for course using &courselog().  Perform
+ special processing for specific resource types (problems, exams, quizzes, etc).
  =item *
  goodbye() : flush course logs and log shutting down; it is called in srm.conf
- Line 3280  as a PerlChildExitHandler
+ Line 4909  as a PerlChildExitHandler
  =back
+ =head2 Other
+ =over 4
+ =item *
+ symblist($mapname,%newhash) : update symbolic storage links
+ =back
  =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.216
changed lines
	Added in v.1.386