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.410 and 1.567

-version 1.410, 2003/09/10 15:53:16
+version 1.567, 2004/11/10 19:03:04
  Line 25
  #
  # http://www.lon-capa.org/
  #
- # 6/1/99,6/2,6/10,6/11,6/12,6/14,6/26,6/28,6/29,6/30,
- # 7/1,7/2,7/9,7/10,7/12,7/14,7/15,7/19,
- # 11/8,11/16,11/18,11/22,11/23,12/22,
- # 01/06,01/13,02/24,02/28,02/29,
- # 03/01,03/02,03/06,03/07,03/13,
- # 04/05,05/29,05/31,06/01,
- # 06/05,06/26 Gerd Kortemeyer
- # 06/26 Ben Tyszka
- # 06/30,07/15,07/17,07/18,07/20,07/21,07/22,07/25 Gerd Kortemeyer
- # 08/14 Ben Tyszka
- # 08/22,08/28,08/31,09/01,09/02,09/04,09/05,09/25,09/28,09/30 Gerd Kortemeyer
- # 10/04 Gerd Kortemeyer
- # 10/04 Guy Albertelli
- # 10/06,10/09,10/10,10/11,10/14,10/20,10/23,10/25,10/26,10/27,10/28,10/29,
- # 10/30,10/31,
- # 11/2,11/14,11/15,11/16,11/20,11/21,11/22,11/25,11/27,
- # 12/02,12/12,12/13,12/14,12/28,12/29 Gerd Kortemeyer
- # 05/01/01 Guy Albertelli
- # 05/01,06/01,09/01 Gerd Kortemeyer
- # 09/01 Guy Albertelli
- # 09/01,10/01,11/01 Gerd Kortemeyer
- # YEAR=2001
- # 3/2 Gerd Kortemeyer
- # 3/19,3/20 Gerd Kortemeyer
- # 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
- # 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/21,12/22,12/27,12/28 Gerd Kortemeyer
- # YEAR=2002
- # 1/4,2/4,2/7 Gerd Kortemeyer
- #
  ###
  package Apache::lonnet;
  use strict;
- use Apache::File;
  use LWP::UserAgent();
  use HTTP::Headers;
+ use HTTP::Date;
+ # use Date::Parse;
  use vars
  qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom
-    %libserv %pr %prp %metacache %packagetab %titlecache
+    %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache
     %courselogs %accesshash %userrolehash $processmarker $dumpcount
-    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseresdatacache
+    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache
-    %domaindescription %domain_auth_def %domain_auth_arg_def
+    %userresdatacache %getsectioncache %domaindescription %domain_auth_def %domain_auth_arg_def
-    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir);
+    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit);
  use IO::Socket;
  use GDBM_File;
  use Apache::Constants qw(:common :http);
  use HTML::LCParser;
  use Fcntl qw(:flock);
- use Apache::loncoursedata;
+ use Apache::lonlocal;
+ use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze);
+ use Time::HiRes qw( gettimeofday tv_interval );
  my $readit;
+ my $max_connection_retries = 10;     # Or some such value.
+ =pod
+ =head1 Package Variables
+ These are largely undocumented, so if you decipher one please note it here.
+ =over 4
+ =item $processmarker
+ Contains the time this process was started and this servers host id.
+ =item $dumpcount
+ Counts the number of times a message log flush has been attempted (regardless
+ of success) by this process.  Used as part of the filename when messages are
+ delayed.
+ =back
+ =cut
  # --------------------------------------------------------------------- Logging
  sub logtouch {
      my $execdir=$perlvar{'lonDaemons'};
      unless (-e "$execdir/logs/lonnet.log") {
- 	my $fh=Apache::File->new(">>$execdir/logs/lonnet.log");
+ 	open(my $fh,">>$execdir/logs/lonnet.log");
  	close $fh;
      }
      my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3];
- Line 105  sub logthis {
+ Line 93  sub logthis {
      my $execdir=$perlvar{'lonDaemons'};
      my $now=time;
      my $local=localtime($now);
-     my $fh=Apache::File->new(">>$execdir/logs/lonnet.log");
+     if (open(my $fh,">>$execdir/logs/lonnet.log")) {
-     print $fh "$local ($$): $message\n";
+ 	print $fh "$local ($$): $message\n";
+ 	close($fh);
+     }
      return 1;
  }
- Line 115  sub logperm {
+ Line 105  sub logperm {
      my $execdir=$perlvar{'lonDaemons'};
      my $now=time;
      my $local=localtime($now);
-     my $fh=Apache::File->new(">>$execdir/logs/lonnet.perm.log");
+     if (open(my $fh,">>$execdir/logs/lonnet.perm.log")) {
-     print $fh "$now:$message:$local\n";
+ 	print $fh "$now:$message:$local\n";
+ 	close($fh);
+     }
      return 1;
  }
- Line 124  sub logperm {
+ Line 116  sub logperm {
  sub subreply {
      my ($cmd,$server)=@_;
      my $peerfile="$perlvar{'lonSockDir'}/$server";
-     my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+     #
-                                      Type    => SOCK_STREAM,
+     #  With loncnew process trimming, there's a timing hole between lonc server
-                                      Timeout => 10)
+     #  process exit and the master server picking up the listen on the AF_UNIX
-        or return "con_lost";
+     #  socket.  In that time interval, a lock file will exist:
-     print $client "$cmd\n";
-     my $answer=<$client>;
+     my $lockfile=$peerfile.".lock";
-     if (!$answer) { $answer="con_lost"; }
+     while (-e $lockfile) {	# Need to wait for the lockfile to disappear.
-     chomp($answer);
+ 	sleep(1);
+     }
+     # At this point, either a loncnew parent is listening or an old lonc
+     # or loncnew child is listening so we can connect or everything's dead.
+     #
+     #   We'll give the connection a few tries before abandoning it.  If
+     #   connection is not possible, we'll con_lost back to the client.
+     #
+     my $client;
+     for (my $retries = 0; $retries < $max_connection_retries; $retries++) {
+ 	$client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+ 				      Type    => SOCK_STREAM,
+ 				      Timeout => 10);
+ 	if($client) {
+ 	    last;		# Connected!
+ 	}
+ 	sleep(1);		# Try again later if failed connection.
+     }
+     my $answer;
+     if ($client) {
+ 	print $client "$cmd\n";
+ 	$answer=<$client>;
+ 	if (!$answer) { $answer="con_lost"; }
+ 	chomp($answer);
+     } else {
+ 	$answer = 'con_lost';	# Failed connection.
+     }
      return $answer;
  }
- Line 168  sub reconlonc {
+ Line 186  sub reconlonc {
      my $peerfile=shift;
      &logthis("Trying to reconnect for $peerfile");
      my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid";
-     if (my $fh=Apache::File->new("$loncfile")) {
+     if (open(my $fh,"<$loncfile")) {
  	my $loncpid=<$fh>;
          chomp($loncpid);
          if (kill 0 => $loncpid) {
- Line 216  sub critical {
+ Line 234  sub critical {
        "$perlvar{'lonSockDir'}/delayed/$now.$dumpcount.$$.$middlename.$server";
              $dumpcount++;
              {
-              my $dfh;
+ 		my $dfh;
-              if ($dfh=Apache::File->new(">$dfilename")) {
+ 		if (open($dfh,">$dfilename")) {
-                 print $dfh "$cmd\n";
+ 		    print $dfh "$cmd\n";
- 	     }
+ 		    close($dfh);
+ 		}
              }
              sleep 2;
              my $wcmd='';
              {
- 	     my $dfh;
+ 		my $dfh;
-              if ($dfh=Apache::File->new("$dfilename")) {
+ 		if (open($dfh,"<$dfilename")) {
-                 $wcmd=<$dfh>;
+ 		    $wcmd=<$dfh>;
- 	     }
+ 		    close($dfh);
+ 		}
              }
              chomp($wcmd);
              if ($wcmd eq $cmd) {
- Line 246  sub critical {
+ Line 266  sub critical {
      return $answer;
  }
+ #
  # -------------- Remove all key from the env that start witha lowercase letter
- #                (Which is alweways a lon-capa value)
+ #                (Which is always a lon-capa value)
  sub cleanenv {
+ #    unless (defined(&Apache::exists_config_define("MODPERL2"))) { return; }
+ #    unless (&Apache::exists_config_define("MODPERL2")) { return; }
      foreach my $key (keys(%ENV)) {
  	if ($key =~ /^[a-z]/) {
  	    delete($ENV{$key});
- Line 262  sub transfer_profile_to_env {
+ Line 286  sub transfer_profile_to_env {
      my ($lonidsdir,$handle)=@_;
      my @profile;
      {
- 	my $idf=Apache::File->new("$lonidsdir/$handle.id");
+ 	open(my $idf,"$lonidsdir/$handle.id");
  	flock($idf,LOCK_SH);
  	@profile=<$idf>;
- 	$idf->close();
+ 	close($idf);
      }
      my $envi;
+     my %Remove;
      for ($envi=0;$envi<=$#profile;$envi++) {
  	chomp($profile[$envi]);
  	my ($envname,$envvalue)=split(/=/,$profile[$envi]);
  	$ENV{$envname} = $envvalue;
+         if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) {
+             if ($time < time-300) {
+                 $Remove{$key}++;
+             }
+         }
      }
      $ENV{'user.environment'} = "$lonidsdir/$handle.id";
+     foreach my $expired_key (keys(%Remove)) {
+         &delenv($expired_key);
+     }
  }
  # ---------------------------------------------------------- Append Environment
- Line 292  sub appenv {
+ Line 325  sub appenv {
      }
      my $lockfh;
-     unless ($lockfh=Apache::File->new("$ENV{'user.environment'}")) {
+     unless (open($lockfh,"$ENV{'user.environment'}")) {
-        return 'error: '.$!;
+ 	return 'error: '.$!;
      }
      unless (flock($lockfh,LOCK_EX)) {
           &logthis("<font color=blue>WARNING: ".
                    'Could not obtain exclusive lock in appenv: '.$!);
-          $lockfh->close();
+          close($lockfh);
           return 'error: '.$!;
      }
      my @oldenv;
      {
-      my $fh;
+ 	my $fh;
-      unless ($fh=Apache::File->new("$ENV{'user.environment'}")) {
+ 	unless (open($fh,"$ENV{'user.environment'}")) {
- 	return 'error: '.$!;
+ 	    return 'error: '.$!;
-      }
+ 	}
-      @oldenv=<$fh>;
+ 	@oldenv=<$fh>;
-      $fh->close();
+ 	close($fh);
      }
      for (my $i=0; $i<=$#oldenv; $i++) {
          chomp($oldenv[$i]);
          if ($oldenv[$i] ne '') {
-            my ($name,$value)=split(/=/,$oldenv[$i]);
+ 	    my ($name,$value)=split(/=/,$oldenv[$i]);
-            unless (defined($newenv{$name})) {
+ 	    unless (defined($newenv{$name})) {
- 	      $newenv{$name}=$value;
+ 		$newenv{$name}=$value;
- 	   }
+ 	    }
          }
      }
      {
-      my $fh;
+ 	my $fh;
-      unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) {
+ 	unless (open($fh,">$ENV{'user.environment'}")) {
- 	return 'error';
+ 	    return 'error';
-      }
+ 	}
-      my $newname;
+ 	my $newname;
-      foreach $newname (keys %newenv) {
+ 	foreach $newname (keys %newenv) {
- 	 print $fh "$newname=$newenv{$newname}\n";
+ 	    print $fh "$newname=$newenv{$newname}\n";
-      }
+ 	}
-      $fh->close();
+ 	close($fh);
      }
-     $lockfh->close();
+     close($lockfh);
      return 'ok';
  }
  # ----------------------------------------------------- Delete from Environment
- Line 347  sub delenv {
+ Line 380  sub delenv {
      }
      my @oldenv;
      {
-      my $fh;
+ 	my $fh;
-      unless ($fh=Apache::File->new("$ENV{'user.environment'}")) {
+ 	unless (open($fh,"$ENV{'user.environment'}")) {
- 	return 'error';
+ 	    return 'error';
-      }
+ 	}
-      unless (flock($fh,LOCK_SH)) {
+ 	unless (flock($fh,LOCK_SH)) {
-          &logthis("<font color=blue>WARNING: ".
+ 	    &logthis("<font color=blue>WARNING: ".
-                   'Could not obtain shared lock in delenv: '.$!);
+ 		     'Could not obtain shared lock in delenv: '.$!);
-          $fh->close();
+ 	    close($fh);
-          return 'error: '.$!;
+ 	    return 'error: '.$!;
-      }
+ 	}
-      @oldenv=<$fh>;
+ 	@oldenv=<$fh>;
-      $fh->close();
+ 	close($fh);
      }
      {
-      my $fh;
+ 	my $fh;
-      unless ($fh=Apache::File->new(">$ENV{'user.environment'}")) {
+ 	unless (open($fh,">$ENV{'user.environment'}")) {
- 	return 'error';
+ 	    return 'error';
-      }
+ 	}
-      unless (flock($fh,LOCK_EX)) {
+ 	unless (flock($fh,LOCK_EX)) {
-          &logthis("<font color=blue>WARNING: ".
+ 	    &logthis("<font color=blue>WARNING: ".
-                   'Could not obtain exclusive lock in delenv: '.$!);
+ 		     'Could not obtain exclusive lock in delenv: '.$!);
-          $fh->close();
+ 	    close($fh);
-          return 'error: '.$!;
+ 	    return 'error: '.$!;
-      }
+ 	}
-      foreach (@oldenv) {
+ 	foreach (@oldenv) {
- 	 unless ($_=~/^$delthis/) { print $fh $_; }
+ 	    if ($_=~/^$delthis/) {
-      }
+                 my ($key,undef) = split('=',$_);
-      $fh->close();
+                 delete($ENV{$key});
+             } else {
+                 print $fh $_;
+             }
+ 	}
+ 	close($fh);
      }
      return 'ok';
  }
- Line 390  sub userload {
+ Line 428  sub userload {
  	while ($filename=readdir(LONIDS)) {
  	    if ($filename eq '.' || $filename eq '..') {next;}
  	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
- 	    if ($curtime-$mtime < 3600) { $numusers++; }
+ 	    if ($curtime-$mtime < 1800) { $numusers++; }
  	}
  	closedir(LONIDS);
      }
- Line 410  sub overloaderror {
+ Line 448  sub overloaderror {
      unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; }
      my $loadavg;
      if ($checkserver eq $perlvar{'lonHostID'}) {
-        my $loadfile=Apache::File->new('/proc/loadavg');
+        open(my $loadfile,'/proc/loadavg');
         $loadavg=<$loadfile>;
         $loadavg =~ s/\s.*//g;
         $loadavg = 100*$loadavg/$perlvar{'lonLoadLim'};
+        close($loadfile);
      } else {
         $loadavg=&reply('load',$checkserver);
      }
- Line 436  sub spareserver {
+ Line 475  sub spareserver {
      my $lowestserver=$loadpercent > $userloadpercent?
  	             $loadpercent :  $userloadpercent;
      foreach $tryserver (keys %spareid) {
-        my $loadans=reply('load',$tryserver);
+ 	my $loadans=reply('load',$tryserver);
-        my $userloadans=reply('userload',$tryserver);
+ 	my $userloadans=reply('userload',$tryserver);
-        if ($userloadans !~ /\d/) { $userloadans=0; }
+ 	if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
-        my $answer=$loadans > $userloadans?
+ 	    next; #didn't get a number from the server
-                   $loadans :  $userloadans;
+ 	}
-        if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+ 	my $answer;
- 	   $spareserver="http://$hostname{$tryserver}";
+ 	if ($loadans =~ /\d/) {
-            $lowestserver=$answer;
+ 	    if ($userloadans =~ /\d/) {
-        }
+ 		#both are numbers, pick the bigger one
+ 		$answer=$loadans > $userloadans?
+ 		    $loadans :  $userloadans;
+ 	    } else {
+ 		$answer = $loadans;
+ 	    }
+ 	} else {
+ 	    $answer = $userloadans;
+ 	}
+ 	if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+ 	    $spareserver="http://$hostname{$tryserver}";
+ 	    $lowestserver=$answer;
+ 	}
      }
      return $spareserver;
  }
- Line 488  sub changepass {
+ Line 539  sub changepass {
  sub queryauthenticate {
      my ($uname,$udom)=@_;
-     if (($perlvar{'lonRole'} eq 'library') &&
+     my $uhome=&homeserver($uname,$udom);
-         ($udom eq $perlvar{'lonDefDomain'})) {
+     if (!$uhome) {
- 	my $answer=reply("encrypt:currentauth:$udom:$uname",
+ 	&logthis("User $uname at $udom is unknown when looking for authentication mechanism");
- 			 $perlvar{'lonHostID'});
+ 	return 'no_host';
- 	unless ($answer eq 'unknown_user' or $answer eq 'refused') {
+     }
- 	    if (length($answer)) {
+     my $answer=reply("encrypt:currentauth:$udom:$uname",$uhome);
- 		return $answer;
+     if ($answer =~ /^(unknown_user|refused|con_lost)/) {
- 	    }
+ 	&logthis("User $uname at $udom threw error $answer when checking authentication mechanism");
- 	    else {
- 	&logthis("User $uname at $udom lacks an authentication mechanism");
- 		return 'no_host';
- 	    }
- 	}
-     }
-     my $tryserver;
-     foreach $tryserver (keys %libserv) {
- 	if ($hostdom{$tryserver} eq $udom) {
-            my $answer=reply("encrypt:currentauth:$udom:$uname",$tryserver);
- 	   unless ($answer eq 'unknown_user' or $answer eq 'refused') {
- 	       if (length($answer)) {
- 		   return $answer;
- 	       }
- 	       else {
- 	   &logthis("User $uname at $udom lacks an authentication mechanism");
- 		   return 'no_host';
- 	       }
- 	   }
-        }
      }
-     &logthis("User $uname at $udom lacks an authentication mechanism");
+     return $answer;
-     return 'no_host';
  }
  # --------- Try to authenticate user from domain's lib servers (first this one)
- Line 528  sub authenticate {
+ Line 557  sub authenticate {
      my ($uname,$upass,$udom)=@_;
      $upass=escape($upass);
      $uname=~s/\W//g;
-     if (($perlvar{'lonRole'} eq 'library') &&
+     my $uhome=&homeserver($uname,$udom);
-         ($udom eq $perlvar{'lonDefDomain'})) {
+     if (!$uhome) {
-     my $answer=reply("encrypt:auth:$udom:$uname:$upass",$perlvar{'lonHostID'});
+ 	&logthis("User $uname at $udom is unknown in authenticate");
-         if ($answer =~ /authorized/) {
+ 	return 'no_host';
-               if ($answer eq 'authorized') {
+     }
-                  &logthis("User $uname at $udom authorized by local server");
+     my $answer=reply("encrypt:auth:$udom:$uname:$upass",$uhome);
-                  return $perlvar{'lonHostID'};
+     if ($answer eq 'authorized') {
-               }
+ 	&logthis("User $uname at $udom authorized by $uhome");
-               if ($answer eq 'non_authorized') {
+ 	return $uhome;
-                  &logthis("User $uname at $udom rejected by local server");
+     }
-                  return 'no_host';
+     if ($answer eq 'non_authorized') {
-               }
+ 	&logthis("User $uname at $udom rejected by $uhome");
- 	}
+ 	return 'no_host';
-     }
-     my $tryserver;
-     foreach $tryserver (keys %libserv) {
- 	if ($hostdom{$tryserver} eq $udom) {
-            my $answer=reply("encrypt:auth:$udom:$uname:$upass",$tryserver);
-            if ($answer =~ /authorized/) {
-               if ($answer eq 'authorized') {
-                  &logthis("User $uname at $udom authorized by $tryserver");
-                  return $tryserver;
-               }
-               if ($answer eq 'non_authorized') {
-                  &logthis("User $uname at $udom rejected by $tryserver");
-                  return 'no_host';
-               }
- 	   }
-        }
      }
-     &logthis("User $uname at $udom could not be authenticated");
+     &logthis("User $uname at $udom threw error $answer when checking authentication mechanism");
      return 'no_host';
  }
- Line 568  sub authenticate {
+ Line 580  sub authenticate {
  sub homeserver {
      my ($uname,$udom,$ignoreBadCache)=@_;
      my $index="$uname:$udom";
-     if ($homecache{$index}) {
-         return "$homecache{$index}";
+     my ($result,$cached)=&is_cached(\%homecache,$index,'home',86400);
-     }
+     if (defined($cached)) { return $result; }
      my $tryserver;
      foreach $tryserver (keys %libserv) {
          next if ($ignoreBadCache ne 'true' &&
- Line 578  sub homeserver {
+ Line 590  sub homeserver {
  	if ($hostdom{$tryserver} eq $udom) {
             my $answer=reply("home:$udom:$uname",$tryserver);
             if ($answer eq 'found') {
-               $homecache{$index}=$tryserver;
+ 	       return &do_cache(\%homecache,$index,$tryserver,'home');
-               return $tryserver;
             } elsif ($answer eq 'no_host') {
  	       $badServerCache{$tryserver}=1;
             }
- Line 632  sub idput {
+ Line 643  sub idput {
      my ($udom,%ids)=@_;
      my %servers=();
      foreach (keys %ids) {
+ 	&cput('environment',{'id'=>$ids{$_}},$udom,$_);
          my $uhom=&homeserver($_,$udom);
          if ($uhom ne 'no_host') {
              my $id=&escape($ids{$_});
- Line 642  sub idput {
+ Line 654  sub idput {
              } else {
                  $servers{$uhom}=$id.'='.$unam;
              }
-             &critical('put:'.$udom.':'.$unam.':environment:id='.$id,$uhom);
          }
      }
      foreach (keys %servers) {
- Line 657  sub assign_access_key {
+ Line 668  sub assign_access_key {
  # a valid key looks like uname:udom#comments
  # comments are being appended
  #
-     my ($ckey,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     my ($ckey,$kdom,$knum,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     $kdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($kdom));
+     $knum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($knum));
      $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);
+     my %existing=&get('accesskeys',[$ckey],$kdom,$knum);
      if (($existing{$ckey}=~/^\#(.*)$/) || # - new key
-         ($existing{$ckey}=~/^$uname\:$udom\#(.*)$/)) {
+         ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#(.*)$/)) {
                                                    # 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},
+         if (&put('accesskeys',{$ckey=>$uname.':'.$udom.'#'.$logentry},
-                                                  $cdom,$cnum) eq 'ok') {
+                                                  $kdom,$knum) eq 'ok') {
  # key now belongs to user
  	    my $envkey='key.'.$cdom.'_'.$cnum;
              if (&put('environment',{$envkey => $ckey}) eq 'ok') {
- Line 770  sub validate_access_key {
+ Line 785  sub validate_access_key {
     $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));
+     $udom=$ENV{'user.domain'} unless (defined($udom));
-     $uname=$ENV{'user.domain'} unless (defined($uname));
+     $uname=$ENV{'user.name'} unless (defined($uname));
      my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
-     return ($existing{$ckey}=~/^$uname\:$udom\#/);
+     return ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#/);
  }
  # ------------------------------------- Find the section of student in a course
- Line 782  sub getsection {
+ Line 797  sub getsection {
      my ($udom,$unam,$courseid)=@_;
      $courseid=~s/\_/\//g;
      $courseid=~s/^(\w)/\/$1/;
+     my $hashid="$udom:$unam:$courseid";
+     my ($result,$cached)=&is_cached(\%getsectioncache,$hashid,'getsection');
+     if (defined($cached)) { return $result; }
      my %Pending;
      my %Expired;
      #
- Line 801  sub getsection {
+ Line 821  sub getsection {
                          &homeserver($unam,$udom)))) {
          my ($key,$value)=split(/\=/,$_);
          $key=&unescape($key);
-         next if ($key !~/^$courseid(?:\/)*(\w+)*\_st$/);
+         next if ($key !~/^\Q$courseid\E(?:\/)*(\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)) {
+         if (defined($end) && $end && ($now > $end)) {
              $Expired{$end}=$section;
              next;
          }
-         if (defined($start) && ($now < $start)) {
+         if (defined($start) && $start && ($now < $start)) {
              $Pending{$start}=$section;
              next;
          }
-         return $section;
+         return &do_cache(\%getsectioncache,$hashid,$section,'getsection');
      }
      #
      # 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};
+         return &do_cache(\%getsectioncache,$hashid,$Pending{$time},'getsection');
      }
      if (scalar(keys(%Expired))) {
          my @sorted = sort {$a <=> $b} keys(%Expired);
          my $time = pop(@sorted);
-         return $Expired{$time};
+         return &do_cache(\%getsectioncache,$hashid,$Expired{$time},'getsection');
      }
-     return '-1';
+     return &do_cache(\%getsectioncache,$hashid,'-1','getsection');
  }
- sub usection {
-     my ($udom,$unam,$courseid)=@_;
+ my $disk_caching_disabled=1;
-     $courseid=~s/\_/\//g;
-     $courseid=~s/^(\w)/\/$1/;
+ sub devalidate_cache {
-     foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
+     my ($cache,$id,$name) = @_;
-                         &homeserver($unam,$udom)))) {
+     delete $$cache{$id.'.time'};
-         my ($key,$value)=split(/\=/,$_);
+     delete $$cache{$id.'.file'};
-         $key=&unescape($key);
+     delete $$cache{$id};
-         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+     if (1 || $disk_caching_disabled) { return; }
-             my $section=$1;
+     my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
-             if ($key eq $courseid.'_st') { $section=''; }
+     if (!-e $filename) { return; }
- 	    my ($dummy,$end,$start)=split(/\_/,&unescape($value));
+     open(DB,">$filename.lock");
-             my $now=time;
+     flock(DB,LOCK_EX);
-             my $notactive=0;
+     my %hash;
-             if ($start) {
+     if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
- 		if ($now<$start) { $notactive=1; }
+ 	eval <<'EVALBLOCK';
-             }
+ 	    delete($hash{$id});
-             if ($end) {
+ 	    delete($hash{$id.'.time'});
-                 if ($now>$end) { $notactive=1; }
+ EVALBLOCK
-             }
+         if ($@) {
-             unless ($notactive) { return $section; }
+ 	    &logthis("<font color='red'>devalidate_cache blew up :$@:$name</font>");
-         }
+ 	    unlink($filename);
+ 	}
+     } else {
+ 	if (-e $filename) {
+ 	    &logthis("Unable to tie hash (devalidate cache): $name");
+ 	    unlink($filename);
+ 	}
+     }
+     untie(%hash);
+     flock(DB,LOCK_UN);
+     close(DB);
+ }
+ sub is_cached {
+     my ($cache,$id,$name,$time) = @_;
+     if (!$time) { $time=300; }
+     if (!exists($$cache{$id.'.time'})) {
+ 	&load_cache_item($cache,$name,$id,$time);
+     }
+     if (!exists($$cache{$id.'.time'})) {
+ #	&logthis("Didn't find $id");
+ 	return (undef,undef);
+     } else {
+ 	if (time-($$cache{$id.'.time'})>$time) {
+ 	    if (exists($$cache{$id.'.file'})) {
+ 		foreach my $filename (@{ $$cache{$id.'.file'} }) {
+ 		    my $mtime=(stat($filename))[9];
+ 		    #+1 is to take care of edge effects
+ 		    if ($mtime && (($mtime+1) < ($$cache{$id.'.time'}))) {
+ #			&logthis("Upping $mtime - ".$$cache{$id.'.time'}.
+ #				 "$id because of $filename");
+ 		    } else {
+ 			&logthis("Devalidating $filename $id - ".(time-($$cache{$id.'.time'})));
+ 			&devalidate_cache($cache,$id,$name);
+ 			return (undef,undef);
+ 		    }
+ 		}
+ 		$$cache{$id.'.time'}=time;
+ 	    } else {
+ #		&logthis("Devalidating $id - ".time-($$cache{$id.'.time'}));
+ 		&devalidate_cache($cache,$id,$name);
+ 		return (undef,undef);
+ 	    }
+ 	}
+     }
+     return ($$cache{$id},1);
+ }
+ sub do_cache {
+     my ($cache,$id,$value,$name) = @_;
+     $$cache{$id.'.time'}=time;
+     $$cache{$id}=$value;
+ #    &logthis("Caching $id as :$value:");
+     &save_cache_item($cache,$name,$id);
+     # do_cache implictly return the set value
+     $$cache{$id};
+ }
+ my %do_save_item;
+ my %do_save;
+ sub save_cache_item {
+     my ($cache,$name,$id)=@_;
+     if ($disk_caching_disabled) { return; }
+     $do_save{$name}=$cache;
+     if (!exists($do_save_item{$name})) { $do_save_item{$name}={} }
+     $do_save_item{$name}->{$id}=1;
+     return;
+ }
+ sub save_cache {
+     if ($disk_caching_disabled) { return; }
+     my ($cache,$name,$id);
+     foreach $name (keys(%do_save)) {
+ 	$cache=$do_save{$name};
+ 	my $starttime=&Time::HiRes::time();
+ 	&logthis("Saving :$name:");
+ 	my %hash;
+ 	my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
+ 	open(DB,">$filename.lock");
+ 	flock(DB,LOCK_EX);
+ 	if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
+ 	    foreach $id (keys(%{ $do_save_item{$name} })) {
+ 		eval <<'EVALBLOCK';
+ 		$hash{$id.'.time'}=$$cache{$id.'.time'};
+ 		$hash{$id}=freeze({'item'=>$$cache{$id}});
+ 		if (exists($$cache{$id.'.file'})) {
+ 		    $hash{$id.'.file'}=freeze({'item'=>$$cache{$id.'.file'}});
+ 		}
+ EVALBLOCK
+                 if ($@) {
+ 		    &logthis("<font color='red'>save_cache blew up :$@:$name</font>");
+ 		    unlink($filename);
+ 		    last;
+ 		}
+ 	    }
+ 	} else {
+ 	    if (-e $filename) {
+ 		&logthis("Unable to tie hash (save cache): $name ($!)");
+ 		unlink($filename);
+ 	    }
+ 	}
+ 	untie(%hash);
+ 	flock(DB,LOCK_UN);
+ 	close(DB);
+ 	&logthis("save_cache $name took ".(&Time::HiRes::time()-$starttime));
+     }
+     undef(%do_save);
+     undef(%do_save_item);
+ }
+ sub load_cache_item {
+     my ($cache,$name,$id,$time)=@_;
+     if ($disk_caching_disabled) { return; }
+     my $starttime=&Time::HiRes::time();
+ #    &logthis("Before Loading $name  for $id size is ".scalar(%$cache));
+     my %hash;
+     my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
+     if (!-e $filename) { return; }
+     open(DB,">$filename.lock");
+     flock(DB,LOCK_SH);
+     if (tie(%hash,'GDBM_File',$filename,&GDBM_READER(),0640)) {
+ 	eval <<'EVALBLOCK';
+ 	    if (!%$cache) {
+ 		my $count;
+ 		while (my ($key,$value)=each(%hash)) {
+ 		    $count++;
+ 		    if ($key =~ /\.time$/) {
+ 			$$cache{$key}=$value;
+ 		    } else {
+ 			my $hashref=thaw($value);
+ 			$$cache{$key}=$hashref->{'item'};
+ 		    }
+ 		}
+ #	    &logthis("Initial load: $count");
+ 	    } else {
+ 		if (($$cache{$id.'.time'}+$time) < time) {
+ 		    $$cache{$id.'.time'}=$hash{$id.'.time'};
+ 		    {
+ 			my $hashref=thaw($hash{$id});
+ 			$$cache{$id}=$hashref->{'item'};
+ 		    }
+ 		    if (exists($hash{$id.'.file'})) {
+ 			my $hashref=thaw($hash{$id.'.file'});
+ 			$$cache{$id.'.file'}=$hashref->{'item'};
+ 		    }
+ 		}
+ 	    }
+ EVALBLOCK
+         if ($@) {
+ 	    &logthis("<font color='red'>load_cache blew up :$@:$name</font>");
+ 	    unlink($filename);
+ 	}
+     } else {
+ 	if (-e $filename) {
+ 	    &logthis("Unable to tie hash (load cache item): $name ($!)");
+ 	    unlink($filename);
+ 	}
      }
-     return '-1';
+     untie(%hash);
+     flock(DB,LOCK_UN);
+     close(DB);
+ #    &logthis("After Loading $name size is ".scalar(%$cache));
+ #    &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime));
  }
  # ------------------------------------- Read an entry from a user's environment
- Line 894  sub getversion {
+ Line 1076  sub getversion {
  sub currentversion {
      my $fname=shift;
+     my ($result,$cached)=&is_cached(\%resversioncache,$fname,'resversion',600);
+     if (defined($cached)) { return $result; }
      my $author=$fname;
      $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
      my ($udom,$uname)=split(/\//,$author);
- Line 905  sub currentversion {
+ Line 1089  sub currentversion {
      if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
  	return -1;
      }
-     return $answer;
+     return &do_cache(\%resversioncache,$fname,$answer,'resversion');
  }
  # ----------------------------- Subscribe to a resource, return URL if possible
- Line 913  sub currentversion {
+ Line 1097  sub currentversion {
  sub subscribe {
      my $fname=shift;
      if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; }
+     $fname=~s/[\n\r]//g;
      my $author=$fname;
      $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
      my ($udom,$uname)=split(/\//,$author);
- Line 932  sub subscribe {
+ Line 1117  sub subscribe {
  sub repcopy {
      my $filename=shift;
      $filename=~s/\/+/\//g;
-     if ($filename=~/^\/home\/httpd\/html\/adm\//) { return OK; }
+     if ($filename=~m|^/home/httpd/html/adm/|) { return OK; }
+     if ($filename=~m|^/home/httpd/html/lonUsers/|) { return OK; }
+     if ($filename=~m|^/home/httpd/html/userfiles/| or
+ 	$filename=~m|^/*uploaded/|) {
+ 	return &repcopy_userfile($filename);
+     }
+     $filename=~s/[\n\r]//g;
      my $transname="$filename.in.transfer";
      if ((-e $filename) || (-e $transname)) { return OK; }
      my $remoteurl=subscribe($filename);
- Line 940  sub repcopy {
+ Line 1131  sub repcopy {
  	   &logthis("Subscribe returned $remoteurl: $filename");
             return HTTP_SERVICE_UNAVAILABLE;
      } elsif ($remoteurl eq 'not_found') {
- 	   &logthis("Subscribe returned not_found: $filename");
+ 	   #&logthis("Subscribe returned not_found: $filename");
  	   return HTTP_NOT_FOUND;
      } elsif ($remoteurl =~ /^rejected by/) {
  	   &logthis("Subscribe returned $remoteurl: $filename");
- Line 997  sub ssi_body {
+ Line 1188  sub ssi_body {
      my ($filelink,%form)=@_;
      my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                       &ssi($filelink,%form));
-     $output=~s/^.*\<body[^\>]*\>//si;
+     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
-     $output=~s/\<\/body\s*\>.*$//si;
+     $output=~s/^.*?\<body[^\>]*\>//si;
-     $output=~
+     $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
-             s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
      return $output;
  }
- Line 1035  sub externalssi {
+ Line 1225  sub externalssi {
      return $response->content;
  }
- # ------- Add a token to a remote URI's query string to vouch for access rights
+ # -------------------------------- Allow a /uploaded/ URI to be vouched for
- sub tokenwrapper {
+ sub allowuploaded {
-     my $uri=shift;
+     my ($srcurl,$url)=@_;
-     $uri=~s/^http\:\/\/([^\/]+)//;
+     $url=&clutter(&declutter($url));
-     $uri=~s/^\///;
+     my $dir=$url;
-     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
+     $dir=~s/\/[^\/]+$//;
-     my $token=$1;
+     my %httpref=();
-     if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
+     my $httpurl=&hreflocation('',$url);
- 	&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
+     $httpref{'httpref.'.$httpurl}=$srcurl;
-         return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
+     &Apache::lonnet::appenv(%httpref);
-                (($uri=~/\?/)?'&':'?').'token='.$token.
+ }
-                                '&tokenissued='.$perlvar{'lonHostID'};
+ # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
+ # input: action, courseID, current domain, home server for course, intended
+ #        path to file, source of file.
+ # output: url to file (if action was uploaddoc),
+ #         ok if successful, or diagnostic message otherwise (if action was propagate or copy)
+ #
+ # Allows directory structure to be used within lonUsers/../userfiles/ for a
+ # course.
+ #
+ # action = propagate - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #          will be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles in
+ #          course's home server.
+ #
+ # action = copy - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file will
+ #          be copied from $source (current location) to
+ #          /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         and will then be copied to
+ #          /home/httpd/lonUsers/$domain/1/2/3/$course/userfiles/$file in
+ #         course's home server.
+ #
+ # action = uploaddoc - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         will be retrived from $ENV{form.uploaddoc} (from DOCS interface) to
+ #         /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         and will then be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles/$file
+ #         in course's home server.
+ sub process_coursefile {
+     my ($action,$docuname,$docudom,$docuhome,$file,$source)=@_;
+     my $fetchresult;
+     if ($action eq 'propagate') {
+         $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file
+                             ,$docuhome);
      } else {
- 	return '/adm/notfound.html';
+         my $fetchresult = '';
+         my $fpath = '';
+         my $fname = $file;
+         ($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|);
+         $fpath=$docudom.'/'.$docuname.'/'.$fpath;
+         my $filepath=$perlvar{'lonDocRoot'}.'/userfiles';
+         unless ($fpath eq '') {
+             my @parts=split('/',$fpath);
+             foreach my $part (@parts) {
+                 $filepath.= '/'.$part;
+                 if ((-e $filepath)!=1) {
+                     mkdir($filepath,0777);
+                 }
+             }
+         }
+         if ($action eq 'copy') {
+             if ($source eq '') {
+                 $fetchresult = 'no source file';
+                 return $fetchresult;
+             } else {
+                 my $destination = $filepath.'/'.$fname;
+                 rename($source,$destination);
+                 $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
+                                  $docuhome);
+             }
+         } elsif ($action eq 'uploaddoc') {
+             open(my $fh,'>'.$filepath.'/'.$fname);
+             print $fh $ENV{'form.'.$source};
+             close($fh);
+             $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
+                                  $docuhome);
+             if ($fetchresult eq 'ok') {
+                 return '/uploaded/'.$fpath.'/'.$fname;
+             } else {
+                 &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file.
+                         ' to host '.$docuhome.': '.$fetchresult);
+                 return '/adm/notfound.html';
+             }
+         }
      }
+     unless ( $fetchresult eq 'ok') {
+         &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file.
+              ' to host '.$docuhome.': '.$fetchresult);
+     }
+     return $fetchresult;
  }
  # --------------- 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 {
+ sub clean_filename {
-     my ($formname,$coursedoc)=@_;
+     my ($fname)=@_;
-     my $fname=$ENV{'form.'.$formname.'.filename'};
  # Replace Windows backslashes by forward slashes
      $fname=~s/\\/\//g;
  # Get rid of everything but the actual filename
- Line 1068  sub userfileupload {
+ Line 1333  sub userfileupload {
      $fname=~s/\s+/\_/g;
  # Replace all other weird characters by nothing
      $fname=~s/[^\w\.\-]//g;
+ # Replace all .\d. sequences with _\d. so they no longer look like version
+ # numbers
+     $fname=~s/\.(\d+)(?=\.)/_$1/g;
+     return $fname;
+ }
+ sub userfileupload {
+     my ($formname,$coursedoc,$subdir)=@_;
+     if (!defined($subdir)) { $subdir='unknown'; }
+     my $fname=$ENV{'form.'.$formname.'.filename'};
+     $fname=&clean_filename($fname);
  # See if there is anything left
      unless ($fname) { return 'error: no uploaded file'; }
      chop($ENV{'form.'.$formname});
+     if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { #files uploaded to help request form are handled differently
+         my $now = time;
+         my $filepath = 'tmp/helprequests/'.$now;
+         my @parts=split(/\//,$filepath);
+         my $fullpath = $perlvar{'lonDaemons'};
+         for (my $i=0;$i<@parts;$i++) {
+             $fullpath .= '/'.$parts[$i];
+             if ((-e $fullpath)!=1) {
+                 mkdir($fullpath,0777);
+             }
+         }
+         open(my $fh,'>'.$fullpath.'/'.$fname);
+         print $fh $ENV{'form.'.$formname};
+         close($fh);
+         return $fullpath.'/'.$fname;
+     }
  # Create the directory if not present
      my $docuname='';
      my $docudom='';
      my $docuhome='';
+     $fname="$subdir/$fname";
      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'};
+         if ($ENV{'form.folder'} =~ m/^default/) {
+             return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
+         } else {
+             $fname=$ENV{'form.folder'}.'/'.$fname;
+             return &process_coursefile('uploaddoc',$docuname,$docudom,$docuhome,$fname,$formname);
+         }
      } else {
          $docuname=$ENV{'user.name'};
          $docudom=$ENV{'user.domain'};
          $docuhome=$ENV{'user.home'};
+         return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
      }
-     return
-         &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
  }
  sub finishuserfileupload {
      my ($docuname,$docudom,$docuhome,$formname,$fname)=@_;
      my $path=$docudom.'/'.$docuname.'/';
      my $filepath=$perlvar{'lonDocRoot'};
+     my ($fnamepath,$file);
+     $file=$fname;
+     if ($fname=~m|/|) {
+         ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
+ 	$path.=$fnamepath.'/';
+     }
      my @parts=split(/\//,$filepath.'/userfiles/'.$path);
      my $count;
      for ($count=4;$count<=$#parts;$count++) {
- Line 1102  sub finishuserfileupload {
+ Line 1406  sub finishuserfileupload {
      }
  # Save the file
      {
-        my $fh=Apache::File->new('>'.$filepath.'/'.$fname);
+ 	#&Apache::lonnet::logthis("Saving to $filepath $file");
+        open(my $fh,'>'.$filepath.'/'.$file);
         print $fh $ENV{'form.'.$formname};
+        close($fh);
      }
  # Notify homeserver to grep it
  #
+     my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome);
-     my $fetchresult=
-  &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,$docuhome);
      if ($fetchresult eq 'ok') {
  #
  # Return the URL to it
-         return '/uploaded/'.$path.$fname;
+         return '/uploaded/'.$path.$file;
      } else {
-         &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$fname.
+         &logthis('Failed to transfer '.$path.$file.' to host '.$docuhome.
-          ' to host '.$docuhome.': '.$fetchresult);
+ 		 ': '.$fetchresult);
          return '/adm/notfound.html';
      }
  }
+ sub removeuploadedurl {
+     my ($url)=@_;
+     my (undef,undef,$udom,$uname,$fname)=split('/',$url,5);
+     return &Apache::lonnet::removeuserfile($uname,$udom,$fname);
+ }
+ sub removeuserfile {
+     my ($docuname,$docudom,$fname)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("removeuserfile:$docudom/$docuname/$fname",$home);
+ }
+ sub mkdiruserfile {
+     my ($docuname,$docudom,$dir)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("mkdiruserfile:".&escape("$docudom/$docuname/$dir"),$home);
+ }
+ sub renameuserfile {
+     my ($docuname,$docudom,$old,$new)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("renameuserfile:$docudom:$docuname:".&escape("$old").':'.
+ 		  &escape("$new"),$home);
+ }
  # ------------------------------------------------------------------------- Log
  sub log {
- Line 1160  sub flushcourselogs {
+ Line 1489  sub flushcourselogs {
          }
          if ($courseidbuffer{$coursehombuf{$crsid}}) {
             $courseidbuffer{$coursehombuf{$crsid}}.='&'.
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
+                          '='.&escape($courseinstcodebuf{$crsid});
          } else {
             $courseidbuffer{$coursehombuf{$crsid}}=
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
+                          '='.&escape($courseinstcodebuf{$crsid});
          }
      }
  #
- Line 1177  sub flushcourselogs {
+ Line 1508  sub flushcourselogs {
  # File accesses
  # Writes to the dynamic metadata of resources to get hit counts, etc.
  #
-     foreach (keys %accesshash) {
+     foreach my $entry (keys(%accesshash)) {
-         my $entry=$_;
+         if ($entry =~ /___count$/) {
-         $entry=~/\_\_\_(\w+)\/(\w+)\/(.*)\_\_\_(\w+)$/;
+             my ($dom,$name);
-         my %temphash=($entry => $accesshash{$entry});
+             ($dom,$name,undef)=($entry=~m:___(\w+)/(\w+)/(.*)___count$:);
-         if (&Apache::lonnet::put('nohist_resevaldata',\%temphash,$1,$2) eq 'ok') {
+             if (! defined($dom) || $dom eq '' ||
- 	    delete $accesshash{$entry};
+                 ! defined($name) || $name eq '') {
+                 my $cid = $ENV{'request.course.id'};
+                 $dom  = $ENV{'request.'.$cid.'.domain'};
+                 $name = $ENV{'request.'.$cid.'.num'};
+             }
+             my $value = $accesshash{$entry};
+             my (undef,$url,undef) = ($entry =~ /^(.*)___(.*)___count$/);
+             my %temphash=($url => $value);
+             my $result = &inc('nohist_accesscount',\%temphash,$dom,$name);
+             if ($result eq 'ok') {
+                 delete $accesshash{$entry};
+             } elsif ($result eq 'unknown_cmd') {
+                 # Target server has old code running on it.
+                 my %temphash=($entry => $value);
+                 if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') {
+                     delete $accesshash{$entry};
+                 }
+             }
+         } else {
+             my ($dom,$name) = ($entry=~m:___(\w+)/(\w+)/(.*)___(\w+)$:);
+             my %temphash=($entry => $accesshash{$entry});
+             if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') {
+                 delete $accesshash{$entry};
+             }
          }
      }
  #
- Line 1214  sub courselog {
+ Line 1568  sub courselog {
         $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
      $coursedescrbuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+     $courseinstcodebuf{$ENV{'request.course.id'}}=
+        $ENV{'course.'.$ENV{'request.course.id'}.'.internal.coursecode'};
      if (defined $courselogs{$ENV{'request.course.id'}}) {
  	$courselogs{$ENV{'request.course.id'}}.='&'.$what;
      } else {
- Line 1241  sub courseacclog {
+ Line 1597  sub courseacclog {
  sub countacc {
      my $url=&declutter(shift);
+     return if (! defined($url) || $url eq '');
      unless ($ENV{'request.course.id'}) { return ''; }
      $accesshash{$ENV{'request.course.id'}.'___'.$url.'___course'}=1;
      my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count';
-     if (defined($accesshash{$key})) {
+     $accesshash{$key}++;
- 	$accesshash{$key}++;
-     } else {
-         $accesshash{$key}=1;
-     }
  }
  sub linklog {
- Line 1263  sub userrolelog {
+ Line 1616  sub userrolelog {
      my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
      if (($trole=~/^ca/) || ($trole=~/^in/) ||
          ($trole=~/^cc/) || ($trole=~/^ep/) ||
-         ($trole=~/^cr/)) {
+         ($trole=~/^cr/) || ($trole=~/^ta/)) {
         my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
         $userrolehash
           {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
- Line 1275  sub get_course_adv_roles {
+ Line 1628  sub get_course_adv_roles {
      my $cid=shift;
      $cid=$ENV{'request.course.id'} unless (defined($cid));
      my %coursehash=&coursedescription($cid);
+     my %nothide=();
+     foreach (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+ 	$nothide{join(':',split(/[\@\:]/,$_))}=1;
+     }
      my %returnhash=();
      my %dumphash=
              &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
- Line 1285  sub get_course_adv_roles {
+ Line 1642  sub get_course_adv_roles {
          if (($tend) && ($tend<$now)) { next; }
          if (($tstart) && ($now<$tstart)) { next; }
          my ($role,$username,$domain,$section)=split(/\:/,$_);
+ 	if ((&privileged($username,$domain)) &&
+ 	    (!$nothide{$username.':'.$domain})) { next; }
          my $key=&plaintext($role);
          if ($section) { $key.=' (Sec/Grp '.$section.')'; }
          if ($returnhash{$key}) {
- Line 1327  sub postannounce {
+ Line 1686  sub postannounce {
  }
  sub getannounce {
-     if (my $fh=Apache::File->new($perlvar{'lonDocRoot'}.'/announcement.txt')) {
+     if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) {
  	my $announcement='';
  	while (<$fh>) { $announcement .=$_; }
- 	$fh->close();
+ 	close($fh);
  	if ($announcement=~/\w/) {
  	    return
     '<table bgcolor="#FF5555" cellpadding="5" cellspacing="3">'.
-    '<tr><td bgcolor="#FFFFFF"><pre>'.$announcement.'</pre></td></tr></table>';
+    '<tr><td bgcolor="#FFFFFF"><tt>'.$announcement.'</tt></td></tr></table>';
  	} else {
  	    return '';
  	}
- Line 1353  sub courseidput {
+ Line 1713  sub courseidput {
  }
  sub courseiddump {
-     my ($domfilter,$descfilter,$sincefilter)=@_;
+     my ($domfilter,$descfilter,$sincefilter,$hostidflag,$hostidref)=@_;
      my %returnhash=();
      unless ($domfilter) { $domfilter=''; }
      foreach my $tryserver (keys %libserv) {
- 	if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+         if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) {
- 	    foreach (
+ 	    if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
-              split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+ 	        foreach (
+                  split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
  			       $sincefilter.':'.&escape($descfilter),
                                 $tryserver))) {
- 		my ($key,$value)=split(/\=/,$_);
+ 		    my ($key,$value)=split(/\=/,$_);
-                 if (($key) && ($value)) {
+                     if (($key) && ($value)) {
- 		    $returnhash{&unescape($key)}=&unescape($value);
+ 		        $returnhash{&unescape($key)}=$value;
+                     }
                  }
              }
          }
      }
      return %returnhash;
- Line 1376  sub courseiddump {
+ Line 1737  sub courseiddump {
  #
  # ----------------------------------------------------------- Check out an item
+ sub get_first_access {
+     my ($type,$argsymb)=@_;
+     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     if ($argsymb) { $symb=$argsymb; }
+     my ($map,$id,$res)=&decode_symb($symb);
+     if ($type eq 'map') { $res=$map; }
+     my %times=&get('firstaccesstimes',[$res],$udom,$uname);
+     return $times{$res};
+ }
+ sub set_first_access {
+     my ($type)=@_;
+     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($map,$id,$res)=&decode_symb($symb);
+     if ($type eq 'map') { $res=$map; }
+     my $firstaccess=&get_first_access($type);
+     if (!$firstaccess) {
+ 	return &put('firstaccesstimes',{$res=>time},$udom,$uname);
+     }
+     return 'already_set';
+ }
  sub checkout {
      my ($symb,$tuname,$tudom,$tcrsid)=@_;
      my $now=time;
- Line 1488  sub devalidate {
+ Line 1871  sub devalidate {
          # - 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
+ 	# - current conditional state info
  	my $key=$uname.':'.$udom.':';
          my $status=
  	    &del('nohist_calculatedsheets',
- Line 1502  sub devalidate {
+ Line 1886  sub devalidate {
                      $uname.' at '.$udom.' for '.
  		    $symb.': '.$status);
          }
+ 	&delenv('user.state.'.$cid);
      }
  }
- Line 1554  sub hash2str {
+ Line 1939  sub hash2str {
  sub hashref2str {
    my ($hashref)=@_;
    my $result='__HASH_REF__';
-   foreach (keys(%$hashref)) {
+   foreach (sort(keys(%$hashref))) {
      if (ref($_) eq 'ARRAY') {
        $result.=&arrayref2str($_).'=';
      } elsif (ref($_) eq 'HASH') {
- Line 1843  sub store {
+ Line 2228  sub store {
         }
      }
      if (!$home) { $home=$ENV{'user.home'}; }
+     $$storehash{'ip'}=$ENV{'REMOTE_ADDR'};
+     $$storehash{'host'}=$perlvar{'lonHostID'};
      my $namevalue='';
      foreach (keys %$storehash) {
          $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
- Line 1876  sub cstore {
+ Line 2265  sub cstore {
      }
      if (!$home) { $home=$ENV{'user.home'}; }
+     $$storehash{'ip'}=$ENV{'REMOTE_ADDR'};
+     $$storehash{'host'}=$perlvar{'lonHostID'};
      my $namevalue='';
      foreach (keys %$storehash) {
          $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
- Line 1958  sub coursedescription {
+ Line 2350  sub coursedescription {
      return %returnhash;
  }
+ # -------------------------------------------------See if a user is privileged
+ sub privileged {
+     my ($username,$domain)=@_;
+     my $rolesdump=&reply("dump:$domain:$username:roles",
+ 			&homeserver($username,$domain));
+     if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return 0; }
+     my $now=time;
+     if ($rolesdump ne '') {
+         foreach (split(/&/,$rolesdump)) {
+ 	    if ($_!~/^rolesdef\&/) {
+ 		my ($area,$role)=split(/=/,$_);
+ 		$area=~s/\_\w\w$//;
+ 		my ($trole,$tend,$tstart)=split(/_/,$role);
+ 		if (($trole eq 'dc') || ($trole eq 'su')) {
+ 		    my $active=1;
+ 		    if ($tend) {
+ 			if ($tend<$now) { $active=0; }
+ 		    }
+ 		    if ($tstart) {
+ 			if ($tstart>$now) { $active=0; }
+ 		    }
+ 		    if ($active) { return 1; }
+ 		}
+ 	    }
+ 	}
+     }
+     return 0;
+ }
  # -------------------------------------------------------- Get user privileges
  sub rolesinit {
- Line 1965  sub rolesinit {
+ Line 2387  sub rolesinit {
      my $rolesdump=reply("dump:$domain:$username:roles",$authhost);
      if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
      my %allroles=();
-     my %thesepriv=();
      my $now=time;
      my $userroles="user.login.time=$now\n";
-     my $thesestr;
      if ($rolesdump ne '') {
          foreach (split(/&/,$rolesdump)) {
- Line 1976  sub rolesinit {
+ Line 2396  sub rolesinit {
              my ($area,$role)=split(/=/,$_);
              $area=~s/\_\w\w$//;
              my ($trole,$tend,$tstart)=split(/_/,$role);
-             $userroles.='user.role.'.$trole.'.'.$area.'='.
+             $userroles.=&set_arearole($trole,$area,$tstart,$tend);
-                         $tstart.'.'.$tend."\n";
+             if (($tend!=0) && ($tend<$now)) { $trole=''; }
- # log the associated role with the area
+             if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
-             &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
-             if ($tend!=0) {
- 	        if ($tend<$now) {
- 	            $trole='';
-                 }
-             }
-             if ($tstart!=0) {
-                 if ($tstart>$now) {
-                    $trole='';
-                 }
-             }
              if (($area ne '') && ($trole ne '')) {
  		my $spec=$trole.'.'.$area;
  		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
  		if ($trole =~ /^cr\//) {
- 		    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+                     &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area);
-  		    my $homsvr=homeserver($rauthor,$rdomain);
- 		    if ($hostname{$homsvr} ne '') {
- 			my ($rdummy,$roledef)=
- 			   &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
- 			if (($rdummy ne 'con_lost') && ($roledef ne '')) {
- 			    my ($syspriv,$dompriv,$coursepriv)=
- 				split(/\_/,$roledef);
- 			    if (defined($syspriv)) {
- 				$allroles{'cm./'}.=':'.$syspriv;
- 				$allroles{$spec.'./'}.=':'.$syspriv;
- 			    }
- 			    if ($tdomain ne '') {
- 				if (defined($dompriv)) {
- 				    $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
- 				    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
- 				}
- 				if ($trest ne '') {
- 				    if (defined($coursepriv)) {
- 					$allroles{'cm.'.$area}.=':'.$coursepriv;
- 					$allroles{$spec.'.'.$area}.=':'.$coursepriv;
- 				    }
- 				}
- 			    }
- 			}
- 		    }
  		} else {
- 		    if (defined($pr{$trole.':s'})) {
+                     &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
- 			$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'};
- 			    }
- 			}
- 		    }
  		}
              }
            }
          }
-         my $adv=0;
+         my ($author,$adv) = &set_userprivs(\$userroles,\%allroles);
-         my $author=0;
-         foreach (keys %allroles) {
-             %thesepriv=();
-             if (($_!~/^st/) && ($_!~/^ta/) && ($_!~/^cm/)) { $adv=1; }
-             if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
-             foreach (split(/:/,$allroles{$_})) {
-                 if ($_ ne '') {
- 		    my ($privilege,$restrictions)=split(/&/,$_);
-                     if ($restrictions eq '') {
- 			$thesepriv{$privilege}='F';
-                     } else {
-                         if ($thesepriv{$privilege} ne 'F') {
- 			    $thesepriv{$privilege}.=$restrictions;
-                         }
-                     }
-                 }
-             }
-             $thesestr='';
-             foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
-             $userroles.='user.priv.'.$_.'='.$thesestr."\n";
-         }
          $userroles.='user.adv='.$adv."\n".
  	            'user.author='.$author."\n";
          $ENV{'user.adv'}=$adv;
- Line 2071  sub rolesinit {
+ Line 2418  sub rolesinit {
      return $userroles;
  }
+ sub set_arearole {
+     my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
+ # log the associated role with the area
+     &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+     return 'user.role.'.$trole.'.'.$area.'='.$tstart.'.'.$tend."\n";
+ }
+ sub custom_roleprivs {
+     my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_;
+     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+     my $homsvr=homeserver($rauthor,$rdomain);
+     if ($hostname{$homsvr} ne '') {
+         my ($rdummy,$roledef)=
+             &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
+         if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+             my ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+             if (defined($syspriv)) {
+                 $$allroles{'cm./'}.=':'.$syspriv;
+                 $$allroles{$spec.'./'}.=':'.$syspriv;
+             }
+             if ($tdomain ne '') {
+                 if (defined($dompriv)) {
+                     $$allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+                     $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
+                 }
+                 if (($trest ne '') && (defined($coursepriv))) {
+                     $$allroles{'cm.'.$area}.=':'.$coursepriv;
+                     $$allroles{$spec.'.'.$area}.=':'.$coursepriv;
+                 }
+             }
+         }
+     }
+ }
+ sub standard_roleprivs {
+     my ($allroles,$trole,$tdomain,$spec,$trest,$area) = @_;
+     if (defined($pr{$trole.':s'})) {
+         $$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 '') && (defined($pr{$trole.':c'}))) {
+             $$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+             $$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+         }
+     }
+ }
+ sub set_userprivs {
+     my ($userroles,$allroles) = @_;
+     my $author=0;
+     my $adv=0;
+     foreach (keys %{$allroles}) {
+         my %thesepriv=();
+         if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
+         foreach (split(/:/,$$allroles{$_})) {
+             if ($_ ne '') {
+                 my ($privilege,$restrictions)=split(/&/,$_);
+                 if ($restrictions eq '') {
+                     $thesepriv{$privilege}='F';
+                 } elsif ($thesepriv{$privilege} ne 'F') {
+                     $thesepriv{$privilege}.=$restrictions;
+                 }
+                 if ($thesepriv{'adv'} eq 'F') { $adv=1; }
+             }
+         }
+         my $thesestr='';
+         foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
+         $$userroles.='user.priv.'.$_.'='.$thesestr."\n";
+     }
+     return ($author,$adv);
+ }
  # --------------------------------------------------------------- get interface
  sub get {
- Line 2092  sub get {
+ Line 2517  sub get {
     my %returnhash=();
     my $i=0;
     foreach (@$storearr) {
-       $returnhash{$_}=unescape($pairs[$i]);
+       $returnhash{$_}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
- Line 2131  sub dump {
+ Line 2556  sub dump {
     my %returnhash=();
     foreach (@pairs) {
        my ($key,$value)=split(/=/,$_);
-       $returnhash{unescape($key)}=unescape($value);
+       $returnhash{unescape($key)}=&thaw_unescape($value);
     }
     return %returnhash;
  }
- Line 2170  sub currentdump {
+ Line 2595  sub currentdump {
         return if ($tmp[0] =~ /^(error:|no_such_host)/);
         my %hash = @tmp;
         @tmp=();
-        # Code ripped from lond, essentially.  The only difference
+        %returnhash = %{&convert_dump_to_currentdump(\%hash)};
-        # 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);
+                                                         &thaw_unescape($value);
         }
     }
     return %returnhash;
  }
+ sub convert_dump_to_currentdump{
+     my %hash = %{shift()};
+     my %returnhash;
+     # 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\./);
+         }
+     }
+     return \%returnhash;
+ }
+ # --------------------------------------------------------------- inc interface
+ sub inc {
+     my ($namespace,$store,$udomain,$uname) = @_;
+     if (!$udomain) { $udomain=$ENV{'user.domain'}; }
+     if (!$uname) { $uname=$ENV{'user.name'}; }
+     my $uhome=&homeserver($uname,$udomain);
+     my $items='';
+     if (! ref($store)) {
+         # got a single value, so use that instead
+         $items = &escape($store).'=&';
+     } elsif (ref($store) eq 'SCALAR') {
+         $items = &escape($$store).'=&';
+     } elsif (ref($store) eq 'ARRAY') {
+         $items = join('=&',map {&escape($_);} @{$store});
+     } elsif (ref($store) eq 'HASH') {
+         while (my($key,$value) = each(%{$store})) {
+             $items.= &escape($key).'='.&escape($value).'&';
+         }
+     }
+     $items=~s/\&$//;
+     return &reply("inc:$udomain:$uname:$namespace:$items",$uhome);
+ }
  # --------------------------------------------------------------- put interface
  sub put {
- Line 2212  sub put {
+ Line 2668  sub put {
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
     foreach (keys %$storehash) {
-        $items.=&escape($_).'='.&escape($$storehash{$_}).'&';
+        $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+    }
+    $items=~s/\&$//;
+    return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
+ }
+ # ---------------------------------------------------------- putstore interface
+ sub putstore {
+    my ($namespace,$storehash,$udomain,$uname)=@_;
+    if (!$udomain) { $udomain=$ENV{'user.domain'}; }
+    if (!$uname) { $uname=$ENV{'user.name'}; }
+    my $uhome=&homeserver($uname,$udomain);
+    my $items='';
+    my %allitems = ();
+    foreach (keys %$storehash) {
+        if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) {
+            my $key = $1.':keys:'.$2;
+            $allitems{$key} .= $3.':';
+        }
+        $items.=$_.'='.&escape($$storehash{$_}).'&';
+    }
+    foreach (keys %allitems) {
+        $allitems{$_} =~ s/\:$//;
+        $items.= $_.'='.$allitems{$_}.'&';
     }
     $items=~s/\&$//;
     return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2227  sub cput {
+ Line 2707  sub cput {
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
     foreach (keys %$storehash) {
-        $items.=escape($_).'='.escape($$storehash{$_}).'&';
+        $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&';
     }
     $items=~s/\&$//;
     return &critical("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2250  sub eget {
+ Line 2730  sub eget {
     my %returnhash=();
     my $i=0;
     foreach (@$storearr) {
-       $returnhash{$_}=unescape($pairs[$i]);
+       $returnhash{$_}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
- Line 2294  sub customaccess {
+ Line 2774  sub customaccess {
  sub allowed {
      my ($priv,$uri)=@_;
+     $uri=&deversion($uri);
      my $orguri=$uri;
      $uri=&declutter($uri);
      if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; }
  # Free bre access to adm and meta resources
+     if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|))
-     if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
+ 	 || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
  	return 'F';
      }
+ # Free bre access to user's own portfolio contents
+     my ($space,$domain,$name,$dir)=split('/',$uri);
+     if (('uploaded' eq $space) && ($ENV{'user.name'} eq $name) &&
+ 	($ENV{'user.domain'} eq $domain) && ('portfolio' eq $dir)) {
+         return 'F';
+     }
  # Free bre to public access
      if ($priv eq 'bre') {
- Line 2347  sub allowed {
+ Line 2836  sub allowed {
  # Course
-     if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'}=~/$priv\&([^\:]*)/) {
+     if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'}=~/\Q$priv\E\&([^\:]*)/) {
         $thisallowed.=$1;
      }
  # Domain
      if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.(split(/\//,$uri))[0].'/'}
-        =~/$priv\&([^\:]*)/) {
+        =~/\Q$priv\E\&([^\:]*)/) {
         $thisallowed.=$1;
      }
- Line 2364  sub allowed {
+ Line 2853  sub allowed {
      $courseuri=~s/^([^\/])/\/$1/;
      if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri}
-        =~/$priv\&([^\:]*)/) {
+        =~/\Q$priv\E\&([^\:]*)/) {
         $thisallowed.=$1;
      }
  # URI is an uploaded document for this course
-     if (($priv eq 'bre') &&
+     if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) {
-         ($uri=~/^uploaded\/$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}\/$ENV{'course.'.$ENV{'request.course.id'}.'.num'}/)) {
+ 	my $refuri=$ENV{'httpref.'.$orguri};
-         return 'F';
+ 	if ($refuri) {
+ 	    if ($refuri =~ m|^/adm/|) {
+ 		$thisallowed='F';
+ 	    }
+ 	}
      }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
- Line 2382  sub allowed {
+ Line 2876  sub allowed {
  # If this is generating or modifying users, exit with special codes
-     if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:cca:'=~/\:$priv\:/) {
+     if (':csu:cdc:ccc:cin:cta:cep:ccr:cst:cad:cli:cau:cdg:cca:'=~/\:\Q$priv\E\:/) {
  	return $thisallowed;
      }
  #
- Line 2403  sub allowed {
+ Line 2897  sub allowed {
         if ($match) {
             $statecond=$cond;
             if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
-                =~/$priv\&([^\:]*)/) {
+                =~/\Q$priv\E\&([^\:]*)/) {
                 $thisallowed.=$1;
                 $checkreferer=0;
             }
- Line 2431  sub allowed {
+ Line 2925  sub allowed {
              if ($match) {
                my $refstatecond=$cond;
                if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
-                   =~/$priv\&([^\:]*)/) {
+                   =~/\Q$priv\E\&([^\:]*)/) {
                    $thisallowed.=$1;
                    $uri=$refuri;
                    $statecond=$refstatecond;
- Line 2484  sub allowed {
+ Line 2978  sub allowed {
                 if ((time-$ENV{$prefix.'last_cache'})>$expiretime) {
  		   &coursedescription($courseid);
                 }
-                if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,$csec\,/)
+                if (($ENV{$prefix.'res.'.$uri.'.lock.sections'}=~/\,\Q$csec\E\,/)
                  || ($ENV{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
  		   if ($ENV{$prefix.'res.'.$uri.'.lock.expire'}>time) {
                         &log($ENV{'user.domain'},$ENV{'user.name'},
- Line 2495  sub allowed {
+ Line 2989  sub allowed {
  		       return '';
                     }
                 }
-                if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,$csec\,/)
+                if (($ENV{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,\Q$csec\E\,/)
                  || ($ENV{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) {
  		   if ($ENV{'priv.'.$priv.'.lock.expire'}>time) {
                         &log($ENV{'user.domain'},$ENV{'user.name'},
- Line 2529  sub allowed {
+ Line 3023  sub allowed {
         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/) {
+ 	   =~/\Q$rolecode\E/) {
             &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                  'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
                  $ENV{'request.course.id'});
- Line 2537  sub allowed {
+ Line 3031  sub allowed {
         }
         if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$priv.'.users.denied'}
- 	   =~/$unamedom/) {
+ 	   =~/\Q$unamedom\E/) {
             &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                  'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '.
                  $ENV{'request.course.id'});
- Line 2549  sub allowed {
+ Line 3043  sub allowed {
     if ($thisallowed=~/R/) {
         my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
-        if (&metadata($uri,'roledeny')=~/$rolecode/) {
+        if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) {
  	  &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                      'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
            return '';
- Line 2561  sub allowed {
+ Line 3055  sub allowed {
     if ($thisallowed=~/X/) {
        if ($ENV{'acc.randomout'}) {
           my $symb=&symbread($uri,1);
-          if (($symb) && ($ENV{'acc.randomout'}=~/\&$symb\&/)) {
+          if (($symb) && ($ENV{'acc.randomout'}=~/\&\Q$symb\E\&/)) {
              return '';
           }
        }
- Line 2579  sub allowed {
+ Line 3073  sub allowed {
  sub is_on_map {
      my $uri=&declutter(shift);
+     $uri=~s/\.\d+\.(\w+)$/\.$1/;
      my @uriparts=split(/\//,$uri);
      my $filename=$uriparts[$#uriparts];
      my $pathname=$uri;
- Line 2594  sub is_on_map {
+ Line 3089  sub is_on_map {
      }
  }
+ # --------------------------------------------------------- Get symb from alias
+ sub get_symb_from_alias {
+     my $symb=shift;
+     my ($map,$resid,$url)=&decode_symb($symb);
+ # Already is a symb
+     if ($url) { return $symb; }
+ # Must be an alias
+     my $aliassymb='';
+     my %bighash;
+     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+                             &GDBM_READER(),0640)) {
+         my $rid=$bighash{'mapalias_'.$symb};
+ 	if ($rid) {
+ 	    my ($mapid,$resid)=split(/\./,$rid);
+ 	    $aliassymb=&encode_symb($bighash{'map_id_'.$mapid},
+ 				    $resid,$bighash{'src_'.$rid});
+ 	}
+         untie %bighash;
+     }
+     return $aliassymb;
+ }
  # ----------------------------------------------------------------- Define Role
  sub definerole {
- Line 2601  sub definerole {
+ Line 3119  sub definerole {
      my ($rolename,$sysrole,$domrole,$courole)=@_;
      foreach (split(':',$sysrole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:s'}!~/$crole/) { return "refused:s:$crole"; }
+         if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; }
-         if ($pr{'cr:s'}=~/$crole\&/) {
+         if ($pr{'cr:s'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:s'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
                 return "refused:s:$crole&$cqual";
              }
          }
      }
      foreach (split(':',$domrole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:d'}!~/$crole/) { return "refused:d:$crole"; }
+         if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; }
-         if ($pr{'cr:d'}=~/$crole\&/) {
+         if ($pr{'cr:d'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:d'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) {
                 return "refused:d:$crole&$cqual";
              }
          }
      }
      foreach (split(':',$courole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:c'}!~/$crole/) { return "refused:c:$crole"; }
+         if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; }
-         if ($pr{'cr:c'}=~/$crole\&/) {
+         if ($pr{'cr:c'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:c'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
                 return "refused:c:$crole&$cqual";
              }
          }
- Line 2668  sub log_query {
+ Line 3186  sub log_query {
      my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters));
      my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command,
                         $uhome);
-     unless ($queryid=~/^$uhost\_/) { return 'error: '.$queryid; }
+     unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; }
      return get_query_reply($queryid);
  }
+ # ------- Request retrieval of institutional classlists for course(s)
+ sub fetch_enrollment_query {
+     my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_;
+     my $homeserver;
+     my $maxtries = 1;
+     if ($context eq 'automated') {
+         $homeserver = $perlvar{'lonHostID'};
+         $maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout
+     } else {
+         $homeserver = &homeserver($cnum,$dom);
+     }
+     my $host=$hostname{$homeserver};
+     my $cmd = '';
+     foreach (keys %{$affiliatesref}) {
+         $cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%';
+     }
+     $cmd =~ s/%%$//;
+     $cmd = &escape($cmd);
+     my $query = 'fetchenrollment';
+     my $queryid=&reply("querysend:".$query.':'.$dom.':'.$ENV{'user.name'}.':'.$cmd,$homeserver);
+     unless ($queryid=~/^\Q$host\E\_/) {
+         &logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum);
+         return 'error: '.$queryid;
+     }
+     my $reply = &get_query_reply($queryid);
+     my $tries = 1;
+     while (($reply=~/^timeout/) && ($tries < $maxtries)) {
+         $reply = &get_query_reply($queryid);
+         $tries ++;
+     }
+     if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
+         &logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$ENV{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries);
+     } else {
+         my @responses = split/:/,$reply;
+         if ($homeserver eq $perlvar{'lonHostID'}) {
+             foreach (@responses) {
+                 my ($key,$value) = split/=/,$_;
+                 $$replyref{$key} = $value;
+             }
+         } else {
+             my $pathname = $perlvar{'lonDaemons'}.'/tmp';
+             foreach (@responses) {
+                 my ($key,$value) = split/=/,$_;
+                 $$replyref{$key} = $value;
+                 if ($value > 0) {
+                     foreach (@{$$affiliatesref{$key}}) {
+                         my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml';
+                         my $destname = $pathname.'/'.$filename;
+                         my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver);
+                         if ($xml_classlist =~ /^error/) {
+                             &logthis('fetch_enrollment_query - autoretrieve error: '.$xml_classlist.' for '.$filename.' from server: '.$homeserver.' '.$context.' '.$cnum);
+                         } else {
+                             if ( open(FILE,">$destname") ) {
+                                 print FILE &unescape($xml_classlist);
+                                 close(FILE);
+                             } else {
+                                 &logthis('fetch_enrollment_query - error opening classlist file '.$destname.' '.$context.' '.$cnum);
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+         return 'ok';
+     }
+     return 'error';
+ }
  sub get_query_reply {
      my $queryid=shift;
      my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid;
- Line 2679  sub get_query_reply {
+ Line 3266  sub get_query_reply {
      for (1..100) {
  	sleep 2;
          if (-e $replyfile.'.end') {
- 	    if (my $fh=Apache::File->new($replyfile)) {
+ 	    if (open(my $fh,$replyfile)) {
                 $reply.=<$fh>;
-                $fh->close;
+                close($fh);
  	   } else { return 'error: reply_file_error'; }
             return &unescape($reply);
  	}
- Line 2716  sub userlog_query {
+ Line 3303  sub userlog_query {
      return &log_query($uname,$udom,'userlog',%filters);
  }
+ #--------- Call auto-enrollment subs in localenroll.pm for homeserver for course
+ sub auto_run {
+     my ($cnum,$cdom) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response = &reply('autorun:'.$cdom,$homeserver);
+     return $response;
+ }
+ sub auto_get_sections {
+     my ($cnum,$cdom,$inst_coursecode) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my @secs = ();
+     my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver));
+     unless ($response eq 'refused') {
+         @secs = split/:/,$response;
+     }
+     return @secs;
+ }
+ sub auto_new_course {
+     my ($cnum,$cdom,$inst_course_id,$owner) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver));
+     return $response;
+ }
+ sub auto_validate_courseID {
+     my ($cnum,$cdom,$inst_course_id) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver));
+     return $response;
+ }
+ sub auto_create_password {
+     my ($cnum,$cdom,$authparam) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $create_passwd = 0;
+     my $authchk = '';
+     my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
+     if ($response eq 'refused') {
+         $authchk = 'refused';
+     } else {
+         ($authparam,$create_passwd,$authchk) = split/:/,$response;
+     }
+     return ($authparam,$create_passwd,$authchk);
+ }
+ sub auto_instcode_format {
+     my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_;
+     my $courses = '';
+     my $homeserver;
+     if ($caller eq 'global') {
+         $homeserver = $perlvar{'lonHostID'};
+     } else {
+         $homeserver = &homeserver($caller,$codedom);
+     }
+     my $host=$hostname{$homeserver};
+     foreach (keys %{$instcodes}) {
+         $courses .= &escape($_).'='.&escape($$instcodes{$_}).'&';
+     }
+     chop($courses);
+     my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver);
+     unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+         my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response;
+         %{$codes} = &str2hash($codes_str);
+         @{$codetitles} = &str2array($codetitles_str);
+         %{$cat_titles} = &str2hash($cat_titles_str);
+         %{$cat_order} = &str2hash($cat_order_str);
+         return 'ok';
+     }
+     return $response;
+ }
  # ------------------------------------------------------------------ Plain Text
  sub plaintext {
      my $short=shift;
-     return $prp{$short};
+     return &mt($prp{$short});
  }
  # ----------------------------------------------------------------- Assign Role
- Line 2906  sub modifyuser {
+ Line 3567  sub modifyuser {
  sub modifystudent {
      my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
-         $end,$start,$forceid,$desiredhome,$email)=@_;
+         $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid)=@_;
-     my $cid='';
+     if (!$cid) {
-     unless ($cid=$ENV{'request.course.id'}) {
+ 	unless ($cid=$ENV{'request.course.id'}) {
- 	return 'not_in_class';
+ 	    return 'not_in_class';
+ 	}
      }
  # --------------------------------------------------------------- Make the user
      my $reply=&modifyuser
- Line 2919  sub modifystudent {
+ Line 3581  sub modifystudent {
      # 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,
+     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
-                                         $last,$gene,$usec,$end,$start);
+ 					$gene,$usec,$end,$start,$type,$locktype,$cid);
      return $reply;
  }
  sub modify_student_enrollment {
-     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start) = @_;
+     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid) = @_;
-     # Get the course id from the environment
+     my ($cdom,$cnum,$chome);
-     my $cid='';
+     if (!$cid) {
-     unless ($cid=$ENV{'request.course.id'}) {
+ 	unless ($cid=$ENV{'request.course.id'}) {
- 	return 'not_in_class';
+ 	    return 'not_in_class';
+ 	}
+ 	$cdom=$ENV{'course.'.$cid.'.domain'};
+ 	$cnum=$ENV{'course.'.$cid.'.num'};
+     } else {
+ 	($cdom,$cnum)=split(/_/,$cid);
      }
+     $chome=$ENV{'course.'.$cid.'.home'};
+     if (!$chome) {
+ 	$chome=&homeserver($cnum,$cdom);
+     }
+     if (!$chome) { return 'unknown_course'; }
      # Make sure the user exists
      my $uhome=&homeserver($uname,$udom);
      if (($uhome eq '') || ($uhome eq 'no_host')) {
  	return 'error: no such user';
      }
-     #
      # Get student data if we were not given enough information
      if (!defined($first)  || $first  eq '' ||
          !defined($last)   || $last   eq '' ||
- Line 2949  sub modify_student_enrollment {
+ Line 3620  sub modify_student_enrollment {
                         ['firstname','middlename','lastname', 'generation','id']
                         ,$udom,$uname);
-         foreach (keys(%tmp)) {
+         #foreach (keys(%tmp)) {
-             &logthis("key $_ = ".$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,
+     my $fullname = &format_name($first,$middle,$last,$gene,'lastname');
-                                                            $first,$middle);
+     my $reply=cput('classlist',
-     my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+ 		   {"$uname:$udom" =>
- 	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
+ 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
-                       &escape($uname.':'.$udom).'='.
+ 		   $cdom,$cnum);
-                       &escape(join(':',$end,$start,$uid,$usec,$fullname)),
- 	              $ENV{'course.'.$cid.'.home'});
      unless (($reply eq 'ok') || ($reply eq 'delayed')) {
  	return 'error: '.$reply;
      }
- Line 2977  sub modify_student_enrollment {
+ Line 3646  sub modify_student_enrollment {
      return &assignrole($udom,$uname,$uurl,'st',$end,$start);
  }
+ sub format_name {
+     my ($firstname,$middlename,$lastname,$generation,$first)=@_;
+     my $name;
+     if ($first ne 'lastname') {
+ 	$name=$firstname.' '.$middlename.' '.$lastname.' '.$generation;
+     } else {
+ 	if ($lastname=~/\S/) {
+ 	    $name.= $lastname.' '.$generation.', '.$firstname.' '.$middlename;
+ 	    $name=~s/\s+,/,/;
+ 	} else {
+ 	    $name.= $firstname.' '.$middlename.' '.$generation;
+ 	}
+     }
+     $name=~s/^\s+//;
+     $name=~s/\s+$//;
+     $name=~s/\s+/ /g;
+     return $name;
+ }
  # ------------------------------------------------- Write to course preferences
  sub writecoursepref {
- Line 2999  sub writecoursepref {
+ Line 3687  sub writecoursepref {
  # ---------------------------------------------------------- Make/modify course
  sub createcourse {
-     my ($udom,$description,$url,$course_server,$nonstandard)=@_;
+     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code)=@_;
      $url=&declutter($url);
      my $cid='';
      unless (&allowed('ccc',$udom)) {
- Line 3032  sub createcourse {
+ Line 3720  sub createcourse {
  	return 'error: no such course';
      }
  # ----------------------------------------------------------------- Course made
- # log existance
+ # log existence
-     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description),
+     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
-                  $uhome);
+                  '='.&escape($inst_code),$uhome);
      &flushcourselogs();
  # set toplevel url
      my $topurl=$url;
- Line 3087  sub revokecustomrole {
+ Line 3775  sub revokecustomrole {
             $deleteflag);
  }
+ # ------------------------------------------------------------ Disk usage
+ sub diskusage {
+     my ($udom,$uname,$directoryRoot)=@_;
+     $directoryRoot =~ s/\/$//;
+     my $listing=&reply('du:'.$directoryRoot,homeserver($uname,$udom));
+     return $listing;
+ }
+ sub is_locked {
+     my ($file_name, $domain, $user) = @_;
+     my @check;
+     my $is_locked;
+     push @check, $file_name;
+     my %locked = &Apache::lonnet::get('file_permissions',\@check,
+                                         $ENV{'user.domain'},$ENV{'user.name'});
+     if (ref($locked{$file_name}) eq 'ARRAY') {
+         $is_locked = 'true';
+     } else {
+         $is_locked = 'false';
+     }
+ }
+ # ------------------------------------------------------------- Mark as Read Only
+ sub mark_as_readonly {
+     my ($domain,$user,$files,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     foreach my $file (@{$files}) {
+         push(@{$current_permissions{$file}},$what);
+     }
+     &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+     return;
+ }
+ #--------------------------------------------------------------Get Marked as Read Only
+ sub get_marked_as_readonly {
+     my ($domain,$user,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     my @readonly_files;
+     while (my ($file_name,$value) = each(%current_permissions)) {
+         if (ref($value) eq "ARRAY"){
+             foreach my $stored_what (@{$value}) {
+                 if ($stored_what eq $what) {
+                     push(@readonly_files, $file_name);
+                 } elsif (!defined($what)) {
+                     push(@readonly_files, $file_name);
+                 }
+             }
+         }
+     }
+     return @readonly_files;
+ }
+ # ------------------------------------------------------------ Unmark as Read Only
+ sub unmark_as_readonly {
+     # unmarks all files locked by $what
+     # for portfolio submissions, $what contains $crsid and $symb
+     my ($domain,$user,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     my @readonly_files = &Apache::lonnet::get_marked_as_readonly($domain,$user,$what);
+     foreach my $file(@readonly_files){
+         my $current_locks = $current_permissions{$file};
+         my @new_locks;
+         my @del_keys;
+         if (ref($current_locks) eq "ARRAY"){
+             foreach my $locker (@{$current_locks}) {
+                 unless ($locker eq $what) {
+                     push(@new_locks, $what);
+                 }
+             }
+             if (@new_locks > 0) {
+                 $current_permissions{$file} = \@new_locks;
+             } else {
+                 push(@del_keys, $file);
+                 &Apache::lonnet::del('file_permissions',\@del_keys, $domain, $user);
+                 delete $current_permissions{$file};
+             }
+         }
+     }
+     &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+     return;
+ }
  # ------------------------------------------------------------ Directory lister
  sub dirlist {
- Line 3195  sub GetFileTimestamp {
+ Line 3968  sub GetFileTimestamp {
  sub directcondval {
      my $number=shift;
+     if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) {
+ 	&Apache::lonuserstate::evalstate();
+     }
      if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
         return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
      } else {
- Line 3248  sub condval {
+ Line 4024  sub condval {
  sub devalidatecourseresdata {
      my ($coursenum,$coursedomain)=@_;
      my $hashid=$coursenum.':'.$coursedomain;
-     delete $courseresdatacache{$hashid.'.time'};
+     &devalidate_cache(\%courseresdatacache,$hashid,'courseres');
  }
  # --------------------------------------------------- Course Resourcedata Query
- Line 3257  sub courseresdata {
+ Line 4033  sub courseresdata {
      my ($coursenum,$coursedomain,@which)=@_;
      my $coursehom=&homeserver($coursenum,$coursedomain);
      my $hashid=$coursenum.':'.$coursedomain;
-     my $dodump=0;
+     my ($result,$cached)=&is_cached(\%courseresdatacache,$hashid,'courseres');
-     if (!defined($courseresdatacache{$hashid.'.time'})) {
+     unless (defined($cached)) {
- 	$dodump=1;
-     } else {
- 	if (time-$courseresdatacache{$hashid.'.time'}>300) { $dodump=1; }
-     }
-     if ($dodump) {
  	my %dumpreply=&dump('resourcedata',$coursedomain,$coursenum);
+ 	$result=\%dumpreply;
  	my ($tmp) = keys(%dumpreply);
  	if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- 	    $courseresdatacache{$hashid.'.time'}=time;
+ 	    &do_cache(\%courseresdatacache,$hashid,$result,'courseres');
- 	    $courseresdatacache{$hashid}=\%dumpreply;
  	} elsif ($tmp =~ /^(con_lost|no_such_host)/) {
  	    return $tmp;
+ 	} elsif ($tmp =~ /^(error)/) {
+ 	    $result=undef;
+ 	    &do_cache(\%courseresdatacache,$hashid,$result,'courseres');
  	}
      }
      foreach my $item (@which) {
- 	if (defined($courseresdatacache{$hashid}->{$item})) {
+ 	if (defined($result->{$item})) {
- 	    return $courseresdatacache{$hashid}->{$item};
+ 	    return $result->{$item};
  	}
      }
      return undef;
- Line 3314  sub EXT {
+ Line 4088  sub EXT {
      #get real user name/domain, courseid and symb
      my $courseid;
      my $publicuser;
+     if ($symbparm) {
+ 	$symbparm=&get_symb_from_alias($symbparm);
+     }
      if (!($uname && $udom)) {
        (my $cursymb,$courseid,$udom,$uname,$publicuser)=
  	  &Apache::lonxml::whichuser($symbparm);
- Line 3399  sub EXT {
+ Line 4176  sub EXT {
     } elsif ($realm eq 'request') {
  # ------------------------------------------------------------- request.browser
          if ($space eq 'browser') {
- 	    return $ENV{'browser.'.$qualifier};
+ 	    if ($qualifier eq 'textremote') {
+ 		if (&mt('textual_remote_display') eq 'on') {
+ 		    return 1;
+ 		} else {
+ 		    return 0;
+ 		}
+ 	    } else {
+ 		return $ENV{'browser.'.$qualifier};
+ 	    }
  # ------------------------------------------------------------ request.filename
          } else {
              return $ENV{'request.'.$spacequalifierrest};
- Line 3411  sub EXT {
+ Line 4196  sub EXT {
  	my $section;
  	if (defined($courseid) && $courseid eq $ENV{'request.course.id'}) {
+ 	    if (!$symbparm) { $symbparm=&symbread(); }
+ 	}
+ 	if ($symbparm && defined($courseid) &&
+ 	    $courseid eq $ENV{'request.course.id'}) {
  	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
  # ----------------------------------------------------- Cascading lookup scheme
- 	    if (!$symbparm) { $symbparm=&symbread(); }
  	    my $symbp=$symbparm;
  	    my $mapp=(&decode_symb($symbp))[0];
- Line 3426  sub EXT {
+ Line 4214  sub EXT {
  		($ENV{'user.domain'} eq $udom)) {
  		$section=$ENV{'request.course.sec'};
  	    } else {
-                 if (! defined($usection)) {
+ 		if (! defined($usection)) {
-                     $section=&usection($udom,$uname,$courseid);
+ 		    $section=&getsection($udom,$uname,$courseid);
-                 } else {
+ 		} else {
-                     $section = $usection;
+ 		    $section = $usection;
-                 }
+ 		}
  	    }
  	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
- Line 3443  sub EXT {
+ Line 4231  sub EXT {
  # ----------------------------------------------------------- first, check user
  	    #most student don\'t have any data set, check if there is some data
-             #every thirty minutes
  	    if (! &EXT_cache_status($udom,$uname)) {
- 		my %resourcedata=&get('resourcedata',
+ 		my $hashid="$udom:$uname";
- 				      [$courselevelr,$courselevelm,$courselevel],
+ 		my ($result,$cached)=&is_cached(\%userresdatacache,$hashid,
- 				      $udom,$uname);
+ 						'userres');
- 		my ($tmp)=keys(%resourcedata);
+ 		if (!defined($cached)) {
+ 		    my %resourcedata=&dump('resourcedata',$udom,$uname);
+ 		    $result=\%resourcedata;
+ 		    &do_cache(\%userresdatacache,$hashid,$result,'userres');
+ 		}
+ 		my ($tmp)=keys(%$result);
  		if (($tmp!~/^error\:/) && ($tmp!~/^con_lost/)) {
- 		    if ($resourcedata{$courselevelr}) {
+ 		    if ($$result{$courselevelr}) {
- 			return $resourcedata{$courselevelr}; }
+ 			return $$result{$courselevelr}; }
- 		    if ($resourcedata{$courselevelm}) {
+ 		    if ($$result{$courselevelm}) {
- 			return $resourcedata{$courselevelm}; }
+ 			return $$result{$courselevelm}; }
- 		    if ($resourcedata{$courselevel}) {
+ 		    if ($$result{$courselevel}) {
- 			return $resourcedata{$courselevel}; }
+ 			return $$result{$courselevel}; }
  		} else {
- 		    if ($tmp!~/No such file/) {
+ 		    #error 2 occurs when the .db doesn't exist
+ 		    if ($tmp!~/error: 2 /) {
  			&logthis("<font color=blue>WARNING:".
  				 " Trying to get resource data for ".
  				 $uname." at ".$udom.": ".
  				 $tmp."</font>");
- 		    } elsif ($tmp=~/error:No such file/) {
+ 		    } elsif ($tmp=~/error: 2 /) {
-                         &EXT_cache_set($udom,$uname);
+ 			&EXT_cache_set($udom,$uname);
  		    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
  			return $tmp;
  		    }
- Line 3473  sub EXT {
+ Line 4266  sub EXT {
  # -------------------------------------------------------- second, check course
  	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
- 					  $ENV{'course.'.$courseid.'.domain'},
+ 					   $ENV{'course.'.$courseid.'.domain'},
- 					  ($seclevelr,$seclevelm,$seclevel,
+ 					   ($seclevelr,$seclevelm,$seclevel,
- 					   $courselevelr,$courselevelm,
+ 					    $courselevelr,$courselevelm,
- 					   $courselevel));
+ 					    $courselevel));
  	    if (defined($coursereply)) { return $coursereply; }
  # ------------------------------------------------------ third, check map parms
- Line 3544  sub packages_tab_default {
+ Line 4337  sub packages_tab_default {
      my $packages=&metadata($uri,'packages');
      foreach my $package (split(/,/,$packages)) {
  	my ($pack_type,$pack_part)=split(/_/,$package,2);
- 	if ($pack_part eq $part) {
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
  	    return $packagetab{"$pack_type&$name&default"};
  	}
+ 	if (defined($packagetab{$pack_type."_".$pack_part."&$name&default"})) {
+ 	    return $packagetab{$pack_type."_".$pack_part."&$name&default"};
+ 	}
      }
      return undef;
  }
- Line 3571  sub add_prefix_and_part {
+ Line 4367  sub add_prefix_and_part {
  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|)) ||
+     if (($uri eq '') ||
-         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|)) {
+ 	(($uri =~ m|^/*adm/|) &&
- 	return '';
+ 	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
+         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
+ 	($uri =~ m|home/[^/]+/public_html/|)) {
+ 	return undef;
      }
      my $filename=$uri;
      $uri=~s/\.meta$//;
- Line 3585  sub metadata {
+ Line 4383  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 && !defined($liburi)) {
+     if (!defined($liburi)) {
+ 	my ($result,$cached)=&is_cached(\%metacache,$uri,'meta');
+ 	if (defined($cached)) { return $result->{':'.$what}; }
+     }
+     {
  #
  # Is this a recursive call for a library?
  #
+ 	if (! exists($metacache{$uri})) {
+ 	    $metacache{$uri}={};
+ 	}
          if ($liburi) {
  	    $liburi=&declutter($liburi);
              $filename=$liburi;
          } else {
- 	    delete($metacache{$uri.':packages'});
+ 	    &devalidate_cache(\%metacache,$uri,'meta');
  	}
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
- 	my $metastring=&getfile(&filelocation('',&clutter($filename)));
+ 	my $metastring;
+ 	if ($uri !~ m|^uploaded/|) {
+ 	    my $file=&filelocation('',&clutter($filename));
+ 	    push(@{$metacache{$uri.'.file'}},$file);
+ 	    $metastring=&getfile($file);
+ 	}
          my $parser=HTML::LCParser->new(\$metastring);
          my $token;
          undef %metathesekeys;
- Line 3612  sub metadata {
+ Line 4422  sub metadata {
  		    if (defined($token->[2]->{'id'})) {
  			$keyroot.='_'.$token->[2]->{'id'};
  		    }
- 		    if ($metacache{$uri.':packages'}) {
+ 		    if ($metacache{$uri}->{':packages'}) {
- 			$metacache{$uri.':packages'}.=','.$package.$keyroot;
+ 			$metacache{$uri}->{':packages'}.=','.$package.$keyroot;
  		    } else {
- 			$metacache{$uri.':packages'}=$package.$keyroot;
+ 			$metacache{$uri}->{':packages'}=$package.$keyroot;
  		    }
  		    foreach (keys %packagetab) {
- 			if ($_=~/^$package\&/) {
+ 			my $part=$keyroot;
+ 			$part=~s/^\_//;
+ 			if ($_=~/^\Q$package\E\&/ ||
+ 			    $_=~/^\Q$package\E_0\&/) {
  			    my ($pack,$name,$subp)=split(/\&/,$_);
  			    # ignore package.tab specified default values
                              # here &package_tab_default() will fetch those
  			    if ($subp eq 'default') { next; }
  			    my $value=$packagetab{$_};
- 			    my $part=$keyroot;
+ 			    my $unikey;
- 			    $part=~s/^\_//;
+ 			    if ($pack =~ /_0$/) {
+ 				$unikey='parameter_0_'.$name;
+ 				$part=0;
+ 			    } else {
+ 				$unikey='parameter'.$keyroot.'_'.$name;
+ 			    }
  			    if ($subp eq 'display') {
  				$value.=' [Part: '.$part.']';
  			    }
- 			    my $unikey='parameter'.$keyroot.'_'.$name;
+ 			    $metacache{$uri}->{':'.$unikey.'.part'}=$part;
- 			    $metacache{$uri.':'.$unikey.'.part'}=$part;
  			    $metathesekeys{$unikey}=1;
- 			    unless (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
+ 			    unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) {
- 				$metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+ 				$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value;
  			    }
- 			    if (defined($metacache{$uri.':'.$unikey.'.default'})) {
+ 			    if (defined($metacache{$uri}->{':'.$unikey.'.default'})) {
- 				$metacache{$uri.':'.$unikey}=
+ 				$metacache{$uri}->{':'.$unikey}=
- 				    $metacache{$uri.':'.$unikey.'.default'};
+ 				    $metacache{$uri}->{':'.$unikey.'.default'};
  			    }
  			}
  		    }
- Line 3670  sub metadata {
+ Line 4487  sub metadata {
  			    foreach (sort(split(/\,/,&metadata($uri,'keys',
  							       $location,$unikey,
  							       $depthcount+1)))) {
+ 				$metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_};
  				$metathesekeys{$_}=1;
  			    }
  			}
- Line 3680  sub metadata {
+ Line 4498  sub metadata {
  			}
  			$metathesekeys{$unikey}=1;
  			foreach (@{$token->[3]}) {
- 			    $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
+ 			    $metacache{$uri}->{':'.$unikey.'.'.$_}=$token->[2]->{$_};
  			}
  			my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
- 			my $default=$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;
+ 			    $metacache{$uri}->{':'.$unikey}=$default;
  			} else {
  		  # either something interesting inside the tag or default
                    # uninteresting
- 			    $metacache{$uri.':'.$unikey}=$internaltext;
+ 			    $metacache{$uri}->{':'.$unikey}=$internaltext;
  			}
  # end of not-a-package not-a-library import
  		    }
- Line 3700  sub metadata {
+ Line 4518  sub metadata {
  # the next is the end of "start tag"
  	    }
  	}
+ 	my ($extension) = ($uri =~ /\.(\w+)$/);
+ 	foreach my $key (sort(keys(%packagetab))) {
+ 	    #&logthis("extsion1 $extension $key !!");
+ 	    #no specific packages #how's our extension
+ 	    if ($key!~/^extension_\Q$extension\E&/) { next; }
+ 	    &metadata_create_package_def($uri,$key,'extension_'.$extension,
+ 					 \%metathesekeys);
+ 	}
+ 	if (!exists($metacache{$uri}->{':packages'})) {
+ 	    foreach my $key (sort(keys(%packagetab))) {
+ 		#no specific packages well let's get default then
+ 		if ($key!~/^default&/) { next; }
+ 		&metadata_create_package_def($uri,$key,'default',
+ 					     \%metathesekeys);
+ 	    }
+ 	}
  # are there custom rights to evaluate
- 	if ($metacache{$uri.':copyright'} eq 'custom') {
+ 	if ($metacache{$uri}->{':copyright'} eq 'custom') {
      #
      # Importing a rights file here
      #
  	    unless ($depthcount) {
- 		my $location=$metacache{$uri.':customdistributionfile'};
+ 		my $location=$metacache{$uri}->{':customdistributionfile'};
  		my $dir=$filename;
  		$dir=~s|[^/]*$||;
  		$location=&filelocation($dir,$location);
  		foreach (sort(split(/\,/,&metadata($uri,'keys',
  						   $location,'_rights',
  						   $depthcount+1)))) {
+ 		    $metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_};
  		    $metathesekeys{$_}=1;
  		}
  	    }
  	}
- 	$metacache{$uri.':keys'}=join(',',keys %metathesekeys);
+ 	$metacache{$uri}->{':keys'}=join(',',keys %metathesekeys);
- 	&metadata_generate_part0(\%metathesekeys,\%metacache,$uri);
+ 	&metadata_generate_part0(\%metathesekeys,$metacache{$uri},$uri);
- 	$metacache{$uri.':allpossiblekeys'}=join(',',keys %metathesekeys);
+ 	$metacache{$uri}->{':allpossiblekeys'}=join(',',keys %metathesekeys);
- 	$metacache{$uri.':cachedtimestamp'}=time;
+ 	&do_cache(\%metacache,$uri,$metacache{$uri},'meta');
  # this is the end of "was not already recently cached
      }
-     return $metacache{$uri.':'.$what};
+     return $metacache{$uri}->{':'.$what};
+ }
+ sub metadata_create_package_def {
+     my ($uri,$key,$package,$metathesekeys)=@_;
+     my ($pack,$name,$subp)=split(/\&/,$key);
+     if ($subp eq 'default') { next; }
+     if (defined($metacache{$uri}->{':packages'})) {
+ 	$metacache{$uri}->{':packages'}.=','.$package;
+     } else {
+ 	$metacache{$uri}->{':packages'}=$package;
+     }
+     my $value=$packagetab{$key};
+     my $unikey;
+     $unikey='parameter_0_'.$name;
+     $metacache{$uri}->{':'.$unikey.'.part'}=0;
+     $$metathesekeys{$unikey}=1;
+     unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) {
+ 	$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value;
+     }
+     if (defined($metacache{$uri}->{':'.$unikey.'.default'})) {
+ 	$metacache{$uri}->{':'.$unikey}=
+ 	    $metacache{$uri}->{':'.$unikey.'.default'};
+     }
  }
  sub metadata_generate_part0 {
- Line 3732  sub metadata_generate_part0 {
+ Line 4591  sub metadata_generate_part0 {
      my %allnames;
      foreach my $metakey (sort keys %$metadata) {
  	if ($metakey=~/^parameter\_(.*)/) {
- 	  my $part=$$metacache{$uri.':'.$metakey.'.part'};
+ 	  my $part=$$metacache{':'.$metakey.'.part'};
- 	  my $name=$$metacache{$uri.':'.$metakey.'.name'};
+ 	  my $name=$$metacache{':'.$metakey.'.name'};
  	  if (! exists($$metadata{'parameter_0_'.$name.'.name'})) {
  	    $allnames{$name}=$part;
  	  }
- Line 3741  sub metadata_generate_part0 {
+ Line 4600  sub metadata_generate_part0 {
      }
      foreach my $name (keys(%allnames)) {
        $$metadata{"parameter_0_$name"}=1;
-       my $key="$uri:parameter_0_$name";
+       my $key=":parameter_0_$name";
        $$metacache{"$key.part"}='0';
        $$metacache{"$key.name"}=$name;
-       $$metacache{"$key.type"}=$$metacache{$uri.':parameter_'.
+       $$metacache{"$key.type"}=$$metacache{':parameter_'.
  					   $allnames{$name}.'_'.$name.
  					   '.type'};
-       my $olddis=$$metacache{$uri.':parameter_'.$allnames{$name}.'_'.$name.
+       my $olddis=$$metacache{':parameter_'.$allnames{$name}.'_'.$name.
  			     '.display'};
        my $expr='\\[Part: '.$allnames{$name}.'\\]';
-       $olddis=~s/$expr/\[Part: 0\]/;
+       $olddis=~s/\Q$expr\E/\[Part: 0\]/;
        $$metacache{"$key.display"}=$olddis;
      }
  }
- Line 3760  sub metadata_generate_part0 {
+ Line 4619  sub metadata_generate_part0 {
  sub gettitle {
      my $urlsymb=shift;
      my $symb=&symbread($urlsymb);
-     unless ($symb) {
+     if ($symb) {
- 	unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; }
+ 	my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
-         return &metadata($urlsymb,'title');
+ 	if (defined($cached)) { return $result; }
-     }
+ 	my ($map,$resid,$url)=&decode_symb($symb);
-     if ($titlecache{$symb}) {
+ 	my $title='';
- 	if (time < ($titlecache{$symb}[1] + 600)) {
+ 	my %bighash;
- 	    return $titlecache{$symb}[0];
+ 	if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
- 	} else {
+ 		&GDBM_READER(),0640)) {
- 	    delete($titlecache{$symb});
+ 	    my $mapid=$bighash{'map_pc_'.&clutter($map)};
+ 	    $title=$bighash{'title_'.$mapid.'.'.$resid};
+ 	    untie %bighash;
  	}
+ 	$title=~s/\&colon\;/\:/gs;
+ 	if ($title) {
+ 	    return &do_cache(\%titlecache,$symb,$title,'title');
+ 	}
+ 	$urlsymb=$url;
      }
-     my ($map,$resid,$url)=&decode_symb($symb);
+     my $title=&metadata($urlsymb,'title');
-     my $title='';
+     if (!$title) { $title=(split('/',$urlsymb))[-1]; }
-     my %bighash;
+     return $title;
-     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 {
      my ($mapname,%newhash)=@_;
-     $mapname=declutter($mapname);
+     $mapname=&deversion(&declutter($mapname));
      my %hash;
      if (($ENV{'request.course.fn'}) && (%newhash)) {
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                        &GDBM_WRCREAT(),0640)) {
  	    foreach (keys %newhash) {
-                 $hash{declutter($_)}=$mapname.'___'.$newhash{$_};
+                 $hash{declutter($_)}=$mapname.'___'.&deversion($newhash{$_});
              }
              if (untie(%hash)) {
  		return 'ok';
- Line 3812  sub symblist {
+ Line 4665  sub symblist {
  # --------------------------------------------------------------- Verify a symb
  sub symbverify {
-     my ($symb,$thisfn)=@_;
+     my ($symb,$thisurl)=@_;
+     my $thisfn=$thisurl;
+ # wrapper not part of symbs
+     $thisfn=~s/^\/adm\/wrapper//;
      $thisfn=&declutter($thisfn);
  # direct jump to resource in page or to a sequence - will construct own symbs
      if ($thisfn=~/\.(page|sequence)$/) { return 1; }
  # check URL part
      my ($map,$resid,$url)=&decode_symb($symb);
-     unless (&symbclean($url) eq &symbclean($thisfn)) { return 0; }
+     unless ($url eq $thisfn) { return 0; }
      $symb=&symbclean($symb);
+     $thisurl=&deversion($thisurl);
+     $thisfn=&deversion($thisfn);
      my %bighash;
      my $okay=0;
      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                              &GDBM_READER(),0640)) {
-         my $ids=$bighash{'ids_'.&clutter($thisfn)};
+         my $ids=$bighash{'ids_'.&clutter($thisurl)};
          unless ($ids) {
-            $ids=$bighash{'ids_/'.$thisfn};
+            $ids=$bighash{'ids_/'.$thisurl};
          }
          if ($ids) {
  # ------------------------------------------------------------------- Has ID(s)
- Line 3857  sub symbclean {
+ Line 4717  sub symbclean {
  # remove version from URL
      $symb=~s/\.(\d+)\.(\w+)$/\.$2/;
+ # remove wrapper
+     $symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/;
      return $symb;
  }
  # ---------------------------------------------- Split symb to find map and url
+ sub encode_symb {
+     my ($map,$resid,$url)=@_;
+     return &symbclean(&declutter($map).'___'.$resid.'___'.&declutter($url));
+ }
  sub decode_symb {
-     return split(/\_\_\_/,shift);
+     my ($map,$resid,$url)=split(/\_\_\_/,shift);
+     return (&fixversion($map),$resid,&fixversion($url));
+ }
+ sub fixversion {
+     my $fn=shift;
+     if ($fn=~/^(adm|uploaded|public)/) { return $fn; }
+     my %bighash;
+     my $uri=&clutter($fn);
+     my $key=$ENV{'request.course.id'}.'_'.$uri;
+ # is this cached?
+     my ($result,$cached)=&is_cached(\%courseresversioncache,$key,
+ 				    'courseresversion',600);
+     if (defined($cached)) { return $result; }
+ # unfortunately not cached, or expired
+     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ 	    &GDBM_READER(),0640)) {
+  	if ($bighash{'version_'.$uri}) {
+  	    my $version=$bighash{'version_'.$uri};
+  	    unless (($version eq 'mostrecent') ||
+ 		    ($version==&getversion($uri))) {
+  		$uri=~s/\.(\w+)$/\.$version\.$1/;
+  	    }
+  	}
+  	untie %bighash;
+     }
+     return &do_cache
+ 	(\%courseresversioncache,$key,&declutter($uri),'courseresversion');
+ }
+ sub deversion {
+     my $url=shift;
+     $url=~s/\.\d+\.(\w+)$/\.$1/;
+     return $url;
  }
  # ------------------------------------------------------ Return symb list entry
  sub symbread {
      my ($thisfn,$donotrecurse)=@_;
+     my $cache_str='request.symbread.cached.'.$thisfn;
+     if (defined($ENV{$cache_str})) { return $ENV{$cache_str}; }
  # no filename provided? try from environment
      unless ($thisfn) {
-         if ($ENV{'request.symb'}) { return &symbclean($ENV{'request.symb'}); }
+         if ($ENV{'request.symb'}) {
+ 	    return $ENV{$cache_str}=&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); }
+ 	if (&symbverify($thisfn,$1)) {
+ 	    return $ENV{$cache_str}=&symbclean($thisfn);
+ 	}
      }
      $thisfn=declutter($thisfn);
      my %hash;
      my %bighash;
      my $syval='';
      if (($ENV{'request.course.fn'}) && ($thisfn)) {
+         my $targetfn = $thisfn;
+         if ( ($thisfn =~ m/^uploaded\//) && ($thisfn !~ m/\.(page|sequence)$/) ) {
+             $targetfn = 'adm/wrapper/'.$thisfn;
+         }
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                        &GDBM_READER(),0640)) {
- 	    $syval=$hash{$thisfn};
+ 	    $syval=$hash{$targetfn};
              untie(%hash);
          }
  # ---------------------------------------------------------- There was an entry
- Line 3894  sub symbread {
+ Line 4805  sub symbread {
             unless ($syval=~/\_\d+$/) {
  	       unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
                    &appenv('request.ambiguous' => $thisfn);
-                   return '';
+ 		  return $ENV{$cache_str}='';
                 }
                 $syval.=$1;
  	   }
- Line 3938  sub symbread {
+ Line 4849  sub symbread {
                   }
  	      }
                untie(%bighash)
             }
          }
          if ($syval) {
-            return &symbclean($syval.'___'.$thisfn);
+ 	    return $ENV{$cache_str}=&symbclean($syval.'___'.$thisfn);
          }
      }
      &appenv('request.ambiguous' => $thisfn);
-     return '';
+     return $ENV{$cache_str}='';
  }
  # ---------------------------------------------------------- Return random seed
- Line 3959  sub numval {
+ Line 4870  sub numval {
      $txt=~tr/U-Z/0-5/;
      $txt=~tr/u-z/0-5/;
      $txt=~s/\D//g;
+     if ($_64bit) { if ($txt > 2**32) { return -1; } }
      return int($txt);
  }
+ sub numval2 {
+     my $txt=shift;
+     $txt=~tr/A-J/0-9/;
+     $txt=~tr/a-j/0-9/;
+     $txt=~tr/K-T/0-9/;
+     $txt=~tr/k-t/0-9/;
+     $txt=~tr/U-Z/0-5/;
+     $txt=~tr/u-z/0-5/;
+     $txt=~s/\D//g;
+     my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt);
+     my $total;
+     foreach my $val (@txts) { $total+=$val; }
+     if ($_64bit) { if ($total > 2**32) { return -1; } }
+     return int($total);
+ }
  sub latest_rnd_algorithm_id {
-     return '64bit';
+     return '64bit3';
+ }
+ sub get_rand_alg {
+     my ($courseid)=@_;
+     if (!$courseid) { $courseid=(&Apache::lonxml::whichuser())[1]; }
+     if ($courseid) {
+ 	return $ENV{"course.$courseid.rndseed"};
+     }
+     return &latest_rnd_algorithm_id();
+ }
+ sub validCODE {
+     my ($CODE)=@_;
+     if (defined($CODE) && $CODE ne '' && $CODE =~ /^\w+$/) { return 1; }
+     return 0;
+ }
+ sub getCODE {
+     if (&validCODE($ENV{'form.CODE'})) { return $ENV{'form.CODE'}; }
+     if (defined($Apache::lonhomework::parsing_a_problem) &&
+ 	&validCODE($Apache::lonhomework::history{'resource.CODE'})) {
+ 	return $Apache::lonhomework::history{'resource.CODE'};
+     }
+     return undef;
  }
  sub rndseed {
- Line 3976  sub rndseed {
+ Line 4928  sub rndseed {
      if (!$courseid) { $courseid=$wcourseid; }
      if (!$domain) { $domain=$wdomain; }
      if (!$username) { $username=$wusername }
-     my $which=$ENV{"course.$courseid.rndseed"};
+     my $which=&get_rand_alg();
-     my $CODE=$ENV{'scantron.CODE'};
+     if (defined(&getCODE())) {
-     if (defined($CODE)) {
+ 	return &rndseed_CODE_64bit($symb,$courseid,$domain,$username);
- 	&rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit3') {
+ 	return &rndseed_64bit3($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit2') {
+ 	return &rndseed_64bit2($symb,$courseid,$domain,$username);
      } elsif ($which eq '64bit') {
  	return &rndseed_64bit($symb,$courseid,$domain,$username);
      }
- Line 3999  sub rndseed_32bit {
+ Line 4954  sub rndseed_32bit {
  	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
  	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	if ($_64bit) { $num=(($num<<32)>>32); }
  	return $num;
      }
  }
- Line 4019  sub rndseed_64bit {
+ Line 4975  sub rndseed_64bit {
  	my $num2=$nameseed+$domainseed+$courseseed;
  	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	return "$num1,$num2";
+     }
+ }
+ sub rndseed_64bit2 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	# strings need to be an even # of cahracters long, it it is odd the
+         # last characters gets thrown away
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 21;
+ 	my $symbseed=numval($symb) << 10;
+ 	my $namechck=unpack("%32S*",$username.' ');
+ 	my $nameseed=numval($username) << 21;
+ 	my $domainseed=unpack("%32S*",$domain.' ') << 10;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
+ 	my $num1=$symbchck+$symbseed+$namechck;
+ 	my $num2=$nameseed+$domainseed+$courseseed;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num:$symb");
  	return "$num1,$num2";
      }
  }
+ sub rndseed_64bit3 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	# strings need to be an even # of cahracters long, it it is odd the
+         # last characters gets thrown away
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 21;
+ 	my $symbseed=numval2($symb) << 10;
+ 	my $namechck=unpack("%32S*",$username.' ');
+ 	my $nameseed=numval2($username) << 21;
+ 	my $domainseed=unpack("%32S*",$domain.' ') << 10;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
+ 	my $num1=$symbchck+$symbseed+$namechck;
+ 	my $num2=$nameseed+$domainseed+$courseseed;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
+     }
+ }
  sub rndseed_CODE_64bit {
      my ($symb,$courseid,$domain,$username)=@_;
      {
  	use integer;
- 	my $symbchck=unpack("%32S*",$symb) << 16;
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 16;
- 	my $symbseed=numval($symb);
+ 	my $symbseed=numval2($symb);
- 	my $CODEseed=numval($ENV{'scantron.CODE'}) << 16;
+ 	my $CODEchck=unpack("%32S*",&getCODE().' ') << 16;
- 	my $courseseed=unpack("%32S*",$courseid);
+ 	my $CODEseed=numval(&getCODE());
- 	my $num1=$symbseed+$CODEseed;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
- 	my $num2=$courseseed+$symbchck;
+ 	my $num1=$symbseed+$CODEchck;
- 	#&Apache::lonxml::debug("$symbseed:$CODEseed|$courseseed:$symbchck");
+ 	my $num2=$CODEseed+$courseseed+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
- 	return "$num1,$num2";
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); }
+ 	if ($_64bit) { $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
      }
  }
  sub setup_random_from_rndseed {
      my ($rndseed)=@_;
-     if ($rndseed =~/,/) {
+     if ($rndseed =~/([,:])/) {
- 	my ($num1,$num2)=split(/,/,$rndseed);
+ 	my ($num1,$num2)=split(/[,:]/,$rndseed);
  	&Math::Random::random_set_seed(abs($num1),abs($num2));
      } else {
  	&Math::Random::random_set_seed_from_phrase($rndseed);
      }
  }
+ sub latest_receipt_algorithm_id {
+     return 'receipt2';
+ }
+ sub recunique {
+     my $fucourseid=shift;
+     my $unique;
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+ 	$unique=$ENV{"course.$fucourseid.internal.encseed"};
+     } else {
+ 	$unique=$perlvar{'lonReceipt'};
+     }
+     return unpack("%32C*",$unique);
+ }
+ sub recprefix {
+     my $fucourseid=shift;
+     my $prefix;
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+ 	$prefix=$ENV{"course.$fucourseid.internal.encpref"};
+     } else {
+ 	$prefix=$perlvar{'lonHostID'};
+     }
+     return unpack("%32C*",$prefix);
+ }
  sub ireceipt {
-     my ($funame,$fudom,$fucourseid,$fusymb)=@_;
+     my ($funame,$fudom,$fucourseid,$fusymb,$part)=@_;
      my $cuname=unpack("%32C*",$funame);
      my $cudom=unpack("%32C*",$fudom);
      my $cucourseid=unpack("%32C*",$fucourseid);
      my $cusymb=unpack("%32C*",$fusymb);
-     my $cunique=unpack("%32C*",$perlvar{'lonReceipt'});
+     my $cunique=&recunique($fucourseid);
-     return unpack("%32C*",$perlvar{'lonHostID'}).'-'.
+     my $cpart=unpack("%32S*",$part);
-            ($cunique%$cuname+
+     my $return =&recprefix($fucourseid).'-';
-             $cunique%$cudom+
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2' ||
-             $cusymb%$cuname+
+ 	$ENV{'request.state'} eq 'construct') {
-             $cusymb%$cudom+
+ 	&Apache::lonxml::debug("doing receipt2  using parts $cpart, uname $cuname and udom $cudom gets  ".($cpart%$cuname).
-             $cucourseid%$cuname+
+ 			       " and ".($cpart%$cudom));
-             $cucourseid%$cudom);
+ 	$return.= ($cunique%$cuname+
+ 		   $cunique%$cudom+
+ 		   $cusymb%$cuname+
+ 		   $cusymb%$cudom+
+ 		   $cucourseid%$cuname+
+ 		   $cucourseid%$cudom+
+ 		   $cpart%$cuname+
+ 		   $cpart%$cudom);
+     } else {
+ 	$return.= ($cunique%$cuname+
+ 		   $cunique%$cudom+
+ 		   $cusymb%$cuname+
+ 		   $cusymb%$cudom+
+ 		   $cucourseid%$cuname+
+ 		   $cucourseid%$cudom);
+     }
+     return $return;
  }
  sub receipt {
-   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     my ($part)=@_;
-   return &ireceipt($name,$domain,$courseid,$symb);
+     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     return &ireceipt($name,$domain,$courseid,$symb,$part);
  }
  # ------------------------------------------------------------ Serves up a file
- # returns either the contents of the file or a -1
+ # returns either the contents of the file or
+ # -1 if the file doesn't exist
+ #
+ # if the target is a file that was uploaded via DOCS,
+ # a check will be made to see if a current copy exists on the local server,
+ # if it does this will be served, otherwise a copy will be retrieved from
+ # the home server for the course and stored in /home/httpd/html/userfiles on
+ # the local server.
  sub getfile {
-  my $file=shift;
+     my ($file) = @_;
-  if ($file=~/^\/*uploaded\//) { # user file
+     if ($file =~ m|^/*uploaded/|) { $file=&filelocation("",$file); }
+     &repcopy($file);
+     return &readfile($file);
+ }
+ sub repcopy_userfile {
+     my ($file)=@_;
+     if ($file =~ m|^/*uploaded/|) { $file=&filelocation("",$file); }
+     if ($file =~ m|^/home/httpd/html/lonUsers/|) { return OK; }
+     my ($cdom,$cnum,$filename) =
+ 	($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+([^/]+)/+([^/]+)/+(.*)|);
+     my ($info,$rtncode);
+     my $uri="/uploaded/$cdom/$cnum/$filename";
+     if (-e "$file") {
+ 	my @fileinfo = stat($file);
+ 	my $lwpresp = &getuploaded('HEAD',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    if ($rtncode eq '404') {
+ 		unlink($file);
+ 	    }
+ 	    #my $ua=new LWP::UserAgent;
+ 	    #my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+ 	    #my $response=$ua->request($request);
+ 	    #if ($response->is_success()) {
+ 	#	return $response->content;
+ 	#    } else {
+ 	#	return -1;
+ 	#    }
+ 	    return -1;
+ 	}
+ 	if ($info < $fileinfo[9]) {
+ 	    return OK;
+ 	}
+ 	$info = '';
+ 	$lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    return -1;
+ 	}
+     } else {
+ 	my $lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    my $ua=new LWP::UserAgent;
+ 	    my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+ 	    my $response=$ua->request($request);
+ 	    if ($response->is_success()) {
+ 		$info=$response->content;
+ 	    } else {
+ 		return -1;
+ 	    }
+ 	}
+ 	my @parts = ($cdom,$cnum);
+ 	if ($filename =~ m|^(.+)/[^/]+$|) {
+ 	    push @parts, split(/\//,$1);
+ 	}
+ 	my $path = $perlvar{'lonDocRoot'}.'/userfiles';
+ 	foreach my $part (@parts) {
+ 	    $path .= '/'.$part;
+ 	    if (!-e $path) {
+ 		mkdir($path,0770);
+ 	    }
+ 	}
+     }
+     open(FILE,">$file");
+     print FILE $info;
+     close(FILE);
+     return OK;
+ }
+ sub tokenwrapper {
+     my $uri=shift;
+     $uri=~s|^http\://([^/]+)||;
+     $uri=~s|^/||;
+     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
+     my $token=$1;
+     my (undef,$udom,$uname,$file)=split('/',$uri,4);
+     if ($udom && $uname && $file) {
+ 	$file=~s|(\?\.*)*$||;
+         &appenv("userfile.$udom/$uname/$file" => $ENV{'request.course.id'});
+         return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri.
+                (($uri=~/\?/)?'&':'?').'token='.$token.
+                                '&tokenissued='.$perlvar{'lonHostID'};
+     } else {
+         return '/adm/notfound.html';
+     }
+ }
+ sub getuploaded {
+     my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_;
+     $uri=~s/^\///;
+     $uri = 'http://'.$hostname{ &homeserver($cnum,$cdom)}.'/raw/'.$uri;
      my $ua=new LWP::UserAgent;
-     my $request=new HTTP::Request('GET',&tokenwrapper($file));
+     my $request=new HTTP::Request($reqtype,$uri);
      my $response=$ua->request($request);
-     if ($response->is_success()) {
+     $$rtncode = $response->code;
-        return $response->content;
+     if (! $response->is_success()) {
-     } else {
+ 	return 'failed';
-        return -1;
+     }
-     }
+     if ($reqtype eq 'HEAD') {
-  } else { # normal file from res space
+ 	$$info = &HTTP::Date::str2time( $response->header('Last-modified') );
-   &repcopy($file);
+     } elsif ($reqtype eq 'GET') {
-   if (! -e $file ) { return -1; };
+ 	$$info = $response->content;
-   my $fh=Apache::File->new($file);
+     }
-   my $a='';
+     return 'ok';
-   while (<$fh>) { $a .=$_; }
+ }
-   return $a;
-  }
+ sub readfile {
+     my $file = shift;
+     if ( (! -e $file ) || ($file eq '') ) { return -1; };
+     my $fh;
+     open($fh,"<$file");
+     my $a='';
+     while (<$fh>) { $a .=$_; }
+     return $a;
  }
  sub filelocation {
- Line 4101  sub filelocation {
+ Line 5259  sub filelocation {
      $location = $file;
      $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
    } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
-     $location=$file;
+       my ($udom,$uname,$filename)=
+ 	  ($file=~m|^/+uploaded/+([^/]+)/+([^/]+)/+(.*)$|);
+       my $home=&homeserver($uname,$udom);
+       my $is_me=0;
+       my @ids=&current_machine_ids();
+       foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } }
+       if ($is_me) {
+ 	  $location=&Apache::loncommon::propath($udom,$uname).
+ 	      '/userfiles/'.$filename;
+       } else {
+ 	  $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.
+ 	      $udom.'/'.$uname.'/'.$filename;
+       }
    } else {
-     $file=~s/^$perlvar{'lonDocRoot'}//;
+     $file=~s/^\Q$perlvar{'lonDocRoot'}\E//;
-     $file=~s:^/*res::;
+     $file=~s:^/res/:/:;
      if ( !( $file =~ m:^/:) ) {
        $location = $dir. '/'.$file;
      } else {
- Line 4113  sub filelocation {
+ Line 5283  sub filelocation {
    }
    $location=~s://+:/:g; # remove duplicate /
    while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
+   while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./
    return $location;
  }
  sub hreflocation {
      my ($dir,$file)=@_;
-     unless (($file=~/^http:\/\//i) || ($file=~/^\//)) {
+     unless (($file=~m-^http://-i) || ($file=~m-^/-)) {
-        my $finalpath=filelocation($dir,$file);
+ 	my $finalpath=filelocation($dir,$file);
-        $finalpath=~s/^\/home\/httpd\/html//;
+ 	$finalpath=~s-^/home/httpd/html--;
-        $finalpath=~s-/home/(\w+)/public_html/-/~$1/-;
+ 	$finalpath=~s-^/home/(\w+)/public_html/-/~$1/-;
-        return $finalpath;
+ 	return $finalpath;
-     } else {
+     } elsif ($file=~m-^/home-) {
-        return $file;
+ 	$file=~s-^/home/httpd/html--;
+ 	$file=~s-^/home/(\w+)/public_html/-/~$1/-;
+ 	return $file;
+     }
+     return $file;
+ }
+ sub current_machine_domains {
+     my $hostname=$hostname{$perlvar{'lonHostID'}};
+     my @domains;
+     while( my($id, $name) = each(%hostname)) {
+ #	&logthis("-$id-$name-$hostname-");
+ 	if ($hostname eq $name) {
+ 	    push(@domains,$hostdom{$id});
+ 	}
      }
+     return @domains;
+ }
+ sub current_machine_ids {
+     my $hostname=$hostname{$perlvar{'lonHostID'}};
+     my @ids;
+     while( my($id, $name) = each(%hostname)) {
+ #	&logthis("-$id-$name-$hostname-");
+ 	if ($hostname eq $name) {
+ 	    push(@ids,$id);
+ 	}
+     }
+     return @ids;
  }
  # ------------------------------------------------------------- Declutters URLs
  sub declutter {
      my $thisfn=shift;
-     $thisfn=~s/^$perlvar{'lonDocRoot'}//;
+     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
      $thisfn=~s/^\///;
      $thisfn=~s/^res\///;
      $thisfn=~s/\?.+$//;
- Line 4143  sub declutter {
+ Line 5341  sub declutter {
  sub clutter {
      my $thisfn='/'.&declutter(shift);
-     unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv)\//) {
+     unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv|public)\//) {
         $thisfn='/res'.$thisfn;
      }
      return $thisfn;
  }
+ sub freeze_escape {
+     my ($value)=@_;
+     if (ref($value)) {
+ 	$value=&nfreeze($value);
+ 	return '__FROZEN__'.&escape($value);
+     }
+     return &escape($value);
+ }
  # -------------------------------------------------------- Escape Special Chars
  sub escape {
- Line 4165  sub unescape {
+ Line 5372  sub unescape {
      return $str;
  }
+ sub thaw_unescape {
+     my ($value)=@_;
+     if ($value =~ /^__FROZEN__/) {
+ 	substr($value,0,10,undef);
+ 	$value=&unescape($value);
+ 	return &thaw($value);
+     }
+     return &unescape($value);
+ }
+ sub mod_perl_version {
+     if (defined($perlvar{'MODPERL2'})) {
+ 	return 2;
+     }
+     return 1;
+ }
+ sub correct_line_ends {
+     my ($result)=@_;
+     $$result =~s/\r\n/\n/mg;
+     $$result =~s/\r/\n/mg;
+ }
  # ================================================================ Main Program
  sub goodbye {
     &logthis("Starting Shut down");
+ #not converted to using infrastruture and probably shouldn't be
+    &logthis(sprintf("%-20s is %s",'%badServerCache',scalar(%badServerCache)));
+ #converted
+    &logthis(sprintf("%-20s is %s",'%metacache',scalar(%metacache)));
+    &logthis(sprintf("%-20s is %s",'%homecache',scalar(%homecache)));
+    &logthis(sprintf("%-20s is %s",'%titlecache',scalar(%titlecache)));
+    &logthis(sprintf("%-20s is %s",'%courseresdatacache',scalar(%courseresdatacache)));
+ #1.1 only
+    &logthis(sprintf("%-20s is %s",'%userresdatacache',scalar(%userresdatacache)));
+    &logthis(sprintf("%-20s is %s",'%getsectioncache',scalar(%getsectioncache)));
+    &logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache)));
+    &logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache)));
     &flushcourselogs();
     &logthis("Shutting down");
     return DONE;
- Line 4178  BEGIN {
+ Line 5419  BEGIN {
  # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
      unless ($readit) {
  {
-     my $config=Apache::File->new("/etc/httpd/conf/loncapa.conf");
+     open(my $config,"</etc/httpd/conf/loncapa.conf");
      while (my $configline=<$config>) {
-         if ($configline =~ /^[^\#]*PerlSetVar/) {
+         if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
  	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
             chomp($varvalue);
             $perlvar{$varname}=$varvalue;
          }
      }
+     close($config);
  }
  {
-     my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");
+     open(my $config,"</etc/httpd/conf/loncapa_apache.conf");
      while (my $configline=<$config>) {
          if ($configline =~ /^[^\#]*PerlSetVar/) {
- Line 4198  BEGIN {
+ Line 5440  BEGIN {
             $perlvar{$varname}=$varvalue;
          }
      }
+     close($config);
  }
  # ------------------------------------------------------------ Read domain file
  {
-     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-                             '/domain.tab');
      %domaindescription = ();
      %domain_auth_def = ();
      %domain_auth_arg_def = ();
-     if ($fh) {
+     my $fh;
+     if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) {
         while (<$fh>) {
             next if (/^(\#|\s*$)/);
  #           next if /^\#/;
- Line 4222  BEGIN {
+ Line 5464  BEGIN {
  	   $domain_longi{$domain}=$longi;
  	   $domain_lati{$domain}=$lati;
- #          &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}");
+  #         &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}");
  #          &logthis("Domain.tab: $domain ".$domaindescription{$domain} );
-        }
+ 	}
      }
+     close ($fh);
  }
  # ------------------------------------------------------------- Read hosts file
  {
-     my $config=Apache::File->new("$perlvar{'lonTabDir'}/hosts.tab");
+     open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
      while (my $configline=<$config>) {
         next if ($configline =~ /^(\#|\s*$)/);
- Line 4243  BEGIN {
+ Line 5486  BEGIN {
  	 $hostip{$id}=$ip;
  	 $iphost{$ip}=$id;
  	 if ($role eq 'library') { $libserv{$id}=$name; }
-        } else {
- 	 if ($configline) {
- 	   &logthis("Skipping hosts.tab line -$configline-");
- 	 }
         }
      }
+     close($config);
  }
  # ------------------------------------------------------ Read spare server file
  {
-     my $config=Apache::File->new("$perlvar{'lonTabDir'}/spare.tab");
+     open(my $config,"<$perlvar{'lonTabDir'}/spare.tab");
      while (my $configline=<$config>) {
         chomp($configline);
- Line 4261  BEGIN {
+ Line 5501  BEGIN {
            $spareid{$configline}=1;
         }
      }
+     close($config);
  }
  # ------------------------------------------------------------ Read permissions
  {
-     my $config=Apache::File->new("$perlvar{'lonTabDir'}/roles.tab");
+     open(my $config,"<$perlvar{'lonTabDir'}/roles.tab");
      while (my $configline=<$config>) {
-        chomp($configline);
+ 	chomp($configline);
-       if ($configline) {
+ 	if ($configline) {
-        my ($role,$perm)=split(/ /,$configline);
+ 	    my ($role,$perm)=split(/ /,$configline);
-        if ($perm ne '') { $pr{$role}=$perm; }
+ 	    if ($perm ne '') { $pr{$role}=$perm; }
-       }
+ 	}
      }
+     close($config);
  }
  # -------------------------------------------- Read plain texts for permissions
  {
-     my $config=Apache::File->new("$perlvar{'lonTabDir'}/rolesplain.tab");
+     open(my $config,"<$perlvar{'lonTabDir'}/rolesplain.tab");
      while (my $configline=<$config>) {
-        chomp($configline);
+ 	chomp($configline);
-       if ($configline) {
+ 	if ($configline) {
-        my ($short,$plain)=split(/:/,$configline);
+ 	    my ($short,$plain)=split(/:/,$configline);
-        if ($plain ne '') { $prp{$short}=$plain; }
+ 	    if ($plain ne '') { $prp{$short}=$plain; }
-       }
+ 	}
      }
+     close($config);
  }
  # ---------------------------------------------------------- Read package table
  {
-     my $config=Apache::File->new("$perlvar{'lonTabDir'}/packages.tab");
+     open(my $config,"<$perlvar{'lonTabDir'}/packages.tab");
      while (my $configline=<$config>) {
-        chomp($configline);
+ 	if ($configline !~ /\S/ || $configline=~/^#/) { next; }
-        my ($short,$plain)=split(/:/,$configline);
+ 	chomp($configline);
-        my ($pack,$name)=split(/\&/,$short);
+ 	my ($short,$plain)=split(/:/,$configline);
-        if ($plain ne '') {
+ 	my ($pack,$name)=split(/\&/,$short);
-           $packagetab{$pack.'&'.$name.'&name'}=$name;
+ 	if ($plain ne '') {
-           $packagetab{$short}=$plain;
+ 	    $packagetab{$pack.'&'.$name.'&name'}=$name;
-        }
+ 	    $packagetab{$short}=$plain;
+ 	}
      }
+     close($config);
  }
  # ------------- set up temporary directory
- Line 4317  $dumpcount=0;
+ Line 5562  $dumpcount=0;
  &logtouch();
  &logthis('<font color=yellow>INFO: Read configuration</font>');
  $readit=1;
+     {
+ 	use integer;
+ 	my $test=(2**32)+1;
+ 	if ($test != 0) { $_64bit=1; }
+ 	&logthis(" Detected 64bit platform ($_64bit)");
+     }
  }
  }
- Line 4544  X<rolesinit()>
+ Line 5795  X<rolesinit()>
  B<rolesinit($udom,$username,$authhost)>: get user privileges
  =item *
- X<usection()>
+ X<getsection()>
- B<usection($udom,$uname,$cname)>: finds the section of student in the
+ B<getsection($udom,$uname,$cname)>: finds the section of student in the
  course $cname, return section name/number or '' for "not in course"
  and '-1' for "no section"
- Line 4919  dumps the complete (or key matching rege
+ Line 6170  dumps the complete (or key matching rege
  =item *
+ inc($namespace,$store,$udom,$uname) : increments $store in $namespace.
+ $store can be a scalar, an array reference, or if the amount to be
+ incremented is > 1, a hash reference.
+ ($udom and $uname are optional)
+ =item *
  put($namespace,$storehash,$udom,$uname) : stores hash in namesp
  ($udom and $uname are optional)
  =item *
+ putstore($namespace,$storehash,$udomain,$uname) : stores hash in namesp
+ keys used in storehash include version information (e.g., 1:$symb:message etc.) as
+ used in records written by &store and retrieved by &restore.  This function
+ was created for use in editing discussion posts, without incrementing the
+ version number included in the key for a particular post. The colon
+ separated list of attribute names (e.g., the value associated with the key
+:keys:$symb) is also generated and passed in the ampersand separated
+ items sent to lonnet::reply().
+ =item *
  cput($namespace,$storehash,$udom,$uname) : critical put
  ($udom and $uname are optional)
- Line 5029  messages of critical importance should g
+ Line 6299  messages of critical importance should g
  =item *
- getfile($file) : returns the entire contents of a file or -1; it
+ getfile($file,$caller) : two cases - requests for files in /res or in /uploaded.
- properly subscribes to and replicates the file if neccessary.
+ (a) files in /uploaded
+   (i) If a local copy of the file exists -
+       compares modification date of local copy with last-modified date for
+       definitive version stored on home server for course. If local copy is
+       stale, requests a new version from the home server and stores it.
+       If the original has been removed from the home server, then local copy
+       is unlinked.
+   (ii) If local copy does not exist -
+       requests the file from the home server and stores it.
+   If $caller is 'uploadrep':
+     This indicates a call from lonuploadrep.pm (PerlHeaderParserHandler phase)
+     for request for files originally uploaded via DOCS.
+      - returns 'ok' if fresh local copy now available, -1 otherwise.
+   Otherwise:
+      This indicates a call from the content generation phase of the request.
+      -  returns the entire contents of the file or -1.
+ (b) files in /res
+    - returns the entire contents of a file or -1;
+    it properly subscribes to and replicates the file if neccessary.
  =item *

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

Removed from v.1.410
changed lines
	Added in v.1.567