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.320 and 1.481

-version 1.320, 2003/01/28 00:09:57
+version 1.481, 2004/03/31 19:25:08
  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
- # 02/27/01 Scott Harrison
- # 3/2 Gerd Kortemeyer
- # 3/15,3/19 Scott Harrison
- # 3/19,3/20 Gerd Kortemeyer
- # 3/22,3/27,4/2,4/16,4/17 Scott Harrison
- # 5/26,5/28 Gerd Kortemeyer
- # 5/30 H. K. Ng
- # 6/1 Gerd Kortemeyer
- # July Guy Albertelli
- # 8/4,8/7,8/8,8/9,8/11,8/16,8/17,8/18,8/20,8/23,9/20,9/21,9/26,
- # 10/2 Gerd Kortemeyer
- # 10/5,10/10,11/13,11/15 Scott Harrison
- # 11/17,11/20,11/22,11/29 Gerd Kortemeyer
- # 12/5 Matthew Hall
- # 12/5 Guy Albertelli
- # 12/6,12/7,12/12 Gerd Kortemeyer
- # 12/18 Scott Harrison
- # 12/21,12/22,12/27,12/28 Gerd Kortemeyer
- # YEAR=2002
- # 1/4,2/4,2/7 Gerd Kortemeyer
- #
  ###
  package Apache::lonnet;
  use strict;
- use Apache::File;
  use LWP::UserAgent();
  use HTTP::Headers;
+ 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 $processmarker $dumpcount
+    %courselogs %accesshash %userrolehash $processmarker $dumpcount
-    %coursedombuf %coursehombuf %courseresdatacache
+    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseresdatacache
-    %domaindescription);
+    %userresdatacache %usectioncache %domaindescription %domain_auth_def %domain_auth_arg_def
+    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir);
  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);
+ use Time::HiRes();
  my $readit;
+ =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 108  sub logthis {
+ Line 92  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 118  sub logperm {
+ Line 104  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 171  sub reconlonc {
+ Line 159  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 219  sub critical {
+ Line 207  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 249  sub critical {
+ Line 239  sub critical {
      return $answer;
  }
+ #
+ # -------------- Remove all key from the env that start witha lowercase letter
+ #                (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});
+ 	}
+     }
+ }
+ # ------------------------------------------- Transfer profile into environment
+ sub transfer_profile_to_env {
+     my ($lonidsdir,$handle)=@_;
+     my @profile;
+     {
+ 	open(my $idf,"$lonidsdir/$handle.id");
+ 	flock($idf,LOCK_SH);
+ 	@profile=<$idf>;
+ 	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
  sub appenv {
- Line 265  sub appenv {
+ Line 298  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 320  sub delenv {
+ Line 353  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';
  }
+ # ------------------------------------------ Find out current server userload
+ # there is a copy in lond
+ sub userload {
+     my $numusers=0;
+     {
+ 	opendir(LONIDS,$perlvar{'lonIDsDir'});
+ 	my $filename;
+ 	my $curtime=time;
+ 	while ($filename=readdir(LONIDS)) {
+ 	    if ($filename eq '.' || $filename eq '..') {next;}
+ 	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+ 	    if ($curtime-$mtime < 1800) { $numusers++; }
+ 	}
+ 	closedir(LONIDS);
+     }
+     my $userloadpercent=0;
+     my $maxuserload=$perlvar{'lonUserLoadLim'};
+     if ($maxuserload) {
+ 	$userloadpercent=100*$numusers/$maxuserload;
+     }
+     $userloadpercent=sprintf("%.2f",$userloadpercent);
+     return $userloadpercent;
+ }
  # ------------------------------------------ Fight off request when overloaded
  sub overloaderror {
- Line 359  sub overloaderror {
+ Line 421  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 378  sub overloaderror {
+ Line 441  sub overloaderror {
  # ------------------------------ Find server with least workload from spare.tab
  sub spareserver {
-     my $loadpercent = shift;
+     my ($loadpercent,$userloadpercent) = @_;
      my $tryserver;
      my $spareserver='';
-     my $lowestserver=$loadpercent;
+     if ($userloadpercent !~ /\d/) { $userloadpercent=0; }
+     my $lowestserver=$loadpercent > $userloadpercent?
+ 	             $loadpercent :  $userloadpercent;
      foreach $tryserver (keys %spareid) {
-        my $answer=reply('load',$tryserver);
+ 	my $loadans=reply('load',$tryserver);
-        if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+ 	my $userloadans=reply('userload',$tryserver);
- 	   $spareserver="http://$hostname{$tryserver}";
+ 	if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
-            $lowestserver=$answer;
+ 	    next; #didn't get a number from the server
-        }
+ 	}
-     }
+ 	my $answer;
+ 	if ($loadans =~ /\d/) {
+ 	    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 431  sub changepass {
+ Line 512  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 471  sub authenticate {
+ Line 530  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 511  sub authenticate {
+ Line 553  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 521  sub homeserver {
+ Line 563  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 593  sub idput {
+ Line 634  sub idput {
      }
  }
+ # --------------------------------------------------- Assign a key to a student
+ sub assign_access_key {
+ #
+ # a valid key looks like uname:udom#comments
+ # comments are being appended
+ #
+     my ($ckey,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     $udom=$ENV{'user.name'} unless (defined($udom));
+     $uname=$ENV{'user.domain'} unless (defined($uname));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     if (($existing{$ckey}=~/^\#(.*)$/) || # - new key
+         ($existing{$ckey}=~/^\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},
+                                                  $cdom,$cnum) eq 'ok') {
+ # key now belongs to user
+ 	    my $envkey='key.'.$cdom.'_'.$cnum;
+             if (&put('environment',{$envkey => $ckey}) eq 'ok') {
+                 &appenv('environment.'.$envkey => $ckey);
+                 return 'ok';
+             } else {
+                 return
+   'error: Count not permanently assign key, will need to be re-entered later.';
+ 	    }
+         } else {
+             return 'error: Could not assign key, try again later.';
+         }
+     } elsif (!$existing{$ckey}) {
+ # the key does not exist
+ 	return 'error: The key does not exist';
+     } else {
+ # the key is somebody else's
+ 	return 'error: The key is already in use';
+     }
+ }
+ # ------------------------------------------ put an additional comment on a key
+ sub comment_access_key {
+ #
+ # a valid key looks like uname:udom#comments
+ # comments are being appended
+ #
+     my ($ckey,$cdom,$cnum,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     if ($existing{$ckey}) {
+         $existing{$ckey}.='; '.$logentry;
+ # ready to assign
+         if (&put('accesskeys',{$ckey=>$existing{$ckey}},
+                                                  $cdom,$cnum) eq 'ok') {
+ 	    return 'ok';
+         } else {
+ 	    return 'error: Count not store comment.';
+         }
+     } else {
+ # the key does not exist
+ 	return 'error: The key does not exist';
+     }
+ }
+ # ------------------------------------------------------ Generate a set of keys
+ sub generate_access_keys {
+     my ($number,$cdom,$cnum,$logentry)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     unless (&allowed('mky',$cdom)) { return 0; }
+     unless (($cdom) && ($cnum)) { return 0; }
+     if ($number>10000) { return 0; }
+     sleep(2); # make sure don't get same seed twice
+     srand(time()^($$+($$<<15))); # from "Programming Perl"
+     my $total=0;
+     for (my $i=1;$i<=$number;$i++) {
+        my $newkey=sprintf("%lx",int(100000*rand)).'-'.
+                   sprintf("%lx",int(100000*rand)).'-'.
+                   sprintf("%lx",int(100000*rand));
+        $newkey=~s/1/g/g; # folks mix up 1 and l
+        $newkey=~s/0/h/g; # and also 0 and O
+        my %existing=&get('accesskeys',[$newkey],$cdom,$cnum);
+        if ($existing{$newkey}) {
+            $i--;
+        } else {
+ 	  if (&put('accesskeys',
+               { $newkey => '# generated '.localtime().
+                            ' by '.$ENV{'user.name'}.'@'.$ENV{'user.domain'}.
+                            '; '.$logentry },
+ 		   $cdom,$cnum) eq 'ok') {
+               $total++;
+ 	  }
+        }
+     }
+     &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.home'},
+          'Generated '.$total.' keys for '.$cnum.' at '.$cdom);
+     return $total;
+ }
+ # ------------------------------------------------------- Validate an accesskey
+ sub validate_access_key {
+     my ($ckey,$cdom,$cnum,$udom,$uname)=@_;
+     $cdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
+     $cnum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
+     $udom=$ENV{'user.name'} unless (defined($udom));
+     $uname=$ENV{'user.domain'} unless (defined($uname));
+     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     return ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#/);
+ }
  # ------------------------------------- Find the section of student in a course
  sub getsection {
- Line 618  sub getsection {
+ Line 785  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));
- Line 648  sub getsection {
+ Line 815  sub getsection {
      return '-1';
  }
+ my $disk_caching_disabled=1;
+ sub devalidate_cache {
+     my ($cache,$id,$name) = @_;
+     delete $$cache{$id.'.time'};
+     delete $$cache{$id};
+     if ($disk_caching_disabled) { return; }
+     my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
+     open(DB,"$filename.lock");
+     flock(DB,LOCK_EX);
+     my %hash;
+     if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
+ 	eval <<'EVALBLOCK';
+ 	    delete($hash{$id});
+ 	    delete($hash{$id.'.time'});
+ EVALBLOCK
+         if ($@) {
+ 	    &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);
+     }
+     if (!exists($$cache{$id.'.time'})) {
+ #	&logthis("Didn't find $id");
+ 	return (undef,undef);
+     } else {
+ 	if (time-($$cache{$id.'.time'})>$time) {
+ #	    &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};
+ }
+ sub save_cache_item {
+     my ($cache,$name,$id)=@_;
+     if ($disk_caching_disabled) { return; }
+     my $starttime=&Time::HiRes::time();
+ #    &logthis("Saving :$name:$id");
+     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)) {
+ 	eval <<'EVALBLOCK';
+ 	    $hash{$id.'.time'}=$$cache{$id.'.time'};
+ 	    $hash{$id}=freeze({'item'=>$$cache{$id}});
+ EVALBLOCK
+         if ($@) {
+ 	    &logthis("<font color='red'>save_cache blew up :$@:$name</font>");
+ 	    unlink($filename);
+ 	}
+     } else {
+ 	if (-e $filename) {
+ 	    &logthis("Unable to tie hash (save cache item): $name ($!)");
+ 	    unlink($filename);
+ 	}
+     }
+     untie(%hash);
+     flock(DB,LOCK_UN);
+     close(DB);
+ #    &logthis("save_cache_item $name took ".(&Time::HiRes::time()-$starttime));
+ }
+ sub load_cache_item {
+     my ($cache,$name,$id)=@_;
+     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";
+     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 {
+ 		my $hashref=thaw($hash{$id});
+ 		$$cache{$id}=$hashref->{'item'};
+ 		$$cache{$id.'.time'}=$hash{$id.'.time'};
+ 	    }
+ 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);
+ 	}
+     }
+     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));
+ }
  sub usection {
      my ($udom,$unam,$courseid)=@_;
+     my $hashid="$udom:$unam:$courseid";
+     my ($result,$cached)=&is_cached(\%usectioncache,$hashid,'usection');
+     if (defined($cached)) { return $result; }
      $courseid=~s/\_/\//g;
      $courseid=~s/^(\w)/\/$1/;
      foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
                          &homeserver($unam,$udom)))) {
          my ($key,$value)=split(/\=/,$_);
          $key=&unescape($key);
-         if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+         if ($key=~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/) {
              my $section=$1;
              if ($key eq $courseid.'_st') { $section=''; }
  	    my ($dummy,$end,$start)=split(/\_/,&unescape($value));
- Line 668  sub usection {
+ Line 976  sub usection {
              if ($end) {
                  if ($now>$end) { $notactive=1; }
              }
-             unless ($notactive) { return $section; }
+             unless ($notactive) {
+ 		return &do_cache(\%usectioncache,$hashid,$section,'usection');
+ 	    }
          }
      }
-     return '-1';
+     return &do_cache(\%usectioncache,$hashid,'-1','usection');
  }
  # ------------------------------------- Read an entry from a user's environment
- Line 711  sub getversion {
+ Line 1021  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 722  sub currentversion {
+ Line 1034  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 734  sub subscribe {
+ Line 1046  sub subscribe {
      $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
      my ($udom,$uname)=split(/\//,$author);
      my $home=homeserver($uname,$udom);
      if ($home eq 'no_host') {
          return 'not_found';
      }
      my $answer=reply("sub:$fname",$home);
      if (($answer eq 'con_lost') || ($answer eq 'rejected')) {
- Line 757  sub repcopy {
+ Line 1069  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 809  sub repcopy {
+ Line 1121  sub repcopy {
      }
  }
+ # ------------------------------------------------ Get server side include body
+ sub ssi_body {
+     my ($filelink,%form)=@_;
+     my $output=($filelink=~/^http\:/?&externalssi($filelink):
+                                      &ssi($filelink,%form));
+     $output=~s/^.*?\<body[^\>]*\>//si;
+     $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
+     $output=~
+             s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
+     return $output;
+ }
  # --------------------------------------------------------- Server Side Include
  sub ssi {
- Line 832  sub ssi {
+ Line 1156  sub ssi {
      return $response->content;
  }
+ sub externalssi {
+     my ($url)=@_;
+     my $ua=new LWP::UserAgent;
+     my $request=new HTTP::Request('GET',$url);
+     my $response=$ua->request($request);
+     return $response->content;
+ }
  # ------- Add a token to a remote URI's query string to vouch for access rights
  sub tokenwrapper {
- Line 840  sub tokenwrapper {
+ Line 1172  sub tokenwrapper {
      $uri=~s/^\///;
      $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
      my $token=$1;
-     if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
+ #    if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
+     if ($uri=~m|^uploaded/([^/]+)/([^/]+)/(.+)(\?\.*)*$|) {
  	&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
          return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
                 (($uri=~/\?/)?'&':'?').'token='.$token.
- Line 849  sub tokenwrapper {
+ Line 1182  sub tokenwrapper {
  	return '/adm/notfound.html';
      }
  }
+ # --------- 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: ok if successful, diagnostic message otherwise
+ #
+ # 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.$source} via 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 {
+         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') || ($fetchresult eq 'no source file') ) {
+         &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
- Line 868  sub userfileupload {
+ Line 1280  sub userfileupload {
  # See if there is anything left
      unless ($fname) { return 'error: no uploaded file'; }
      chop($ENV{'form.'.$formname});
+     my $url = '';
  # Create the directory if not present
      my $docuname='';
      my $docudom='';
- Line 876  sub userfileupload {
+ Line 1289  sub userfileupload {
  	$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/) {
+             $url = &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
+         } else {
+             $fname=$ENV{'form.folder'}.'/'.$fname;
+             $url = &process_coursefile('uploaddoc',$docuname,$docudom,$docuhome,$fname,$formname);
+         }
      } else {
          $docuname=$ENV{'user.name'};
          $docudom=$ENV{'user.domain'};
- Line 899  sub finishuserfileupload {
+ Line 1318  sub finishuserfileupload {
      }
  # Save the file
      {
-        my $fh=Apache::File->new('>'.$filepath.'/'.$fname);
+        open(my $fh,'>'.$filepath.'/'.$fname);
         print $fh $ENV{'form.'.$formname};
+        close($fh);
      }
  # Notify homeserver to grep it
  #
+     my $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,
-     my $fetchresult=
+ 			    $docuhome);
-  &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,$docuhome);
      if ($fetchresult eq 'ok') {
  #
  # Return the URL to it
- Line 926  sub log {
+ Line 1345  sub log {
  }
  # ------------------------------------------------------------------ Course Log
+ #
+ # This routine flushes several buffers of non-mission-critical nature
+ #
  sub flushcourselogs {
-     &logthis('Flushing course log buffers');
+     &logthis('Flushing log buffers');
+ #
+ # course logs
+ # This is a log of all transactions in a course, which can be used
+ # for data mining purposes
+ #
+ # It also collects the courseid database, which lists last transaction
+ # times and course titles for all courseids
+ #
+     my %courseidbuffer=();
      foreach (keys %courselogs) {
          my $crsid=$_;
-         if (&reply('log:'.$coursedombuf{$crsid}.':'.
+         if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'.
  		          &escape($courselogs{$crsid}),
  		          $coursehombuf{$crsid}) eq 'ok') {
  	    delete $courselogs{$crsid};
- Line 942  sub flushcourselogs {
+ Line 1373  sub flushcourselogs {
                          " exceeded maximum size, deleting.</font>");
                 delete $courselogs{$crsid};
              }
          }
+         if ($courseidbuffer{$coursehombuf{$crsid}}) {
+            $courseidbuffer{$coursehombuf{$crsid}}.='&'.
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+         } else {
+            $courseidbuffer{$coursehombuf{$crsid}}=
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+         }
+     }
+ #
+ # Write course id database (reverse lookup) to homeserver of courses
+ # Is used in pickcourse
+ #
+     foreach (keys %courseidbuffer) {
+         &courseidput($hostdom{$_},$courseidbuffer{$_},$_);
+     }
+ #
+ # File accesses
+ # Writes to the dynamic metadata of resources to get hit counts, etc.
+ #
+     foreach my $entry (keys(%accesshash)) {
+         if ($entry =~ /___count$/) {
+             my ($dom,$name);
+             ($dom,$name,undef)=($entry=~m:___(\w+)/(\w+)/(.*)___count$:);
+             if (! defined($dom) || $dom eq '' ||
+                 ! 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};
+             }
+         }
      }
-     &logthis('Flushing access logs');
+ #
-     foreach (keys %accesshash) {
+ # Roles
+ # Reverse lookup of user roles for course faculty/staff and co-authorship
+ #
+     foreach (keys %userrolehash) {
          my $entry=$_;
-         $entry=~/\_\_\_(\w+)\/(\w+)\/(.*)\_\_\_(\w+)$/;
+         my ($role,$uname,$udom,$runame,$rudom,$rsec)=
-         my %temphash=($entry => $accesshash{$entry});
+ 	    split(/\:/,$entry);
-         if (&Apache::lonnet::put('nohist_resevaldata',\%temphash,$1,$2) eq 'ok') {
+         if (&Apache::lonnet::put('nohist_userroles',
- 	    delete $accesshash{$entry};
+              { $role.':'.$uname.':'.$udom.':'.$rsec => $userrolehash{$entry} },
+                 $rudom,$runame) eq 'ok') {
+ 	    delete $userrolehash{$entry};
          }
      }
      $dumpcount++;
- Line 961  sub courselog {
+ Line 1446  sub courselog {
      $what=time.':'.$what;
      unless ($ENV{'request.course.id'}) { return ''; }
      $coursedombuf{$ENV{'request.course.id'}}=
-        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.':'.
+        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+     $coursenumbuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
      $coursehombuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+     $coursedescrbuf{$ENV{'request.course.id'}}=
+        $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
      if (defined $courselogs{$ENV{'request.course.id'}}) {
  	$courselogs{$ENV{'request.course.id'}}.='&'.$what;
      } else {
- Line 979  sub courseacclog {
+ Line 1467  sub courseacclog {
      my $fnsymb=shift;
      unless ($ENV{'request.course.id'}) { return ''; }
      my $what=$fnsymb.':'.$ENV{'user.name'}.':'.$ENV{'user.domain'};
-     if ($fnsymb=~/(problem|exam|quiz|assess|survey|form)$/) {
+     if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|page)$/) {
          $what.=':POST';
  	foreach (keys %ENV) {
              if ($_=~/^form\.(.*)/) {
- Line 992  sub courseacclog {
+ Line 1480  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}++;
+ }
+ sub linklog {
+     my ($from,$to)=@_;
+     $from=&declutter($from);
+     $to=&declutter($to);
+     $accesshash{$from.'___'.$to.'___comefrom'}=1;
+     $accesshash{$to.'___'.$from.'___goto'}=1;
+ }
+ sub userrolelog {
+     my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
+     if (($trole=~/^ca/) || ($trole=~/^in/) ||
+         ($trole=~/^cc/) || ($trole=~/^ep/) ||
+         ($trole=~/^cr/) || ($trole=~/^ta/)) {
+        my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
+        $userrolehash
+          {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
+                     =$tend.':'.$tstart;
+    }
+ }
+ sub get_course_adv_roles {
+     my $cid=shift;
+     $cid=$ENV{'request.course.id'} unless (defined($cid));
+     my %coursehash=&coursedescription($cid);
+     my %nothide=();
+     foreach (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+ 	$nothide{join(':',split(/[\@\:]/,$_))}=1;
+     }
+     my %returnhash=();
+     my %dumphash=
+             &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
+     my $now=time;
+     foreach (keys %dumphash) {
+ 	my ($tend,$tstart)=split(/\:/,$dumphash{$_});
+         if (($tstart) && ($tstart<0)) { next; }
+         if (($tend) && ($tend<$now)) { next; }
+         if (($tstart) && ($now<$tstart)) { next; }
+         my ($role,$username,$domain,$section)=split(/\:/,$_);
+ 	if ((&privileged($username,$domain)) &&
+ 	    (!$nothide{$username.':'.$domain})) { next; }
+         my $key=&plaintext($role);
+         if ($section) { $key.=' (Sec/Grp '.$section.')'; }
+         if ($returnhash{$key}) {
+ 	    $returnhash{$key}.=','.$username.':'.$domain;
+         } else {
+             $returnhash{$key}=$username.':'.$domain;
+         }
+      }
+     return %returnhash;
+ }
+ sub get_my_roles {
+     my ($uname,$udom)=@_;
+     unless (defined($uname)) { $uname=$ENV{'user.name'}; }
+     unless (defined($udom)) { $udom=$ENV{'user.domain'}; }
+     my %dumphash=
+             &dump('nohist_userroles',$udom,$uname);
+     my %returnhash=();
+     my $now=time;
+     foreach (keys %dumphash) {
+ 	my ($tend,$tstart)=split(/\:/,$dumphash{$_});
+         if (($tstart) && ($tstart<0)) { next; }
+         if (($tend) && ($tend<$now)) { next; }
+         if (($tstart) && ($now<$tstart)) { next; }
+         my ($role,$username,$domain,$section)=split(/\:/,$_);
+ 	$returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend;
+      }
+     return %returnhash;
+ }
+ # ----------------------------------------------------- Frontpage Announcements
+ #
+ #
+ sub postannounce {
+     my ($server,$text)=@_;
+     unless (&allowed('psa',$hostdom{$server})) { return 'refused'; }
+     unless ($text=~/\w/) { $text=''; }
+     return &reply('setannounce:'.&escape($text),$server);
+ }
+ sub getannounce {
+     if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) {
+ 	my $announcement='';
+ 	while (<$fh>) { $announcement .=$_; }
+ 	close($fh);
+ 	if ($announcement=~/\w/) {
+ 	    return
+    '<table bgcolor="#FF5555" cellpadding="5" cellspacing="3">'.
+    '<tr><td bgcolor="#FFFFFF"><pre>'.$announcement.'</pre></td></tr></table>';
+ 	} else {
+ 	    return '';
+ 	}
      } else {
-         $accesshash{$key}=1;
+ 	return '';
      }
  }
+ # ---------------------------------------------------------- Course ID routines
+ # Deal with domain's nohist_courseid.db files
+ #
+ sub courseidput {
+     my ($domain,$what,$coursehome)=@_;
+     return &reply('courseidput:'.$domain.':'.$what,$coursehome);
+ }
+ sub courseiddump {
+     my ($domfilter,$descfilter,$sincefilter)=@_;
+     my %returnhash=();
+     unless ($domfilter) { $domfilter=''; }
+     foreach my $tryserver (keys %libserv) {
+ 	if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+ 	    foreach (
+              split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+ 			       $sincefilter.':'.&escape($descfilter),
+                                $tryserver))) {
+ 		my ($key,$value)=split(/\=/,$_);
+                 if (($key) && ($value)) {
+ 		    $returnhash{&unescape($key)}=&unescape($value);
+                 }
+             }
+         }
+     }
+     return %returnhash;
+ }
+ #
  # ----------------------------------------------------------- Check out an item
  sub checkout {
- Line 1109  sub expirespread {
+ Line 1724  sub expirespread {
  # ----------------------------------------------------- Devalidate Spreadsheets
  sub devalidate {
-     my $symb=shift;
+     my ($symb,$uname,$udom)=@_;
      my $cid=$ENV{'request.course.id'};
      if ($cid) {
- 	my $key=$ENV{'user.name'}.':'.$ENV{'user.domain'}.':';
+         # delete the stored spreadsheets for
+         # - the student level sheet of this user in course's homespace
+         # - the assessment level sheet for this resource
+         #   for this user in user's homespace
+ 	my $key=$uname.':'.$udom.':';
          my $status=
  	    &del('nohist_calculatedsheets',
- 		 [$key.'studentcalc'],
+ 		 [$key.'studentcalc:'],
  		 $ENV{'course.'.$cid.'.domain'},
  		 $ENV{'course.'.$cid.'.num'})
  		.' '.
  	    &del('nohist_calculatedsheets_'.$cid,
- 		 [$key.'assesscalc:'.$symb]);
+ 		 [$key.'assesscalc:'.$symb],$udom,$uname);
          unless ($status eq 'ok ok') {
             &logthis('Could not devalidate spreadsheet '.
-                     $ENV{'user.name'}.' at '.$ENV{'user.domain'}.' for '.
+                     $uname.' at '.$udom.' for '.
  		    $symb.': '.$status);
          }
      }
- Line 1326  sub tmpreset {
+ Line 1945  sub tmpreset {
    my ($symb,$namespace,$domain,$stuname) = @_;
    if (!$symb) {
      $symb=&symbread();
-     if (!$symb) { $symb= $ENV{'REQUEST_URI'}; }
+     if (!$symb) { $symb= $ENV{'request.url'}; }
    }
    $symb=escape($symb);
- Line 1455  sub store {
+ Line 2074  sub store {
      $symb=&symbclean($symb);
      if (!$symb) { unless ($symb=&symbread()) { return ''; } }
-     &devalidate($symb);
+     if (!$domain) { $domain=$ENV{'user.domain'}; }
+     if (!$stuname) { $stuname=$ENV{'user.name'}; }
+     &devalidate($symb,$stuname,$domain);
      $symb=escape($symb);
      if (!$namespace) {
- Line 1463  sub store {
+ Line 2085  sub store {
            return '';
         }
      }
-     if (!$domain) { $domain=$ENV{'user.domain'}; }
-     if (!$stuname) { $stuname=$ENV{'user.name'}; }
      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 1486  sub cstore {
+ Line 2110  sub cstore {
      $symb=&symbclean($symb);
      if (!$symb) { unless ($symb=&symbread()) { return ''; } }
-     &devalidate($symb);
+     if (!$domain) { $domain=$ENV{'user.domain'}; }
+     if (!$stuname) { $stuname=$ENV{'user.name'}; }
+     &devalidate($symb,$stuname,$domain);
      $symb=escape($symb);
      if (!$namespace) {
- Line 1494  sub cstore {
+ Line 2121  sub cstore {
            return '';
         }
      }
-     if (!$domain) { $domain=$ENV{'user.domain'}; }
-     if (!$stuname) { $stuname=$ENV{'user.name'}; }
      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 1580  sub coursedescription {
+ Line 2208  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 1600  sub rolesinit {
+ Line 2258  sub rolesinit {
              my ($trole,$tend,$tstart)=split(/_/,$role);
              $userroles.='user.role.'.$trole.'.'.$area.'='.
                          $tstart.'.'.$tend."\n";
+ # log the associated role with the area
+             &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
              if ($tend!=0) {
  	        if ($tend<$now) {
  	            $trole='';
- Line 1611  sub rolesinit {
+ Line 2271  sub rolesinit {
                  }
              }
              if (($area ne '') && ($trole ne '')) {
- 	       my $spec=$trole.'.'.$area;
+ 		my $spec=$trole.'.'.$area;
-                my ($tdummy,$tdomain,$trest)=split(/\//,$area);
+ 		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
-                if ($trole =~ /^cr\//) {
+ 		if ($trole =~ /^cr\//) {
- 		   my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+ 		    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
-                    my $homsvr=homeserver($rauthor,$rdomain);
+  		    my $homsvr=homeserver($rauthor,$rdomain);
-                    if ($hostname{$homsvr} ne '') {
+ 		    if ($hostname{$homsvr} ne '') {
-                       my $roledef=
+ 			my ($rdummy,$roledef)=
- 			  reply("get:$rdomain:$rauthor:roles:rolesdef_$rrole",
+ 			   &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
-                                 $homsvr);
-                       if (($roledef ne 'con_lost') && ($roledef ne '')) {
+ 			if (($rdummy ne 'con_lost') && ($roledef ne '')) {
-                          my ($syspriv,$dompriv,$coursepriv)=
+ 			    my ($syspriv,$dompriv,$coursepriv)=
- 			     split(/\_/,unescape($roledef));
+ 				split(/\_/,$roledef);
-  	                 $allroles{'cm./'}.=':'.$syspriv;
+ 			    if (defined($syspriv)) {
-                          $allroles{$spec.'./'}.=':'.$syspriv;
+ 				$allroles{'cm./'}.=':'.$syspriv;
-                          if ($tdomain ne '') {
+ 				$allroles{$spec.'./'}.=':'.$syspriv;
-                              $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+ 			    }
-                              $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
+ 			    if ($tdomain ne '') {
-                              if ($trest ne '') {
+ 				if (defined($dompriv)) {
- 		                $allroles{'cm.'.$area}.=':'.$coursepriv;
+ 				    $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
- 		                $allroles{$spec.'.'.$area}.=':'.$coursepriv;
+ 				    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
-                              }
+ 				}
- 	                 }
+ 				if ($trest ne '') {
-                       }
+ 				    if (defined($coursepriv)) {
-                    }
+ 					$allroles{'cm.'.$area}.=':'.$coursepriv;
-                } else {
+ 					$allroles{$spec.'.'.$area}.=':'.$coursepriv;
- 	           $allroles{'cm./'}.=':'.$pr{$trole.':s'};
+ 				    }
- 	           $allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
+ 				}
-                    if ($tdomain ne '') {
+ 			    }
-                      $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			}
-                      $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 		    }
-                       if ($trest ne '') {
+ 		} else {
- 		          $allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+ 		    if (defined($pr{$trole.':s'})) {
- 		          $allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+ 			$allroles{'cm./'}.=':'.$pr{$trole.':s'};
-                       }
+ 			$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
- 	           }
+ 		    }
- 	       }
+ 		    if ($tdomain ne '') {
+ 			if (defined($pr{$trole.':d'})) {
+ 			    $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+ 			}
+ 			if ($trest ne '') {
+ 			    if (defined($pr{$trole.':c'})) {
+ 				$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+ 				$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+ 			    }
+ 			}
+ 		    }
+ 		}
              }
            }
          }
- Line 1744  sub dump {
+ Line 2416  sub dump {
     return %returnhash;
  }
+ # -------------------------------------------------------------- keys interface
+ sub getkeys {
+    my ($namespace,$udomain,$uname)=@_;
+    if (!$udomain) { $udomain=$ENV{'user.domain'}; }
+    if (!$uname) { $uname=$ENV{'user.name'}; }
+    my $uhome=&homeserver($uname,$udomain);
+    my $rep=reply("keys:$udomain:$uname:$namespace",$uhome);
+    my @keyarray=();
+    foreach (split(/\&/,$rep)) {
+       push (@keyarray,&unescape($_));
+    }
+    return @keyarray;
+ }
  # --------------------------------------------------------------- currentdump
  sub currentdump {
-    my ($namespace,$udomain,$uname)=@_;
+    my ($courseid,$sdom,$sname)=@_;
-    if (!$udomain) { $udomain = $ENV{'user.domain'}; }
+    $courseid = $ENV{'request.course.id'} if (! defined($courseid));
-    if (!$uname)   { $uname   = $ENV{'user.name'};   }
+    $sdom     = $ENV{'user.domain'}       if (! defined($sdom));
-    my $uhome = &homeserver($uname,$udomain);
+    $sname    = $ENV{'user.name'}         if (! defined($sname));
-    my $rep=reply("currentdump:$udomain:$uname:$namespace",$uhome);
+    my $uhome = &homeserver($sname,$sdom);
+    my $rep=reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome);
     return if ($rep =~ /^(error:|no_such_host)/);
     #
     my %returnhash=();
- Line 1758  sub currentdump {
+ Line 2446  sub currentdump {
     if ($rep eq "unknown_cmd") {
         # an old lond will not know currentdump
         # Do a dump and make it look like a currentdump
-        my @tmp = &dump($namespace,$udomain,$uname,'.');
+        my @tmp = &dump($courseid,$sdom,$sname,'.');
         return if ($tmp[0] =~ /^(error:|no_such_host)/);
         my %hash = @tmp;
         @tmp=();
-        # Code ripped from lond, essentially.  The only difference
+        %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) {
- Line 1795  sub currentdump {
+ Line 2463  sub currentdump {
     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 1848  sub eget {
+ Line 2567  sub eget {
     return %returnhash;
  }
+ # ---------------------------------------------- Custom access rule evaluation
+ sub customaccess {
+     my ($priv,$uri)=@_;
+     my ($urole,$urealm)=split(/\./,$ENV{'request.role'});
+     $urealm=~s/^\W//;
+     my ($udom,$ucrs,$usec)=split(/\//,$urealm);
+     my $access=0;
+     foreach (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) {
+ 	my ($effect,$realm,$role)=split(/\:/,$_);
+         if ($role) {
+ 	   if ($role ne $urole) { next; }
+         }
+         foreach (split(/\s*\,\s*/,$realm)) {
+             my ($tdom,$tcrs,$tsec)=split(/\_/,$_);
+             if ($tdom) {
+ 		if ($tdom ne $udom) { next; }
+             }
+             if ($tcrs) {
+ 		if ($tcrs ne $ucrs) { next; }
+             }
+             if ($tsec) {
+ 		if ($tsec ne $usec) { next; }
+             }
+             $access=($effect eq 'allow');
+             last;
+         }
+ 	if ($realm eq '' && $role eq '') {
+             $access=($effect eq 'allow');
+ 	}
+     }
+     return $access;
+ }
  # ------------------------------------------------- Check for a user privilege
  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=~/\.meta$/)) && ($priv eq 'bre')) {
- Line 1886  sub allowed {
+ Line 2640  sub allowed {
              # Library role, so allow browsing of resources in this domain.
              return 'F';
          }
+         if ($copyright eq 'custom') {
+ 	    unless (&customaccess($priv,$uri)) { return ''; }
+         }
      }
      # Domain coordinator is trying to create a course
      if (($priv eq 'ccc') && ($ENV{'request.role'} =~ /^dc\./)) {
- Line 1901  sub allowed {
+ Line 2658  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 1918  sub allowed {
+ Line 2675  sub allowed {
      $courseuri=~s/^([^\/])/\/$1/;
      if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri}
-        =~/$priv\&([^\:]*)/) {
+        =~/\Q$priv\E\&([^\:]*)/) {
         $thisallowed.=$1;
      }
- Line 1936  sub allowed {
+ Line 2693  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 1957  sub allowed {
+ Line 2714  sub allowed {
         if ($match) {
             $statecond=$cond;
             if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
-                =~/$priv\&([^\:]*)/) {
+                =~/\Q$priv\E\&([^\:]*)/) {
                 $thisallowed.=$1;
                 $checkreferer=0;
             }
- Line 1985  sub allowed {
+ Line 2742  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 2038  sub allowed {
+ Line 2795  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 2049  sub allowed {
+ Line 2806  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 2083  sub allowed {
+ Line 2840  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 2091  sub allowed {
+ Line 2848  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 2103  sub allowed {
+ Line 2860  sub allowed {
     if ($thisallowed=~/R/) {
         my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
-        my $filename=$perlvar{'lonDocRoot'}.'/res/'.$uri.'.meta';
+        if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) {
-        if (-e $filename) {
+ 	  &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
-            my @content;
-            {
- 	     my $fh=Apache::File->new($filename);
-              @content=<$fh>;
- 	   }
-            if (join('',@content)=~
-                     /\<roledeny[^\>]*\>[^\<]*$rolecode[^\<]*\<\/roledeny\>/) {
- 	       &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                      'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
-            return '';
+           return '';
-            }
         }
     }
- Line 2125  sub allowed {
+ Line 2872  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 2143  sub allowed {
+ Line 2890  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;
      $pathname=~s|/\Q$filename\E$||;
+     $pathname=~s/^adm\/wrapper\///;
      #Trying to find the conditional for the file
      my $match=($ENV{'acc.res.'.$ENV{'request.course.id'}.'.'.$pathname}=~
  	       /\&\Q$filename\E\:([\d\|]+)\&/);
- Line 2157  sub is_on_map {
+ Line 2906  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 {
    if (allowed('mcr','/')) {
      my ($rolename,$sysrole,$domrole,$courole)=@_;
-     foreach (split('/',$sysrole)) {
+     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)) {
+     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)) {
+     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 2231  sub log_query {
+ Line 3003  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);
  }
- Line 2242  sub get_query_reply {
+ Line 3014  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 2283  sub userlog_query {
+ Line 3055  sub userlog_query {
  sub plaintext {
      my $short=shift;
-     return $prp{$short};
+     return &mt($prp{$short});
  }
  # ----------------------------------------------------------------- Assign Role
  sub assignrole {
-     my ($udom,$uname,$url,$role,$end,$start)=@_;
+     my ($udom,$uname,$url,$role,$end,$start,$deleteflag)=@_;
      my $mrole;
      if ($role =~ /^cr\//) {
- 	unless (&allowed('ccr',$url)) {
+         my $cwosec=$url;
+         $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
+ 	unless (&allowed('ccr',$cwosec)) {
             &logthis('Refused custom assignrole: '.
               $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
  		    $ENV{'user.name'}.' at '.$ENV{'user.domain'});
- Line 2302  sub assignrole {
+ Line 3076  sub assignrole {
      } else {
          my $cwosec=$url;
          $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
-         unless (&allowed('c'.$role,$cwosec)) {
+         unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) {
             &logthis('Refused assignrole: '.
               $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
  		    $ENV{'user.name'}.' at '.$ENV{'user.domain'});
- Line 2320  sub assignrole {
+ Line 3094  sub assignrole {
             $command.='_0_'.$start;
          }
      }
-     return &reply($command,&homeserver($uname,$udom));
+ # actually delete
+     if ($deleteflag) {
+ 	if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) {
+ # modify command to delete the role
+            $command="encrypt:rolesdel:$ENV{'user.domain'}:$ENV{'user.name'}:".
+                 "$udom:$uname:$url".'_'."$mrole";
+ 	   &logthis("$ENV{'user.name'} at $ENV{'user.domain'} deletes $mrole in $url for $uname at $udom");
+ # set start and finish to negative values for userrolelog
+            $start=-1;
+            $end=-1;
+         }
+     }
+ # send command
+     my $answer=&reply($command,&homeserver($uname,$udom));
+ # log new user role if status is ok
+     if ($answer eq 'ok') {
+ 	&userrolelog($mrole,$uname,$udom,$url,$start,$end);
+     }
+     return $answer;
  }
  # -------------------------------------------------- Modify user authentication
- Line 2355  sub modifyuser {
+ Line 3147  sub modifyuser {
      my ($udom,    $uname, $uid,
          $umode,   $upass, $first,
          $middle,  $last,  $gene,
-         $forceid, $desiredhome)=@_;
+         $forceid, $desiredhome, $email)=@_;
      $udom=~s/\W//g;
      $uname=~s/\W//g;
      &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '.
- Line 2367  sub modifyuser {
+ Line 3159  sub modifyuser {
               ' in domain '.$ENV{'request.role.domain'});
      my $uhome=&homeserver($uname,$udom,'true');
  # ----------------------------------------------------------------- Create User
-     if (($uhome eq 'no_host') && ($umode) && ($upass)) {
+     if (($uhome eq 'no_host') &&
+ 	(($umode && $upass) || ($umode eq 'localauth'))) {
          my $unhome='';
          if (defined($desiredhome) && $hostdom{$desiredhome} eq $udom) {
              $unhome = $desiredhome;
- Line 2397  sub modifyuser {
+ Line 3190  sub modifyuser {
          }
          $uhome=&homeserver($uname,$udom,'true');
          if (($uhome eq '') || ($uhome eq 'no_host') || ($uhome ne $unhome)) {
- 	    return 'error: verify home';
+ 	    return 'error: unable verify users home machine.';
          }
      }   # End of creation of new user
  # ---------------------------------------------------------------------- Add ID
- Line 2407  sub modifyuser {
+ Line 3200  sub modifyuser {
         if (($uidhash{$uname}) && ($uidhash{$uname}!~/error\:/)
           && (!$forceid)) {
  	  unless ($uid eq $uidhash{$uname}) {
- 	      return 'error: mismatch '.$uidhash{$uname}.' versus '.$uid;
+ 	      return 'error: user id "'.$uid.'" does not match '.
+                   'current user id "'.$uidhash{$uname}.'".';
            }
         } else {
  	  &idput($udom,($uname => $uid));
- Line 2423  sub modifyuser {
+ Line 3217  sub modifyuser {
      } else {
          %names = @tmp;
      }
+ #
+ # Make sure to not trash student environment if instructor does not bother
+ # to supply name and email information
+ #
      if ($first)  { $names{'firstname'}  = $first; }
-     if ($middle) { $names{'middlename'} = $middle; }
+     if (defined($middle)) { $names{'middlename'} = $middle; }
      if ($last)   { $names{'lastname'}   = $last; }
-     if ($gene)   { $names{'generation'} = $gene; }
+     if (defined($gene))   { $names{'generation'} = $gene; }
+     if ($email)  { $names{'notification'} = $email;
+                    $names{'critnotification'} = $email; }
      my $reply = &put('environment', \%names, $udom,$uname);
      if ($reply ne 'ok') { return 'error: '.$reply; }
      &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
- Line 2440  sub modifyuser {
+ Line 3241  sub modifyuser {
  sub modifystudent {
      my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
-         $end,$start,$forceid,$desiredhome)=@_;
+         $end,$start,$forceid,$desiredhome,$email,$type,$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
  	($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid,
-          $desiredhome);
+          $desiredhome,$email);
      unless ($reply eq 'ok') { return $reply; }
      # This will cause &modify_student_enrollment to get the uid from the
      # students environment
      $uid = undef if (!$forceid);
-     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,
+     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
-                                         $last,$gene,$usec,$end,$start);
+ 					$gene,$usec,$end,$start,$type,$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,
-     # Get the course id from the environment
+ 	$cid) = @_;
-     my $cid='';
+     my ($cdom,$cnum,$chome);
-     unless ($cid=$ENV{'request.course.id'}) {
+     if (!$cid) {
- 	return 'not_in_class';
+ 	unless ($cid=$ENV{'request.course.id'}) {
+ 	    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 2483  sub modify_student_enrollment {
+ Line 3295  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 '');
- Line 2494  sub modify_student_enrollment {
+ Line 3306  sub modify_student_enrollment {
      }
      my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene,
                                                             $first,$middle);
-     my $reply=critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
+     my $value=&escape($uname.':'.$udom).'='.
- 	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
+ 	&escape(join(':',$end,$start,$uid,$usec,$fullname,$type));
-                       &escape($uname.':'.$udom).'='.
+     my $reply=critical('put:'.$cdom.':'.$cnum.':classlist:'.$value,$chome);
-                       &escape(join(':',$end,$start,$uid,$usec,$fullname)),
- 	              $ENV{'course.'.$cid.'.home'});
      unless (($reply eq 'ok') || ($reply eq 'delayed')) {
  	return 'error: '.$reply;
      }
- Line 2566  sub createcourse {
+ Line 3376  sub createcourse {
  	return 'error: no such course';
      }
  # ----------------------------------------------------------------- Course made
+ # log existance
+     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description),
+                  $uhome);
+     &flushcourselogs();
+ # set toplevel url
      my $topurl=$url;
      unless ($nonstandard) {
  # ------------------------------------------ For standard courses, make top url
- Line 2594  ENDINITMAP
+ Line 3409  ENDINITMAP
  # ---------------------------------------------------------- Assign Custom Role
  sub assigncustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag)=@_;
      return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename,
-                        $end,$start);
+                        $end,$start,$deleteflag);
  }
  # ----------------------------------------------------------------- Revoke Role
  sub revokerole {
-     my ($udom,$uname,$url,$role)=@_;
+     my ($udom,$uname,$url,$role,$deleteflag)=@_;
      my $now=time;
-     return &assignrole($udom,$uname,$url,$role,$now);
+     return &assignrole($udom,$uname,$url,$role,$now,$deleteflag);
  }
  # ---------------------------------------------------------- Revoke Custom Role
  sub revokecustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag)=@_;
      my $now=time;
-     return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now);
+     return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now,
+            $deleteflag);
  }
  # ------------------------------------------------------------ Directory lister
- Line 2677  sub dirlist {
+ Line 3493  sub dirlist {
          }
          my $alldomstr='';
          foreach (sort keys %alldom) {
-             $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'&domain:';
+             $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:';
          }
          $alldomstr=~s/:$//;
          return split(/:/,$alldomstr);
- Line 2693  sub dirlist {
+ Line 3509  sub dirlist {
  # when it was last modified.  It will also return an error of -1
  # if an error occurs
+ ##
+ ## FIXME: This subroutine assumes its caller knows something about the
+ ## directory structure of the home server for the student ($root).
+ ## Not a good assumption to make.  Since this is for looking up files
+ ## in user directories, the full path should be constructed by lond, not
+ ## whatever machine we request data from.
+ ##
  sub GetFileTimestamp {
      my ($studentDomain,$studentName,$filename,$root)=@_;
      $studentDomain=~s/\W//g;
- Line 2701  sub GetFileTimestamp {
+ Line 3524  sub GetFileTimestamp {
      $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
      my $proname="$studentDomain/$subdir/$studentName";
      $proname .= '/'.$filename;
-     my @dir = &Apache::lonnet::dirlist($proname, $studentDomain, $studentName,
+     my ($fileStat) = &Apache::lonnet::dirlist($proname, $studentDomain,
-                                        $root);
+                                               $studentName, $root);
-     my $fileStat = $dir[0];
      my @stats = split('&', $fileStat);
      if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
-         return $stats[9];
+         # @stats contains first the filename, then the stat output
+         return $stats[10]; # so this is 10 instead of 9.
      } else {
          return -1;
      }
- Line 2769  sub condval {
+ Line 3592  sub condval {
  sub devalidatecourseresdata {
      my ($coursenum,$coursedomain)=@_;
      my $hashid=$coursenum.':'.$coursedomain;
-     delete $courseresdatacache{$hashid.'.time'};
+     &devalidate_cache(\%courseresdatacache,$hashid,'courseres');
  }
  # --------------------------------------------------- Course Resourcedata Query
- Line 2778  sub courseresdata {
+ Line 3601  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;
  }
- # --------------------------------------------------------- Value of a Variable
+ #
+ # EXT resource caching routines
+ #
+ sub clear_EXT_cache_status {
+     &delenv('cache.EXT.');
+ }
+ sub EXT_cache_status {
+     my ($target_domain,$target_user) = @_;
+     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
+     if (exists($ENV{$cachename}) && ($ENV{$cachename}+600) > time) {
+         # We know already the user has no data
+         return 1;
+     } else {
+         return 0;
+     }
+ }
+ sub EXT_cache_set {
+     my ($target_domain,$target_user) = @_;
+     my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
+     &appenv($cachename => time);
+ }
+ # --------------------------------------------------------- Value of a Variable
  sub EXT {
-     my ($varname,$symbparm,$udom,$uname,)=@_;
+     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
      unless ($varname) { return ''; }
      #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)=&Apache::lonxml::whichuser();
+       (my $cursymb,$courseid,$udom,$uname,$publicuser)=
+ 	  &Apache::lonxml::whichuser($symbparm);
        if (!$symbparm) {	$symbparm=$cursymb; }
      } else {
  	$courseid=$ENV{'request.course.id'};
- Line 2832  sub EXT {
+ Line 3681  sub EXT {
      if ($realm eq 'user') {
  # --------------------------------------------------------------- user.resource
  	if ($space eq 'resource') {
- 	    my %restored=&restore(undef,undef,$udom,$uname);
+ 	    if (defined($Apache::lonhomework::parsing_a_problem)) {
-             return $restored{$qualifierrest};
+ 		return $Apache::lonhomework::history{$qualifierrest};
+ 	    } else {
+ 		my %restored;
+ 		if ($publicuser || $ENV{'request.state'} eq 'construct') {
+ 		    %restored=&tmprestore($symbparm,$courseid,$udom,$uname);
+ 		} else {
+ 		    %restored=&restore($symbparm,$courseid,$udom,$uname);
+ 		}
+ 		return $restored{$qualifierrest};
+ 	    }
  # ----------------------------------------------------------------- user.access
          } elsif ($space eq 'access') {
  	    # FIXME - not supporting calls for a specific user
- Line 2844  sub EXT {
+ Line 3702  sub EXT {
  		($udom eq $ENV{'user.domain'})) {
  		return $ENV{join('.',('environment',$qualifierrest))};
  	    } else {
- 		my %returnhash=&userenvironment($udom,$uname,$qualifierrest);
+ 		my %returnhash;
+ 		if (!$publicuser) {
+ 		    %returnhash=&userenvironment($udom,$uname,
+ 						 $qualifierrest);
+ 		}
  		return $returnhash{$qualifierrest};
  	    }
  # ----------------------------------------------------------------- user.course
- Line 2868  sub EXT {
+ Line 3730  sub EXT {
              return $uname;
  # ---------------------------------------------------- Any other user namespace
          } else {
-             my $item=($rest)?$qualifier.'.'.$rest:$qualifier;
+ 	    my %reply;
-             my %reply=&get($space,[$item]);
+ 	    if (!$publicuser) {
-             return $reply{$item};
+ 		%reply=&get($space,[$qualifierrest],$udom,$uname);
+ 	    }
+ 	    return $reply{$qualifierrest};
          }
      } elsif ($realm eq 'query') {
  # ---------------------------------------------- pull stuff out of query string
-         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},[$space]);
+         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- 	return $ENV{'form.'.$space};
+ 						[$spacequalifierrest]);
+ 	return $ENV{'form.'.$spacequalifierrest};
     } 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 2889  sub EXT {
+ Line 3762  sub EXT {
          return $ENV{'course.'.$courseid.'.'.$spacequalifierrest};
      } elsif ($realm eq 'resource') {
- 	if ($courseid eq $ENV{'request.course.id'}) {
+ 	my $section;
+ 	if (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=(split(/\_\_\_/,$symbp))[0];
+ 	    my $mapp=(&decode_symb($symbp))[0];
  	    my $symbparm=$symbp.'.'.$spacequalifierrest;
  	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
- 	    my $section;
  	    if (($ENV{'user.name'} eq $uname) &&
  		($ENV{'user.domain'} eq $udom)) {
  		$section=$ENV{'request.course.sec'};
  	    } else {
- 		$section=&usection($udom,$uname,$courseid);
+                 if (! defined($usection)) {
+                     $section=&usection($udom,$uname,$courseid);
+                 } else {
+                     $section = $usection;
+                 }
  	    }
  	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
- Line 2918  sub EXT {
+ Line 3795  sub EXT {
  	    my $courselevelm=$courseid.'.'.$mapparm;
  # ----------------------------------------------------------- first, check user
- 	    #most student don't have any data set, check if there is some data
+ 	    #most student don\'t have any data set, check if there is some data
-             #every thirty minutes
+ 	    if (! &EXT_cache_status($udom,$uname)) {
- 	    if (!
+ 		my $hashid="$udom:$uname";
- 		(exists($ENV{'cache.studentresdata'})
+ 		my ($result,$cached)=&is_cached(\%userresdatacache,$hashid,
- 		    && (($ENV{'cache.studentresdata'}+1800) > time))) {
+ 						'userres');
- 		my %resourcedata=&get('resourcedata',
+ 		if (!defined($cached)) {
- 				      [$courselevelr,$courselevelm,$courselevel],
+ 		    my %resourcedata=&dump('resourcedata',$udom,$uname);
- 				      $udom,$uname);
+ 		    $result=\%resourcedata;
- 		my ($tmp)=keys(%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 /) {
- 			$ENV{'cache.studentresdata'}=time;
+                         &EXT_cache_set($udom,$uname);
- 			&appenv(('cache.studentresdata'=>
- 				 $ENV{'cache.studentresdata'}));
  		    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
  			return $tmp;
  		    }
- Line 2976  sub EXT {
+ Line 3854  sub EXT {
  	my $filename;
  	if (!$symbparm) { $symbparm=&symbread(); }
  	if ($symbparm) {
- 	    $filename=(split(/\_\_\_/,$symbparm))[2];
+ 	    $filename=(&decode_symb($symbparm))[2];
  	} else {
  	    $filename=$ENV{'request.filename'};
  	}
- Line 2987  sub EXT {
+ Line 3865  sub EXT {
  # ------------------------------------------------------------------ Cascade up
  	unless ($space eq '0') {
- 	    my ($part,$id)=split(/\_/,$space);
+ 	    my @parts=split(/_/,$space);
- 	    if ($id) {
+ 	    my $id=pop(@parts);
- 		my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
+ 	    my $part=join('_',@parts);
- 				     $symbparm,$udom,$uname);
+ 	    if ($part eq '') { $part='0'; }
- 		if (defined($partgeneral)) { return $partgeneral; }
+ 	    my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
- 	    } else {
+ 				 $symbparm,$udom,$uname,$section,1);
- 		my $resourcegeneral=&EXT('resource.0.'.$qualifierrest,
+ 	    if (defined($partgeneral)) { return $partgeneral; }
- 					 $symbparm,$udom,$uname);
- 		if (defined($resourcegeneral)) { return $resourcegeneral; }
- 	    }
  	}
+ 	if ($recurse) { return undef; }
+ 	my $pack_def=&packages_tab_default($filename,$varname);
+ 	if (defined($pack_def)) { return $pack_def; }
  # ---------------------------------------------------- Any other user namespace
      } elsif ($realm eq 'environment') {
- Line 3018  sub EXT {
+ Line 3896  sub EXT {
      return '';
  }
+ sub packages_tab_default {
+     my ($uri,$varname)=@_;
+     my (undef,$part,$name)=split(/\./,$varname);
+     my $packages=&metadata($uri,'packages');
+     foreach my $package (split(/,/,$packages)) {
+ 	my ($pack_type,$pack_part)=split(/_/,$package,2);
+ 	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;
+ }
+ sub add_prefix_and_part {
+     my ($prefix,$part)=@_;
+     my $keyroot;
+     if (defined($prefix) && $prefix !~ /^__/) {
+ 	# prefix that has a part already
+ 	$keyroot=$prefix;
+     } elsif (defined($prefix)) {
+ 	# prefix that is missing a part
+ 	if (defined($part)) { $keyroot='_'.$part.substr($prefix,1); }
+     } else {
+ 	# no prefix at all
+ 	if (defined($part)) { $keyroot='_'.$part; }
+     }
+     return $keyroot;
+ }
  # ---------------------------------------------------------------- Get metadata
  sub metadata {
      my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
      $uri=&declutter($uri);
      # if it is a non metadata possible uri return quickly
      if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) ||
-         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|)) {
+         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
- 	return '';
+ 	($uri =~ m|home/[^/]+/public_html/|) || ($uri =~ m|^uploaded/|)) {
+ 	return undef;
      }
      my $filename=$uri;
      $uri=~s/\.meta$//;
- Line 3036  sub metadata {
+ Line 3946  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 {
+ 	    &devalidate_cache(\%metacache,$uri,'meta');
+ 	}
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
- 	my $metastring=&getfile($perlvar{'lonDocRoot'}.'/res/'.$filename);
+ 	my $metastring=&getfile(&filelocation('',&clutter($filename)));
          my $parser=HTML::LCParser->new(\$metastring);
          my $token;
          undef %metathesekeys;
          while ($token=$parser->get_token) {
-            if ($token->[0] eq 'S') {
+ 	    if ($token->[0] eq 'S') {
- 	     if (defined($token->[2]->{'package'})) {
+ 		if (defined($token->[2]->{'package'})) {
  #
  # This is a package - get package info
  #
- 	      my $package=$token->[2]->{'package'};
+ 		    my $package=$token->[2]->{'package'};
- 	      my $keyroot='';
+ 		    my $keyroot=&add_prefix_and_part($prefix,$token->[2]->{'part'});
-               if ($prefix) {
+ 		    if (defined($token->[2]->{'id'})) {
- 		  $keyroot.=$prefix;
+ 			$keyroot.='_'.$token->[2]->{'id'};
-               } else {
+ 		    }
-                 if (defined($token->[2]->{'part'})) {
+ 		    if ($metacache{$uri}->{':packages'}) {
-                    $keyroot.='_'.$token->[2]->{'part'};
+ 			$metacache{$uri}->{':packages'}.=','.$package.$keyroot;
- 	        }
+ 		    } else {
- 	      }
+ 			$metacache{$uri}->{':packages'}=$package.$keyroot;
-               if (defined($token->[2]->{'id'})) {
+ 		    }
-                  $keyroot.='_'.$token->[2]->{'id'};
+ 		    foreach (keys %packagetab) {
- 	      }
+ 			my $part=$keyroot;
-               if ($metacache{$uri.':packages'}) {
+ 			$part=~s/^\_//;
-                  $metacache{$uri.':packages'}.=','.$package.$keyroot;
+ 			if ($_=~/^\Q$package\E\&/ ||
-               } else {
+ 			    $_=~/^\Q$package\E_0\&/) {
-                  $metacache{$uri.':packages'}=$package.$keyroot;
+ 			    my ($pack,$name,$subp)=split(/\&/,$_);
- 	      }
+ 			    # ignore package.tab specified default values
-               foreach (keys %packagetab) {
+                             # here &package_tab_default() will fetch those
- 		  if ($_=~/^$package\&/) {
+ 			    if ($subp eq 'default') { next; }
- 		      my ($pack,$name,$subp)=split(/\&/,$_);
+ 			    my $value=$packagetab{$_};
-                       my $value=$packagetab{$_};
+ 			    my $unikey;
- 		      my $part=$keyroot;
+ 			    if ($pack =~ /_0$/) {
-                       $part=~s/^\_//;
+ 				$unikey='parameter_0_'.$name;
-                       if ($subp eq 'display') {
+ 				$part=0;
- 			  $value.=' [Part: '.$part.']';
+ 			    } else {
-                       }
+ 				$unikey='parameter'.$keyroot.'_'.$name;
-                       my $unikey='parameter'.$keyroot.'_'.$name;
+ 			    }
-                       $metathesekeys{$unikey}=1;
+ 			    if ($subp eq 'display') {
-                       $metacache{$uri.':'.$unikey.'.part'}=$part;
+ 				$value.=' [Part: '.$part.']';
-                       unless
+ 			    }
-                        (defined($metacache{$uri.':'.$unikey.'.'.$subp})) {
+ 			    $metacache{$uri}->{':'.$unikey.'.part'}=$part;
-                          $metacache{$uri.':'.$unikey.'.'.$subp}=$value;
+ 			    $metathesekeys{$unikey}=1;
- 		      }
+ 			    unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) {
-                   }
+ 				$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value;
-               }
+ 			    }
-              } else {
+ 			    if (defined($metacache{$uri}->{':'.$unikey.'.default'})) {
+ 				$metacache{$uri}->{':'.$unikey}=
+ 				    $metacache{$uri}->{':'.$unikey.'.default'};
+ 			    }
+ 			}
+ 		    }
+ 		} else {
  #
  # This is not a package - some other kind of start tag
  #
-               my $entry=$token->[1];
+ 		    my $entry=$token->[1];
-               my $unikey;
+ 		    my $unikey;
-               if ($entry eq 'import') {
+ 		    if ($entry eq 'import') {
-                  $unikey='';
+ 			$unikey='';
-               } else {
+ 		    } else {
-                  $unikey=$entry;
+ 			$unikey=$entry;
- 	      }
+ 		    }
-               if ($prefix) {
+ 		    $unikey.=&add_prefix_and_part($prefix,$token->[2]->{'part'});
- 		  $unikey.=$prefix;
-               } else {
-                 if (defined($token->[2]->{'part'})) {
-                    $unikey.='_'.$token->[2]->{'part'};
- 	        }
- 	      }
-               if (defined($token->[2]->{'id'})) {
-                  $unikey.='_'.$token->[2]->{'id'};
- 	      }
-              if ($entry eq 'import') {
+ 		    if (defined($token->[2]->{'id'})) {
+ 			$unikey.='_'.$token->[2]->{'id'};
+ 		    }
+ 		    if ($entry eq 'import') {
  #
  # Importing a library here
  #
-                  if ($depthcount<20) {
+ 			if ($depthcount<20) {
- 		     my $location=$parser->get_text('/import');
+ 			    my $location=$parser->get_text('/import');
- 		     my $dir=$filename;
+ 			    my $dir=$filename;
- 		     $dir=~s|[^/]*$||;
+ 			    $dir=~s|[^/]*$||;
- 		     $location=&filelocation($dir,$location);
+ 			    $location=&filelocation($dir,$location);
- 		     foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 			    foreach (sort(split(/\,/,&metadata($uri,'keys',
- 							$location,$unikey,
+ 							       $location,$unikey,
- 							$depthcount+1)))) {
+ 							       $depthcount+1)))) {
-                          $metathesekeys{$_}=1;
+ 				$metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_};
- 		     }
+ 				$metathesekeys{$_}=1;
- 		 }
+ 			    }
-              } else {
+ 			}
+ 		    } else {
-               if (defined($token->[2]->{'name'})) {
-                  $unikey.='_'.$token->[2]->{'name'};
+ 			if (defined($token->[2]->{'name'})) {
- 	      }
+ 			    $unikey.='_'.$token->[2]->{'name'};
-               $metathesekeys{$unikey}=1;
+ 			}
-               foreach (@{$token->[3]}) {
+ 			$metathesekeys{$unikey}=1;
- 		  $metacache{$uri.':'.$unikey.'.'.$_}=$token->[2]->{$_};
+ 			foreach (@{$token->[3]}) {
-               }
+ 			    $metacache{$uri}->{':'.$unikey.'.'.$_}=$token->[2]->{$_};
-               unless (
+ 			}
-                  $metacache{$uri.':'.$unikey}=&HTML::Entities::decode($parser->get_text('/'.$entry))
+ 			my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
- 		      ) { $metacache{$uri.':'.$unikey}=
+ 			my $default=$metacache{$uri}->{':'.$unikey.'.default'};
- 			      $metacache{$uri.':'.$unikey.'.default'};
+ 			if ( $internaltext =~ /^\s*$/ && $default !~ /^\s*$/) {
- 		      }
+ 		 # only ws inside the tag, and not in default, so use default
+ 		 # as value
+ 			    $metacache{$uri}->{':'.$unikey}=$default;
+ 			} else {
+ 		  # either something interesting inside the tag or default
+                   # uninteresting
+ 			    $metacache{$uri}->{':'.$unikey}=$internaltext;
+ 			}
  # end of not-a-package not-a-library import
- 	   }
+ 		    }
  # end of not-a-package start tag
- 	  }
+ 		}
  # the next is the end of "start tag"
- 	 }
+ 	    }
-        }
+ 	}
-        $metacache{$uri.':keys'}=join(',',keys %metathesekeys);
+ # are there custom rights to evaluate
- 	&metadata_generate_part0(\%metathesekeys,\%metacache,$uri);
+ 	if ($metacache{$uri}->{':copyright'} eq 'custom') {
-        $metacache{$uri.':allpossiblekeys'}=join(',',keys %metathesekeys);
-        $metacache{$uri.':cachedtimestamp'}=time;
+     #
+     # Importing a rights file here
+     #
+ 	    unless ($depthcount) {
+ 		my $location=$metacache{$uri}->{':customdistributionfile'};
+ 		my $dir=$filename;
+ 		$dir=~s|[^/]*$||;
+ 		$location=&filelocation($dir,$location);
+ 		foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 						   $location,'_rights',
+ 						   $depthcount+1)))) {
+ 		    $metacache{$uri}->{':'.$_}=$metacache{$uri}->{':'.$_};
+ 		    $metathesekeys{$_}=1;
+ 		}
+ 	    }
+ 	}
+ 	$metacache{$uri}->{':keys'}=join(',',keys %metathesekeys);
+ 	&metadata_generate_part0(\%metathesekeys,$metacache{$uri},$uri);
+ 	$metacache{$uri}->{':allpossiblekeys'}=join(',',keys %metathesekeys);
+ 	&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_generate_part0 {
- Line 3163  sub metadata_generate_part0 {
+ Line 4109  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})) {
+ 	  if (! exists($$metadata{'parameter_0_'.$name.'.name'})) {
  	    $allnames{$name}=$part;
  	  }
  	}
      }
      foreach my $name (keys(%allnames)) {
        $$metadata{"parameter_0_$name"}=1;
-       my $key="$uri:parameter_0_$name";
+       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 3195  sub gettitle {
+ Line 4141  sub gettitle {
  	unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; }
          return &metadata($urlsymb,'title');
      }
-     if ($titlecache{$symb}) { return $titlecache{$symb}; }
+     my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
-     my ($map,$resid,$url)=split(/\_\_\_/,$symb);
+     if (defined($cached)) { return $result; }
+     my ($map,$resid,$url)=&decode_symb($symb);
      my $title='';
      my %bighash;
      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
- Line 3205  sub gettitle {
+ Line 4152  sub gettitle {
          $title=$bighash{'title_'.$mapid.'.'.$resid};
          untie %bighash;
      }
+     $title=~s/\&colon\;/\:/gs;
      if ($title) {
-         $titlecache{$symb}=$title;
+         return &do_cache(\%titlecache,$symb,$title,'title');
-         return $title;
      } else {
  	return &metadata($urlsymb,'title');
      }
- Line 3217  sub gettitle {
+ Line 4164  sub gettitle {
  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 3241  sub symbverify {
+ Line 4188  sub symbverify {
  # 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)=split(/\_\_\_/,$symb);
+     my ($map,$resid,$url)=&decode_symb($symb);
-     unless (&symbclean($url) eq &symbclean($thisfn)) { return 0; }
+     unless ($url eq $thisfn) { return 0; }
      $symb=&symbclean($symb);
+     $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)};
- Line 3284  sub symbclean {
+ Line 4234  sub symbclean {
      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 {
+     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 {
- Line 3302  sub symbread {
+ Line 4296  sub symbread {
      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 3356  sub symbread {
+ Line 4354  sub symbread {
                   }
  	      }
                untie(%bighash)
             }
          }
          if ($syval) {
             return &symbclean($syval.'___'.$thisfn);
- Line 3378  sub numval {
+ Line 4376  sub numval {
      $txt=~tr/u-z/0-5/;
      $txt=~s/\D//g;
      return int($txt);
  }
+ sub latest_rnd_algorithm_id {
+     return '64bit2';
+ }
  sub rndseed {
      my ($symb,$courseid,$domain,$username)=@_;
+     my ($wsymb,$wcourseid,$wdomain,$wusername)=&Apache::lonxml::whichuser();
      if (!$symb) {
-       unless ($symb=&symbread()) { return time; }
+ 	unless ($symb=$wsymb) { return time; }
+     }
+     if (!$courseid) { $courseid=$wcourseid; }
+     if (!$domain) { $domain=$wdomain; }
+     if (!$username) { $username=$wusername }
+     my $which=$ENV{"course.$courseid.rndseed"};
+     my $CODE=$ENV{'scantron.CODE'};
+     if (defined($CODE)) {
+ 	&rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit2') {
+ 	return &rndseed_64bit2($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit') {
+ 	return &rndseed_64bit($symb,$courseid,$domain,$username);
+     }
+     return &rndseed_32bit($symb,$courseid,$domain,$username);
+ }
+ sub rndseed_32bit {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	my $symbchck=unpack("%32C*",$symb) << 27;
+ 	my $symbseed=numval($symb) << 22;
+ 	my $namechck=unpack("%32C*",$username) << 17;
+ 	my $nameseed=numval($username) << 12;
+ 	my $domainseed=unpack("%32C*",$domain) << 7;
+ 	my $courseseed=unpack("%32C*",$courseid);
+ 	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	return $num;
+     }
+ }
+ sub rndseed_64bit {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	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_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";
      }
-     if (!$courseid) { $courseid=$ENV{'request.course.id'};}
+ }
-     if (!$domain) {$domain=$ENV{'user.domain'};}
-     if (!$username) {$username=$ENV{'user.name'};}
+ sub rndseed_CODE_64bit {
+     my ($symb,$courseid,$domain,$username)=@_;
      {
-       use integer;
+ 	use integer;
-       my $symbchck=unpack("%32C*",$symb) << 27;
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 16;
-       my $symbseed=numval($symb) << 22;
+ 	my $symbseed=numval($symb);
-       my $namechck=unpack("%32C*",$username) << 17;
+ 	my $CODEseed=numval($ENV{'scantron.CODE'}) << 16;
-       my $nameseed=numval($username) << 12;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
-       my $domainseed=unpack("%32C*",$domain) << 7;
+ 	my $num1=$symbseed+$CODEseed;
-       my $courseseed=unpack("%32C*",$courseid);
+ 	my $num2=$courseseed+$symbchck;
-       my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$CODEseed|$courseseed:$symbchck");
-       #uncommenting these lines can break things!
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
-       #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	return "$num1,$num2";
-       #&Apache::lonxml::debug("rndseed :$num:$symb");
+     }
-       return $num;
+ }
+ sub setup_random_from_rndseed {
+     my ($rndseed)=@_;
+     if ($rndseed =~/,/) {
+ 	my ($num1,$num2)=split(/,/,$rndseed);
+ 	&Math::Random::random_set_seed(abs($num1),abs($num2));
+     } else {
+ 	&Math::Random::random_set_seed_from_phrase($rndseed);
+     }
+ }
+ 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,$caller) = @_;
-  if ($file=~/^\/*uploaded\//) { # user file
+     if ($file=~ m|^/*uploaded/(\w+)/(\w+)/(.+)$|) { # user file
+         my $info;
+         my $cdom = $1;
+         my $cnum = $2;
+         my $filename = $3;
+         my $path = $Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles';
+         my ($lwpresp,$rtncode);
+         my $localfile = $path.'/'.$cdom.'/'.$cnum.'/'.$filename;
+         if (-e "$localfile") {
+             my @fileinfo = stat($localfile);
+             $lwpresp = &getuploaded('HEAD',$file,$cdom,$cnum,\$info,\$rtncode);
+             if ($lwpresp eq 'ok') {
+                 if ($info > $fileinfo[9]) {
+                     $info = '';
+                     $lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode);
+                     if ($lwpresp eq 'ok') {
+                         open (FILE,">$localfile");
+                         print FILE $info;
+                         close(FILE);
+                         if ($caller eq 'uploadrep') {
+                             return 'ok';
+                         } else {
+                             return $info;
+                         }
+                     } else {
+                         return -1;
+                     }
+ 	        } else {
+                     return &readfile($localfile);
+                 }
+             } else {
+                 if ($rtncode eq '404') {
+                     unlink($localfile);
+                 }
+                 return -1;
+             }
+ 	} else {
+             $lwpresp = &getuploaded('GET',$file,$cdom,$cnum,\$info,\$rtncode);
+             if ($lwpresp eq 'ok') {
+                 my @parts = ($cdom,$cnum);
+                 if ($filename =~ m|^(.+)/[^/]+$|) {
+                     push @parts, split(/\//,$1);
+                 }
+                 foreach my $part (@parts) {
+                     $path .= '/'.$part;
+                     if (!-e $path) {
+                         mkdir($path,0770);
+                     }
+                 }
+                 open (FILE,">$localfile");
+                 print FILE $info;
+                 close(FILE);
+                 if ($caller eq 'uploadrep') {
+                     return 'ok';
+                 } else {
+                     return $info;
+                 }
+             } else {
+                 return -1;
+             }
+         }
+     } else { # normal file from res space
+ 	&repcopy($file);
+         return &readfile($file);
+     }
+ }
+ 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);
+     $$rtncode = $response->code;
      if ($response->is_success()) {
-        return $response->content;
+         if ($reqtype eq 'HEAD') {
-     } else {
+             $$info = &Date::Parse::str2time( $response->header('Last-modified') );
-        return -1;
+         } elsif ($reqtype eq 'GET') {
-     }
+             $$info = $response->content;
-  } else { # normal file from res space
+         }
-   &repcopy($file);
+         return 'ok';
-   if (! -e $file ) { return -1; };
+     } else {
-   my $fh=Apache::File->new($file);
+         return 'failed';
-   my $a='';
+     }
-   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 3458  sub filelocation {
+ Line 4673  sub filelocation {
    } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
      $location=$file;
    } 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 3468  sub filelocation {
+ Line 4683  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 3520  sub unescape {
+ Line 4763  sub unescape {
      return $str;
  }
+ 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",'%usectioncache',scalar(%usectioncache)));
+    &logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache)));
+    &logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache)));
     &flushcourselogs();
     &logthis("Shutting down");
+    return DONE;
  }
  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/) {
- Line 3541  BEGIN {
+ Line 4809  BEGIN {
             $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 3552  BEGIN {
+ Line 4821  BEGIN {
             $perlvar{$varname}=$varvalue;
          }
      }
+     close($config);
  }
+ # ------------------------------------------------------------ Read domain file
+ {
+     %domaindescription = ();
+     %domain_auth_def = ();
+     %domain_auth_arg_def = ();
+     my $fh;
+     if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) {
+        while (<$fh>) {
+            next if (/^(\#|\s*$)/);
+ #           next if /^\#/;
+            chomp;
+            my ($domain, $domain_description, $def_auth, $def_auth_arg,
+ 	       $def_lang, $city, $longi, $lati) = split(/:/,$_);
+ 	   $domain_auth_def{$domain}=$def_auth;
+            $domain_auth_arg_def{$domain}=$def_auth_arg;
+ 	   $domaindescription{$domain}=$domain_description;
+ 	   $domain_lang_def{$domain}=$def_lang;
+ 	   $domain_city{$domain}=$city;
+ 	   $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 ".$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 3567  BEGIN {
+ Line 4866  BEGIN {
  	 $hostdom{$id}=$domain;
  	 $hostip{$id}=$ip;
  	 $iphost{$ip}=$id;
- 	 if ($domdescr) { $domaindescription{$domain}=$domdescr; }
  	 if ($role eq 'library') { $libserv{$id}=$name; }
         } else {
  	 if ($configline) {
- Line 3575  BEGIN {
+ Line 4873  BEGIN {
  	 }
         }
      }
+     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 3587  BEGIN {
+ Line 4886  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);
+ 	chomp($configline);
-        my ($short,$plain)=split(/:/,$configline);
+ 	my ($short,$plain)=split(/:/,$configline);
-        my ($pack,$name)=split(/\&/,$short);
+ 	my ($pack,$name)=split(/\&/,$short);
-        if ($plain ne '') {
+ 	if ($plain ne '') {
-           $packagetab{$pack.'&'.$name.'&name'}=$name;
+ 	    $packagetab{$pack.'&'.$name.'&name'}=$name;
-           $packagetab{$short}=$plain;
+ 	    $packagetab{$short}=$plain;
-        }
+ 	}
      }
+     close($config);
+ }
+ # ------------- set up temporary directory
+ {
+     $tmpdir = $perlvar{'lonDaemons'}.'/tmp/';
  }
  %metacache=();
- Line 3678  being set.
+ Line 4987  being set.
  =back
- =head1 INTRODUCTION
+ =head1 OVERVIEW
- This module provides subroutines which interact with the
+ lonnet provides subroutines which interact with the
- lonc/lond (TCP) network layer of LON-CAPA. And Can be used to ask about
+ lonc/lond (TCP) network layer of LON-CAPA. They can be used to ask
- - classes
+ about classes, users, and resources.
- - users
- - resources
  For many of these objects you can also use this to store data about
  them or modify them in various ways.
- This is part of the LearningOnline Network with CAPA project
+ =head2 Symbs
- described at http://www.lon-capa.org.
- =head1 RETURN MESSAGES
+ To identify a specific instance of a resource, LON-CAPA uses symbols
+ or "symbs"X<symb>. These identifiers are built from the URL of the
+ map, the resource number of the resource in the map, and the URL of
+ the resource itself. The latter is somewhat redundant, but might help
+ if maps change.
- =over 4
+ An example is
- =item *
+  msu/korte/parts/part1.sequence___19___msu/korte/tests/part12.problem
- con_lost : unable to contact remote host
+ The respective map entry is
- =item *
+  <resource id="19" src="/res/msu/korte/tests/part12.problem"
+   title="Problem 2">
+  </resource>
- con_delayed : unable to contact remote host, message will be delivered
+ Symbs are used by the random number generator, as well as to store and
- when the connection is brought back up
+ restore data specific to a certain instance of for example a problem.
- =item *
+ =head2 Storing And Retrieving Data
- con_failed : unable to contact remote host and unable to save message
+ X<store()>X<cstore()>X<restore()>Three of the most important functions
- for later delivery
+ in C<lonnet.pm> are C<&Apache::lonnet::cstore()>,
+ C<&Apache::lonnet:restore()>, and C<&Apache::lonnet::store()>, which
+ is is the non-critical message twin of cstore. These functions are for
+ handlers to store a perl hash to a user's permanent data space in an
+ easy manner, and to retrieve it again on another call. It is expected
+ that a handler would use this once at the beginning to retrieve data,
+ and then again once at the end to send only the new data back.
- =item *
+ The data is stored in the user's data directory on the user's
+ homeserver under the ID of the course.
- error: : an error a occured, a description of the error follows the :
+ The hash that is returned by restore will have all of the previous
+ value for all of the elements of the hash.
- =item *
+ Example:
+  #creating a hash
+  my %hash;
+  $hash{'foo'}='bar';
+  #storing it
+  &Apache::lonnet::cstore(\%hash);
- no_such_host : unable to fund a host associated with the user/domain
+  #changing a value
+  $hash{'foo'}='notbar';
+  #adding a new value
+  $hash{'bar'}='foo';
+  &Apache::lonnet::cstore(\%hash);
+  #retrieving the hash
+  my %history=&Apache::lonnet::restore();
+  #print the hash
+  foreach my $key (sort(keys(%history))) {
+    print("\%history{$key} = $history{$key}");
+  }
+ Will print out:
+  %history{1:foo} = bar
+  %history{1:keys} = foo:timestamp
+  %history{1:timestamp} = 990455579
+  %history{2:bar} = foo
+  %history{2:foo} = notbar
+  %history{2:keys} = foo:bar:timestamp
+  %history{2:timestamp} = 990455580
+  %history{bar} = foo
+  %history{foo} = notbar
+  %history{timestamp} = 990455580
+  %history{version} = 2
+ Note that the special hash entries C<keys>, C<version> and
+ C<timestamp> were added to the hash. C<version> will be equal to the
+ total number of versions of the data that have been stored. The
+ C<timestamp> attribute will be the UNIX time the hash was
+ stored. C<keys> is available in every historical section to list which
+ keys were added or changed at a specific historical revision of a
+ hash.
+ B<Warning>: do not store the hash that restore returns directly. This
+ will cause a mess since it will restore the historical keys as if the
+ were new keys. I.E. 1:foo will become 1:1:foo etc.
+ Calling convention:
+  my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home);
+  &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home);
+ For more detailed information, see lonnet specific documentation.
+ =head1 RETURN MESSAGES
+ =over 4
+ =item * B<con_lost>: unable to contact remote host
+ =item * B<con_delayed>: unable to contact remote host, message will be delivered
+ when the connection is brought back up
+ =item * B<con_failed>: unable to contact remote host and unable to save message
+ for later delivery
+ =item * B<error:>: an error a occured, a description of the error follows the :
+ =item * B<no_such_host>: unable to fund a host associated with the user/domain
  that was requested
  =back
- Line 3727  that was requested
+ Line 5116  that was requested
  =over 4
  =item *
+ X<appenv()>
- appenv(%hash) : the value of %hash is written to the user envirnoment
+ B<appenv(%hash)>: the value of %hash is written to
- file, and will be restored for each access this user makes during this
+ the user envirnoment file, and will be restored for each access this
- session, also modifies the %ENV for the current process
+ user makes during this session, also modifies the %ENV for the current
+ process
  =item *
+ X<delenv()>
- delenv($regexp) : removes all items from the session environment file that matches the regular expression in $regexp. The values are also delted from the current processes %ENV.
+ B<delenv($regexp)>: removes all items from the session
+ environment file that matches the regular expression in $regexp. The
+ values are also delted from the current processes %ENV.
  =back
- Line 3744  delenv($regexp) : removes all items from
+ Line 5136  delenv($regexp) : removes all items from
  =over 4
  =item *
+ X<queryauthenticate()>
- queryauthenticate($uname,$udom) : try to determine user's current
+ B<queryauthenticate($uname,$udom)>: try to determine user's current
  authentication scheme
  =item *
+ X<authenticate()>
- authenticate($uname,$upass,$udom) : try to authenticate user from domain's lib
+ B<authenticate($uname,$upass,$udom)>: try to
- servers (first use the current one), $upass should be the users password
+ authenticate user from domain's lib servers (first use the current
+ one). C<$upass> should be the users password.
  =item *
+ X<homeserver()>
- homeserver($uname,$udom) : find the server which has the user's
+ B<homeserver($uname,$udom)>: find the server which has
- directory and files (there must be only one), this caches the answer,
+ the user's directory and files (there must be only one), this caches
- and also caches if there is a borken connection.
+ the answer, and also caches if there is a borken connection.
  =item *
+ X<idget()>
- idget($udom,@ids) : find the usernames behind a list of IDs (IDs are a
+ B<idget($udom,@ids)>: find the usernames behind a list of IDs
- unique resource in a domain, there must be only 1 ID per username, and
+ (IDs are a unique resource in a domain, there must be only 1 ID per
- only 1 username per ID in a specific domain) (returns hash:
+ username, and only 1 username per ID in a specific domain) (returns
- id=>name,id=>name)
+ hash: id=>name,id=>name)
  =item *
+ X<idrget()>
- idrget($udom,@unames) : find the IDs behind a list of usernames (returns hash:
+ B<idrget($udom,@unames)>: find the IDs behind a list of
- name=>id,name=>id)
+ usernames (returns hash: name=>id,name=>id)
  =item *
+ X<idput()>
- idput($udom,%ids) : store away a list of names and associated IDs
+ B<idput($udom,%ids)>: store away a list of names and associated IDs
  =item *
+ X<rolesinit()>
- rolesinit($udom,$username,$authhost) : get user privileges
+ B<rolesinit($udom,$username,$authhost)>: get user privileges
  =item *
+ X<usection()>
- usection($udom,$uname,$cname) : finds the section of student in the
+ B<usection($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"
  =item *
+ X<userenvironment()>
- userenvironment($udom,$uname,@what) : gets the values of the keys
+ B<userenvironment($udom,$uname,@what)>: gets the values of the keys
  passed in @what from the requested user's environment, returns a hash
  =back
- Line 4155  dumps the complete (or key matching rege
+ Line 5548  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)
- Line 4265  messages of critical importance should g
+ Line 5666  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.320
changed lines
	Added in v.1.481