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.459 and 1.596

-version 1.459, 2003/12/12 00:20:08
+version 1.596, 2005/02/09 22:04:22
  Line 32  package Apache::lonnet;
  use strict;
  use LWP::UserAgent();
  use HTTP::Headers;
+ use HTTP::Date;
+ # use Date::Parse;
  use vars
- qw(%perlvar %hostname %homecache %badServerCache %hostip %iphost %spareid %hostdom
+ qw(%perlvar %hostname %homecache %badServerCache %iphost %spareid %hostdom
     %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache
     %courselogs %accesshash %userrolehash $processmarker $dumpcount
-    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseresdatacache
+    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %courseresdatacache
-    %userresdatacache %usectioncache %domaindescription %domain_auth_def %domain_auth_arg_def
+    %userresdatacache %getsectioncache %domaindescription %domain_auth_def %domain_auth_arg_def
-    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir);
+    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit);
  use IO::Socket;
  use GDBM_File;
  use Apache::Constants qw(:common :http);
  use HTML::LCParser;
  use Fcntl qw(:flock);
- use Apache::loncoursedata;
  use Apache::lonlocal;
- use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw);
+ use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze);
- use Time::HiRes();
+ use Time::HiRes qw( gettimeofday tv_interval );
  my $readit;
+ my $max_connection_retries = 10;     # Or some such value.
  =pod
- Line 114  sub logperm {
+ Line 116  sub logperm {
  sub subreply {
      my ($cmd,$server)=@_;
      my $peerfile="$perlvar{'lonSockDir'}/$server";
-     my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+     #
-                                      Type    => SOCK_STREAM,
+     #  With loncnew process trimming, there's a timing hole between lonc server
-                                      Timeout => 10)
+     #  process exit and the master server picking up the listen on the AF_UNIX
-        or return "con_lost";
+     #  socket.  In that time interval, a lock file will exist:
-     print $client "$cmd\n";
-     my $answer=<$client>;
+     my $lockfile=$peerfile.".lock";
-     if (!$answer) { $answer="con_lost"; }
+     while (-e $lockfile) {	# Need to wait for the lockfile to disappear.
-     chomp($answer);
+ 	sleep(1);
+     }
+     # At this point, either a loncnew parent is listening or an old lonc
+     # or loncnew child is listening so we can connect or everything's dead.
+     #
+     #   We'll give the connection a few tries before abandoning it.  If
+     #   connection is not possible, we'll con_lost back to the client.
+     #
+     my $client;
+     for (my $retries = 0; $retries < $max_connection_retries; $retries++) {
+ 	$client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
+ 				      Type    => SOCK_STREAM,
+ 				      Timeout => 10);
+ 	if($client) {
+ 	    last;		# Connected!
+ 	}
+ 	sleep(1);		# Try again later if failed connection.
+     }
+     my $answer;
+     if ($client) {
+ 	print $client "$cmd\n";
+ 	$answer=<$client>;
+ 	if (!$answer) { $answer="con_lost"; }
+ 	chomp($answer);
+     } else {
+ 	$answer = 'con_lost';	# Failed connection.
+     }
      return $answer;
  }
- Line 129  sub reply {
+ Line 157  sub reply {
      my ($cmd,$server)=@_;
      unless (defined($hostname{$server})) { return 'no_such_host'; }
      my $answer=subreply($cmd,$server);
-     if ($answer eq 'con_lost') {
-         #sleep 5;
-         #$answer=subreply($cmd,$server);
-         #if ($answer eq 'con_lost') {
- 	#   &logthis("Second attempt con_lost on $server");
-         #   my $peerfile="$perlvar{'lonSockDir'}/$server";
-         #   my $client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
-         #                                    Type    => SOCK_STREAM,
-         #                                    Timeout => 10)
-         #              or return "con_lost";
-         #   &logthis("Killing socket");
-         #   print $client "close_connection_exit\n";
-            #sleep 5;
-         #   $answer=subreply($cmd,$server);
-        #}
-     }
      if (($answer=~/^refused/) || ($answer=~/^rejected/)) {
         &logthis("<font color=blue>WARNING:".
                  " $cmd to $server returned $answer</font>");
- Line 192  sub critical {
+ Line 204  sub critical {
      }
      my $answer=reply($cmd,$server);
      if ($answer eq 'con_lost') {
-         my $pingreply=reply('ping',$server);
  	&reconlonc("$perlvar{'lonSockDir'}/$server");
-         my $pongreply=reply('pong',$server);
+ 	my $answer=reply($cmd,$server);
-         &logthis("Ping/Pong for $server: $pingreply/$pongreply");
-         $answer=reply($cmd,$server);
          if ($answer eq 'con_lost') {
              my $now=time;
              my $middlename=$cmd;
- Line 377  sub delenv {
+ Line 386  sub delenv {
  	    return 'error: '.$!;
  	}
  	foreach (@oldenv) {
- 	    unless ($_=~/^$delthis/) { print $fh $_; }
+ 	    if ($_=~/^$delthis/) {
+                 my ($key,undef) = split('=',$_);
+                 delete($ENV{$key});
+             } else {
+                 print $fh $_;
+             }
  	}
  	close($fh);
      }
- Line 524  sub authenticate {
+ Line 538  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");
-                  return $perlvar{'lonHostID'};
-               }
-               if ($answer eq 'non_authorized') {
-                  &logthis("User $uname at $udom rejected by local server");
-                  return 'no_host';
-               }
- 	}
      }
+     my $answer=reply("encrypt:auth:$udom:$uname:$upass",$uhome);
-     my $tryserver;
+     if ($answer eq 'authorized') {
-     foreach $tryserver (keys %libserv) {
+ 	&logthis("User $uname at $udom authorized by $uhome");
- 	if ($hostdom{$tryserver} eq $udom) {
+ 	return $uhome;
-            my $answer=reply("encrypt:auth:$udom:$uname:$upass",$tryserver);
+     }
-            if ($answer =~ /authorized/) {
+     if ($answer eq 'non_authorized') {
-               if ($answer eq 'authorized') {
+ 	&logthis("User $uname at $udom rejected by $uhome");
-                  &logthis("User $uname at $udom authorized by $tryserver");
+ 	return 'no_host';
-                  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 627  sub idput {
+ Line 624  sub idput {
      my ($udom,%ids)=@_;
      my %servers=();
      foreach (keys %ids) {
+ 	&cput('environment',{'id'=>$ids{$_}},$udom,$_);
          my $uhom=&homeserver($_,$udom);
          if ($uhom ne 'no_host') {
              my $id=&escape($ids{$_});
- Line 637  sub idput {
+ Line 635  sub idput {
              } else {
                  $servers{$uhom}=$id.'='.$unam;
              }
-             &critical('put:'.$udom.':'.$unam.':environment:id='.$id,$uhom);
          }
      }
      foreach (keys %servers) {
- Line 652  sub assign_access_key {
+ Line 649  sub assign_access_key {
  # a valid key looks like uname:udom#comments
  # comments are being appended
  #
-     my ($ckey,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     my ($ckey,$kdom,$knum,$cdom,$cnum,$udom,$uname,$logentry)=@_;
+     $kdom=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($kdom));
+     $knum=
+    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($knum));
      $cdom=
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
      $cnum=
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
      $udom=$ENV{'user.name'} unless (defined($udom));
      $uname=$ENV{'user.domain'} unless (defined($uname));
-     my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
+     my %existing=&get('accesskeys',[$ckey],$kdom,$knum);
      if (($existing{$ckey}=~/^\#(.*)$/) || # - new key
-         ($existing{$ckey}=~/^$uname\:$udom\#(.*)$/)) {
+         ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#(.*)$/)) {
                                                    # assigned to this person
                                                    # - this should not happen,
                                                    # unless something went wrong
                                                    # the first time around
  # ready to assign
          $logentry=$1.'; '.$logentry;
-         if (&put('accesskey',{$ckey=>$uname.':'.$udom.'#'.$logentry},
+         if (&put('accesskeys',{$ckey=>$uname.':'.$udom.'#'.$logentry},
-                                                  $cdom,$cnum) eq 'ok') {
+                                                  $kdom,$knum) eq 'ok') {
  # key now belongs to user
  	    my $envkey='key.'.$cdom.'_'.$cnum;
              if (&put('environment',{$envkey => $ckey}) eq 'ok') {
- Line 765  sub validate_access_key {
+ Line 766  sub validate_access_key {
     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
      $cnum=
     $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
-     $udom=$ENV{'user.name'} unless (defined($udom));
+     $udom=$ENV{'user.domain'} unless (defined($udom));
-     $uname=$ENV{'user.domain'} unless (defined($uname));
+     $uname=$ENV{'user.name'} unless (defined($uname));
      my %existing=&get('accesskeys',[$ckey],$cdom,$cnum);
-     return ($existing{$ckey}=~/^$uname\:$udom\#/);
+     return ($existing{$ckey}=~/^\Q$uname\E\:\Q$udom\E\#/);
  }
  # ------------------------------------- Find the section of student in a course
- Line 777  sub getsection {
+ Line 778  sub getsection {
      my ($udom,$unam,$courseid)=@_;
      $courseid=~s/\_/\//g;
      $courseid=~s/^(\w)/\/$1/;
+     my $hashid="$udom:$unam:$courseid";
+     my ($result,$cached)=&is_cached(\%getsectioncache,$hashid,'getsection');
+     if (defined($cached)) { return $result; }
      my %Pending;
      my %Expired;
      #
- Line 796  sub getsection {
+ Line 802  sub getsection {
                          &homeserver($unam,$udom)))) {
          my ($key,$value)=split(/\=/,$_);
          $key=&unescape($key);
-         next if ($key !~/^$courseid(?:\/)*(\w+)*\_st$/);
+         next if ($key !~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/);
          my $section=$1;
          if ($key eq $courseid.'_st') { $section=''; }
          my ($dummy,$end,$start)=split(/\_/,&unescape($value));
          my $now=time;
-         if (defined($end) && ($now > $end)) {
+         if (defined($end) && $end && ($now > $end)) {
              $Expired{$end}=$section;
              next;
          }
-         if (defined($start) && ($now < $start)) {
+         if (defined($start) && $start && ($now < $start)) {
              $Pending{$start}=$section;
              next;
          }
-         return $section;
+         return &do_cache(\%getsectioncache,$hashid,$section,'getsection');
      }
      #
      # Presumedly there will be few matching roles from the above
      # loop and the sorting time will be negligible.
      if (scalar(keys(%Pending))) {
          my ($time) = sort {$a <=> $b} keys(%Pending);
-         return $Pending{$time};
+         return &do_cache(\%getsectioncache,$hashid,$Pending{$time},'getsection');
      }
      if (scalar(keys(%Expired))) {
          my @sorted = sort {$a <=> $b} keys(%Expired);
          my $time = pop(@sorted);
-         return $Expired{$time};
+         return &do_cache(\%getsectioncache,$hashid,$Expired{$time},'getsection');
      }
-     return '-1';
+     return &do_cache(\%getsectioncache,$hashid,'-1','getsection');
  }
- Line 832  my $disk_caching_disabled=1;
+ Line 838  my $disk_caching_disabled=1;
  sub devalidate_cache {
      my ($cache,$id,$name) = @_;
      delete $$cache{$id.'.time'};
+     delete $$cache{$id.'.file'};
      delete $$cache{$id};
-     if ($disk_caching_disabled) { return; }
+     if (1 || $disk_caching_disabled) { return; }
      my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
-     open(DB,"$filename.lock");
+     if (!-e $filename) { return; }
+     open(DB,">$filename.lock");
      flock(DB,LOCK_EX);
      my %hash;
      if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
- Line 862  sub is_cached {
+ Line 870  sub is_cached {
      my ($cache,$id,$name,$time) = @_;
      if (!$time) { $time=300; }
      if (!exists($$cache{$id.'.time'})) {
- 	&load_cache_item($cache,$name,$id);
+ 	&load_cache_item($cache,$name,$id,$time);
      }
      if (!exists($$cache{$id.'.time'})) {
  #	&logthis("Didn't find $id");
  	return (undef,undef);
      } else {
  	if (time-($$cache{$id.'.time'})>$time) {
- #	    &logthis("Devalidating $id - ".time-($$cache{$id.'.time'}));
+ 	    if (exists($$cache{$id.'.file'})) {
- 	    &devalidate_cache($cache,$id,$name);
+ 		foreach my $filename (@{ $$cache{$id.'.file'} }) {
- 	    return (undef,undef);
+ 		    my $mtime=(stat($filename))[9];
+ 		    #+1 is to take care of edge effects
+ 		    if ($mtime && (($mtime+1) < ($$cache{$id.'.time'}))) {
+ #			&logthis("Upping $mtime - ".$$cache{$id.'.time'}.
+ #				 "$id because of $filename");
+ 		    } else {
+ 			&logthis("Devalidating $filename $id - ".(time-($$cache{$id.'.time'})));
+ 			&devalidate_cache($cache,$id,$name);
+ 			return (undef,undef);
+ 		    }
+ 		}
+ 		$$cache{$id.'.time'}=time;
+ 	    } else {
+ #		&logthis("Devalidating $id - ".time-($$cache{$id.'.time'}));
+ 		&devalidate_cache($cache,$id,$name);
+ 		return (undef,undef);
+ 	    }
  	}
      }
      return ($$cache{$id},1);
- Line 887  sub do_cache {
+ Line 911  sub do_cache {
      $$cache{$id};
  }
+ my %do_save_item;
+ my %do_save;
  sub save_cache_item {
      my ($cache,$name,$id)=@_;
      if ($disk_caching_disabled) { return; }
-     my $starttime=&Time::HiRes::time();
+     $do_save{$name}=$cache;
- #    &logthis("Saving :$name:$id");
+     if (!exists($do_save_item{$name})) { $do_save_item{$name}={} }
-     my %hash;
+     $do_save_item{$name}->{$id}=1;
-     my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
+     return;
-     open(DB,"$filename.lock");
+ }
-     flock(DB,LOCK_EX);
-     if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
+ sub save_cache {
- 	eval <<'EVALBLOCK';
+     if ($disk_caching_disabled) { return; }
- 	    $hash{$id.'.time'}=$$cache{$id.'.time'};
+     my ($cache,$name,$id);
- 	    $hash{$id}=freeze({'item'=>$$cache{$id}});
+     foreach $name (keys(%do_save)) {
+ 	$cache=$do_save{$name};
+ 	my $starttime=&Time::HiRes::time();
+ 	&logthis("Saving :$name:");
+ 	my %hash;
+ 	my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
+ 	open(DB,">$filename.lock");
+ 	flock(DB,LOCK_EX);
+ 	if (tie(%hash,'GDBM_File',$filename,&GDBM_WRCREAT(),0640)) {
+ 	    foreach $id (keys(%{ $do_save_item{$name} })) {
+ 		eval <<'EVALBLOCK';
+ 		$hash{$id.'.time'}=$$cache{$id.'.time'};
+ 		$hash{$id}=freeze({'item'=>$$cache{$id}});
+ 		if (exists($$cache{$id.'.file'})) {
+ 		    $hash{$id.'.file'}=freeze({'item'=>$$cache{$id.'.file'}});
+ 		}
  EVALBLOCK
-         if ($@) {
+                 if ($@) {
- 	    &logthis("<font color='red'>save_cache blew up :$@:$name</font>");
+ 		    &logthis("<font color='red'>save_cache blew up :$@:$name</font>");
- 	    unlink($filename);
+ 		    unlink($filename);
- 	}
+ 		    last;
-     } else {
+ 		}
- 	if (-e $filename) {
+ 	    }
- 	    &logthis("Unable to tie hash (save cache item): $name ($!)");
+ 	} else {
- 	    unlink($filename);
+ 	    if (-e $filename) {
+ 		&logthis("Unable to tie hash (save cache): $name ($!)");
+ 		unlink($filename);
+ 	    }
  	}
+ 	untie(%hash);
+ 	flock(DB,LOCK_UN);
+ 	close(DB);
+ 	&logthis("save_cache $name took ".(&Time::HiRes::time()-$starttime));
      }
-     untie(%hash);
+     undef(%do_save);
-     flock(DB,LOCK_UN);
+     undef(%do_save_item);
-     close(DB);
- #    &logthis("save_cache_item $name took ".(&Time::HiRes::time()-$starttime));
  }
  sub load_cache_item {
-     my ($cache,$name,$id)=@_;
+     my ($cache,$name,$id,$time)=@_;
      if ($disk_caching_disabled) { return; }
      my $starttime=&Time::HiRes::time();
  #    &logthis("Before Loading $name  for $id size is ".scalar(%$cache));
      my %hash;
      my $filename=$perlvar{'lonDaemons'}.'/tmp/lonnet_internal_cache_'.$name.".db";
-     open(DB,"$filename.lock");
+     if (!-e $filename) { return; }
+     open(DB,">$filename.lock");
      flock(DB,LOCK_SH);
      if (tie(%hash,'GDBM_File',$filename,&GDBM_READER(),0640)) {
  	eval <<'EVALBLOCK';
- Line 941  sub load_cache_item {
+ Line 990  sub load_cache_item {
  		}
  #	    &logthis("Initial load: $count");
  	    } else {
- 		my $hashref=thaw($hash{$id});
+ 		if (($$cache{$id.'.time'}+$time) < time) {
- 		$$cache{$id}=$hashref->{'item'};
+ 		    $$cache{$id.'.time'}=$hash{$id.'.time'};
- 		$$cache{$id.'.time'}=$hash{$id.'.time'};
+ 		    {
+ 			my $hashref=thaw($hash{$id});
+ 			$$cache{$id}=$hashref->{'item'};
+ 		    }
+ 		    if (exists($hash{$id.'.file'})) {
+ 			my $hashref=thaw($hash{$id.'.file'});
+ 			$$cache{$id.'.file'}=$hashref->{'item'};
+ 		    }
+ 		}
  	    }
  EVALBLOCK
          if ($@) {
- Line 963  EVALBLOCK
+ Line 1020  EVALBLOCK
  #    &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$/) {
-             my $section=$1;
-             if ($key eq $courseid.'_st') { $section=''; }
- 	    my ($dummy,$end,$start)=split(/\_/,&unescape($value));
-             my $now=time;
-             my $notactive=0;
-             if ($start) {
- 		if ($now<$start) { $notactive=1; }
-             }
-             if ($end) {
-                 if ($now>$end) { $notactive=1; }
-             }
-             unless ($notactive) {
- 		return &do_cache(\%usectioncache,$hashid,$section,'usection');
- 	    }
-         }
-     }
-     return &do_cache(\%usectioncache,$hashid,'-1','usection');
- }
  # ------------------------------------- Read an entry from a user's environment
  sub userenvironment {
- Line 1053  sub currentversion {
+ Line 1078  sub currentversion {
  sub subscribe {
      my $fname=shift;
      if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return ''; }
+     $fname=~s/[\n\r]//g;
      my $author=$fname;
      $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/;
      my ($udom,$uname)=split(/\//,$author);
- Line 1072  sub subscribe {
+ Line 1098  sub subscribe {
  sub repcopy {
      my $filename=shift;
      $filename=~s/\/+/\//g;
-     if ($filename=~/^\/home\/httpd\/html\/adm\//) { return OK; }
+     if ($filename=~m|^/home/httpd/html/adm/|) { return OK; }
+     if ($filename=~m|^/home/httpd/html/lonUsers/|) { return OK; }
+     if ($filename=~m|^/home/httpd/html/userfiles/| or
+ 	$filename=~m|^/*uploaded/|) {
+ 	return &repcopy_userfile($filename);
+     }
+     $filename=~s/[\n\r]//g;
      my $transname="$filename.in.transfer";
      if ((-e $filename) || (-e $transname)) { return OK; }
      my $remoteurl=subscribe($filename);
- Line 1137  sub ssi_body {
+ Line 1169  sub ssi_body {
      my ($filelink,%form)=@_;
      my $output=($filelink=~/^http\:/?&externalssi($filelink):
                                       &ssi($filelink,%form));
+     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
      $output=~s/^.*?\<body[^\>]*\>//si;
      $output=~s/(.*)\<\/body\s*\>.*?$/$1/si;
-     $output=~
-             s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs;
      return $output;
  }
- Line 1175  sub externalssi {
+ Line 1206  sub externalssi {
      return $response->content;
  }
- # ------- Add a token to a remote URI's query string to vouch for access rights
+ # -------------------------------- Allow a /uploaded/ URI to be vouched for
- sub tokenwrapper {
+ sub allowuploaded {
-     my $uri=shift;
+     my ($srcurl,$url)=@_;
-     $uri=~s/^http\:\/\/([^\/]+)//;
+     $url=&clutter(&declutter($url));
-     $uri=~s/^\///;
+     my $dir=$url;
-     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
+     $dir=~s/\/[^\/]+$//;
-     my $token=$1;
+     my %httpref=();
-     if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) {
+     my $httpurl=&hreflocation('',$url);
- 	&appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'});
+     $httpref{'httpref.'.$httpurl}=$srcurl;
-         return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri.
+     &Apache::lonnet::appenv(%httpref);
-                (($uri=~/\?/)?'&':'?').'token='.$token.
+ }
-                                '&tokenissued='.$perlvar{'lonHostID'};
+ # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
+ # input: action, courseID, current domain, home server for course, intended
+ #        path to file, source of file.
+ # output: url to file (if action was uploaddoc),
+ #         ok if successful, or diagnostic message otherwise (if action was propagate or copy)
+ #
+ # Allows directory structure to be used within lonUsers/../userfiles/ for a
+ # course.
+ #
+ # action = propagate - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #          will be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles in
+ #          course's home server.
+ #
+ # action = copy - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file will
+ #          be copied from $source (current location) to
+ #          /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         and will then be copied to
+ #          /home/httpd/lonUsers/$domain/1/2/3/$course/userfiles/$file in
+ #         course's home server.
+ #
+ # action = uploaddoc - /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         will be retrived from $ENV{form.uploaddoc} (from DOCS interface) to
+ #         /home/httpd/html/userfiles/$domain/1/2/3/$course/$file
+ #         and will then be copied to /home/httpd/lonUsers/1/2/3/$course/userfiles/$file
+ #         in course's home server.
+ sub process_coursefile {
+     my ($action,$docuname,$docudom,$docuhome,$file,$source)=@_;
+     my $fetchresult;
+     if ($action eq 'propagate') {
+         $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file
+                             ,$docuhome);
      } else {
- 	return '/adm/notfound.html';
+         my $fetchresult = '';
+         my $fpath = '';
+         my $fname = $file;
+         ($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|);
+         $fpath=$docudom.'/'.$docuname.'/'.$fpath;
+         my $filepath=$perlvar{'lonDocRoot'}.'/userfiles';
+         unless ($fpath eq '') {
+             my @parts=split('/',$fpath);
+             foreach my $part (@parts) {
+                 $filepath.= '/'.$part;
+                 if ((-e $filepath)!=1) {
+                     mkdir($filepath,0777);
+                 }
+             }
+         }
+         if ($action eq 'copy') {
+             if ($source eq '') {
+                 $fetchresult = 'no source file';
+                 return $fetchresult;
+             } else {
+                 my $destination = $filepath.'/'.$fname;
+                 rename($source,$destination);
+                 $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
+                                  $docuhome);
+             }
+         } elsif ($action eq 'uploaddoc') {
+             open(my $fh,'>'.$filepath.'/'.$fname);
+             print $fh $ENV{'form.'.$source};
+             close($fh);
+             $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
+                                  $docuhome);
+             if ($fetchresult eq 'ok') {
+                 return '/uploaded/'.$fpath.'/'.$fname;
+             } else {
+                 &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file.
+                         ' to host '.$docuhome.': '.$fetchresult);
+                 return '/adm/notfound.html';
+             }
+         }
      }
+     unless ( $fetchresult eq 'ok') {
+         &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$file.
+              ' to host '.$docuhome.': '.$fetchresult);
+     }
+     return $fetchresult;
  }
  # --------------- Take an uploaded file and put it into the userfiles directory
  # input: name of form element, coursedoc=1 means this is for the course
  # output: url of file in userspace
- sub userfileupload {
+ sub clean_filename {
-     my ($formname,$coursedoc)=@_;
+     my ($fname)=@_;
-     my $fname=$ENV{'form.'.$formname.'.filename'};
  # Replace Windows backslashes by forward slashes
      $fname=~s/\\/\//g;
  # Get rid of everything but the actual filename
- Line 1208  sub userfileupload {
+ Line 1314  sub userfileupload {
      $fname=~s/\s+/\_/g;
  # Replace all other weird characters by nothing
      $fname=~s/[^\w\.\-]//g;
+ # Replace all .\d. sequences with _\d. so they no longer look like version
+ # numbers
+     $fname=~s/\.(\d+)(?=\.)/_$1/g;
+     return $fname;
+ }
+ sub userfileupload {
+     my ($formname,$coursedoc,$subdir)=@_;
+     if (!defined($subdir)) { $subdir='unknown'; }
+     my $fname=$ENV{'form.'.$formname.'.filename'};
+     $fname=&clean_filename($fname);
  # See if there is anything left
      unless ($fname) { return 'error: no uploaded file'; }
      chop($ENV{'form.'.$formname});
+     if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { #files uploaded to help request form are handled differently
+         my $now = time;
+         my $filepath = 'tmp/helprequests/'.$now;
+         my @parts=split(/\//,$filepath);
+         my $fullpath = $perlvar{'lonDaemons'};
+         for (my $i=0;$i<@parts;$i++) {
+             $fullpath .= '/'.$parts[$i];
+             if ((-e $fullpath)!=1) {
+                 mkdir($fullpath,0777);
+             }
+         }
+         open(my $fh,'>'.$fullpath.'/'.$fname);
+         print $fh $ENV{'form.'.$formname};
+         close($fh);
+         return $fullpath.'/'.$fname;
+     }
  # Create the directory if not present
      my $docuname='';
      my $docudom='';
      my $docuhome='';
+     $fname="$subdir/$fname";
      if ($coursedoc) {
  	$docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
  	$docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
  	$docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+         if ($ENV{'form.folder'} =~ m/^default/) {
+             return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
+         } else {
+             $fname=$ENV{'form.folder'}.'/'.$fname;
+             return &process_coursefile('uploaddoc',$docuname,$docudom,$docuhome,$fname,$formname);
+         }
      } else {
          $docuname=$ENV{'user.name'};
          $docudom=$ENV{'user.domain'};
          $docuhome=$ENV{'user.home'};
+         return &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
      }
-     return
-         &finishuserfileupload($docuname,$docudom,$docuhome,$formname,$fname);
  }
  sub finishuserfileupload {
      my ($docuname,$docudom,$docuhome,$formname,$fname)=@_;
      my $path=$docudom.'/'.$docuname.'/';
      my $filepath=$perlvar{'lonDocRoot'};
+     my ($fnamepath,$file);
+     $file=$fname;
+     if ($fname=~m|/|) {
+         ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
+ 	$path.=$fnamepath.'/';
+     }
      my @parts=split(/\//,$filepath.'/userfiles/'.$path);
      my $count;
      for ($count=4;$count<=$#parts;$count++) {
- Line 1242  sub finishuserfileupload {
+ Line 1387  sub finishuserfileupload {
      }
  # Save the file
      {
-        open(my $fh,'>'.$filepath.'/'.$fname);
+ 	open(FH,'>'.$filepath.'/'.$file);
-        print $fh $ENV{'form.'.$formname};
+ 	print FH $ENV{'form.'.$formname};
-        close($fh);
+ 	close(FH);
      }
  # Notify homeserver to grep it
  #
+     &Apache::lonnet::logthis("fetching ".$path.$file);
-     my $fetchresult=
+     my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome);
-  &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$fname,$docuhome);
      if ($fetchresult eq 'ok') {
  #
  # Return the URL to it
-         return '/uploaded/'.$path.$fname;
+         return '/uploaded/'.$path.$file;
      } else {
-         &logthis('Failed to transfer '.$docudom.'/'.$docuname.'/'.$fname.
+         &logthis('Failed to transfer '.$path.$file.' to host '.$docuhome.
-          ' to host '.$docuhome.': '.$fetchresult);
+ 		 ': '.$fetchresult);
          return '/adm/notfound.html';
      }
  }
+ sub removeuploadedurl {
+     my ($url)=@_;
+     my (undef,undef,$udom,$uname,$fname)=split('/',$url,5);
+     return &Apache::lonnet::removeuserfile($uname,$udom,$fname);
+ }
+ sub removeuserfile {
+     my ($docuname,$docudom,$fname)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("removeuserfile:$docudom/$docuname/$fname",$home);
+ }
+ sub mkdiruserfile {
+     my ($docuname,$docudom,$dir)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("mkdiruserfile:".&escape("$docudom/$docuname/$dir"),$home);
+ }
+ sub renameuserfile {
+     my ($docuname,$docudom,$old,$new)=@_;
+     my $home=&homeserver($docuname,$docudom);
+     return &reply("renameuserfile:$docudom:$docuname:".&escape("$old").':'.
+ 		  &escape("$new"),$home);
+ }
  # ------------------------------------------------------------------------- Log
  sub log {
- Line 1301  sub flushcourselogs {
+ Line 1470  sub flushcourselogs {
          }
          if ($courseidbuffer{$coursehombuf{$crsid}}) {
             $courseidbuffer{$coursehombuf{$crsid}}.='&'.
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
+                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
          } else {
             $courseidbuffer{$coursehombuf{$crsid}}=
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid});
+ 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-         }
+                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+         }
      }
  #
  # Write course id database (reverse lookup) to homeserver of courses
- Line 1378  sub courselog {
+ Line 1549  sub courselog {
         $ENV{'course.'.$ENV{'request.course.id'}.'.home'};
      $coursedescrbuf{$ENV{'request.course.id'}}=
         $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+     $courseinstcodebuf{$ENV{'request.course.id'}}=
+        $ENV{'course.'.$ENV{'request.course.id'}.'.internal.coursecode'};
+     $courseownerbuf{$ENV{'request.course.id'}}=
+        $ENV{'course.'.$ENV{'request.course.id'}.'.internal.courseowner'};
      if (defined $courselogs{$ENV{'request.course.id'}}) {
  	$courselogs{$ENV{'request.course.id'}}.='&'.$what;
      } else {
- Line 1394  sub courseacclog {
+ Line 1569  sub courseacclog {
      my $what=$fnsymb.':'.$ENV{'user.name'}.':'.$ENV{'user.domain'};
      if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|page)$/) {
          $what.=':POST';
+         # FIXME: Probably ought to escape things....
  	foreach (keys %ENV) {
              if ($_=~/^form\.(.*)/) {
  		$what.=':'.$1.'='.$ENV{$_};
              }
          }
+     } elsif ($fnsymb =~ m:^/adm/searchcat:) {
+         # FIXME: We should not be depending on a form parameter that someone
+         # editing lonsearchcat.pm might change in the future.
+         if ($ENV{'form.phase'} eq 'course_search') {
+             $what.= ':POST';
+             # FIXME: Probably ought to escape things....
+             foreach my $element ('courseexp','crsfulltext','crsrelated',
+                                  'crsdiscuss') {
+                 $what.=':'.$element.'='.$ENV{'form.'.$element};
+             }
+         }
      }
      &courselog($what);
  }
- Line 1424  sub userrolelog {
+ Line 1611  sub userrolelog {
      my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
      if (($trole=~/^ca/) || ($trole=~/^in/) ||
          ($trole=~/^cc/) || ($trole=~/^ep/) ||
-         ($trole=~/^cr/)) {
+         ($trole=~/^cr/) || ($trole=~/^ta/)) {
         my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
         $userrolehash
           {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
- Line 1436  sub get_course_adv_roles {
+ Line 1623  sub get_course_adv_roles {
      my $cid=shift;
      $cid=$ENV{'request.course.id'} unless (defined($cid));
      my %coursehash=&coursedescription($cid);
+     my %nothide=();
+     foreach (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+ 	$nothide{join(':',split(/[\@\:]/,$_))}=1;
+     }
      my %returnhash=();
      my %dumphash=
              &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
- Line 1446  sub get_course_adv_roles {
+ Line 1637  sub get_course_adv_roles {
          if (($tend) && ($tend<$now)) { next; }
          if (($tstart) && ($now<$tstart)) { next; }
          my ($role,$username,$domain,$section)=split(/\:/,$_);
+ 	if ($username eq '' || $domain eq '') { next; }
+ 	if ((&privileged($username,$domain)) &&
+ 	    (!$nothide{$username.':'.$domain})) { next; }
          my $key=&plaintext($role);
          if ($section) { $key.=' (Sec/Grp '.$section.')'; }
          if ($returnhash{$key}) {
- Line 1496  sub getannounce {
+ Line 1690  sub getannounce {
  	if ($announcement=~/\w/) {
  	    return
     '<table bgcolor="#FF5555" cellpadding="5" cellspacing="3">'.
-    '<tr><td bgcolor="#FFFFFF"><pre>'.$announcement.'</pre></td></tr></table>';
+    '<tr><td bgcolor="#FFFFFF"><tt>'.$announcement.'</tt></td></tr></table>';
  	} else {
  	    return '';
  	}
- Line 1515  sub courseidput {
+ Line 1709  sub courseidput {
  }
  sub courseiddump {
-     my ($domfilter,$descfilter,$sincefilter)=@_;
+     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$hostidflag,$hostidref)=@_;
      my %returnhash=();
      unless ($domfilter) { $domfilter=''; }
      foreach my $tryserver (keys %libserv) {
- 	if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+         if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) {
- 	    foreach (
+ 	    if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
-              split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+ 	        foreach (
- 			       $sincefilter.':'.&escape($descfilter),
+                  split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+ 			       $sincefilter.':'.&escape($descfilter).':'.
+                                &escape($instcodefilter).':'.&escape($ownerfilter),
                                 $tryserver))) {
- 		my ($key,$value)=split(/\=/,$_);
+ 		    my ($key,$value)=split(/\=/,$_);
-                 if (($key) && ($value)) {
+                     if (($key) && ($value)) {
- 		    $returnhash{&unescape($key)}=&unescape($value);
+ 		        $returnhash{&unescape($key)}=$value;
+                     }
                  }
              }
          }
      }
      return %returnhash;
- Line 1538  sub courseiddump {
+ Line 1734  sub courseiddump {
  #
  # ----------------------------------------------------------- Check out an item
+ sub get_first_access {
+     my ($type,$argsymb)=@_;
+     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     if ($argsymb) { $symb=$argsymb; }
+     my ($map,$id,$res)=&decode_symb($symb);
+     if ($type eq 'map') {
+ 	$res=&symbread($map);
+     } else {
+ 	$res=$symb;
+     }
+     my %times=&get('firstaccesstimes',["$courseid\0$res"],$udom,$uname);
+     return $times{"$courseid\0$res"};
+ }
+ sub set_first_access {
+     my ($type)=@_;
+     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($map,$id,$res)=&decode_symb($symb);
+     if ($type eq 'map') {
+ 	$res=&symbread($map);
+     } else {
+ 	$res=$symb;
+     }
+     my $firstaccess=&get_first_access($type,$symb);
+     if (!$firstaccess) {
+ 	return &put('firstaccesstimes',{"$courseid\0$res"=>time},$udom,$uname);
+     }
+     return 'already_set';
+ }
  sub checkout {
      my ($symb,$tuname,$tudom,$tcrsid)=@_;
      my $now=time;
- Line 1591  sub checkin {
+ Line 1817  sub checkin {
      my $now=time;
      my ($ta,$tb,$lonhost)=split(/\*/,$token);
      $lonhost=~tr/A-Z/a-z/;
-     my $dtoken=$ta.'_'.$hostip{$lonhost}.'_'.$tb;
+     my $dtoken=$ta.'_'.$hostname{$lonhost}.'_'.$tb;
      $dtoken=~s/\W/\_/g;
      my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
                   split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
- Line 1650  sub devalidate {
+ Line 1876  sub devalidate {
          # - the student level sheet of this user in course's homespace
          # - the assessment level sheet for this resource
          #   for this user in user's homespace
+ 	# - current conditional state info
  	my $key=$uname.':'.$udom.':';
          my $status=
  	    &del('nohist_calculatedsheets',
- Line 1664  sub devalidate {
+ Line 1891  sub devalidate {
                      $uname.' at '.$udom.' for '.
  		    $symb.': '.$status);
          }
+ 	&delenv('user.state.'.$cid);
      }
  }
- Line 1716  sub hash2str {
+ Line 1944  sub hash2str {
  sub hashref2str {
    my ($hashref)=@_;
    my $result='__HASH_REF__';
-   foreach (keys(%$hashref)) {
+   foreach (sort(keys(%$hashref))) {
      if (ref($_) eq 'ARRAY') {
        $result.=&arrayref2str($_).'=';
      } elsif (ref($_) eq 'HASH') {
- Line 1872  sub tmpreset {
+ Line 2100  sub tmpreset {
    $namespace=~s/\//\_/g;
    $namespace=~s/\W//g;
-   #FIXME needs to do something for /pub resources
    if (!$domain) { $domain=$ENV{'user.domain'}; }
    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+   if ($domain eq 'public' && $stuname eq 'public') {
+       $stuname=$ENV{'REMOTE_ADDR'};
+   }
    my $path=$perlvar{'lonDaemons'}.'/tmp';
    my %hash;
    if (tie(%hash,'GDBM_File',
- Line 1907  sub tmpstore {
+ Line 2137  sub tmpstore {
    }
    $namespace=~s/\//\_/g;
    $namespace=~s/\W//g;
- #FIXME needs to do something for /pub resources
    if (!$domain) { $domain=$ENV{'user.domain'}; }
    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+   if ($domain eq 'public' && $stuname eq 'public') {
+       $stuname=$ENV{'REMOTE_ADDR'};
+   }
    my $now=time;
    my %hash;
    my $path=$perlvar{'lonDaemons'}.'/tmp';
- Line 1921  sub tmpstore {
+ Line 2153  sub tmpstore {
      my $allkeys='';
      foreach my $key (keys(%$storehash)) {
        $allkeys.=$key.':';
-       $hash{"$version:$symb:$key"}=$$storehash{$key};
+       $hash{"$version:$symb:$key"}=&freeze_escape($$storehash{$key});
      }
      $hash{"$version:$symb:timestamp"}=$now;
      $allkeys.='timestamp';
- Line 1948  sub tmprestore {
+ Line 2180  sub tmprestore {
    $symb=escape($symb);
    if (!$namespace) { $namespace=$ENV{'request.state'}; }
-   #FIXME needs to do something for /pub resources
    if (!$domain) { $domain=$ENV{'user.domain'}; }
    if (!$stuname) { $stuname=$ENV{'user.name'}; }
+   if ($domain eq 'public' && $stuname eq 'public') {
+       $stuname=$ENV{'REMOTE_ADDR'};
+   }
    my %returnhash;
    $namespace=~s/\//\_/g;
    $namespace=~s/\W//g;
- Line 1969  sub tmprestore {
+ Line 2203  sub tmprestore {
        my $key;
        $returnhash{"$scope:keys"}=$vkeys;
        foreach $key (@keys) {
- 	$returnhash{"$scope:$key"}=$hash{"$scope:$symb:$key"};
+ 	$returnhash{"$scope:$key"}=&thaw_unescape($hash{"$scope:$symb:$key"});
- 	$returnhash{"$key"}=$hash{"$scope:$symb:$key"};
+ 	$returnhash{"$key"}=&thaw_unescape($hash{"$scope:$symb:$key"});
        }
      }
      if (!(untie(%hash))) {
- Line 2011  sub store {
+ Line 2245  sub store {
      my $namevalue='';
      foreach (keys %$storehash) {
-         $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
+         $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
      }
      $namevalue=~s/\&$//;
      &courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue);
- Line 2047  sub cstore {
+ Line 2281  sub cstore {
      my $namevalue='';
      foreach (keys %$storehash) {
-         $namevalue.=escape($_).'='.escape($$storehash{$_}).'&';
+         $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
      }
      $namevalue=~s/\&$//;
      &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue);
- Line 2081  sub restore {
+ Line 2315  sub restore {
      my %returnhash=();
      foreach (split(/\&/,$answer)) {
  	my ($name,$value)=split(/\=/,$_);
-         $returnhash{&unescape($name)}=&unescape($value);
+         $returnhash{&unescape($name)}=&thaw_unescape($value);
      }
      my $version;
      for ($version=1;$version<=$returnhash{'version'};$version++) {
- Line 2127  sub coursedescription {
+ Line 2361  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 2134  sub rolesinit {
+ Line 2398  sub rolesinit {
      my $rolesdump=reply("dump:$domain:$username:roles",$authhost);
      if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
      my %allroles=();
-     my %thesepriv=();
      my $now=time;
      my $userroles="user.login.time=$now\n";
-     my $thesestr;
      if ($rolesdump ne '') {
          foreach (split(/&/,$rolesdump)) {
- 	  if ($_!~/^rolesdef\&/) {
+ 	  if ($_!~/^rolesdef_/) {
              my ($area,$role)=split(/=/,$_);
-             $area=~s/\_\w\w$//;
+ 	    $area=~s/\_\w\w$//;
-             my ($trole,$tend,$tstart)=split(/_/,$role);
-             $userroles.='user.role.'.$trole.'.'.$area.'='.
+             my ($trole,$tend,$tstart);
-                         $tstart.'.'.$tend."\n";
+ 	    if ($role=~/^cr/) {
- # log the associated role with the area
+ 		($trole,my $trest)=($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|);
-             &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+ 		($tend,$tstart)=split('_',$trest);
-             if ($tend!=0) {
+ 	    } else {
- 	        if ($tend<$now) {
+ 		($trole,$tend,$tstart)=split(/_/,$role);
- 	            $trole='';
+ 	    }
-                 }
+             $userroles.=&set_arearole($trole,$area,$tstart,$tend,$domain,$username);
-             }
+             if (($tend!=0) && ($tend<$now)) { $trole=''; }
-             if ($tstart!=0) {
+             if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
-                 if ($tstart>$now) {
-                    $trole='';
-                 }
-             }
              if (($area ne '') && ($trole ne '')) {
  		my $spec=$trole.'.'.$area;
  		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
  		if ($trole =~ /^cr\//) {
- 		    my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+                     &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area);
-  		    my $homsvr=homeserver($rauthor,$rdomain);
- 		    if ($hostname{$homsvr} ne '') {
- 			my ($rdummy,$roledef)=
- 			   &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
- 			if (($rdummy ne 'con_lost') && ($roledef ne '')) {
- 			    my ($syspriv,$dompriv,$coursepriv)=
- 				split(/\_/,$roledef);
- 			    if (defined($syspriv)) {
- 				$allroles{'cm./'}.=':'.$syspriv;
- 				$allroles{$spec.'./'}.=':'.$syspriv;
- 			    }
- 			    if ($tdomain ne '') {
- 				if (defined($dompriv)) {
- 				    $allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
- 				    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
- 				}
- 				if ($trest ne '') {
- 				    if (defined($coursepriv)) {
- 					$allroles{'cm.'.$area}.=':'.$coursepriv;
- 					$allroles{$spec.'.'.$area}.=':'.$coursepriv;
- 				    }
- 				}
- 			    }
- 			}
- 		    }
  		} else {
- 		    if (defined($pr{$trole.':s'})) {
+                     &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
- 			$allroles{'cm./'}.=':'.$pr{$trole.':s'};
- 			$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
- 		    }
- 		    if ($tdomain ne '') {
- 			if (defined($pr{$trole.':d'})) {
- 			    $allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
- 			    $allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
- 			}
- 			if ($trest ne '') {
- 			    if (defined($pr{$trole.':c'})) {
- 				$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
- 				$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
- 			    }
- 			}
- 		    }
  		}
              }
            }
          }
-         my $adv=0;
+         my ($author,$adv) = &set_userprivs(\$userroles,\%allroles);
-         my $author=0;
-         foreach (keys %allroles) {
-             %thesepriv=();
-             if (($_!~/^st/) && ($_!~/^ta/) && ($_!~/^cm/)) { $adv=1; }
-             if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
-             foreach (split(/:/,$allroles{$_})) {
-                 if ($_ ne '') {
- 		    my ($privilege,$restrictions)=split(/&/,$_);
-                     if ($restrictions eq '') {
- 			$thesepriv{$privilege}='F';
-                     } else {
-                         if ($thesepriv{$privilege} ne 'F') {
- 			    $thesepriv{$privilege}.=$restrictions;
-                         }
-                     }
-                 }
-             }
-             $thesestr='';
-             foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
-             $userroles.='user.priv.'.$_.'='.$thesestr."\n";
-         }
          $userroles.='user.adv='.$adv."\n".
  	            'user.author='.$author."\n";
          $ENV{'user.adv'}=$adv;
- Line 2240  sub rolesinit {
+ Line 2436  sub rolesinit {
      return $userroles;
  }
+ sub set_arearole {
+     my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
+ # log the associated role with the area
+     &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
+     return 'user.role.'.$trole.'.'.$area.'='.$tstart.'.'.$tend."\n";
+ }
+ sub custom_roleprivs {
+     my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_;
+     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
+     my $homsvr=homeserver($rauthor,$rdomain);
+     if ($hostname{$homsvr} ne '') {
+         my ($rdummy,$roledef)=
+             &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
+         if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+             my ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+             if (defined($syspriv)) {
+                 $$allroles{'cm./'}.=':'.$syspriv;
+                 $$allroles{$spec.'./'}.=':'.$syspriv;
+             }
+             if ($tdomain ne '') {
+                 if (defined($dompriv)) {
+                     $$allroles{'cm./'.$tdomain.'/'}.=':'.$dompriv;
+                     $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
+                 }
+                 if (($trest ne '') && (defined($coursepriv))) {
+                     $$allroles{'cm.'.$area}.=':'.$coursepriv;
+                     $$allroles{$spec.'.'.$area}.=':'.$coursepriv;
+                 }
+             }
+         }
+     }
+ }
+ sub standard_roleprivs {
+     my ($allroles,$trole,$tdomain,$spec,$trest,$area) = @_;
+     if (defined($pr{$trole.':s'})) {
+         $$allroles{'cm./'}.=':'.$pr{$trole.':s'};
+         $$allroles{$spec.'./'}.=':'.$pr{$trole.':s'};
+     }
+     if ($tdomain ne '') {
+         if (defined($pr{$trole.':d'})) {
+             $$allroles{'cm./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+             $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$pr{$trole.':d'};
+         }
+         if (($trest ne '') && (defined($pr{$trole.':c'}))) {
+             $$allroles{'cm.'.$area}.=':'.$pr{$trole.':c'};
+             $$allroles{$spec.'.'.$area}.=':'.$pr{$trole.':c'};
+         }
+     }
+ }
+ sub set_userprivs {
+     my ($userroles,$allroles) = @_;
+     my $author=0;
+     my $adv=0;
+     foreach (keys %{$allroles}) {
+         my %thesepriv=();
+         if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
+         foreach (split(/:/,$$allroles{$_})) {
+             if ($_ ne '') {
+                 my ($privilege,$restrictions)=split(/&/,$_);
+                 if ($restrictions eq '') {
+                     $thesepriv{$privilege}='F';
+                 } elsif ($thesepriv{$privilege} ne 'F') {
+                     $thesepriv{$privilege}.=$restrictions;
+                 }
+                 if ($thesepriv{'adv'} eq 'F') { $adv=1; }
+             }
+         }
+         my $thesestr='';
+         foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
+         $$userroles.='user.priv.'.$_.'='.$thesestr."\n";
+     }
+     return ($author,$adv);
+ }
  # --------------------------------------------------------------- get interface
  sub get {
- Line 2261  sub get {
+ Line 2535  sub get {
     my %returnhash=();
     my $i=0;
     foreach (@$storearr) {
-       $returnhash{$_}=unescape($pairs[$i]);
+       $returnhash{$_}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
- Line 2300  sub dump {
+ Line 2574  sub dump {
     my %returnhash=();
     foreach (@pairs) {
        my ($key,$value)=split(/=/,$_);
-       $returnhash{unescape($key)}=unescape($value);
+       $returnhash{unescape($key)}=&thaw_unescape($value);
     }
     return %returnhash;
  }
- Line 2346  sub currentdump {
+ Line 2620  sub currentdump {
             my ($key,$value)=split(/=/,$_);
             my ($symb,$param) = split(/:/,$key);
             $returnhash{&unescape($symb)}->{&unescape($param)} =
-                                                           &unescape($value);
+                                                         &thaw_unescape($value);
         }
     }
     return %returnhash;
- Line 2412  sub put {
+ Line 2686  sub put {
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
     foreach (keys %$storehash) {
-        $items.=&escape($_).'='.&escape($$storehash{$_}).'&';
+        $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+    }
+    $items=~s/\&$//;
+    return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
+ }
+ # ---------------------------------------------------------- putstore interface
+ sub putstore {
+    my ($namespace,$storehash,$udomain,$uname)=@_;
+    if (!$udomain) { $udomain=$ENV{'user.domain'}; }
+    if (!$uname) { $uname=$ENV{'user.name'}; }
+    my $uhome=&homeserver($uname,$udomain);
+    my $items='';
+    my %allitems = ();
+    foreach (keys %$storehash) {
+        if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) {
+            my $key = $1.':keys:'.$2;
+            $allitems{$key} .= $3.':';
+        }
+        $items.=$_.'='.&freeze_escape($$storehash{$_}).'&';
+    }
+    foreach (keys %allitems) {
+        $allitems{$_} =~ s/\:$//;
+        $items.= $_.'='.$allitems{$_}.'&';
     }
     $items=~s/\&$//;
     return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2427  sub cput {
+ Line 2725  sub cput {
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
     foreach (keys %$storehash) {
-        $items.=escape($_).'='.escape($$storehash{$_}).'&';
+        $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&';
     }
     $items=~s/\&$//;
     return &critical("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2450  sub eget {
+ Line 2748  sub eget {
     my %returnhash=();
     my $i=0;
     foreach (@$storearr) {
-       $returnhash{$_}=unescape($pairs[$i]);
+       $returnhash{$_}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
- Line 2493  sub customaccess {
+ Line 2791  sub customaccess {
  # ------------------------------------------------- Check for a user privilege
  sub allowed {
-     my ($priv,$uri)=@_;
+     my ($priv,$uri,$symb)=@_;
      $uri=&deversion($uri);
      my $orguri=$uri;
      $uri=&declutter($uri);
      if (defined($ENV{'allowed.'.$priv})) { return $ENV{'allowed.'.$priv}; }
  # Free bre access to adm and meta resources
+     if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|))
-     if ((($uri=~/^adm\//) || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
+ 	 || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
  	return 'F';
      }
+ # Free bre access to user's own portfolio contents
+     my ($space,$domain,$name,$dir)=split('/',$uri);
+     if (('uploaded' eq $space) && ($ENV{'user.name'} eq $name) &&
+ 	($ENV{'user.domain'} eq $domain) && ('portfolio' eq $dir)) {
+         return 'F';
+     }
  # Free bre to public access
      if ($priv eq 'bre') {
- Line 2547  sub allowed {
+ Line 2854  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 2564  sub allowed {
+ Line 2871  sub allowed {
      $courseuri=~s/^([^\/])/\/$1/;
      if ($ENV{'user.priv.'.$ENV{'request.role'}.'.'.$courseuri}
-        =~/$priv\&([^\:]*)/) {
+        =~/\Q$priv\E\&([^\:]*)/) {
         $thisallowed.=$1;
      }
  # URI is an uploaded document for this course
-     if (($priv eq 'bre') &&
+     if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) {
-         ($uri=~/^uploaded\/$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}\/$ENV{'course.'.$ENV{'request.course.id'}.'.num'}/)) {
+ 	my $refuri=$ENV{'httpref.'.$orguri};
-         return 'F';
+ 	if ($refuri) {
+ 	    if ($refuri =~ m|^/adm/|) {
+ 		$thisallowed='F';
+ 	    }
+ 	}
      }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
- Line 2582  sub allowed {
+ Line 2894  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 2603  sub allowed {
+ Line 2915  sub allowed {
         if ($match) {
             $statecond=$cond;
             if ($ENV{'user.priv.'.$ENV{'request.role'}.'./'.$courseprivid}
-                =~/$priv\&([^\:]*)/) {
+                =~/\Q$priv\E\&([^\:]*)/) {
                 $thisallowed.=$1;
                 $checkreferer=0;
             }
- Line 2631  sub allowed {
+ Line 2943  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 2684  sub allowed {
+ Line 2996  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 2695  sub allowed {
+ Line 3007  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 2729  sub allowed {
+ Line 3041  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 2737  sub allowed {
+ Line 3049  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 2749  sub allowed {
+ Line 3061  sub allowed {
     if ($thisallowed=~/R/) {
         my $rolecode=(split(/\./,$ENV{'request.role'}))[0];
-        if (&metadata($uri,'roledeny')=~/$rolecode/) {
+        if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) {
  	  &log($ENV{'user.domain'},$ENV{'user.name'},$ENV{'user.host'},
                      'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
            return '';
- Line 2760  sub allowed {
+ Line 3072  sub allowed {
     if ($thisallowed=~/X/) {
        if ($ENV{'acc.randomout'}) {
-          my $symb=&symbread($uri,1);
+ 	 if (!$symb) { $symb=&symbread($uri,1); }
-          if (($symb) && ($ENV{'acc.randomout'}=~/\&$symb\&/)) {
+          if (($symb) && ($ENV{'acc.randomout'}=~/\&\Q$symb\E\&/)) {
              return '';
           }
        }
- Line 2825  sub definerole {
+ Line 3137  sub definerole {
      my ($rolename,$sysrole,$domrole,$courole)=@_;
      foreach (split(':',$sysrole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:s'}!~/$crole/) { return "refused:s:$crole"; }
+         if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; }
-         if ($pr{'cr:s'}=~/$crole\&/) {
+         if ($pr{'cr:s'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:s'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
                 return "refused:s:$crole&$cqual";
              }
          }
      }
      foreach (split(':',$domrole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:d'}!~/$crole/) { return "refused:d:$crole"; }
+         if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; }
-         if ($pr{'cr:d'}=~/$crole\&/) {
+         if ($pr{'cr:d'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:d'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) {
                 return "refused:d:$crole&$cqual";
              }
          }
      }
      foreach (split(':',$courole)) {
  	my ($crole,$cqual)=split(/\&/,$_);
-         if ($pr{'cr:c'}!~/$crole/) { return "refused:c:$crole"; }
+         if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; }
-         if ($pr{'cr:c'}=~/$crole\&/) {
+         if ($pr{'cr:c'}=~/\Q$crole\E\&/) {
- 	    if ($pr{'cr:c'}!~/$crole\&\w*$cqual/) {
+ 	    if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
                 return "refused:c:$crole&$cqual";
              }
          }
- Line 2892  sub log_query {
+ Line 3204  sub log_query {
      my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters));
      my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command,
                         $uhome);
-     unless ($queryid=~/^$uhost\_/) { return 'error: '.$queryid; }
+     unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; }
      return get_query_reply($queryid);
  }
+ # ------- Request retrieval of institutional classlists for course(s)
+ sub fetch_enrollment_query {
+     my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_;
+     my $homeserver;
+     my $maxtries = 1;
+     if ($context eq 'automated') {
+         $homeserver = $perlvar{'lonHostID'};
+         $maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout
+     } else {
+         $homeserver = &homeserver($cnum,$dom);
+     }
+     my $host=$hostname{$homeserver};
+     my $cmd = '';
+     foreach (keys %{$affiliatesref}) {
+         $cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%';
+     }
+     $cmd =~ s/%%$//;
+     $cmd = &escape($cmd);
+     my $query = 'fetchenrollment';
+     my $queryid=&reply("querysend:".$query.':'.$dom.':'.$ENV{'user.name'}.':'.$cmd,$homeserver);
+     unless ($queryid=~/^\Q$host\E\_/) {
+         &logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum);
+         return 'error: '.$queryid;
+     }
+     my $reply = &get_query_reply($queryid);
+     my $tries = 1;
+     while (($reply=~/^timeout/) && ($tries < $maxtries)) {
+         $reply = &get_query_reply($queryid);
+         $tries ++;
+     }
+     if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
+         &logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$ENV{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries);
+     } else {
+         my @responses = split/:/,$reply;
+         if ($homeserver eq $perlvar{'lonHostID'}) {
+             foreach (@responses) {
+                 my ($key,$value) = split/=/,$_;
+                 $$replyref{$key} = $value;
+             }
+         } else {
+             my $pathname = $perlvar{'lonDaemons'}.'/tmp';
+             foreach (@responses) {
+                 my ($key,$value) = split/=/,$_;
+                 $$replyref{$key} = $value;
+                 if ($value > 0) {
+                     foreach (@{$$affiliatesref{$key}}) {
+                         my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml';
+                         my $destname = $pathname.'/'.$filename;
+                         my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver);
+                         if ($xml_classlist =~ /^error/) {
+                             &logthis('fetch_enrollment_query - autoretrieve error: '.$xml_classlist.' for '.$filename.' from server: '.$homeserver.' '.$context.' '.$cnum);
+                         } else {
+                             if ( open(FILE,">$destname") ) {
+                                 print FILE &unescape($xml_classlist);
+                                 close(FILE);
+                             } else {
+                                 &logthis('fetch_enrollment_query - error opening classlist file '.$destname.' '.$context.' '.$cnum);
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+         return 'ok';
+     }
+     return 'error';
+ }
  sub get_query_reply {
      my $queryid=shift;
      my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid;
- Line 2940  sub userlog_query {
+ Line 3321  sub userlog_query {
      return &log_query($uname,$udom,'userlog',%filters);
  }
+ #--------- Call auto-enrollment subs in localenroll.pm for homeserver for course
+ sub auto_run {
+     my ($cnum,$cdom) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response = &reply('autorun:'.$cdom,$homeserver);
+     return $response;
+ }
+ sub auto_get_sections {
+     my ($cnum,$cdom,$inst_coursecode) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my @secs = ();
+     my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver));
+     unless ($response eq 'refused') {
+         @secs = split/:/,$response;
+     }
+     return @secs;
+ }
+ sub auto_new_course {
+     my ($cnum,$cdom,$inst_course_id,$owner) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver));
+     return $response;
+ }
+ sub auto_validate_courseID {
+     my ($cnum,$cdom,$inst_course_id) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver));
+     return $response;
+ }
+ sub auto_create_password {
+     my ($cnum,$cdom,$authparam) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $create_passwd = 0;
+     my $authchk = '';
+     my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
+     if ($response eq 'refused') {
+         $authchk = 'refused';
+     } else {
+         ($authparam,$create_passwd,$authchk) = split/:/,$response;
+     }
+     return ($authparam,$create_passwd,$authchk);
+ }
+ sub auto_instcode_format {
+     my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_;
+     my $courses = '';
+     my $homeserver;
+     if ($caller eq 'global') {
+         foreach my $tryserver (keys %libserv) {
+             if ($hostdom{$tryserver} eq $codedom) {
+                 $homeserver = $tryserver;
+                 last;
+             }
+         }
+         if (($ENV{'user.name'}) && ($ENV{'user.domain'} eq $codedom)) {
+             $homeserver = &homeserver($ENV{'user.name'},$codedom);
+         }
+     } else {
+         $homeserver = &homeserver($caller,$codedom);
+     }
+     foreach (keys %{$instcodes}) {
+         $courses .= &escape($_).'='.&escape($$instcodes{$_}).'&';
+     }
+     chop($courses);
+     my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver);
+     unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+         my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response;
+         %{$codes} = &str2hash($codes_str);
+         @{$codetitles} = &str2array($codetitles_str);
+         %{$cat_titles} = &str2hash($cat_titles_str);
+         %{$cat_order} = &str2hash($cat_order_str);
+         return 'ok';
+     }
+     return $response;
+ }
  # ------------------------------------------------------------------ Plain Text
  sub plaintext {
- Line 3114  sub modifyuser {
+ Line 3576  sub modifyuser {
      if (defined($middle)) { $names{'middlename'} = $middle; }
      if ($last)   { $names{'lastname'}   = $last; }
      if (defined($gene))   { $names{'generation'} = $gene; }
-     if ($email)  { $names{'notification'} = $email;
+     if ($email) {
-                    $names{'critnotification'} = $email; }
+        $email=~s/[^\w\@\.\-\,]//gs;
+        if ($email=~/\@/) { $names{'notification'} = $email;
+ 			   $names{'critnotification'} = $email;
+ 			   $names{'permanentemail'} = $email; }
+     }
      my $reply = &put('environment', \%names, $udom,$uname);
      if ($reply ne 'ok') { return 'error: '.$reply; }
      &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
- Line 3130  sub modifyuser {
+ Line 3595  sub modifyuser {
  sub modifystudent {
      my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
-         $end,$start,$forceid,$desiredhome,$email,$type,$cid)=@_;
+         $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid)=@_;
      if (!$cid) {
  	unless ($cid=$ENV{'request.course.id'}) {
  	    return 'not_in_class';
- Line 3145  sub modifystudent {
+ Line 3610  sub modifystudent {
      # students environment
      $uid = undef if (!$forceid);
      $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
- 					$gene,$usec,$end,$start,$type,$cid);
+ 					$gene,$usec,$end,$start,$type,$locktype,$cid);
      return $reply;
  }
  sub modify_student_enrollment {
-     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
+     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid) = @_;
- 	$cid) = @_;
      my ($cdom,$cnum,$chome);
      if (!$cid) {
  	unless ($cid=$ENV{'request.course.id'}) {
- Line 3193  sub modify_student_enrollment {
+ Line 3657  sub modify_student_enrollment {
          $gene   = $tmp{'generation'} if (!defined($gene)   || $gene eq '');
          $uid    = $tmp{'id'}         if (!defined($uid)    || $uid  eq '');
      }
-     my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene,
+     my $fullname = &format_name($first,$middle,$last,$gene,'lastname');
-                                                            $first,$middle);
+     my $reply=cput('classlist',
-     my $value=&escape($uname.':'.$udom).'='.
+ 		   {"$uname:$udom" =>
- 	&escape(join(':',$end,$start,$uid,$usec,$fullname,$type));
+ 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
-     my $reply=critical('put:'.$cdom.':'.$cnum.':classlist:'.$value,$chome);
+ 		   $cdom,$cnum);
      unless (($reply eq 'ok') || ($reply eq 'delayed')) {
  	return 'error: '.$reply;
      }
- Line 3210  sub modify_student_enrollment {
+ Line 3674  sub modify_student_enrollment {
      return &assignrole($udom,$uname,$uurl,'st',$end,$start);
  }
+ sub format_name {
+     my ($firstname,$middlename,$lastname,$generation,$first)=@_;
+     my $name;
+     if ($first ne 'lastname') {
+ 	$name=$firstname.' '.$middlename.' '.$lastname.' '.$generation;
+     } else {
+ 	if ($lastname=~/\S/) {
+ 	    $name.= $lastname.' '.$generation.', '.$firstname.' '.$middlename;
+ 	    $name=~s/\s+,/,/;
+ 	} else {
+ 	    $name.= $firstname.' '.$middlename.' '.$generation;
+ 	}
+     }
+     $name=~s/^\s+//;
+     $name=~s/\s+$//;
+     $name=~s/\s+/ /g;
+     return $name;
+ }
  # ------------------------------------------------- Write to course preferences
  sub writecoursepref {
- Line 3232  sub writecoursepref {
+ Line 3715  sub writecoursepref {
  # ---------------------------------------------------------- Make/modify course
  sub createcourse {
-     my ($udom,$description,$url,$course_server,$nonstandard)=@_;
+     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner)=@_;
      $url=&declutter($url);
      my $cid='';
      unless (&allowed('ccc',$udom)) {
- Line 3265  sub createcourse {
+ Line 3748  sub createcourse {
  	return 'error: no such course';
      }
  # ----------------------------------------------------------------- Course made
- # log existance
+ # log existence
-     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description),
+     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
-                  $uhome);
+                  ':'.&escape($inst_code).':'.&escape($course_owner),$uhome);
      &flushcourselogs();
  # set toplevel url
      my $topurl=$url;
- Line 3320  sub revokecustomrole {
+ Line 3803  sub revokecustomrole {
             $deleteflag);
  }
+ # ------------------------------------------------------------ Disk usage
+ sub diskusage {
+     my ($udom,$uname,$directoryRoot)=@_;
+     $directoryRoot =~ s/\/$//;
+     my $listing=&reply('du:'.$directoryRoot,homeserver($uname,$udom));
+     return $listing;
+ }
+ sub is_locked {
+     my ($file_name, $domain, $user) = @_;
+     my @check;
+     my $is_locked;
+     push @check, $file_name;
+     my %locked = &Apache::lonnet::get('file_permissions',\@check,
+                                         $ENV{'user.domain'},$ENV{'user.name'});
+     if (ref($locked{$file_name}) eq 'ARRAY') {
+         $is_locked = 'true';
+     } else {
+         $is_locked = 'false';
+     }
+ }
+ # ------------------------------------------------------------- Mark as Read Only
+ sub mark_as_readonly {
+     my ($domain,$user,$files,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     foreach my $file (@{$files}) {
+         push(@{$current_permissions{$file}},$what);
+     }
+     &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+     return;
+ }
+ # ------------------------------------------------------------Save Selected Files
+ sub save_selected_files {
+     my ($user, $path, @files) = @_;
+     my $filename = $user."savedfiles";
+     my @other_files = &files_not_in_path($user, $path);
+     open (OUT, '>'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
+     foreach my $file (@files) {
+         print (OUT $ENV{'form.currentpath'}.$file."\n");
+     }
+     foreach my $file (@other_files) {
+         print (OUT $file."\n");
+     }
+     close (OUT);
+     return 'ok';
+ }
+ sub clear_selected_files {
+     my ($user) = @_;
+     my $filename = $user."savedfiles";
+     open (OUT, '>'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
+     print (OUT undef);
+     close (OUT);
+     return ("ok");
+ }
+ sub files_in_path {
+     my ($user, $path) = @_;
+     my $filename = $user."savedfiles";
+     my %return_files;
+     open (IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
+     while (my $line_in = <IN>) {
+         chomp ($line_in);
+         my @paths_and_file = split (m!/!, $line_in);
+         my $file_part = pop (@paths_and_file);
+         my $path_part = join ('/', @paths_and_file);
+         $path_part.='/';
+         my $path_and_file = $path_part.$file_part;
+         if ($path_part eq $path) {
+             $return_files{$file_part}= 'selected';
+         }
+     }
+     close (IN);
+     return (\%return_files);
+ }
+ # called in portfolio select mode, to show files selected NOT in current directory
+ sub files_not_in_path {
+     my ($user, $path) = @_;
+     my $filename = $user."savedfiles";
+     my @return_files;
+     my $path_part;
+     open (IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
+     while (<IN>) {
+         #ok, I know it's clunky, but I want it to work
+         my @paths_and_file = split m!/!, $_;
+         my $file_part = pop (@paths_and_file);
+         chomp ($file_part);
+         my $path_part = join ('/', @paths_and_file);
+         $path_part .= '/';
+         my $path_and_file = $path_part.$file_part;
+         if ($path_part ne $path) {
+             push (@return_files, ($path_and_file));
+         }
+     }
+     close (OUT);
+     return (@return_files);
+ }
+ #--------------------------------------------------------------Get Marked as Read Only
+ sub get_marked_as_readonly {
+     my ($domain,$user,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     my @readonly_files;
+     while (my ($file_name,$value) = each(%current_permissions)) {
+         if (ref($value) eq "ARRAY"){
+             foreach my $stored_what (@{$value}) {
+                 if ($stored_what eq $what) {
+                     push(@readonly_files, $file_name);
+                 } elsif (!defined($what)) {
+                     push(@readonly_files, $file_name);
+                 }
+             }
+         }
+     }
+     return @readonly_files;
+ }
+ #-----------------------------------------------------------Get Marked as Read Only Hash
+ sub get_marked_as_readonly_hash {
+     my ($domain,$user,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     my %readonly_files;
+     while (my ($file_name,$value) = each(%current_permissions)) {
+         if (ref($value) eq "ARRAY"){
+             foreach my $stored_what (@{$value}) {
+                 if ($stored_what eq $what) {
+                     $readonly_files{$file_name} = 'locked';
+                 } elsif (!defined($what)) {
+                     $readonly_files{$file_name} = 'locked';
+                 }
+             }
+         }
+     }
+     return %readonly_files;
+ }
+ # ------------------------------------------------------------ Unmark as Read Only
+ sub unmark_as_readonly {
+     # unmarks all files locked by $what
+     # for portfolio submissions, $what contains $crsid and $symb
+     my ($domain,$user,$what) = @_;
+     my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user);
+     my @readonly_files = &Apache::lonnet::get_marked_as_readonly($domain,$user,$what);
+     foreach my $file(@readonly_files){
+         my $current_locks = $current_permissions{$file};
+         my @new_locks;
+         my @del_keys;
+         if (ref($current_locks) eq "ARRAY"){
+             foreach my $locker (@{$current_locks}) {
+                 unless ($locker eq $what) {
+                     push(@new_locks, $what);
+                 }
+             }
+             if (@new_locks > 0) {
+                 $current_permissions{$file} = \@new_locks;
+             } else {
+                 push(@del_keys, $file);
+                 &Apache::lonnet::del('file_permissions',\@del_keys, $domain, $user);
+                 delete $current_permissions{$file};
+             }
+         }
+     }
+     &Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user);
+     return;
+ }
  # ------------------------------------------------------------ Directory lister
  sub dirlist {
- Line 3428  sub GetFileTimestamp {
+ Line 4083  sub GetFileTimestamp {
  sub directcondval {
      my $number=shift;
+     if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) {
+ 	&Apache::lonuserstate::evalstate();
+     }
      if ($ENV{'user.state.'.$ENV{'request.course.id'}}) {
         return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1);
      } else {
- Line 3653  sub EXT {
+ Line 4311  sub EXT {
  	my $section;
  	if (defined($courseid) && $courseid eq $ENV{'request.course.id'}) {
+ 	    if (!$symbparm) { $symbparm=&symbread(); }
+ 	}
+ 	my ($courselevelm,$courselevel);
+ 	if ($symbparm && defined($courseid) &&
+ 	    $courseid eq $ENV{'request.course.id'}) {
  	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
  # ----------------------------------------------------- Cascading lookup scheme
- 	    if (!$symbparm) { $symbparm=&symbread(); }
  	    my $symbp=$symbparm;
  	    my $mapp=(&decode_symb($symbp))[0];
- Line 3668  sub EXT {
+ Line 4330  sub EXT {
  		($ENV{'user.domain'} eq $udom)) {
  		$section=$ENV{'request.course.sec'};
  	    } else {
-                 if (! defined($usection)) {
+ 		if (! defined($usection)) {
-                     $section=&usection($udom,$uname,$courseid);
+ 		    $section=&getsection($udom,$uname,$courseid);
-                 } else {
+ 		} else {
-                     $section = $usection;
+ 		    $section = $usection;
-                 }
+ 		}
  	    }
  	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
  	    my $seclevelr=$courseid.'.['.$section.'].'.$symbparm;
  	    my $seclevelm=$courseid.'.['.$section.'].'.$mapparm;
- 	    my $courselevel=$courseid.'.'.$spacequalifierrest;
+ 	    $courselevel=$courseid.'.'.$spacequalifierrest;
  	    my $courselevelr=$courseid.'.'.$symbparm;
- 	    my $courselevelm=$courseid.'.'.$mapparm;
+ 	    $courselevelm=$courseid.'.'.$mapparm;
  # ----------------------------------------------------------- first, check user
  	    #most student don\'t have any data set, check if there is some data
- Line 3710  sub EXT {
+ Line 4372  sub EXT {
  				 $uname." at ".$udom.": ".
  				 $tmp."</font>");
  		    } elsif ($tmp=~/error: 2 /) {
-                         &EXT_cache_set($udom,$uname);
+ 			&EXT_cache_set($udom,$uname);
  		    } elsif ($tmp =~ /^(con_lost|no_such_host)/) {
  			return $tmp;
  		    }
  		}
  	    }
- # -------------------------------------------------------- second, check course
+ # ------------------------------------------------ second, check some of course
  	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
- 					  $ENV{'course.'.$courseid.'.domain'},
+ 					   $ENV{'course.'.$courseid.'.domain'},
- 					  ($seclevelr,$seclevelm,$seclevel,
+ 					   ($seclevelr,$seclevelm,$seclevel,
- 					   $courselevelr,$courselevelm,
+ 					    $courselevelr));
- 					   $courselevel));
  	    if (defined($coursereply)) { return $coursereply; }
  # ------------------------------------------------------ third, check map parms
- Line 3737  sub EXT {
+ Line 4398  sub EXT {
  	    }
  	    if ($thisparm) { return $thisparm; }
  	}
- # --------------------------------------------- last, look in resource metadata
+ # ------------------------------------------ fourth, look in resource metadata
  	$spacequalifierrest=~s/\./\_/;
  	my $filename;
- Line 3752  sub EXT {
+ Line 4413  sub EXT {
  	$metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
  	if (defined($metadata)) { return $metadata; }
+ # ---------------------------------------------- fourth, look in rest pf course
+ 	if ($symbparm && defined($courseid) &&
+ 	    $courseid eq $ENV{'request.course.id'}) {
+ 	    my $coursereply=&courseresdata($ENV{'course.'.$courseid.'.num'},
+ 					   $ENV{'course.'.$courseid.'.domain'},
+ 					   ($courselevelm,$courselevel));
+ 	    if (defined($coursereply)) { return $coursereply; }
+ 	}
  # ------------------------------------------------------------------ Cascade up
  	unless ($space eq '0') {
  	    my @parts=split(/_/,$space);
- Line 3791  sub packages_tab_default {
+ Line 4460  sub packages_tab_default {
      my $packages=&metadata($uri,'packages');
      foreach my $package (split(/,/,$packages)) {
  	my ($pack_type,$pack_part)=split(/_/,$package,2);
- 	if ($pack_part eq $part) {
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
  	    return $packagetab{"$pack_type&$name&default"};
  	}
+ 	if ($pack_type eq 'part') { $pack_part='0'; }
+ 	if (defined($packagetab{$pack_type."_".$pack_part."&$name&default"})) {
+ 	    return $packagetab{$pack_type."_".$pack_part."&$name&default"};
+ 	}
      }
      return undef;
  }
- Line 3820  sub metadata {
+ Line 4493  sub metadata {
      my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
      $uri=&declutter($uri);
      # if it is a non metadata possible uri return quickly
-     if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) ||
+     if (($uri eq '') ||
+ 	(($uri =~ m|^/*adm/|) &&
+ 	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
          ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
  	($uri =~ m|home/[^/]+/public_html/|)) {
- 	return '';
+ 	return undef;
      }
      my $filename=$uri;
      $uri=~s/\.meta$//;
- Line 3851  sub metadata {
+ Line 4526  sub metadata {
  	}
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
- 	my $metastring=&getfile(&filelocation('',&clutter($filename)));
+ 	my $metastring;
+ 	if ($uri !~ m|^uploaded/|) {
+ 	    my $file=&filelocation('',&clutter($filename));
+ 	    push(@{$metacache{$uri.'.file'}},$file);
+ 	    $metastring=&getfile($file);
+ 	}
          my $parser=HTML::LCParser->new(\$metastring);
          my $token;
          undef %metathesekeys;
- Line 3962  sub metadata {
+ Line 4642  sub metadata {
  # the next is the end of "start tag"
  	    }
  	}
+ 	my ($extension) = ($uri =~ /\.(\w+)$/);
+ 	foreach my $key (sort(keys(%packagetab))) {
+ 	    #&logthis("extsion1 $extension $key !!");
+ 	    #no specific packages #how's our extension
+ 	    if ($key!~/^extension_\Q$extension\E&/) { next; }
+ 	    &metadata_create_package_def($uri,$key,'extension_'.$extension,
+ 					 \%metathesekeys);
+ 	}
+ 	if (!exists($metacache{$uri}->{':packages'})) {
+ 	    foreach my $key (sort(keys(%packagetab))) {
+ 		#no specific packages well let's get default then
+ 		if ($key!~/^default&/) { next; }
+ 		&metadata_create_package_def($uri,$key,'default',
+ 					     \%metathesekeys);
+ 	    }
+ 	}
  # are there custom rights to evaluate
  	if ($metacache{$uri}->{':copyright'} eq 'custom') {
- Line 3990  sub metadata {
+ Line 4686  sub metadata {
      return $metacache{$uri}->{':'.$what};
  }
+ sub metadata_create_package_def {
+     my ($uri,$key,$package,$metathesekeys)=@_;
+     my ($pack,$name,$subp)=split(/\&/,$key);
+     if ($subp eq 'default') { next; }
+     if (defined($metacache{$uri}->{':packages'})) {
+ 	$metacache{$uri}->{':packages'}.=','.$package;
+     } else {
+ 	$metacache{$uri}->{':packages'}=$package;
+     }
+     my $value=$packagetab{$key};
+     my $unikey;
+     $unikey='parameter_0_'.$name;
+     $metacache{$uri}->{':'.$unikey.'.part'}=0;
+     $$metathesekeys{$unikey}=1;
+     unless (defined($metacache{$uri}->{':'.$unikey.'.'.$subp})) {
+ 	$metacache{$uri}->{':'.$unikey.'.'.$subp}=$value;
+     }
+     if (defined($metacache{$uri}->{':'.$unikey.'.default'})) {
+ 	$metacache{$uri}->{':'.$unikey}=
+ 	    $metacache{$uri}->{':'.$unikey.'.default'};
+     }
+ }
  sub metadata_generate_part0 {
      my ($metadata,$metacache,$uri) = @_;
      my %allnames;
- Line 4013  sub metadata_generate_part0 {
+ Line 4733  sub metadata_generate_part0 {
        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 4023  sub metadata_generate_part0 {
+ Line 4743  sub metadata_generate_part0 {
  sub gettitle {
      my $urlsymb=shift;
      my $symb=&symbread($urlsymb);
-     unless ($symb) {
+     if ($symb) {
- 	unless ($urlsymb) { $urlsymb=$ENV{'request.filename'}; }
+ 	my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
-         return &metadata($urlsymb,'title');
+ 	if (defined($cached)) {
-     }
+ 	    return $result;
-     my ($result,$cached)=&is_cached(\%titlecache,$symb,'title',600);
+ 	}
-     if (defined($cached)) { return $result; }
+ 	my ($map,$resid,$url)=&decode_symb($symb);
-     my ($map,$resid,$url)=&decode_symb($symb);
+ 	my $title='';
-     my $title='';
+ 	my %bighash;
-     my %bighash;
+ 	if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
-     if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+ 		&GDBM_READER(),0640)) {
-                             &GDBM_READER(),0640)) {
+ 	    my $mapid=$bighash{'map_pc_'.&clutter($map)};
-         my $mapid=$bighash{'map_pc_'.&clutter($map)};
+ 	    $title=$bighash{'title_'.$mapid.'.'.$resid};
-         $title=$bighash{'title_'.$mapid.'.'.$resid};
+ 	    untie %bighash;
-         untie %bighash;
+ 	}
-     }
+ 	$title=~s/\&colon\;/\:/gs;
-     $title=~s/\&colon\;/\:/gs;
+ 	if ($title) {
-     if ($title) {
+ 	    return &do_cache(\%titlecache,$symb,$title,'title');
-         return &do_cache(\%titlecache,$symb,$title,'title');
+ 	}
-     } else {
+ 	$urlsymb=$url;
- 	return &metadata($urlsymb,'title');
+     }
-     }
+     my $title=&metadata($urlsymb,'title');
+     if (!$title) { $title=(split('/',$urlsymb))[-1]; }
+     return $title;
  }
  # ------------------------------------------------- Update symbolic store links
- Line 4069  sub symblist {
+ Line 4791  sub symblist {
  # --------------------------------------------------------------- Verify a symb
  sub symbverify {
-     my ($symb,$thisfn)=@_;
+     my ($symb,$thisurl)=@_;
+     my $thisfn=$thisurl;
+ # wrapper not part of symbs
+     $thisfn=~s/^\/adm\/wrapper//;
      $thisfn=&declutter($thisfn);
  # direct jump to resource in page or to a sequence - will construct own symbs
      if ($thisfn=~/\.(page|sequence)$/) { return 1; }
- Line 4079  sub symbverify {
+ Line 4804  sub symbverify {
      unless ($url eq $thisfn) { return 0; }
      $symb=&symbclean($symb);
+     $thisurl=&deversion($thisurl);
      $thisfn=&deversion($thisfn);
      my %bighash;
- Line 4086  sub symbverify {
+ Line 4812  sub symbverify {
      if (tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
                              &GDBM_READER(),0640)) {
-         my $ids=$bighash{'ids_'.&clutter($thisfn)};
+         my $ids=$bighash{'ids_'.&clutter($thisurl)};
          unless ($ids) {
-            $ids=$bighash{'ids_/'.$thisfn};
+            $ids=$bighash{'ids_/'.$thisurl};
          }
          if ($ids) {
  # ------------------------------------------------------------------- Has ID(s)
- Line 4097  sub symbverify {
+ Line 4823  sub symbverify {
                 if (
    &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn)
     eq $symb) {
-                   $okay=1;
+ 		   if (($ENV{'request.role.adv'}) ||
-                }
+ 		       $bighash{'encrypted_'.$_} eq $ENV{'request.enc'}) {
+ 		       $okay=1;
+ 		   }
+ 	       }
  	   }
          }
  	untie(%bighash);
- Line 4110  sub symbverify {
+ Line 4839  sub symbverify {
  sub symbclean {
      my $symb=shift;
+     if ($symb=~m|^/enc/|) { $symb=&Apache::lonenc::unencrypted($symb); }
  # remove version from map
      $symb=~s/\.(\d+)\.(\w+)\_\_\_/\.$2\_\_\_/;
  # remove version from URL
      $symb=~s/\.(\d+)\.(\w+)$/\.$2/;
+ # remove wrapper
+     $symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/;
      return $symb;
  }
- Line 4128  sub encode_symb {
+ Line 4860  sub encode_symb {
  }
  sub decode_symb {
-     my ($map,$resid,$url)=split(/\_\_\_/,shift);
+     my $symb=shift;
+     if ($symb=~m|^/enc/|) { $symb=&Apache::lonenc::unencrypted($symb); }
+     my ($map,$resid,$url)=split(/___/,$symb);
      return (&fixversion($map),$resid,&fixversion($url));
  }
- Line 4168  sub deversion {
+ Line 4902  sub deversion {
  sub symbread {
      my ($thisfn,$donotrecurse)=@_;
+     my $cache_str='request.symbread.cached.'.$thisfn;
+     if (defined($ENV{$cache_str})) { return $ENV{$cache_str}; }
  # no filename provided? try from environment
      unless ($thisfn) {
-         if ($ENV{'request.symb'}) { return &symbclean($ENV{'request.symb'}); }
+         if ($ENV{'request.symb'}) {
+ 	    return $ENV{$cache_str}=&symbclean($ENV{'request.symb'});
+ 	}
  	$thisfn=$ENV{'request.filename'};
      }
+     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
  # is that filename actually a symb? Verify, clean, and return
      if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) {
- 	if (&symbverify($thisfn,$1)) { return &symbclean($thisfn); }
+ 	if (&symbverify($thisfn,$1)) {
+ 	    return $ENV{$cache_str}=&symbclean($thisfn);
+ 	}
      }
      $thisfn=declutter($thisfn);
      my %hash;
      my %bighash;
      my $syval='';
      if (($ENV{'request.course.fn'}) && ($thisfn)) {
+         my $targetfn = $thisfn;
+         if ( ($thisfn =~ m/^uploaded\//) && ($thisfn !~ m/\.(page|sequence)$/) ) {
+             $targetfn = 'adm/wrapper/'.$thisfn;
+         }
          if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
                        &GDBM_READER(),0640)) {
- 	    $syval=$hash{$thisfn};
+ 	    $syval=$hash{$targetfn};
              untie(%hash);
          }
  # ---------------------------------------------------------- There was an entry
- Line 4192  sub symbread {
+ Line 4937  sub symbread {
             unless ($syval=~/\_\d+$/) {
  	       unless ($ENV{'form.request.prefix'}=~/\.(\d+)\_$/) {
                    &appenv('request.ambiguous' => $thisfn);
-                   return '';
+ 		  return $ENV{$cache_str}='';
                 }
                 $syval.=$1;
  	   }
- Line 4236  sub symbread {
+ Line 4981  sub symbread {
                   }
  	      }
                untie(%bighash)
             }
          }
          if ($syval) {
-            return &symbclean($syval.'___'.$thisfn);
+ 	    return $ENV{$cache_str}=&symbclean($syval.'___'.$thisfn);
          }
      }
      &appenv('request.ambiguous' => $thisfn);
-     return '';
+     return $ENV{$cache_str}='';
  }
  # ---------------------------------------------------------- Return random seed
- Line 4257  sub numval {
+ Line 5002  sub numval {
      $txt=~tr/U-Z/0-5/;
      $txt=~tr/u-z/0-5/;
      $txt=~s/\D//g;
+     if ($_64bit) { if ($txt > 2**32) { return -1; } }
      return int($txt);
  }
+ sub numval2 {
+     my $txt=shift;
+     $txt=~tr/A-J/0-9/;
+     $txt=~tr/a-j/0-9/;
+     $txt=~tr/K-T/0-9/;
+     $txt=~tr/k-t/0-9/;
+     $txt=~tr/U-Z/0-5/;
+     $txt=~tr/u-z/0-5/;
+     $txt=~s/\D//g;
+     my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt);
+     my $total;
+     foreach my $val (@txts) { $total+=$val; }
+     if ($_64bit) { if ($total > 2**32) { return -1; } }
+     return int($total);
+ }
+ sub numval3 {
+     use integer;
+     my $txt=shift;
+     $txt=~tr/A-J/0-9/;
+     $txt=~tr/a-j/0-9/;
+     $txt=~tr/K-T/0-9/;
+     $txt=~tr/k-t/0-9/;
+     $txt=~tr/U-Z/0-5/;
+     $txt=~tr/u-z/0-5/;
+     $txt=~s/\D//g;
+     my @txts=split(/(\d\d\d\d\d\d\d\d\d)/,$txt);
+     my $total;
+     foreach my $val (@txts) { $total+=$val; }
+     if ($_64bit) { $total=(($total<<32)>>32); }
+     return $total;
+ }
  sub latest_rnd_algorithm_id {
-     return '64bit2';
+     return '64bit4';
+ }
+ sub get_rand_alg {
+     my ($courseid)=@_;
+     if (!$courseid) { $courseid=(&Apache::lonxml::whichuser())[1]; }
+     if ($courseid) {
+ 	return $ENV{"course.$courseid.rndseed"};
+     }
+     return &latest_rnd_algorithm_id();
+ }
+ sub validCODE {
+     my ($CODE)=@_;
+     if (defined($CODE) && $CODE ne '' && $CODE =~ /^\w+$/) { return 1; }
+     return 0;
+ }
+ sub getCODE {
+     if (&validCODE($ENV{'form.CODE'})) { return $ENV{'form.CODE'}; }
+     if (defined($Apache::lonhomework::parsing_a_problem) &&
+ 	&validCODE($Apache::lonhomework::history{'resource.CODE'})) {
+ 	return $Apache::lonhomework::history{'resource.CODE'};
+     }
+     return undef;
  }
  sub rndseed {
- Line 4274  sub rndseed {
+ Line 5077  sub rndseed {
      if (!$courseid) { $courseid=$wcourseid; }
      if (!$domain) { $domain=$wdomain; }
      if (!$username) { $username=$wusername }
-     my $which=$ENV{"course.$courseid.rndseed"};
+     my $which=&get_rand_alg();
-     my $CODE=$ENV{'scantron.CODE'};
+     if (defined(&getCODE())) {
-     if (defined($CODE)) {
+ 	if ($which eq '64bit4') {
- 	&rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+ 	    return &rndseed_CODE_64bit4($symb,$courseid,$domain,$username);
+ 	} else {
+ 	    return &rndseed_CODE_64bit($symb,$courseid,$domain,$username);
+ 	}
+     } elsif ($which eq '64bit4') {
+ 	return &rndseed_64bit4($symb,$courseid,$domain,$username);
+     } elsif ($which eq '64bit3') {
+ 	return &rndseed_64bit3($symb,$courseid,$domain,$username);
      } elsif ($which eq '64bit2') {
  	return &rndseed_64bit2($symb,$courseid,$domain,$username);
      } elsif ($which eq '64bit') {
- Line 4299  sub rndseed_32bit {
+ Line 5109  sub rndseed_32bit {
  	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
  	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	if ($_64bit) { $num=(($num<<32)>>32); }
  	return $num;
      }
  }
- Line 4319  sub rndseed_64bit {
+ Line 5130  sub rndseed_64bit {
  	my $num2=$nameseed+$domainseed+$courseseed;
  	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
  	return "$num1,$num2";
      }
  }
- Line 4345  sub rndseed_64bit2 {
+ Line 5158  sub rndseed_64bit2 {
      }
  }
+ sub rndseed_64bit3 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	# strings need to be an even # of cahracters long, it it is odd the
+         # last characters gets thrown away
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 21;
+ 	my $symbseed=numval2($symb) << 10;
+ 	my $namechck=unpack("%32S*",$username.' ');
+ 	my $nameseed=numval2($username) << 21;
+ 	my $domainseed=unpack("%32S*",$domain.' ') << 10;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
+ 	my $num1=$symbchck+$symbseed+$namechck;
+ 	my $num2=$nameseed+$domainseed+$courseseed;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
+     }
+ }
+ sub rndseed_64bit4 {
+     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=numval3($symb) << 10;
+ 	my $namechck=unpack("%32S*",$username.' ');
+ 	my $nameseed=numval3($username) << 21;
+ 	my $domainseed=unpack("%32S*",$domain.' ') << 10;
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
+ 	my $num1=$symbchck+$symbseed+$namechck;
+ 	my $num2=$nameseed+$domainseed+$courseseed;
+ 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
+     }
+ }
  sub rndseed_CODE_64bit {
      my ($symb,$courseid,$domain,$username)=@_;
      {
  	use integer;
  	my $symbchck=unpack("%32S*",$symb.' ') << 16;
- 	my $symbseed=numval($symb);
+ 	my $symbseed=numval2($symb);
- 	my $CODEseed=numval($ENV{'scantron.CODE'}) << 16;
+ 	my $CODEchck=unpack("%32S*",&getCODE().' ') << 16;
+ 	my $CODEseed=numval(&getCODE());
  	my $courseseed=unpack("%32S*",$courseid.' ');
- 	my $num1=$symbseed+$CODEseed;
+ 	my $num1=$symbseed+$CODEchck;
- 	my $num2=$courseseed+$symbchck;
+ 	my $num2=$CODEseed+$courseseed+$symbchck;
- 	#&Apache::lonxml::debug("$symbseed:$CODEseed|$courseseed:$symbchck");
+ 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
  	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
- 	return "$num1,$num2";
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); }
+ 	if ($_64bit) { $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
+     }
+ }
+ sub rndseed_CODE_64bit4 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     {
+ 	use integer;
+ 	my $symbchck=unpack("%32S*",$symb.' ') << 16;
+ 	my $symbseed=numval3($symb);
+ 	my $CODEchck=unpack("%32S*",&getCODE().' ') << 16;
+ 	my $CODEseed=numval3(&getCODE());
+ 	my $courseseed=unpack("%32S*",$courseid.' ');
+ 	my $num1=$symbseed+$CODEchck;
+ 	my $num2=$CODEseed+$courseseed+$symbchck;
+ 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
+ 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); }
+ 	if ($_64bit) { $num2=(($num2<<32)>>32); }
+ 	return "$num1:$num2";
      }
  }
  sub setup_random_from_rndseed {
      my ($rndseed)=@_;
-     if ($rndseed =~/,/) {
+     if ($rndseed =~/([,:])/) {
- 	my ($num1,$num2)=split(/,/,$rndseed);
+ 	my ($num1,$num2)=split(/[,:]/,$rndseed);
  	&Math::Random::random_set_seed(abs($num1),abs($num2));
      } else {
  	&Math::Random::random_set_seed_from_phrase($rndseed);
      }
  }
+ sub latest_receipt_algorithm_id {
+     return 'receipt2';
+ }
+ sub recunique {
+     my $fucourseid=shift;
+     my $unique;
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+ 	$unique=$ENV{"course.$fucourseid.internal.encseed"};
+     } else {
+ 	$unique=$perlvar{'lonReceipt'};
+     }
+     return unpack("%32C*",$unique);
+ }
+ sub recprefix {
+     my $fucourseid=shift;
+     my $prefix;
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+ 	$prefix=$ENV{"course.$fucourseid.internal.encpref"};
+     } else {
+ 	$prefix=$perlvar{'lonHostID'};
+     }
+     return unpack("%32C*",$prefix);
+ }
  sub ireceipt {
-     my ($funame,$fudom,$fucourseid,$fusymb)=@_;
+     my ($funame,$fudom,$fucourseid,$fusymb,$part)=@_;
      my $cuname=unpack("%32C*",$funame);
      my $cudom=unpack("%32C*",$fudom);
      my $cucourseid=unpack("%32C*",$fucourseid);
      my $cusymb=unpack("%32C*",$fusymb);
-     my $cunique=unpack("%32C*",$perlvar{'lonReceipt'});
+     my $cunique=&recunique($fucourseid);
-     return unpack("%32C*",$perlvar{'lonHostID'}).'-'.
+     my $cpart=unpack("%32S*",$part);
-            ($cunique%$cuname+
+     my $return =&recprefix($fucourseid).'-';
-             $cunique%$cudom+
+     if ($ENV{"course.$fucourseid.receiptalg"} eq 'receipt2' ||
-             $cusymb%$cuname+
+ 	$ENV{'request.state'} eq 'construct') {
-             $cusymb%$cudom+
+ 	&Apache::lonxml::debug("doing receipt2  using parts $cpart, uname $cuname and udom $cudom gets  ".($cpart%$cuname).
-             $cucourseid%$cuname+
+ 			       " and ".($cpart%$cudom));
-             $cucourseid%$cudom);
+ 	$return.= ($cunique%$cuname+
+ 		   $cunique%$cudom+
+ 		   $cusymb%$cuname+
+ 		   $cusymb%$cudom+
+ 		   $cucourseid%$cuname+
+ 		   $cucourseid%$cudom+
+ 		   $cpart%$cuname+
+ 		   $cpart%$cudom);
+     } else {
+ 	$return.= ($cunique%$cuname+
+ 		   $cunique%$cudom+
+ 		   $cusymb%$cuname+
+ 		   $cusymb%$cudom+
+ 		   $cucourseid%$cuname+
+ 		   $cucourseid%$cudom);
+     }
+     return $return;
  }
  sub receipt {
-   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     my ($part)=@_;
-   return &ireceipt($name,$domain,$courseid,$symb);
+     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     return &ireceipt($name,$domain,$courseid,$symb,$part);
  }
  # ------------------------------------------------------------ Serves up a file
- # returns either the contents of the file or a -1
+ # returns either the contents of the file or
+ # -1 if the file doesn't exist
+ #
+ # if the target is a file that was uploaded via DOCS,
+ # a check will be made to see if a current copy exists on the local server,
+ # if it does this will be served, otherwise a copy will be retrieved from
+ # the home server for the course and stored in /home/httpd/html/userfiles on
+ # the local server.
  sub getfile {
-  my $file=shift;
+     my ($file) = @_;
-  if ($file=~/^\/*uploaded\//) { # user file
+     if ($file =~ m|^/*uploaded/|) { $file=&filelocation("",$file); }
+     &repcopy($file);
+     return &readfile($file);
+ }
+ sub repcopy_userfile {
+     my ($file)=@_;
+     if ($file =~ m|^/*uploaded/|) { $file=&filelocation("",$file); }
+     if ($file =~ m|^/home/httpd/html/lonUsers/|) { return OK; }
+     my ($cdom,$cnum,$filename) =
+ 	($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+([^/]+)/+([^/]+)/+(.*)|);
+     my ($info,$rtncode);
+     my $uri="/uploaded/$cdom/$cnum/$filename";
+     if (-e "$file") {
+ 	my @fileinfo = stat($file);
+ 	my $lwpresp = &getuploaded('HEAD',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    if ($rtncode eq '404') {
+ 		unlink($file);
+ 	    }
+ 	    #my $ua=new LWP::UserAgent;
+ 	    #my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+ 	    #my $response=$ua->request($request);
+ 	    #if ($response->is_success()) {
+ 	#	return $response->content;
+ 	#    } else {
+ 	#	return -1;
+ 	#    }
+ 	    return -1;
+ 	}
+ 	if ($info < $fileinfo[9]) {
+ 	    return OK;
+ 	}
+ 	$info = '';
+ 	$lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    return -1;
+ 	}
+     } else {
+ 	my $lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+ 	if ($lwpresp ne 'ok') {
+ 	    my $ua=new LWP::UserAgent;
+ 	    my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+ 	    my $response=$ua->request($request);
+ 	    if ($response->is_success()) {
+ 		$info=$response->content;
+ 	    } else {
+ 		return -1;
+ 	    }
+ 	}
+ 	my @parts = ($cdom,$cnum);
+ 	if ($filename =~ m|^(.+)/[^/]+$|) {
+ 	    push @parts, split(/\//,$1);
+ 	}
+ 	my $path = $perlvar{'lonDocRoot'}.'/userfiles';
+ 	foreach my $part (@parts) {
+ 	    $path .= '/'.$part;
+ 	    if (!-e $path) {
+ 		mkdir($path,0770);
+ 	    }
+ 	}
+     }
+     open(FILE,">$file");
+     print FILE $info;
+     close(FILE);
+     return OK;
+ }
+ sub tokenwrapper {
+     my $uri=shift;
+     $uri=~s|^http\://([^/]+)||;
+     $uri=~s|^/||;
+     $ENV{'user.environment'}=~/\/([^\/]+)\.id/;
+     my $token=$1;
+     my (undef,$udom,$uname,$file)=split('/',$uri,4);
+     if ($udom && $uname && $file) {
+ 	$file=~s|(\?\.*)*$||;
+         &appenv("userfile.$udom/$uname/$file" => $ENV{'request.course.id'});
+         return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri.
+                (($uri=~/\?/)?'&':'?').'token='.$token.
+                                '&tokenissued='.$perlvar{'lonHostID'};
+     } else {
+         return '/adm/notfound.html';
+     }
+ }
+ sub getuploaded {
+     my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_;
+     $uri=~s/^\///;
+     $uri = 'http://'.$hostname{ &homeserver($cnum,$cdom)}.'/raw/'.$uri;
      my $ua=new LWP::UserAgent;
-     my $request=new HTTP::Request('GET',&tokenwrapper($file));
+     my $request=new HTTP::Request($reqtype,$uri);
      my $response=$ua->request($request);
-     if ($response->is_success()) {
+     $$rtncode = $response->code;
-        return $response->content;
+     if (! $response->is_success()) {
-     } else {
+ 	return 'failed';
-        return -1;
+     }
-     }
+     if ($reqtype eq 'HEAD') {
-  } else { # normal file from res space
+ 	$$info = &HTTP::Date::str2time( $response->header('Last-modified') );
-   &repcopy($file);
+     } elsif ($reqtype eq 'GET') {
-   if (! -e $file ) { return -1; };
+ 	$$info = $response->content;
-   my $fh;
+     }
-   open($fh,"<$file");
+     return 'ok';
-   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 {
-   my ($dir,$file) = @_;
+     my ($dir,$file) = @_;
-   my $location;
+     my $location;
-   $file=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
+     $file=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
-   if ($file=~m:^/~:) { # is a contruction space reference
+     if ($file=~m:^/~:) { # is a contruction space reference
-     $location = $file;
+         $location = $file;
-     $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
+         $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
-   } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
+     } elsif ($file=~/^\/*uploaded/) { # is an uploaded file
-     $location=$file;
+         my ($udom,$uname,$filename)=
-   } else {
+   	    ($file=~m|^/+uploaded/+([^/]+)/+([^/]+)/+(.*)$|);
-     $file=~s/^$perlvar{'lonDocRoot'}//;
+         my $home=&homeserver($uname,$udom);
-     $file=~s:^/*res::;
+         my $is_me=0;
-     if ( !( $file =~ m:^/:) ) {
+         my @ids=&current_machine_ids();
-       $location = $dir. '/'.$file;
+         foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } }
+         if ($is_me) {
+   	    $location=&Apache::loncommon::propath($udom,$uname).
+   	      '/userfiles/'.$filename;
+         } else {
+   	  $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.
+   	      $udom.'/'.$uname.'/'.$filename;
+         }
+     } elsif ($file =~ /^\/adm\/portfolio\//) {
+         $file =~ s:^/adm/portfolio/::;
+         $location = $location=&Apache::loncommon::propath($ENV{'user.domain'},$ENV{'user.name'}).'/userfiles/portfolio/'.$file;
      } else {
-       $location = '/home/httpd/html/res'.$file;
+         $file=~s/^\Q$perlvar{'lonDocRoot'}\E//;
+         $file=~s:^/res/:/:;
+         if ( !( $file =~ m:^/:) ) {
+             $location = $dir. '/'.$file;
+         } else {
+             $location = '/home/httpd/html/res'.$file;
+         }
      }
-   }
+     $location=~s://+:/:g; # remove duplicate /
-   $location=~s://+:/:g; # remove duplicate /
+     while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
-   while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
+     while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./
-   return $location;
+     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'}//;
+     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
+     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
      $thisfn=~s/^\///;
      $thisfn=~s/^res\///;
      $thisfn=~s/\?.+$//;
- Line 4466  sub declutter {
+ Line 5543  sub declutter {
  sub clutter {
      my $thisfn='/'.&declutter(shift);
-     unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv)\//) {
+     unless ($thisfn=~/^\/(uploaded|adm|userfiles|ext|raw|priv|public)\//) {
         $thisfn='/res'.$thisfn;
      }
      return $thisfn;
  }
+ sub freeze_escape {
+     my ($value)=@_;
+     if (ref($value)) {
+ 	$value=&nfreeze($value);
+ 	return '__FROZEN__'.&escape($value);
+     }
+     return &escape($value);
+ }
  # -------------------------------------------------------- Escape Special Chars
  sub escape {
- Line 4488  sub unescape {
+ Line 5574  sub unescape {
      return $str;
  }
+ sub thaw_unescape {
+     my ($value)=@_;
+     if ($value =~ /^__FROZEN__/) {
+ 	substr($value,0,10,undef);
+ 	$value=&unescape($value);
+ 	return &thaw($value);
+     }
+     return &unescape($value);
+ }
  sub mod_perl_version {
+     return 1;
      if (defined($perlvar{'MODPERL2'})) {
  	return 2;
      }
-     return 1;
  }
  sub correct_line_ends {
- Line 4513  sub goodbye {
+ Line 5609  sub goodbye {
     &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",'%getsectioncache',scalar(%getsectioncache)));
     &logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache)));
     &logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache)));
     &flushcourselogs();
- Line 4525  BEGIN {
+ Line 5621  BEGIN {
  # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
      unless ($readit) {
  {
+     # FIXME: Use LONCAPA::Configuration::read_conf here and omit next block
      open(my $config,"</etc/httpd/conf/loncapa.conf");
      while (my $configline=<$config>) {
-         if ($configline =~ /^[^\#]*PerlSetVar/) {
+         if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
  	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
             chomp($varvalue);
             $perlvar{$varname}=$varvalue;
- Line 4585  BEGIN {
+ Line 5682  BEGIN {
      while (my $configline=<$config>) {
         next if ($configline =~ /^(\#|\s*$)/);
         chomp($configline);
-        my ($id,$domain,$role,$name,$ip,$domdescr)=split(/:/,$configline);
+        my ($id,$domain,$role,$name)=split(/:/,$configline);
-        if ($id && $domain && $role && $name && $ip) {
+        $name=~s/\s^//g;
+        if ($id && $domain && $role && $name) {
+ 	 my $ip = gethostbyname($name);
+ 	 if (length($ip) ne 4) {
+ 	     &logthis("Skipping host $id name $name no IP $ip found\n");
+ 	     next;
+ 	 }
+ 	 $ip=inet_ntoa($ip);
+ 	 push(@{$iphost{$ip}},$id);
  	 $hostname{$id}=$name;
  	 $hostdom{$id}=$domain;
- 	 $hostip{$id}=$ip;
- 	 $iphost{$ip}=$id;
  	 if ($role eq 'library') { $libserv{$id}=$name; }
-        } else {
- 	 if ($configline) {
- 	   &logthis("Skipping hosts.tab line -$configline-");
- 	 }
         }
      }
      close($config);
- Line 4646  BEGIN {
+ Line 5745  BEGIN {
      open(my $config,"<$perlvar{'lonTabDir'}/packages.tab");
      while (my $configline=<$config>) {
+ 	if ($configline !~ /\S/ || $configline=~/^#/) { next; }
  	chomp($configline);
  	my ($short,$plain)=split(/:/,$configline);
  	my ($pack,$name)=split(/\&/,$short);
- Line 4671  $dumpcount=0;
+ Line 5771  $dumpcount=0;
  &logtouch();
  &logthis('<font color=yellow>INFO: Read configuration</font>');
  $readit=1;
+     {
+ 	use integer;
+ 	my $test=(2**32)+1;
+ 	if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
+ 	&logthis(" Detected 64bit platform ($_64bit)");
+     }
  }
  }
- Line 4898  X<rolesinit()>
+ Line 6004  X<rolesinit()>
  B<rolesinit($udom,$username,$authhost)>: get user privileges
  =item *
- X<usection()>
+ X<getsection()>
- B<usection($udom,$uname,$cname)>: finds the section of student in the
+ B<getsection($udom,$uname,$cname)>: finds the section of student in the
  course $cname, return section name/number or '' for "not in course"
  and '-1' for "no section"
- Line 5157  returns the data handle
+ Line 6263  returns the data handle
  =item *
  symbverify($symb,$thisfn) : verifies that $symb actually exists and is
- a possible symb for the URL in $thisfn, returns a 1 on success, 0 on
+ a possible symb for the URL in $thisfn, and if is an encryypted
- failure, user must be in a course, as it assumes the existance of the
+ resource that the user accessed using /enc/ returns a 1 on success, 0
- course initi hash, and uses $ENV('request.course.id'}
+ on failure, user must be in a course, as it assumes the existance of
+ the course initial hash, and uses $ENV('request.course.id'}
  =item *
- Line 5286  put($namespace,$storehash,$udom,$uname)
+ Line 6393  put($namespace,$storehash,$udom,$uname)
  =item *
+ putstore($namespace,$storehash,$udomain,$uname) : stores hash in namesp
+ keys used in storehash include version information (e.g., 1:$symb:message etc.) as
+ used in records written by &store and retrieved by &restore.  This function
+ was created for use in editing discussion posts, without incrementing the
+ version number included in the key for a particular post. The colon
+ separated list of attribute names (e.g., the value associated with the key
+:keys:$symb) is also generated and passed in the ampersand separated
+ items sent to lonnet::reply().
+ =item *
  cput($namespace,$storehash,$udom,$uname) : critical put
  ($udom and $uname are optional)
- Line 5391  messages of critical importance should g
+ Line 6509  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.459
changed lines
	Added in v.1.596