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.662 and 1.1100

-version 1.662, 2005/10/11 21:29:38
+version 1.1100, 2011/01/18 20:19:29
  Line 27
  #
  ###
- package Apache::lonnet;
+ =pod
- use strict;
+ =head1 NAME
- use LWP::UserAgent();
- use HTTP::Headers;
- use HTTP::Date;
- # use Date::Parse;
- use vars
- qw(%perlvar %hostname %badServerCache %iphost %spareid %hostdom
-    %libserv %pr %prp $memcache %packagetab
-    %courselogs %accesshash %userrolehash %domainrolehash $processmarker $dumpcount
-    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf
-    %domaindescription %domain_auth_def %domain_auth_arg_def
-    %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir $_64bit
-    %env);
- use IO::Socket;
+ Apache::lonnet.pm
- use GDBM_File;
- use Apache::Constants qw(:common :http);
- use HTML::LCParser;
- use HTML::Parser;
- use Fcntl qw(:flock);
- use Apache::lonlocal;
- use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze);
- use Time::HiRes qw( gettimeofday tv_interval );
- use Cache::Memcached;
- my $readit;
- my $max_connection_retries = 10;     # Or some such value.
- require Exporter;
+ =head1 SYNOPSIS
- our @ISA = qw (Exporter);
+ This file is an interface to the lonc processes of
- our @EXPORT = qw(%env);
+ the LON-CAPA network as well as set of elaborated functions for handling information
+ necessary for navigating through a given cluster of LON-CAPA machines within a
+ domain. There are over 40 specialized functions in this module which handle the
+ reading and transmission of metadata, user information (ids, names, environments, roles,
+ logs), file information (storage, reading, directories, extensions, replication, embedded
+ styles and descriptors), educational resources (course descriptions, section names and
+ numbers), url hashing (to assign roles on a url basis), and translating abbreviated symbols to
+ and from more descriptive phrases or explanations.
- =pod
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
  =head1 Package Variables
- Line 83  delayed.
+ Line 68  delayed.
  =cut
+ package Apache::lonnet;
+ use strict;
+ use LWP::UserAgent();
+ use HTTP::Date;
+ use Image::Magick;
+ use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
+             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease);
+ my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash,
+     %userrolehash, $processmarker, $dumpcount, %coursedombuf,
+     %coursenumbuf, %coursehombuf, %coursedescrbuf, %courseinstcodebuf,
+     %courseownerbuf, %coursetypebuf,$locknum);
+ use IO::Socket;
+ use GDBM_File;
+ use HTML::LCParser;
+ use Fcntl qw(:flock);
+ use Storable qw(thaw nfreeze);
+ use Time::HiRes qw( gettimeofday tv_interval );
+ use Cache::Memcached;
+ use Digest::MD5;
+ use Math::Random;
+ use File::MMagic;
+ use LONCAPA qw(:DEFAULT :match);
+ use LONCAPA::Configuration;
+ use File::Copy;
+ my $readit;
+ my $max_connection_retries = 10;     # Or some such value.
+ require Exporter;
+ our @ISA = qw (Exporter);
+ our @EXPORT = qw(%env);
  # --------------------------------------------------------------------- Logging
+ {
+     my $logid;
+     sub instructor_log {
+ 	my ($hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
+         if (($cnum eq '') || ($cdom eq '')) {
+             $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+         }
+ 	$logid++;
+         my $now = time();
+ 	my $id=$now.'00000'.$$.'00000'.$logid;
+ 	return &Apache::lonnet::put('nohist_'.$hash_name,
+ 				    { $id => {
+ 					'exe_uname' => $env{'user.name'},
+ 					'exe_udom'  => $env{'user.domain'},
+ 					'exe_time'  => $now,
+ 					'exe_ip'    => $ENV{'REMOTE_ADDR'},
+ 					'delflag'   => $delflag,
+ 					'logentry'  => $storehash,
+ 					'uname'     => $uname,
+ 					'udom'      => $udom,
+ 				    }
+ 				  },$cdom,$cnum);
+     }
+ }
  sub logtouch {
      my $execdir=$perlvar{'lonDaemons'};
- Line 102  sub logthis {
+ Line 149  sub logthis {
      my $now=time;
      my $local=localtime($now);
      if (open(my $fh,">>$execdir/logs/lonnet.log")) {
- 	print $fh "$local ($$): $message\n";
+ 	my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string.
+ 	print $fh $logstring;
  	close($fh);
      }
      return 1;
- Line 120  sub logperm {
+ Line 168  sub logperm {
      return 1;
  }
+ sub create_connection {
+     my ($hostname,$lonid) = @_;
+     my $client=IO::Socket::UNIX->new(Peer    => $perlvar{'lonSockCreate'},
+ 				     Type    => SOCK_STREAM,
+ 				     Timeout => 10);
+     return 0 if (!$client);
+     print $client (join(':',$hostname,$lonid,&machine_ids($hostname))."\n");
+     my $result = <$client>;
+     chomp($result);
+     return 1 if ($result eq 'done');
+     return 0;
+ }
+ sub get_server_timezone {
+     my ($cnum,$cdom) = @_;
+     my $home=&homeserver($cnum,$cdom);
+     if ($home ne 'no_host') {
+         my $cachetime = 24*3600;
+         my ($timezone,$cached)=&is_cached_new('servertimezone',$home);
+         if (defined($cached)) {
+             return $timezone;
+         } else {
+             my $timezone = &reply('servertimezone',$home);
+             return &do_cache_new('servertimezone',$home,$timezone,$cachetime);
+         }
+     }
+ }
+ sub get_server_loncaparev {
+     my ($dom,$lonhost,$ignore_cache,$caller) = @_;
+     if (defined($lonhost)) {
+         if (!defined(&hostname($lonhost))) {
+             undef($lonhost);
+         }
+     }
+     if (!defined($lonhost)) {
+         if (defined(&domain($dom,'primary'))) {
+             $lonhost=&domain($dom,'primary');
+             if ($lonhost eq 'no_host') {
+                 undef($lonhost);
+             }
+         }
+     }
+     if (defined($lonhost)) {
+         my $cachetime = 12*3600;
+         if (!$ignore_cache) {
+             my ($loncaparev,$cached)=&is_cached_new('serverloncaparev',$lonhost);
+             if (defined($cached)) {
+                 return $loncaparev;
+             }
+         }
+         my ($answer,$loncaparev);
+         my @ids=&current_machine_ids();
+         if (grep(/^\Q$lonhost\E$/,@ids)) {
+             $answer = $perlvar{'lonVersion'};
+             if ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
+                 $loncaparev = $1;
+             }
+         } else {
+             $answer = &reply('serverloncaparev',$lonhost);
+             if (($answer eq 'unknown_cmd') || ($answer eq 'con_lost')) {
+                 if ($caller eq 'loncron') {
+                     my $ua=new LWP::UserAgent;
+                     $ua->timeout(4);
+                     my $protocol = $protocol{$lonhost};
+                     $protocol = 'http' if ($protocol ne 'https');
+                     my $url = $protocol.'://'.&hostname($lonhost).'/adm/about.html';
+                     my $request=new HTTP::Request('GET',$url);
+                     my $response=$ua->request($request);
+                     unless ($response->is_error()) {
+                         my $content = $response->content;
+                         if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) {
+                             $loncaparev = $1;
+                         }
+                     }
+                 } else {
+                     $loncaparev = $loncaparevs{$lonhost};
+                 }
+             } elsif ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
+                 $loncaparev = $1;
+             }
+         }
+         return &do_cache_new('serverloncaparev',$lonhost,$loncaparev,$cachetime);
+     }
+ }
+ sub get_server_homeID {
+     my ($hostname,$ignore_cache,$caller) = @_;
+     unless ($ignore_cache) {
+         my ($serverhomeID,$cached)=&is_cached_new('serverhomeID',$hostname);
+         if (defined($cached)) {
+             return $serverhomeID;
+         }
+     }
+     my $cachetime = 12*3600;
+     my $serverhomeID;
+     if ($caller eq 'loncron') {
+         my @machine_ids = &machine_ids($hostname);
+         foreach my $id (@machine_ids) {
+             my $response = &reply('serverhomeID',$id);
+             unless (($response eq 'unknown_cmd') || ($response eq 'con_lost')) {
+                 $serverhomeID = $response;
+                 last;
+             }
+         }
+         if ($serverhomeID eq '') {
+             $serverhomeID = $machine_ids[-1];
+         }
+     } else {
+         $serverhomeID = $serverhomeIDs{$hostname};
+     }
+     return &do_cache_new('serverhomeID',$hostname,$serverhomeID,$cachetime);
+ }
  # -------------------------------------------------- Non-critical communication
  sub subreply {
      my ($cmd,$server)=@_;
-     my $peerfile="$perlvar{'lonSockDir'}/$server";
+     my $peerfile="$perlvar{'lonSockDir'}/".&hostname($server);
      #
      #  With loncnew process trimming, there's a timing hole between lonc server
      #  process exit and the master server picking up the listen on the AF_UNIX
- Line 144  sub subreply {
+ Line 306  sub subreply {
  	$client=IO::Socket::UNIX->new(Peer    =>"$peerfile",
  				      Type    => SOCK_STREAM,
  				      Timeout => 10);
- 	if($client) {
+ 	if ($client) {
  	    last;		# Connected!
+ 	} else {
+ 	    &create_connection(&hostname($server),$server);
  	}
- 	sleep(1);		# Try again later if failed connection.
+         sleep(1);		# Try again later if failed connection.
      }
      my $answer;
      if ($client) {
- 	print $client "$cmd\n";
+ 	print $client "sethost:$server:$cmd\n";
  	$answer=<$client>;
  	if (!$answer) { $answer="con_lost"; }
  	chomp($answer);
- Line 163  sub subreply {
+ Line 327  sub subreply {
  sub reply {
      my ($cmd,$server)=@_;
-     unless (defined($hostname{$server})) { return 'no_such_host'; }
+     unless (defined(&hostname($server))) { return 'no_such_host'; }
      my $answer=subreply($cmd,$server);
      if (($answer=~/^refused/) || ($answer=~/^rejected/)) {
-        &logthis("<font color=blue>WARNING:".
+        &logthis("<font color=\"blue\">WARNING:".
                  " $cmd to $server returned $answer</font>");
      }
      return $answer;
- Line 175  sub reply {
+ Line 339  sub reply {
  # ----------------------------------------------------------- Send USR1 to lonc
  sub reconlonc {
-     my $peerfile=shift;
+     my ($lonid) = @_;
-     &logthis("Trying to reconnect for $peerfile");
+     my $hostname = &hostname($lonid);
+     if ($lonid) {
+ 	my $peerfile="$perlvar{'lonSockDir'}/$hostname";
+ 	if ($hostname && -e $peerfile) {
+ 	    &logthis("Trying to reconnect lonc for $lonid ($hostname)");
+ 	    my $client=IO::Socket::UNIX->new(Peer    => $peerfile,
+ 					     Type    => SOCK_STREAM,
+ 					     Timeout => 10);
+ 	    if ($client) {
+ 		print $client ("reset_retries\n");
+ 		my $answer=<$client>;
+ 		#reset just this one.
+ 	    }
+ 	}
+ 	return;
+     }
+     &logthis("Trying to reconnect lonc");
      my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid";
      if (open(my $fh,"<$loncfile")) {
  	my $loncpid=<$fh>;
- Line 185  sub reconlonc {
+ Line 366  sub reconlonc {
  	    &logthis("lonc at pid $loncpid responding, sending USR1");
              kill USR1 => $loncpid;
              sleep 1;
-             if (-e "$peerfile") { return; }
+          } else {
-             &logthis("$peerfile still not there, give it another try");
-             sleep 5;
-             if (-e "$peerfile") { return; }
-             &logthis(
-   "<font color=blue>WARNING: $peerfile still not there, giving up</font>");
-         } else {
  	    &logthis(
-                "<font color=blue>WARNING:".
+                "<font color=\"blue\">WARNING:".
                 " lonc at pid $loncpid not responding, giving up</font>");
          }
      } else {
-      &logthis('<font color=blue>WARNING: lonc not running, giving up</font>');
+ 	&logthis('<font color="blue">WARNING: lonc not running, giving up</font>');
      }
  }
- Line 205  sub reconlonc {
+ Line 380  sub reconlonc {
  sub critical {
      my ($cmd,$server)=@_;
-     unless ($hostname{$server}) {
+     unless (&hostname($server)) {
-         &logthis("<font color=blue>WARNING:".
+         &logthis("<font color=\"blue\">WARNING:".
                 " Critical message to unknown server ($server)</font>");
          return 'no_such_host';
      }
- Line 240  sub critical {
+ Line 415  sub critical {
              }
              chomp($wcmd);
              if ($wcmd eq $cmd) {
- 		&logthis("<font color=blue>WARNING: ".
+ 		&logthis("<font color=\"blue\">WARNING: ".
                           "Connection buffer $dfilename: $cmd</font>");
                  &logperm("D:$server:$cmd");
  	        return 'con_delayed';
              } else {
-                 &logthis("<font color=red>CRITICAL:"
+                 &logthis("<font color=\"red\">CRITICAL:"
                          ." Critical connection failed: $server $cmd</font>");
                  &logperm("F:$server:$cmd");
                  return 'con_failed';
- Line 255  sub critical {
+ Line 430  sub critical {
      return $answer;
  }
- # ------------------------------------------- Transfer profile into environment
+ # ------------------------------------------- check if return value is an error
- sub transfer_profile_to_env {
+ sub error {
+     my ($result) = @_;
+     if ($result =~ /^(con_lost|no_such_host|error: (\d+) (.*))/) {
+ 	if ($2 == 2) { return undef; }
+ 	return $1;
+     }
+     return undef;
+ }
+ sub convert_and_load_session_env {
      my ($lonidsdir,$handle)=@_;
      my @profile;
      {
- 	open(my $idf,"$lonidsdir/$handle.id");
+ 	my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id");
+ 	if (!$opened) {
+ 	    return 0;
+ 	}
  	flock($idf,LOCK_SH);
  	@profile=<$idf>;
  	close($idf);
      }
-     my $envi;
+     my %temp_env;
-     my %Remove;
+     foreach my $line (@profile) {
-     for ($envi=0;$envi<=$#profile;$envi++) {
+ 	if ($line !~ m/=/) {
- 	chomp($profile[$envi]);
+ 	    return 0;
- 	my ($envname,$envvalue)=split(/=/,$profile[$envi]);
+ 	}
- 	$env{$envname} = $envvalue;
+ 	chomp($line);
+ 	my ($envname,$envvalue)=split(/=/,$line,2);
+ 	$temp_env{&unescape($envname)} = &unescape($envvalue);
+     }
+     unlink("$lonidsdir/$handle.id");
+     if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id",&GDBM_WRCREAT(),
+)) {
+ 	%disk_env = %temp_env;
+ 	@env{keys(%temp_env)} = @disk_env{keys(%temp_env)};
+ 	untie(%disk_env);
+     }
+     return 1;
+ }
+ # ------------------------------------------- Transfer profile into environment
+ my $env_loaded;
+ sub transfer_profile_to_env {
+     my ($lonidsdir,$handle,$force_transfer) = @_;
+     if (!$force_transfer && $env_loaded) { return; }
+     if (!defined($lonidsdir)) {
+ 	$lonidsdir = $perlvar{'lonIDsDir'};
+     }
+     if (!defined($handle)) {
+         ($handle) = ($env{'user.environment'} =~m|/([^/]+)\.id$| );
+     }
+     my $convert;
+     {
+     	my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id");
+ 	if (!$opened) {
+ 	    return;
+ 	}
+ 	flock($idf,LOCK_SH);
+ 	if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id",
+ 		&GDBM_READER(),0640)) {
+ 	    @env{keys(%disk_env)} = @disk_env{keys(%disk_env)};
+ 	    untie(%disk_env);
+ 	} else {
+ 	    $convert = 1;
+ 	}
+     }
+     if ($convert) {
+ 	if (!&convert_and_load_session_env($lonidsdir,$handle)) {
+ 	    &logthis("Failed to load session, or convert session.");
+ 	}
+     }
+     my %remove;
+     while ( my $envname = each(%env) ) {
          if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) {
              if ($time < time-300) {
-                 $Remove{$key}++;
+                 $remove{$key}++;
              }
          }
      }
      $env{'user.environment'} = "$lonidsdir/$handle.id";
-     foreach my $expired_key (keys(%Remove)) {
+     $env_loaded=1;
+     foreach my $expired_key (keys(%remove)) {
          &delenv($expired_key);
      }
  }
- # ---------------------------------------------------------- Append Environment
+ # ---------------------------------------------------- Check for valid session
+ sub check_for_valid_session {
- sub appenv {
+     my ($r) = @_;
-     my %newenv=@_;
+     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-     foreach (keys %newenv) {
+     my $lonid=$cookies{'lonID'};
- 	if (($newenv{$_}=~/^user\.role/) || ($newenv{$_}=~/^user\.priv/)) {
+     return undef if (!$lonid);
-             &logthis("<font color=blue>WARNING: ".
-                 "Attempt to modify environment ".$_." to ".$newenv{$_}
+     my $handle=&LONCAPA::clean_handle($lonid->value);
-                 .'</font>');
+     my $lonidsdir=$r->dir_config('lonIDsDir');
- 	    delete($newenv{$_});
+     return undef if (!-e "$lonidsdir/$handle.id");
-         } else {
-             $env{$_}=$newenv{$_};
+     my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id");
-         }
+     return undef if (!$opened);
+     flock($idf,LOCK_SH);
+     my %disk_env;
+     if (!tie(%disk_env,'GDBM_File',"$lonidsdir/$handle.id",
+ 	    &GDBM_READER(),0640)) {
+ 	return undef;
      }
-     my $lockfh;
+     if (!defined($disk_env{'user.name'})
-     unless (open($lockfh,"$env{'user.environment'}")) {
+ 	|| !defined($disk_env{'user.domain'})) {
- 	return 'error: '.$!;
+ 	return undef;
-     }
-     unless (flock($lockfh,LOCK_EX)) {
-          &logthis("<font color=blue>WARNING: ".
-                   'Could not obtain exclusive lock in appenv: '.$!);
-          close($lockfh);
-          return 'error: '.$!;
      }
+     return $handle;
+ }
-     my @oldenv;
+ sub timed_flock {
-     {
+     my ($file,$lock_type) = @_;
- 	my $fh;
+     my $failed=0;
- 	unless (open($fh,"$env{'user.environment'}")) {
+     eval {
- 	    return 'error: '.$!;
+ 	local $SIG{__DIE__}='DEFAULT';
- 	}
+ 	local $SIG{ALRM}=sub {
- 	@oldenv=<$fh>;
+ 	    $failed=1;
- 	close($fh);
+ 	    die("failed lock");
+ 	};
+ 	alarm(13);
+ 	flock($file,$lock_type);
+ 	alarm(0);
+     };
+     if ($failed) {
+ 	return undef;
+     } else {
+ 	return 1;
      }
-     for (my $i=0; $i<=$#oldenv; $i++) {
+ }
-         chomp($oldenv[$i]);
-         if ($oldenv[$i] ne '') {
+ # ---------------------------------------------------------- Append Environment
- 	    my ($name,$value)=split(/=/,$oldenv[$i]);
- 	    unless (defined($newenv{$name})) {
+ sub appenv {
- 		$newenv{$name}=$value;
+     my ($newenv,$roles) = @_;
+     if (ref($newenv) eq 'HASH') {
+         foreach my $key (keys(%{$newenv})) {
+             my $refused = 0;
+ 	    if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) {
+                 $refused = 1;
+                 if (ref($roles) eq 'ARRAY') {
+                     my ($type,$role) = ($key =~ /^user\.(role|priv)\.([^.]+)\./);
+                     if (grep(/^\Q$role\E$/,@{$roles})) {
+                         $refused = 0;
+                     }
+                 }
+             }
+             if ($refused) {
+                 &logthis("<font color=\"blue\">WARNING: ".
+                          "Attempt to modify environment ".$key." to ".$newenv->{$key}
+                          .'</font>');
+ 	        delete($newenv->{$key});
+             } else {
+                 $env{$key}=$newenv->{$key};
+             }
+         }
+         my $opened = open(my $env_file,'+<',$env{'user.environment'});
+         if ($opened
+ 	    && &timed_flock($env_file,LOCK_EX)
+ 	    &&
+ 	    tie(my %disk_env,'GDBM_File',$env{'user.environment'},
+ 	        (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
+ 	    while (my ($key,$value) = each(%{$newenv})) {
+ 	        $disk_env{$key} = $value;
  	    }
+ 	    untie(%disk_env);
          }
      }
-     {
- 	my $fh;
- 	unless (open($fh,">$env{'user.environment'}")) {
- 	    return 'error';
- 	}
- 	my $newname;
- 	foreach $newname (keys %newenv) {
- 	    print $fh "$newname=$newenv{$newname}\n";
- 	}
- 	close($fh);
-     }
-     close($lockfh);
      return 'ok';
  }
  # ----------------------------------------------------- Delete from Environment
  sub delenv {
-     my $delthis=shift;
+     my ($delthis,$regexp) = @_;
-     my %newenv=();
      if (($delthis=~/user\.role/) || ($delthis=~/user\.priv/)) {
-         &logthis("<font color=blue>WARNING: ".
+         &logthis("<font color=\"blue\">WARNING: ".
                  "Attempt to delete from environment ".$delthis);
          return 'error';
      }
-     my @oldenv;
+     my $opened = open(my $env_file,'+<',$env{'user.environment'});
-     {
+     if ($opened
- 	my $fh;
+ 	&& &timed_flock($env_file,LOCK_EX)
- 	unless (open($fh,"$env{'user.environment'}")) {
+ 	&&
- 	    return 'error';
+ 	tie(my %disk_env,'GDBM_File',$env{'user.environment'},
- 	}
+ 	    (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
- 	unless (flock($fh,LOCK_SH)) {
+ 	foreach my $key (keys(%disk_env)) {
- 	    &logthis("<font color=blue>WARNING: ".
+ 	    if ($regexp) {
- 		     'Could not obtain shared lock in delenv: '.$!);
+                 if ($key=~/^$delthis/) {
- 	    close($fh);
+                     delete($env{$key});
- 	    return 'error: '.$!;
+                     delete($disk_env{$key});
- 	}
+                 }
- 	@oldenv=<$fh>;
- 	close($fh);
-     }
-     {
- 	my $fh;
- 	unless (open($fh,">$env{'user.environment'}")) {
- 	    return 'error';
- 	}
- 	unless (flock($fh,LOCK_EX)) {
- 	    &logthis("<font color=blue>WARNING: ".
- 		     'Could not obtain exclusive lock in delenv: '.$!);
- 	    close($fh);
- 	    return 'error: '.$!;
- 	}
- 	foreach (@oldenv) {
- 	    if ($_=~/^$delthis/) {
-                 my ($key,undef) = split('=',$_);
-                 delete($env{$key});
              } else {
-                 print $fh $_;
+                 if ($key=~/^\Q$delthis\E/) {
+ 		    delete($env{$key});
+ 		    delete($disk_env{$key});
+ 	        }
              }
  	}
- 	close($fh);
+ 	untie(%disk_env);
      }
      return 'ok';
  }
+ sub get_env_multiple {
+     my ($name) = @_;
+     my @values;
+     if (defined($env{$name})) {
+         # exists is it an array
+         if (ref($env{$name})) {
+             @values=@{ $env{$name} };
+         } else {
+             $values[0]=$env{$name};
+         }
+     }
+     return(@values);
+ }
+ # ------------------------------------------------------------------- Locking
+ sub set_lock {
+     my ($text)=@_;
+     $locknum++;
+     my $id=$$.'-'.$locknum;
+     &appenv({'session.locks' => $env{'session.locks'}.','.$id,
+              'session.lock.'.$id => $text});
+     return $id;
+ }
+ sub get_locks {
+     my $num=0;
+     my %texts=();
+     foreach my $lock (split(/\,/,$env{'session.locks'})) {
+        if ($lock=~/\w/) {
+           $num++;
+           $texts{$lock}=$env{'session.lock.'.$lock};
+        }
+    }
+    return ($num,%texts);
+ }
+ sub remove_lock {
+     my ($id)=@_;
+     my $newlocks='';
+     foreach my $lock (split(/\,/,$env{'session.locks'})) {
+        if (($lock=~/\w/) && ($lock ne $id)) {
+           $newlocks.=','.$lock;
+        }
+     }
+     &appenv({'session.locks' => $newlocks});
+     &delenv('session.lock.'.$id);
+ }
+ sub remove_all_locks {
+     my $activelocks=$env{'session.locks'};
+     foreach my $lock (split(/\,/,$env{'session.locks'})) {
+        if ($lock=~/\w/) {
+           &remove_lock($lock);
+        }
+     }
+ }
  # ------------------------------------------ Find out current server userload
- # there is a copy in lond
  sub userload {
      my $numusers=0;
      {
- Line 401  sub userload {
+ Line 709  sub userload {
  	my $filename;
  	my $curtime=time;
  	while ($filename=readdir(LONIDS)) {
- 	    if ($filename eq '.' || $filename eq '..') {next;}
+ 	    next if ($filename eq '.' || $filename eq '..');
+ 	    next if ($filename =~ /publicuser_\d+\.id/);
  	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
  	    if ($curtime-$mtime < 1800) { $numusers++; }
  	}
- Line 416  sub userload {
+ Line 725  sub userload {
      return $userloadpercent;
  }
- # ------------------------------------------ Fight off request when overloaded
- sub overloaderror {
-     my ($r,$checkserver)=@_;
-     unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; }
-     my $loadavg;
-     if ($checkserver eq $perlvar{'lonHostID'}) {
-        open(my $loadfile,'/proc/loadavg');
-        $loadavg=<$loadfile>;
-        $loadavg =~ s/\s.*//g;
-        $loadavg = 100*$loadavg/$perlvar{'lonLoadLim'};
-        close($loadfile);
-     } else {
-        $loadavg=&reply('load',$checkserver);
-     }
-     my $overload=$loadavg-100;
-     if ($overload>0) {
- 	$r->err_headers_out->{'Retry-After'}=$overload;
-         $r->log_error('Overload of '.$overload.' on '.$checkserver);
-         return 413;
-     }
-     return '';
- }
  # ------------------------------ Find server with least workload from spare.tab
  sub spareserver {
-     my ($loadpercent,$userloadpercent) = @_;
+     my ($loadpercent,$userloadpercent,$want_server_name,$udom) = @_;
-     my $tryserver;
+     my $spare_server;
-     my $spareserver='';
      if ($userloadpercent !~ /\d/) { $userloadpercent=0; }
-     my $lowestserver=$loadpercent > $userloadpercent?
+     my $lowest_load=($loadpercent > $userloadpercent) ? $loadpercent
- 	             $loadpercent :  $userloadpercent;
+                                                      :  $userloadpercent;
-     foreach $tryserver (keys %spareid) {
+     my ($uint_dom,$remotesessions);
- 	my $loadans=reply('load',$tryserver);
+     if (($udom ne '') && (&domain($udom) ne '')) {
- 	my $userloadans=reply('userload',$tryserver);
+         my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
- 	if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
+         $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
- 	    next; #didn't get a number from the server
+         my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom);
- 	}
+         $remotesessions = $udomdefaults{'remotesessions'};
- 	my $answer;
+     }
- 	if ($loadans =~ /\d/) {
+     foreach my $try_server (@{ $spareid{'primary'} }) {
- 	    if ($userloadans =~ /\d/) {
+         if ($uint_dom) {
- 		#both are numbers, pick the bigger one
+              next unless (&spare_can_host($udom,$uint_dom,$remotesessions,
- 		$answer=$loadans > $userloadans?
+                                           $try_server));
- 		    $loadans :  $userloadans;
+         }
- 	    } else {
+ 	($spare_server, $lowest_load) =
- 		$answer = $loadans;
+ 	    &compare_server_load($try_server, $spare_server, $lowest_load);
- 	    }
+     }
- 	} else {
- 	    $answer = $userloadans;
+     my $found_server = ($spare_server ne '' && $lowest_load < 100);
+     if (!$found_server) {
+ 	foreach my $try_server (@{ $spareid{'default'} }) {
+             if ($uint_dom) {
+                 next unless (&spare_can_host($udom,$uint_dom,$remotesessions,
+                                              $try_server));
+             }
+ 	    ($spare_server, $lowest_load) =
+ 		&compare_server_load($try_server, $spare_server, $lowest_load);
  	}
- 	if (($answer =~ /\d/) && ($answer<$lowestserver)) {
+     }
- 	    $spareserver="http://$hostname{$tryserver}";
- 	    $lowestserver=$answer;
+     if (!$want_server_name) {
+         my $protocol = 'http';
+         if ($protocol{$spare_server} eq 'https') {
+             $protocol = $protocol{$spare_server};
+         }
+         if (defined($spare_server)) {
+             my $hostname = &hostname($spare_server);
+             if (defined($hostname)) {
+ 	        $spare_server = $protocol.'://'.$hostname;
+             }
+         }
+     }
+     return $spare_server;
+ }
+ sub compare_server_load {
+     my ($try_server, $spare_server, $lowest_load) = @_;
+     my $loadans     = &reply('load',    $try_server);
+     my $userloadans = &reply('userload',$try_server);
+     if ($loadans !~ /\d/ && $userloadans !~ /\d/) {
+ 	return; #didn't get a number from the server
+     }
+     my $load;
+     if ($loadans =~ /\d/) {
+ 	if ($userloadans =~ /\d/) {
+ 	    #both are numbers, pick the bigger one
+ 	    $load = ($loadans > $userloadans) ? $loadans
+ 		                              : $userloadans;
+ 	} else {
+ 	    $load = $loadans;
  	}
+     } else {
+ 	$load = $userloadans;
      }
-     return $spareserver;
+     if (($load =~ /\d/) && ($load < $lowest_load)) {
+ 	$spare_server = $try_server;
+ 	$lowest_load  = $load;
+     }
+     return ($spare_server,$lowest_load);
+ }
+ # --------------------------- ask offload servers if user already has a session
+ sub find_existing_session {
+     my ($udom,$uname) = @_;
+     foreach my $try_server (@{ $spareid{'primary'} },
+ 			    @{ $spareid{'default'} }) {
+ 	return $try_server if (&has_user_session($try_server, $udom, $uname));
+     }
+     return;
+ }
+ # -------------------------------- ask if server already has a session for user
+ sub has_user_session {
+     my ($lonid,$udom,$uname) = @_;
+     my $result = &reply(join(':','userhassession',
+ 			     map {&escape($_)} ($udom,$uname)),$lonid);
+     return 1 if ($result eq 'ok');
+     return 0;
+ }
+ # --------- determine least loaded server in a user's domain which allows login
+ sub choose_server {
+     my ($udom) = @_;
+     my %domconfhash = &Apache::loncommon::get_domainconf($udom);
+     my %servers = &get_servers($udom);
+     my $lowest_load = 30000;
+     my ($login_host,$hostname);
+     foreach my $lonhost (keys(%servers)) {
+         my $loginvia = $domconfhash{$udom.'.login.loginvia_'.$lonhost};
+         if ($loginvia eq '') {
+             ($login_host, $lowest_load) =
+             &compare_server_load($lonhost, $login_host, $lowest_load);
+         }
+     }
+     if ($login_host ne '') {
+         $hostname = $servers{$login_host};
+     }
+     return ($login_host,$hostname);
  }
  # --------------------------------------------- Try to change a user's password
  sub changepass {
-     my ($uname,$udom,$currentpass,$newpass,$server)=@_;
+     my ($uname,$udom,$currentpass,$newpass,$server,$context)=@_;
      $currentpass = &escape($currentpass);
      $newpass     = &escape($newpass);
-     my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass",
+     my $lonhost = $perlvar{'lonHostID'};
+     my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context:$lonhost",
  		       $server);
      if (! $answer) {
  	&logthis("No reply on password change request to $server ".
- Line 506  sub changepass {
+ Line 880  sub changepass {
      } elsif ($answer =~ "^refused") {
  	&logthis("$server refused to change $uname in $udom password because ".
  		 "it was sent an unencrypted request to change the password.");
+     } elsif ($answer =~ "invalid_client") {
+         &logthis("$server refused to change $uname in $udom password because ".
+                  "it was a reset by e-mail originating from an invalid server.");
      }
      return $answer;
  }
- Line 529  sub queryauthenticate {
+ Line 906  sub queryauthenticate {
  # --------- Try to authenticate user from domain's lib servers (first this one)
  sub authenticate {
-     my ($uname,$upass,$udom)=@_;
+     my ($uname,$upass,$udom,$checkdefauth,$clientcancheckhost)=@_;
-     $upass=escape($upass);
+     $upass=&escape($upass);
-     $uname=~s/\W//g;
+     $uname= &LONCAPA::clean_username($uname);
-     my $uhome=&homeserver($uname,$udom);
+     my $uhome=&homeserver($uname,$udom,1);
-     if (!$uhome) {
+     my $newhome;
- 	&logthis("User $uname at $udom is unknown in authenticate");
+     if ((!$uhome) || ($uhome eq 'no_host')) {
- 	return 'no_host';
+ # Maybe the machine was offline and only re-appeared again recently?
+         &reconlonc();
+ # One more
+ 	$uhome=&homeserver($uname,$udom,1);
+         if (($uhome eq 'no_host') && $checkdefauth) {
+             if (defined(&domain($udom,'primary'))) {
+                 $newhome=&domain($udom,'primary');
+             }
+             if ($newhome ne '') {
+                 $uhome = $newhome;
+             }
+         }
+ 	if ((!$uhome) || ($uhome eq 'no_host')) {
+ 	    &logthis("User $uname at $udom is unknown in authenticate");
+ 	    return 'no_host';
+         }
      }
-     my $answer=reply("encrypt:auth:$udom:$uname:$upass",$uhome);
+     my $answer=reply("encrypt:auth:$udom:$uname:$upass:$checkdefauth:$clientcancheckhost",$uhome);
      if ($answer eq 'authorized') {
- 	&logthis("User $uname at $udom authorized by $uhome");
+         if ($newhome) {
- 	return $uhome;
+             &logthis("User $uname at $udom authorized by $uhome, but needs account");
+             return 'no_account_on_host';
+         } else {
+             &logthis("User $uname at $udom authorized by $uhome");
+             return $uhome;
+         }
      }
      if ($answer eq 'non_authorized') {
  	&logthis("User $uname at $udom rejected by $uhome");
- Line 550  sub authenticate {
+ Line 947  sub authenticate {
      return 'no_host';
  }
+ sub can_host_session {
+     my ($udom,$lonhost,$remoterev,$remotesessions,$hostedsessions) = @_;
+     my $canhost = 1;
+     my $host_idn = &Apache::lonnet::internet_dom($lonhost);
+     if (ref($remotesessions) eq 'HASH') {
+         if (ref($remotesessions->{'excludedomain'}) eq 'ARRAY') {
+             if (grep(/^\Q$host_idn\E$/,@{$remotesessions->{'excludedomain'}})) {
+                 $canhost = 0;
+             } else {
+                 $canhost = 1;
+             }
+         }
+         if (ref($remotesessions->{'includedomain'}) eq 'ARRAY') {
+             if (grep(/^\Q$host_idn\E$/,@{$remotesessions->{'includedomain'}})) {
+                 $canhost = 1;
+             } else {
+                 $canhost = 0;
+             }
+         }
+         if ($canhost) {
+             if ($remotesessions->{'version'} ne '') {
+                 my ($reqmajor,$reqminor) = ($remotesessions->{'version'} =~ /^(\d+)\.(\d+)$/);
+                 if ($reqmajor ne '' && $reqminor ne '') {
+                     if ($remoterev =~ /^\'?(\d+)\.(\d+)/) {
+                         my $major = $1;
+                         my $minor = $2;
+                         if (($major < $reqmajor ) ||
+                             (($major == $reqmajor) && ($minor < $reqminor))) {
+                             $canhost = 0;
+                         }
+                     } else {
+                         $canhost = 0;
+                     }
+                 }
+             }
+         }
+     }
+     if ($canhost) {
+         if (ref($hostedsessions) eq 'HASH') {
+             if (ref($hostedsessions->{'excludedomain'}) eq 'ARRAY') {
+                 if (grep(/^\Q$udom\E$/,@{$hostedsessions->{'excludedomain'}})) {
+                     $canhost = 0;
+                 } else {
+                     $canhost = 1;
+                 }
+             }
+             if (ref($hostedsessions->{'includedomain'}) eq 'ARRAY') {
+                 if (grep(/^\Q$udom\E$/,@{$hostedsessions->{'includedomain'}})) {
+                     $canhost = 1;
+                 } else {
+                     $canhost = 0;
+                 }
+             }
+         }
+     }
+     return $canhost;
+ }
+ sub spare_can_host {
+     my ($udom,$uint_dom,$remotesessions,$try_server)=@_;
+     my $canhost=1;
+     my @intdoms;
+     my $internet_names = &Apache::lonnet::get_internet_names($try_server);
+     if (ref($internet_names) eq 'ARRAY') {
+         @intdoms = @{$internet_names};
+     }
+     unless (grep(/^\Q$uint_dom\E$/,@intdoms)) {
+         my $serverhomeID = &Apache::lonnet::get_server_homeID($try_server);
+         my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+         my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
+         my $remoterev = &Apache::lonnet::get_server_loncaparev(undef,$try_server);
+         $canhost = &can_host_session($udom,$try_server,$remoterev,
+                                      $remotesessions,
+                                      $defdomdefaults{'hostedsessions'});
+     }
+     return $canhost;
+ }
  # ---------------------- Find the homebase for a user from domain's lib servers
  my %homecache;
- Line 558  sub homeserver {
+ Line 1033  sub homeserver {
      my $index="$uname:$udom";
      if (exists($homecache{$index})) { return $homecache{$index}; }
-     my $tryserver;
-     foreach $tryserver (keys %libserv) {
+     my %servers = &get_servers($udom,'library');
+     foreach my $tryserver (keys(%servers)) {
          next if ($ignoreBadCache ne 'true' &&
  		 exists($badServerCache{$tryserver}));
- 	if ($hostdom{$tryserver} eq $udom) {
-            my $answer=reply("home:$udom:$uname",$tryserver);
+ 	my $answer=reply("home:$udom:$uname",$tryserver);
-            if ($answer eq 'found') {
+ 	if ($answer eq 'found') {
- 	       return $homecache{$index}=$tryserver;
+ 	    delete($badServerCache{$tryserver});
-            } elsif ($answer eq 'no_host') {
+ 	    return $homecache{$index}=$tryserver;
- 	       $badServerCache{$tryserver}=1;
+ 	} elsif ($answer eq 'no_host') {
-            }
+ 	    $badServerCache{$tryserver}=1;
-        }
+ 	}
      }
      return 'no_host';
  }
- Line 580  sub idget {
+ Line 1056  sub idget {
      my ($udom,@ids)=@_;
      my %returnhash=();
-     my $tryserver;
+     my %servers = &get_servers($udom,'library');
-     foreach $tryserver (keys %libserv) {
+     foreach my $tryserver (keys(%servers)) {
-        if ($hostdom{$tryserver} eq $udom) {
+ 	my $idlist=join('&',@ids);
- 	  my $idlist=join('&',@ids);
+ 	$idlist=~tr/A-Z/a-z/;
-           $idlist=~tr/A-Z/a-z/;
+ 	my $reply=&reply("idget:$udom:".$idlist,$tryserver);
- 	  my $reply=&reply("idget:$udom:".$idlist,$tryserver);
+ 	my @answer=();
-           my @answer=();
+ 	if (($reply ne 'con_lost') && ($reply!~/^error\:/)) {
-           if (($reply ne 'con_lost') && ($reply!~/^error\:/)) {
+ 	    @answer=split(/\&/,$reply);
- 	      @answer=split(/\&/,$reply);
+ 	}                    ;
-           }                    ;
+ 	my $i;
-           my $i;
+ 	for ($i=0;$i<=$#ids;$i++) {
-           for ($i=0;$i<=$#ids;$i++) {
+ 	    if ($answer[$i]) {
-               if ($answer[$i]) {
+ 		$returnhash{$ids[$i]}=$answer[$i];
- 		  $returnhash{$ids[$i]}=$answer[$i];
+ 	    }
-               }
+ 	}
-           }
+     }
-        }
-     }
      return %returnhash;
  }
- Line 606  sub idget {
+ Line 1080  sub idget {
  sub idrget {
      my ($udom,@unames)=@_;
      my %returnhash=();
-     foreach (@unames) {
+     foreach my $uname (@unames) {
-         $returnhash{$_}=(&userenvironment($udom,$_,'id'))[1];
+         $returnhash{$uname}=(&userenvironment($udom,$uname,'id'))[1];
      }
      return %returnhash;
  }
- Line 617  sub idrget {
+ Line 1091  sub idrget {
  sub idput {
      my ($udom,%ids)=@_;
      my %servers=();
-     foreach (keys %ids) {
+     foreach my $uname (keys(%ids)) {
- 	&cput('environment',{'id'=>$ids{$_}},$udom,$_);
+ 	&cput('environment',{'id'=>$ids{$uname}},$udom,$uname);
-         my $uhom=&homeserver($_,$udom);
+         my $uhom=&homeserver($uname,$udom);
          if ($uhom ne 'no_host') {
-             my $id=&escape($ids{$_});
+             my $id=&escape($ids{$uname});
              $id=~tr/A-Z/a-z/;
-             my $unam=&escape($_);
+             my $esc_unam=&escape($uname);
  	    if ($servers{$uhom}) {
- 		$servers{$uhom}.='&'.$id.'='.$unam;
+ 		$servers{$uhom}.='&'.$id.'='.$esc_unam;
              } else {
-                 $servers{$uhom}=$id.'='.$unam;
+                 $servers{$uhom}=$id.'='.$esc_unam;
              }
          }
      }
-     foreach (keys %servers) {
+     foreach my $server (keys(%servers)) {
-         &critical('idput:'.$udom.':'.$servers{$_},$_);
+         &critical('idput:'.$udom.':'.$servers{$server},$server);
      }
  }
+ # ------------------------------dump from db file owned by domainconfig user
+ sub dump_dom {
+     my ($namespace,$udom,$regexp,$range)=@_;
+     if (!$udom) {
+         $udom=$env{'user.domain'};
+     }
+     my %returnhash;
+     if ($udom) {
+         my $uname = &get_domainconfiguser($udom);
+         %returnhash = &dump($namespace,$udom,$uname,$regexp,$range);
+     }
+     return %returnhash;
+ }
+ # ------------------------------------------ get items from domain db files
+ sub get_dom {
+     my ($namespace,$storearr,$udom,$uhome)=@_;
+     my $items='';
+     foreach my $item (@$storearr) {
+         $items.=&escape($item).'&';
+     }
+     $items=~s/\&$//;
+     if (!$udom) {
+         $udom=$env{'user.domain'};
+         if (defined(&domain($udom,'primary'))) {
+             $uhome=&domain($udom,'primary');
+         } else {
+             undef($uhome);
+         }
+     } else {
+         if (!$uhome) {
+             if (defined(&domain($udom,'primary'))) {
+                 $uhome=&domain($udom,'primary');
+             }
+         }
+     }
+     if ($udom && $uhome && ($uhome ne 'no_host')) {
+         my $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
+         my %returnhash;
+         if ($rep eq '' || $rep =~ /^error: 2 /) {
+             return %returnhash;
+         }
+         my @pairs=split(/\&/,$rep);
+         if ( $#pairs==0 && $pairs[0] =~ /^(con_lost|error|no_such_host)/i) {
+             return @pairs;
+         }
+         my $i=0;
+         foreach my $item (@$storearr) {
+             $returnhash{$item}=&thaw_unescape($pairs[$i]);
+             $i++;
+         }
+         return %returnhash;
+     } else {
+         &logthis("get_dom failed - no homeserver and/or domain ($udom) ($uhome)");
+     }
+ }
+ # -------------------------------------------- put items in domain db files
+ sub put_dom {
+     my ($namespace,$storehash,$udom,$uhome)=@_;
+     if (!$udom) {
+         $udom=$env{'user.domain'};
+         if (defined(&domain($udom,'primary'))) {
+             $uhome=&domain($udom,'primary');
+         } else {
+             undef($uhome);
+         }
+     } else {
+         if (!$uhome) {
+             if (defined(&domain($udom,'primary'))) {
+                 $uhome=&domain($udom,'primary');
+             }
+         }
+     }
+     if ($udom && $uhome && ($uhome ne 'no_host')) {
+         my $items='';
+         foreach my $item (keys(%$storehash)) {
+             $items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
+         }
+         $items=~s/\&$//;
+         return &reply("putdom:$udom:$namespace:$items",$uhome);
+     } else {
+         &logthis("put_dom failed - no homeserver and/or domain");
+     }
+ }
+ # --------------------- newput for items in db file owned by domainconfig user
+ sub newput_dom {
+     my ($namespace,$storehash,$udom) = @_;
+     my $result;
+     if (!$udom) {
+         $udom=$env{'user.domain'};
+     }
+     if ($udom) {
+         my $uname = &get_domainconfiguser($udom);
+         $result = &newput($namespace,$storehash,$udom,$uname);
+     }
+     return $result;
+ }
+ # --------------------- delete for items in db file owned by domainconfig user
+ sub del_dom {
+     my ($namespace,$storearr,$udom)=@_;
+     if (ref($storearr) eq 'ARRAY') {
+         if (!$udom) {
+             $udom=$env{'user.domain'};
+         }
+         if ($udom) {
+             my $uname = &get_domainconfiguser($udom);
+             return &del($namespace,$storearr,$udom,$uname);
+         }
+     }
+ }
+ # ----------------------------------construct domainconfig user for a domain
+ sub get_domainconfiguser {
+     my ($udom) = @_;
+     return $udom.'-domainconfig';
+ }
+ sub retrieve_inst_usertypes {
+     my ($udom) = @_;
+     my (%returnhash,@order);
+     my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
+     if ((ref($domdefs{'inststatustypes'}) eq 'HASH') &&
+         (ref($domdefs{'inststatusorder'}) eq 'ARRAY')) {
+         %returnhash = %{$domdefs{'inststatustypes'}};
+         @order = @{$domdefs{'inststatusorder'}};
+     } else {
+         if (defined(&domain($udom,'primary'))) {
+             my $uhome=&domain($udom,'primary');
+             my $rep=&reply("inst_usertypes:$udom",$uhome);
+             if ($rep =~ /^(con_lost|error|no_such_host|refused)/) {
+                 &logthis("get_dom failed - $rep returned from $uhome in domain: $udom");
+                 return (\%returnhash,\@order);
+             }
+             my ($hashitems,$orderitems) = split(/:/,$rep);
+             my @pairs=split(/\&/,$hashitems);
+             foreach my $item (@pairs) {
+                 my ($key,$value)=split(/=/,$item,2);
+                 $key = &unescape($key);
+                 next if ($key =~ /^error: 2 /);
+                 $returnhash{$key}=&thaw_unescape($value);
+             }
+             my @esc_order = split(/\&/,$orderitems);
+             foreach my $item (@esc_order) {
+                 push(@order,&unescape($item));
+             }
+         } else {
+             &logthis("get_dom failed - no primary domain server for $udom");
+         }
+     }
+     return (\%returnhash,\@order);
+ }
+ sub is_domainimage {
+     my ($url) = @_;
+     if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+-) {
+         if (&domain($1) ne '') {
+             return '1';
+         }
+     }
+     return;
+ }
+ sub inst_directory_query {
+     my ($srch) = @_;
+     my $udom = $srch->{'srchdomain'};
+     my %results;
+     my $homeserver = &domain($udom,'primary');
+     my $outcome;
+     if ($homeserver ne '') {
+ 	my $queryid=&reply("querysend:instdirsearch:".
+ 			   &escape($srch->{'srchby'}).':'.
+ 			   &escape($srch->{'srchterm'}).':'.
+ 			   &escape($srch->{'srchtype'}),$homeserver);
+ 	my $host=&hostname($homeserver);
+ 	if ($queryid !~/^\Q$host\E\_/) {
+ 	    &logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
+ 	    return;
+ 	}
+ 	my $response = &get_query_reply($queryid);
+ 	my $maxtries = 5;
+ 	my $tries = 1;
+ 	while (($response=~/^timeout/) && ($tries < $maxtries)) {
+ 	    $response = &get_query_reply($queryid);
+ 	    $tries ++;
+ 	}
+         if (!&error($response) && $response ne 'refused') {
+             if ($response eq 'unavailable') {
+                 $outcome = $response;
+             } else {
+                 $outcome = 'ok';
+                 my @matches = split(/\n/,$response);
+                 foreach my $match (@matches) {
+                     my ($key,$value) = split(/=/,$match);
+                     $results{&unescape($key).':'.$udom} = &thaw_unescape($value);
+                 }
+             }
+         }
+     }
+     return ($outcome,%results);
+ }
+ sub usersearch {
+     my ($srch) = @_;
+     my $dom = $srch->{'srchdomain'};
+     my %results;
+     my %libserv = &all_library();
+     my $query = 'usersearch';
+     foreach my $tryserver (keys(%libserv)) {
+         if (&host_domain($tryserver) eq $dom) {
+             my $host=&hostname($tryserver);
+             my $queryid=
+                 &reply("querysend:".&escape($query).':'.
+                        &escape($srch->{'srchby'}).':'.
+                        &escape($srch->{'srchtype'}).':'.
+                        &escape($srch->{'srchterm'}),$tryserver);
+             if ($queryid !~/^\Q$host\E\_/) {
+                 &logthis('usersearch: invalid queryid: '.$queryid.' for host: '.$host.'in domain '.$dom.' and server: '.$tryserver);
+                 next;
+             }
+             my $reply = &get_query_reply($queryid);
+             my $maxtries = 1;
+             my $tries = 1;
+             while (($reply=~/^timeout/) && ($tries < $maxtries)) {
+                 $reply = &get_query_reply($queryid);
+                 $tries ++;
+             }
+             if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
+                 &logthis('usersrch error: '.$reply.' for '.$dom.' - searching for : '.$srch->{'srchterm'}.' by '.$srch->{'srchby'}.' ('.$srch->{'srchtype'}.') -  maxtries: '.$maxtries.' tries: '.$tries);
+             } else {
+                 my @matches;
+                 if ($reply =~ /\n/) {
+                     @matches = split(/\n/,$reply);
+                 } else {
+                     @matches = split(/\&/,$reply);
+                 }
+                 foreach my $match (@matches) {
+                     my ($uname,$udom,%userhash);
+                     foreach my $entry (split(/:/,$match)) {
+                         my ($key,$value) =
+                             map {&unescape($_);} split(/=/,$entry);
+                         $userhash{$key} = $value;
+                         if ($key eq 'username') {
+                             $uname = $value;
+                         } elsif ($key eq 'domain') {
+                             $udom = $value;
+                         }
+                     }
+                     $results{$uname.':'.$udom} = \%userhash;
+                 }
+             }
+         }
+     }
+     return %results;
+ }
+ sub get_instuser {
+     my ($udom,$uname,$id) = @_;
+     my $homeserver = &domain($udom,'primary');
+     my ($outcome,%results);
+     if ($homeserver ne '') {
+         my $queryid=&reply("querysend:getinstuser:".&escape($uname).':'.
+                            &escape($id).':'.&escape($udom),$homeserver);
+         my $host=&hostname($homeserver);
+         if ($queryid !~/^\Q$host\E\_/) {
+             &logthis('get_instuser invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
+             return;
+         }
+         my $response = &get_query_reply($queryid);
+         my $maxtries = 5;
+         my $tries = 1;
+         while (($response=~/^timeout/) && ($tries < $maxtries)) {
+             $response = &get_query_reply($queryid);
+             $tries ++;
+         }
+         if (!&error($response) && $response ne 'refused') {
+             if ($response eq 'unavailable') {
+                 $outcome = $response;
+             } else {
+                 $outcome = 'ok';
+                 my @matches = split(/\n/,$response);
+                 foreach my $match (@matches) {
+                     my ($key,$value) = split(/=/,$match);
+                     $results{&unescape($key)} = &thaw_unescape($value);
+                 }
+             }
+         }
+     }
+     my %userinfo;
+     if (ref($results{$uname}) eq 'HASH') {
+         %userinfo = %{$results{$uname}};
+     }
+     return ($outcome,%userinfo);
+ }
+ sub inst_rulecheck {
+     my ($udom,$uname,$id,$item,$rules) = @_;
+     my %returnhash;
+     if ($udom ne '') {
+         if (ref($rules) eq 'ARRAY') {
+             @{$rules} = map {&escape($_);} (@{$rules});
+             my $rulestr = join(':',@{$rules});
+             my $homeserver=&domain($udom,'primary');
+             if (($homeserver ne '') && ($homeserver ne 'no_host')) {
+                 my $response;
+                 if ($item eq 'username') {
+                     $response=&unescape(&reply('instrulecheck:'.&escape($udom).
+                                               ':'.&escape($uname).':'.$rulestr,
+                                               $homeserver));
+                 } elsif ($item eq 'id') {
+                     $response=&unescape(&reply('instidrulecheck:'.&escape($udom).
+                                               ':'.&escape($id).':'.$rulestr,
+                                               $homeserver));
+                 } elsif ($item eq 'selfcreate') {
+                     $response=&unescape(&reply('instselfcreatecheck:'.
+                                                &escape($udom).':'.&escape($uname).
+                                               ':'.$rulestr,$homeserver));
+                 }
+                 if ($response ne 'refused') {
+                     my @pairs=split(/\&/,$response);
+                     foreach my $item (@pairs) {
+                         my ($key,$value)=split(/=/,$item,2);
+                         $key = &unescape($key);
+                         next if ($key =~ /^error: 2 /);
+                         $returnhash{$key}=&thaw_unescape($value);
+                     }
+                 }
+             }
+         }
+     }
+     return %returnhash;
+ }
+ sub inst_userrules {
+     my ($udom,$check) = @_;
+     my (%ruleshash,@ruleorder);
+     if ($udom ne '') {
+         my $homeserver=&domain($udom,'primary');
+         if (($homeserver ne '') && ($homeserver ne 'no_host')) {
+             my $response;
+             if ($check eq 'id') {
+                 $response=&reply('instidrules:'.&escape($udom),
+                                  $homeserver);
+             } elsif ($check eq 'email') {
+                 $response=&reply('instemailrules:'.&escape($udom),
+                                  $homeserver);
+             } else {
+                 $response=&reply('instuserrules:'.&escape($udom),
+                                  $homeserver);
+             }
+             if (($response ne 'refused') && ($response ne 'error') &&
+                 ($response ne 'unknown_cmd') &&
+                 ($response ne 'no_such_host')) {
+                 my ($hashitems,$orderitems) = split(/:/,$response);
+                 my @pairs=split(/\&/,$hashitems);
+                 foreach my $item (@pairs) {
+                     my ($key,$value)=split(/=/,$item,2);
+                     $key = &unescape($key);
+                     next if ($key =~ /^error: 2 /);
+                     $ruleshash{$key}=&thaw_unescape($value);
+                 }
+                 my @esc_order = split(/\&/,$orderitems);
+                 foreach my $item (@esc_order) {
+                     push(@ruleorder,&unescape($item));
+                 }
+             }
+         }
+     }
+     return (\%ruleshash,\@ruleorder);
+ }
+ # ------------- Get Authentication, Language and User Tools Defaults for Domain
+ sub get_domain_defaults {
+     my ($domain) = @_;
+     my $cachetime = 60*60*24;
+     my ($result,$cached)=&is_cached_new('domdefaults',$domain);
+     if (defined($cached)) {
+         if (ref($result) eq 'HASH') {
+             return %{$result};
+         }
+     }
+     my %domdefaults;
+     my %domconfig =
+          &Apache::lonnet::get_dom('configuration',['defaults','quotas',
+                                   'requestcourses','inststatus',
+                                   'coursedefaults','usersessions'],$domain);
+     if (ref($domconfig{'defaults'}) eq 'HASH') {
+         $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'};
+         $domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
+         $domdefaults{'auth_arg_def'} = $domconfig{'defaults'}{'auth_arg_def'};
+         $domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'};
+         $domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'};
+     } else {
+         $domdefaults{'lang_def'} = &domain($domain,'lang_def');
+         $domdefaults{'auth_def'} = &domain($domain,'auth_def');
+         $domdefaults{'auth_arg_def'} = &domain($domain,'auth_arg_def');
+     }
+     if (ref($domconfig{'quotas'}) eq 'HASH') {
+         if (ref($domconfig{'quotas'}{'defaultquota'}) eq 'HASH') {
+             $domdefaults{'defaultquota'} = $domconfig{'quotas'}{'defaultquota'};
+         } else {
+             $domdefaults{'defaultquota'} = $domconfig{'quotas'};
+         }
+         my @usertools = ('aboutme','blog','portfolio');
+         foreach my $item (@usertools) {
+             if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
+                 $domdefaults{$item} = $domconfig{'quotas'}{$item};
+             }
+         }
+     }
+     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
+         foreach my $item ('official','unofficial','community') {
+             $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
+         }
+     }
+     if (ref($domconfig{'inststatus'}) eq 'HASH') {
+         foreach my $item ('inststatustypes','inststatusorder') {
+             $domdefaults{$item} = $domconfig{'inststatus'}{$item};
+         }
+     }
+     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+         foreach my $item ('canuse_pdfforms') {
+             $domdefaults{$item} = $domconfig{'coursedefaults'}{$item};
+         }
+     }
+     if (ref($domconfig{'usersessions'}) eq 'HASH') {
+         if (ref($domconfig{'usersessions'}{'remote'}) eq 'HASH') {
+             $domdefaults{'remotesessions'} = $domconfig{'usersessions'}{'remote'};
+         }
+         if (ref($domconfig{'usersessions'}{'hosted'}) eq 'HASH') {
+             $domdefaults{'hostedsessions'} = $domconfig{'usersessions'}{'hosted'};
+         }
+     }
+     &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults,
+                                   $cachetime);
+     return %domdefaults;
+ }
  # --------------------------------------------------- Assign a key to a student
  sub assign_access_key {
- Line 668  sub assign_access_key {
+ Line 1586  sub assign_access_key {
  # key now belongs to user
  	    my $envkey='key.'.$cdom.'_'.$cnum;
              if (&put('environment',{$envkey => $ckey}) eq 'ok') {
-                 &appenv('environment.'.$envkey => $ckey);
+                 &appenv({'environment.'.$envkey => $ckey});
                  return 'ok';
              } else {
                  return
- Line 769  sub validate_access_key {
+ Line 1687  sub validate_access_key {
  # ------------------------------------- Find the section of student in a course
  sub devalidate_getsection_cache {
      my ($udom,$unam,$courseid)=@_;
-     $courseid=~s/\_/\//g;
-     $courseid=~s/^(\w)/\/$1/;
      my $hashid="$udom:$unam:$courseid";
      &devalidate_cache_new('getsection',$hashid);
  }
+ sub courseid_to_courseurl {
+     my ($courseid) = @_;
+     #already url style courseid
+     return $courseid if ($courseid =~ m{^/});
+     if (exists($env{'course.'.$courseid.'.num'})) {
+ 	my $cnum = $env{'course.'.$courseid.'.num'};
+ 	my $cdom = $env{'course.'.$courseid.'.domain'};
+ 	return "/$cdom/$cnum";
+     }
+     my %courseinfo=&Apache::lonnet::coursedescription($courseid);
+     if (exists($courseinfo{'num'})) {
+ 	return "/$courseinfo{'domain'}/$courseinfo{'num'}";
+     }
+     return undef;
+ }
  sub getsection {
      my ($udom,$unam,$courseid)=@_;
      my $cachetime=1800;
-     $courseid=~s/\_/\//g;
-     $courseid=~s/^(\w)/\/$1/;
      my $hashid="$udom:$unam:$courseid";
      my ($result,$cached)=&is_cached_new('getsection',$hashid);
- Line 800  sub getsection {
+ Line 1733  sub getsection {
      # If there is more than one expired role, choose the one which ended last.
      # If there is a role which has expired, return it.
      #
-     foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles',
+     $courseid = &courseid_to_courseurl($courseid);
-                         &homeserver($unam,$udom)))) {
+     my $extra = &freeze_escape({'skipcheck' => 1});
-         my ($key,$value)=split(/\=/,$_);
+     my %roleshash = &dump('roles',$udom,$unam,$courseid,undef,$extra);
-         $key=&unescape($key);
+     foreach my $key (keys(%roleshash)) {
          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 ($dummy,$end,$start)=split(/\_/,&unescape($roleshash{$key}));
          my $now=time;
          if (defined($end) && $end && ($now > $end)) {
              $Expired{$end}=$section;
- Line 835  sub getsection {
+ Line 1768  sub getsection {
  }
  sub save_cache {
-     my ($r)=@_;
-     if (! $r->is_initial_req()) { return DECLINED; }
      &purge_remembered();
+     #&Apache::loncommon::validate_page();
      undef(%env);
-     return OK;
+     undef($env_loaded);
  }
  my $to_remember=-1;
- Line 847  my %remembered;
+ Line 1779  my %remembered;
  my %accessed;
  my $kicks=0;
  my $hits=0;
+ sub make_key {
+     my ($name,$id) = @_;
+     if (length($id) > 65
+ 	&& length(&escape($id)) > 200) {
+ 	$id=length($id).':'.&Digest::MD5::md5_hex($id);
+     }
+     return &escape($name.':'.$id);
+ }
  sub devalidate_cache_new {
      my ($name,$id,$debug) = @_;
      if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); }
-     $id=&escape($name.':'.$id);
+     $id=&make_key($name,$id);
      $memcache->delete($id);
      delete($remembered{$id});
      delete($accessed{$id});
- Line 858  sub devalidate_cache_new {
+ Line 1799  sub devalidate_cache_new {
  sub is_cached_new {
      my ($name,$id,$debug) = @_;
-     $id=&escape($name.':'.$id);
+     $id=&make_key($name,$id);
      if (exists($remembered{$id})) {
  	if ($debug) { &Apache::lonnet::logthis("Earyl return $id of $remembered{$id} "); }
  	$accessed{$id}=[&gettimeofday()];
- Line 881  sub is_cached_new {
+ Line 1822  sub is_cached_new {
  sub do_cache_new {
      my ($name,$id,$value,$time,$debug) = @_;
-     $id=&escape($name.':'.$id);
+     $id=&make_key($name,$id);
      my $setvalue=$value;
      if (!defined($setvalue)) {
  	$setvalue='__undef__';
- Line 890  sub do_cache_new {
+ Line 1831  sub do_cache_new {
  	$time=600;
      }
      if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); }
-     $memcache->set($id,$setvalue,$time);
+     my $result = $memcache->set($id,$setvalue,$time);
+     if (! $result) {
+ 	&logthis("caching of id -> $id  failed");
+ 	$memcache->disconnect_all();
+     }
      # need to make a copy of $value
-     #&make_room($id,$value,$debug);
+     &make_room($id,$value,$debug);
      return $value;
  }
  sub make_room {
      my ($id,$value,$debug)=@_;
-     $remembered{$id}=$value;
+     $remembered{$id}= (ref($value)) ? &Storable::dclone($value)
+                                     : $value;
      if ($to_remember<0) { return; }
      $accessed{$id}=[&gettimeofday()];
      if (scalar(keys(%remembered)) <= $to_remember) { return; }
- Line 927  sub purge_remembered {
+ Line 1874  sub purge_remembered {
  sub userenvironment {
      my ($udom,$unam,@what)=@_;
+     my $items;
+     foreach my $item (@what) {
+         $items.=&escape($item).'&';
+     }
+     $items=~s/\&$//;
      my %returnhash=();
-     my @answer=split(/\&/,
+     my $uhome = &homeserver($unam,$udom);
-                 &reply('get:'.$udom.':'.$unam.':environment:'.join('&',@what),
+     unless ($uhome eq 'no_host') {
-                       &homeserver($unam,$udom)));
+         my @answer=split(/\&/,
-     my $i;
+             &reply('get:'.$udom.':'.$unam.':environment:'.$items,$uhome));
-     for ($i=0;$i<=$#what;$i++) {
+         if ($#answer==0 && $answer[0] =~ /^(con_lost|error:|no_such_host)/i) {
- 	$returnhash{$what[$i]}=&unescape($answer[$i]);
+             return %returnhash;
+         }
+         my $i;
+         for ($i=0;$i<=$#what;$i++) {
+ 	    $returnhash{$what[$i]}=&unescape($answer[$i]);
+         }
      }
      return %returnhash;
  }
- Line 942  sub userenvironment {
+ Line 1899  sub userenvironment {
  sub studentphoto {
      my ($udom,$unam,$ext) = @_;
      my $home=&Apache::lonnet::homeserver($unam,$udom);
-     my $ret=&Apache::lonnet::reply("studentphoto:$udom:$unam:$ext",$home);
+     if (defined($env{'request.course.id'})) {
-     my $url="/uploaded/$udom/$unam/internal/studentphoto.".$ext;
+         if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
-     if ($ret ne 'ok') {
+             if ($udom eq $env{'course.'.$env{'request.course.id'}.'.domain'}) {
- 	return '/adm/lonKaputt/lonlogo_broken.gif';
+                 return(&retrievestudentphoto($udom,$unam,$ext));
+             } else {
+                 my ($result,$perm_reqd)=
+ 		    &Apache::lonnet::auto_photo_permission($unam,$udom);
+                 if ($result eq 'ok') {
+                     if (!($perm_reqd eq 'yes')) {
+                         return(&retrievestudentphoto($udom,$unam,$ext));
+                     }
+                 }
+             }
+         }
+     } else {
+         my ($result,$perm_reqd) =
+ 	    &Apache::lonnet::auto_photo_permission($unam,$udom);
+         if ($result eq 'ok') {
+             if (!($perm_reqd eq 'yes')) {
+                 return(&retrievestudentphoto($udom,$unam,$ext));
+             }
+         }
+     }
+     return '/adm/lonKaputt/lonlogo_broken.gif';
+ }
+ sub retrievestudentphoto {
+     my ($udom,$unam,$ext,$type) = @_;
+     my $home=&Apache::lonnet::homeserver($unam,$udom);
+     my $ret=&Apache::lonnet::reply("studentphoto:$udom:$unam:$ext:$type",$home);
+     if ($ret eq 'ok') {
+         my $url="/uploaded/$udom/$unam/internal/studentphoto.$ext";
+         if ($type eq 'thumbnail') {
+             $url="/uploaded/$udom/$unam/internal/studentphoto_tn.$ext";
+         }
+         my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+         return $tokenurl;
+     } else {
+         if ($type eq 'thumbnail') {
+             return '/adm/lonKaputt/genericstudent_tn.gif';
+         } else {
+             return '/adm/lonKaputt/lonlogo_broken.gif';
+         }
      }
-     my $tokenurl=&Apache::lonnet::tokenwrapper($url);
-     return $tokenurl;
  }
  # -------------------------------------------------------------------- New chat
  sub chatsend {
-     my ($newentry,$anon)=@_;
+     my ($newentry,$anon,$group)=@_;
      my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $chome=$env{'course.'.$env{'request.course.id'}.'.home'};
      &reply('chatsend:'.$cdom.':'.$cnum.':'.
  	   &escape($env{'user.domain'}.':'.$env{'user.name'}.':'.$anon.':'.
- 		   &escape($newentry)),$chome);
+ 		   &escape($newentry)).':'.$group,$chome);
  }
  # ------------------------------------------ Find current version of a resource
- Line 1022  sub repcopy {
+ Line 2016  sub repcopy {
      }
      $filename=~s/[\n\r]//g;
      my $transname="$filename.in.transfer";
+ # FIXME: this should flock
      if ((-e $filename) || (-e $transname)) { return 'ok'; }
      my $remoteurl=subscribe($filename);
      if ($remoteurl =~ /^con_lost by/) {
- Line 1060  sub repcopy {
+ Line 2055  sub repcopy {
             if ($response->is_error()) {
  	       unlink($transname);
                 my $message=$response->status_line;
-                &logthis("<font color=blue>WARNING:"
+                &logthis("<font color=\"blue\">WARNING:"
                         ." LWP get: $message: $filename</font>");
                 return 'unavailable';
             } else {
- Line 1070  sub repcopy {
+ Line 2065  sub repcopy {
                    if ($mresponse->is_error()) {
  		      unlink($filename.'.meta');
                        &logthis(
-                      "<font color=yellow>INFO: No metadata: $filename</font>");
+                      "<font color=\"yellow\">INFO: No metadata: $filename</font>");
                    }
  	       }
                 rename($transname,$filename);
- Line 1086  sub ssi_body {
+ Line 2081  sub ssi_body {
      if (! exists($form{'LONCAPA_INTERNAL_no_discussion'})) {
          $form{'LONCAPA_INTERNAL_no_discussion'}='true';
      }
-     my $output=($filelink=~/^http\:/?&externalssi($filelink):
+     my $output='';
-                                      &ssi($filelink,%form));
+     my $response;
-     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+// END LON-CAPA Internal\s*(-->)?\s||gs;
+     if ($filelink=~/^https?\:/) {
+        ($output,$response)=&externalssi($filelink);
+     } else {
+        $filelink .= $filelink=~/\?/ ? '&' : '?';
+        $filelink .= 'inhibitmenu=yes';
+        ($output,$response)=&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/\<\/body\s*\>.*?$//si;
-     return $output;
+     if (wantarray) {
+         return ($output, $response);
+     } else {
+         return $output;
+     }
  }
  # --------------------------------------------------------- Server Side Include
+ sub absolute_url {
+     my ($host_name) = @_;
+     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://');
+     if ($host_name eq '') {
+ 	$host_name = $ENV{'SERVER_NAME'};
+     }
+     return $protocol.$host_name;
+ }
+ #
+ #   Server side include.
+ # Parameters:
+ #  fn     Possibly encrypted resource name/id.
+ #  form   Hash that describes how the rendering should be done
+ #         and other things.
+ # Returns:
+ #   Scalar context: The content of the response.
+ #   Array context:  2 element list of the content and the full response object.
+ #
  sub ssi {
      my ($fn,%form)=@_;
      my $ua=new LWP::UserAgent;
      my $request;
+     $form{'no_update_last_known'}=1;
+     &Apache::lonenc::check_encrypt(\$fn);
      if (%form) {
-       $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
+       $request=new HTTP::Request('POST',&absolute_url().$fn);
-       $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));
+       $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys(%form)));
      } else {
-       $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
+       $request=new HTTP::Request('GET',&absolute_url().$fn);
      }
      $request->header(Cookie => $ENV{'HTTP_COOKIE'});
      my $response=$ua->request($request);
-     return $response->content;
+     if (wantarray) {
+ 	return ($response->content, $response);
+     } else {
+ 	return $response->content;
+     }
  }
  sub externalssi {
- Line 1122  sub externalssi {
+ Line 2151  sub externalssi {
      my $ua=new LWP::UserAgent;
      my $request=new HTTP::Request('GET',$url);
      my $response=$ua->request($request);
-     return $response->content;
+     if (wantarray) {
+         return ($response->content, $response);
+     } else {
+         return $response->content;
+     }
  }
  # -------------------------------- Allow a /uploaded/ URI to be vouched for
- Line 1135  sub allowuploaded {
+ Line 2168  sub allowuploaded {
      my %httpref=();
      my $httpurl=&hreflocation('',$url);
      $httpref{'httpref.'.$httpurl}=$srcurl;
-     &Apache::lonnet::appenv(%httpref);
+     &Apache::lonnet::appenv(\%httpref);
  }
  # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
- Line 1143  sub allowuploaded {
+ Line 2176  sub allowuploaded {
  #        path to file, source of file, instruction to parse file for objects,
  #        ref to hash for embedded objects,
  #        ref to hash for codebase of java objects.
+ #        reference to scalar to accommodate mime type determined
+ #          from File::MMagic if $parser = parse.
  #
  # output: url to file (if action was uploaddoc),
  #         ok if successful, or diagnostic message otherwise (if action was propagate or copy)
- Line 1169  sub allowuploaded {
+ Line 2204  sub allowuploaded {
  #
  sub process_coursefile {
-     my ($action,$docuname,$docudom,$file,$source,$parser,$allfiles,$codebase)=@_;
+     my ($action,$docuname,$docudom,$file,$source,$parser,$allfiles,$codebase,
+         $mimetype)=@_;
      my $fetchresult;
      my $home=&homeserver($docuname,$docudom);
      if ($action eq 'propagate') {
          $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
  			     $home);
      } else {
-         my $fetchresult = '';
          my $fpath = '';
          my $fname = $file;
          ($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|);
- Line 1197  sub process_coursefile {
+ Line 2232  sub process_coursefile {
              print $fh $env{'form.'.$source};
              close($fh);
              if ($parser eq 'parse') {
-                 my $parse_result = &extract_embedded_items($filepath,$fname,$allfiles,$codebase);
+                 my $mm = new File::MMagic;
-                 unless ($parse_result eq 'ok') {
+                 my $type = $mm->checktype_filename($filepath.'/'.$fname);
-                     &logthis('Failed to parse '.$filepath.'/'.$fname.' for embedded media: '.$parse_result);
+                 if ($type eq 'text/html') {
+                     my $parse_result = &extract_embedded_items($filepath.'/'.$fname,$allfiles,$codebase);
+                     unless ($parse_result eq 'ok') {
+                         &logthis('Failed to parse '.$filepath.'/'.$fname.' for embedded media: '.$parse_result);
+                     }
                  }
+                 if (ref($mimetype)) {
+                     $$mimetype = $type;
+                 }
              }
              $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file,
                                   $home);
- Line 1260  sub store_edited_file {
+ Line 2302  sub store_edited_file {
  }
  sub clean_filename {
-     my ($fname)=@_;
+     my ($fname,$args)=@_;
  # Replace Windows backslashes by forward slashes
      $fname=~s/\\/\//g;
- # Get rid of everything but the actual filename
+     if (!$args->{'keep_path'}) {
-     $fname=~s/^.*\/([^\/]+)$/$1/;
+         # Get rid of everything but the actual filename
+ 	$fname=~s/^.*\/([^\/]+)$/$1/;
+     }
  # Replace spaces by underscores
      $fname=~s/\s+/\_/g;
  # Replace all other weird characters by nothing
-     $fname=~s/[^\w\.\-]//g;
+     $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;
  }
+ # This Function checks if an Image's dimensions exceed either $resizewidth (width)
+ # or $resizeheight (height) - both pixels. If so, the image is scaled to produce an
+ # image with the same aspect ratio as the original, but with dimensions which do
+ # not exceed $resizewidth and $resizeheight.
+ sub resizeImage {
+     my ($img_path,$resizewidth,$resizeheight) = @_;
+     my $ima = Image::Magick->new;
+     my $resized;
+     if (-e $img_path) {
+         $ima->Read($img_path);
+         if (($resizewidth =~ /^\d+$/) && ($resizeheight > 0)) {
+             my $width = $ima->Get('width');
+             my $height = $ima->Get('height');
+             if ($width > $resizewidth) {
+ 	        my $factor = $width/$resizewidth;
+                 my $newheight = $height/$factor;
+                 $ima->Scale(width=>$resizewidth,height=>$newheight);
+                 $resized = 1;
+             }
+         }
+         if (($resizeheight =~ /^\d+$/) && ($resizeheight > 0)) {
+             my $width = $ima->Get('width');
+             my $height = $ima->Get('height');
+             if ($height > $resizeheight) {
+                 my $factor = $height/$resizeheight;
+                 my $newwidth = $width/$factor;
+                 $ima->Scale(width=>$newwidth,height=>$resizeheight);
+                 $resized = 1;
+             }
+         }
+         if ($resized) {
+             $ima->Write($img_path);
+         }
+     }
+     return;
+ }
  # --------------- Take an uploaded file and put it into the userfiles directory
- # input: name of form element, coursedoc=1 means this is for the course
+ # input: $formname - the contents of the file are in $env{"form.$formname"}
- # output: url of file in userspace
+ #                    the desired filename is in $env{"form.$formname.filename"}
+ #        $context - possible values: coursedoc, existingfile, overwrite,
+ #                                    canceloverwrite, or ''.
+ #                   if 'coursedoc': upload to the current course
+ #                   if 'existingfile': write file to tmp/overwrites directory
+ #                   if 'canceloverwrite': delete file written to tmp/overwrites directory
+ #                   $context is passed as argument to &finishuserfileupload
+ #        $subdir - directory in userfile to store the file into
+ #        $parser - instruction to parse file for objects ($parser = parse)
+ #        $allfiles - reference to hash for embedded objects
+ #        $codebase - reference to hash for codebase of java objects
+ #        $desuname - username for permanent storage of uploaded file
+ #        $dsetudom - domain for permanaent storage of uploaded file
+ #        $thumbwidth - width (pixels) of thumbnail to make for uploaded image
+ #        $thumbheight - height (pixels) of thumbnail to make for uploaded image
+ #        $resizewidth - width (pixels) to which to resize uploaded image
+ #        $resizeheight - height (pixels) to which to resize uploaded image
+ #        $mimetype - reference to scalar to accommodate mime type determined
+ #                    from File::MMagic if $parser = parse.
+ #
+ # output: url of file in userspace, or error: <message>
+ #             or /adm/notfound.html if failure to upload occurse
  sub userfileupload {
-     my ($formname,$coursedoc,$subdir,$parser,$allfiles,$codebase)=@_;
+     my ($formname,$context,$subdir,$parser,$allfiles,$codebase,$destuname,
+         $destudom,$thumbwidth,$thumbheight,$resizewidth,$resizeheight,$mimetype)=@_;
      if (!defined($subdir)) { $subdir='unknown'; }
      my $fname=$env{'form.'.$formname.'.filename'};
      $fname=&clean_filename($fname);
- # See if there is anything left
+     # See if there is anything left
      unless ($fname) { return 'error: no uploaded file'; }
-     chop($env{'form.'.$formname});
+     # Files uploaded to help request form, or uploaded to "create course" page are handled differently
-     if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { #files uploaded to help request form are handled differently
+     if ((($formname eq 'screenshot') && ($subdir eq 'helprequests')) ||
+         (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) ||
+          ($context eq 'existingfile') || ($context eq 'canceloverwrite')) {
          my $now = time;
-         my $filepath = 'tmp/helprequests/'.$now;
+         my $filepath;
+         if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) {
+              $filepath = 'tmp/helprequests/'.$now;
+         } elsif (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) {
+              $filepath = 'tmp/addcourse/'.$destudom.'/web/'.$env{'user.name'}.
+                          '_'.$env{'user.domain'}.'/pending';
+         } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) {
+             my ($docuname,$docudom);
+             if ($destudom) {
+                 $docudom = $destudom;
+             } else {
+                 $docudom = $env{'user.domain'};
+             }
+             if ($destuname) {
+                 $docuname = $destuname;
+             } else {
+                 $docuname = $env{'user.name'};
+             }
+             if (exists($env{'form.group'})) {
+                 $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+                 $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+             }
+             $filepath = 'tmp/overwrites/'.$docudom.'/'.$docuname.'/'.$subdir;
+             if ($context eq 'canceloverwrite') {
+                 my $tempfile =  $perlvar{'lonDaemons'}.'/'.$filepath.'/'.$fname;
+                 if (-e  $tempfile) {
+                     my @info = stat($tempfile);
+                     if ($info[9] eq $env{'form.timestamp'}) {
+                         unlink($tempfile);
+                     }
+                 }
+                 return;
+             }
+         }
+         # Create the directory if not present
          my @parts=split(/\//,$filepath);
          my $fullpath = $perlvar{'lonDaemons'};
          for (my $i=0;$i<@parts;$i++) {
- Line 1302  sub userfileupload {
+ Line 2440  sub userfileupload {
          open(my $fh,'>'.$fullpath.'/'.$fname);
          print $fh $env{'form.'.$formname};
          close($fh);
-         return $fullpath.'/'.$fname;
+         if ($context eq 'existingfile') {
+             my @info = stat($fullpath.'/'.$fname);
+             return ($fullpath.'/'.$fname,$info[9]);
+         } else {
+             return $fullpath.'/'.$fname;
+         }
      }
- # Create the directory if not present
+     if ($subdir eq 'scantron') {
-     $fname="$subdir/$fname";
+         $fname = 'scantron_orig_'.$fname;
-     if ($coursedoc) {
+     } else {
+         $fname="$subdir/$fname";
+     }
+     if ($context eq 'coursedoc') {
  	my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
  	my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
          if ($env{'form.folder'} =~ m/^(default|supplemental)/) {
              return &finishuserfileupload($docuname,$docudom,
  					 $formname,$fname,$parser,$allfiles,
- 					 $codebase);
+ 					 $codebase,$thumbwidth,$thumbheight,
+                                          $resizewidth,$resizeheight,$context,$mimetype);
          } else {
              $fname=$env{'form.folder'}.'/'.$fname;
              return &process_coursefile('uploaddoc',$docuname,$docudom,
  				       $fname,$formname,$parser,
- 				       $allfiles,$codebase);
+ 				       $allfiles,$codebase,$mimetype);
          }
+     } elsif (defined($destuname)) {
+         my $docuname=$destuname;
+         my $docudom=$destudom;
+ 	return &finishuserfileupload($docuname,$docudom,$formname,$fname,
+ 				     $parser,$allfiles,$codebase,
+                                      $thumbwidth,$thumbheight,
+                                      $resizewidth,$resizeheight,$context,$mimetype);
      } else {
          my $docuname=$env{'user.name'};
          my $docudom=$env{'user.domain'};
- 	return &finishuserfileupload($docuname,$docudom,$formname,
+         if (exists($env{'form.group'})) {
- 				     $fname,$parser,$allfiles,$codebase);
+             $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+             $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+         }
+ 	return &finishuserfileupload($docuname,$docudom,$formname,$fname,
+ 				     $parser,$allfiles,$codebase,
+                                      $thumbwidth,$thumbheight,
+                                      $resizewidth,$resizeheight,$context,$mimetype);
      }
  }
  sub finishuserfileupload {
-     my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase) = @_;
+     my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase,
+         $thumbwidth,$thumbheight,$resizewidth,$resizeheight,$context,$mimetype) = @_;
      my $path=$docudom.'/'.$docuname.'/';
      my $filepath=$perlvar{'lonDocRoot'};
-     my ($fnamepath,$file);
+     my ($fnamepath,$file,$fetchthumb);
      $file=$fname;
      if ($fname=~m|/|) {
          ($fnamepath,$file) = ($fname =~ m|^(.*)/([^/]+)$|);
- Line 1345  sub finishuserfileupload {
+ Line 2507  sub finishuserfileupload {
  	    mkdir($filepath,0777);
          }
      }
  # Save the file
      {
- 	open(FH,'>'.$filepath.'/'.$file);
+ 	if (!open(FH,'>'.$filepath.'/'.$file)) {
- 	print FH $env{'form.'.$formname};
+ 	    &logthis('Failed to create '.$filepath.'/'.$file);
+ 	    print STDERR ('Failed to create '.$filepath.'/'.$file."\n");
+ 	    return '/adm/notfound.html';
+ 	}
+         if ($context eq 'overwrite') {
+             my $source =  $perlvar{'lonDaemons'}.'/tmp/overwrites/'.$docudom.'/'.$docuname.'/'.$fname;
+             my $target = $filepath.'/'.$file;
+             if (-e $source) {
+                 my @info = stat($source);
+                 if ($info[9] eq $env{'form.timestamp'}) {
+                     unless (&File::Copy::move($source,$target)) {
+                         &logthis('Failed to overwrite '.$filepath.'/'.$file);
+                         return "Moving from $source failed";
+                     }
+                 } else {
+                     return "Temporary file: $source had unexpected date/time for last modification";
+                 }
+             } else {
+                 return "Temporary file: $source missing";
+             }
+         } elsif (!print FH ($env{'form.'.$formname})) {
+ 	    &logthis('Failed to write to '.$filepath.'/'.$file);
+ 	    print STDERR ('Failed to write to '.$filepath.'/'.$file."\n");
+ 	    return '/adm/notfound.html';
+ 	}
  	close(FH);
+         if ($resizewidth && $resizeheight) {
+             my $mm = new File::MMagic;
+             my $mime_type = $mm->checktype_filename($filepath.'/'.$file);
+             if ($mime_type =~ m{^image/}) {
+ 	        &resizeImage($filepath.'/'.$file,$resizewidth,$resizeheight);
+             }
+ 	}
      }
      if ($parser eq 'parse') {
-         my $parse_result = &extract_embedded_items($filepath,$file,$allfiles,
+         my $mm = new File::MMagic;
- 						   $codebase);
+         my $type = $mm->checktype_filename($filepath.'/'.$file);
-         unless ($parse_result eq 'ok') {
+         if ($type eq 'text/html') {
-             &logthis('Failed to parse '.$filepath.$file.
+             my $parse_result = &extract_embedded_items($filepath.'/'.$file,
- 		     ' for embedded media: '.$parse_result);
+                                                        $allfiles,$codebase);
+             unless ($parse_result eq 'ok') {
+                 &logthis('Failed to parse '.$filepath.$file.
+ 	   	         ' for embedded media: '.$parse_result);
+             }
+         }
+         if (ref($mimetype)) {
+             $$mimetype = $type;
+         }
+     }
+     if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
+         my $input = $filepath.'/'.$file;
+         my $output = $filepath.'/'.'tn-'.$file;
+         my $thumbsize = $thumbwidth.'x'.$thumbheight;
+         system("convert -sample $thumbsize $input $output");
+         if (-e $filepath.'/'.'tn-'.$file) {
+             $fetchthumb  = 1;
          }
      }
  # Notify homeserver to grep it
  #
      my $docuhome=&homeserver($docuname,$docudom);
      my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome);
      if ($fetchresult eq 'ok') {
+         if ($fetchthumb) {
+             my $thumbresult= &reply('fetchuserfile:'.$path.'tn-'.$file,$docuhome);
+             if ($thumbresult ne 'ok') {
+                 &logthis('Failed to transfer '.$path.'tn-'.$file.' to host '.
+                          $docuhome.': '.$thumbresult);
+             }
+         }
  #
  # Return the URL to it
          return '/uploaded/'.$path.$file;
- Line 1371  sub finishuserfileupload {
+ Line 2589  sub finishuserfileupload {
          &logthis('Failed to transfer '.$path.$file.' to host '.$docuhome.
  		 ': '.$fetchresult);
          return '/adm/notfound.html';
      }
  }
  sub extract_embedded_items {
-     my ($filepath,$file,$allfiles,$codebase,$content) = @_;
+     my ($fullpath,$allfiles,$codebase,$content) = @_;
      my @state = ();
      my %javafiles = (
                        codebase => '',
- Line 1390  sub extract_embedded_items {
+ Line 2608  sub extract_embedded_items {
      if ($content) {
          $p = HTML::LCParser->new($content);
      } else {
-         $p = HTML::LCParser->new($filepath.'/'.$file);
+         $p = HTML::LCParser->new($fullpath);
      }
      while (my $t=$p->get_token()) {
  	if ($t->[0] eq 'S') {
  	    my ($tagname, $attr) = ($t->[1],$t->[2]);
- 	    push (@state, $tagname);
+ 	    push(@state, $tagname);
              if (lc($tagname) eq 'allow') {
                  &add_filetype($allfiles,$attr->{'src'},'src');
              }
  	    if (lc($tagname) eq 'img') {
  		&add_filetype($allfiles,$attr->{'src'},'src');
  	    }
+ 	    if (lc($tagname) eq 'a') {
+ 		&add_filetype($allfiles,$attr->{'href'},'href');
+ 	    }
              if (lc($tagname) eq 'script') {
                  if ($attr->{'archive'} =~ /\.jar$/i) {
                      &add_filetype($allfiles,$attr->{'archive'},'archive');
- Line 1483  sub add_filetype {
+ Line 2704  sub add_filetype {
  }
  sub removeuploadedurl {
      my ($url)=@_;
      my (undef,undef,$udom,$uname,$fname)=split('/',$url,5);
      return &removeuserfile($uname,$udom,$fname);
  }
  sub removeuserfile {
      my ($docuname,$docudom,$fname)=@_;
      my $home=&homeserver($docuname,$docudom);
-     return &reply("removeuserfile:$docudom/$docuname/$fname",$home);
+     my $result = &reply("removeuserfile:$docudom/$docuname/$fname",$home);
+     if ($result eq 'ok') {
+         if (($fname !~ /\.meta$/) && (&is_portfolio_file($fname))) {
+             my $metafile = $fname.'.meta';
+             my $metaresult = &removeuserfile($docuname,$docudom,$metafile);
+ 	    my $url = "/uploaded/$docudom/$docuname/$fname";
+             my ($file,$group) = (&parse_portfolio_url($url))[3,4];
+             my $sqlresult =
+                 &update_portfolio_table($docuname,$docudom,$file,
+                                         'portfolio_metadata',$group,
+                                         'delete');
+         }
+     }
+     return $result;
  }
  sub mkdiruserfile {
- Line 1503  sub mkdiruserfile {
+ Line 2737  sub mkdiruserfile {
  sub renameuserfile {
      my ($docuname,$docudom,$old,$new)=@_;
      my $home=&homeserver($docuname,$docudom);
-     return &reply("renameuserfile:$docudom:$docuname:".&escape("$old").':'.
+     my $result = &reply("renameuserfile:$docudom:$docuname:".
- 		  &escape("$new"),$home);
+                         &escape("$old").':'.&escape("$new"),$home);
+     if ($result eq 'ok') {
+         if (($old !~ /\.meta$/) && (&is_portfolio_file($old))) {
+             my $oldmeta = $old.'.meta';
+             my $newmeta = $new.'.meta';
+             my $metaresult =
+                 &renameuserfile($docuname,$docudom,$oldmeta,$newmeta);
+ 	    my $url = "/uploaded/$docudom/$docuname/$old";
+             my ($file,$group) = (&parse_portfolio_url($url))[3,4];
+             my $sqlresult =
+                 &update_portfolio_table($docuname,$docudom,$file,
+                                         'portfolio_metadata',$group,
+                                         'delete');
+         }
+     }
+     return $result;
  }
  # ------------------------------------------------------------------------- Log
- Line 1530  sub flushcourselogs {
+ Line 2779  sub flushcourselogs {
  # times and course titles for all courseids
  #
      my %courseidbuffer=();
-     foreach (keys %courselogs) {
+     foreach my $crsid (keys(%courselogs)) {
-         my $crsid=$_;
          if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'.
  		          &escape($courselogs{$crsid}),
  		          $coursehombuf{$crsid}) eq 'ok') {
- Line 1539  sub flushcourselogs {
+ Line 2787  sub flushcourselogs {
          } else {
              &logthis('Failed to flush log buffer for '.$crsid);
              if (length($courselogs{$crsid})>40000) {
-                &logthis("<font color=blue>WARNING: Buffer for ".$crsid.
+                &logthis("<font color=\"blue\">WARNING: Buffer for ".$crsid.
                          " exceeded maximum size, deleting.</font>");
                 delete $courselogs{$crsid};
              }
          }
-         if ($courseidbuffer{$coursehombuf{$crsid}}) {
+         $courseidbuffer{$coursehombuf{$crsid}}{$crsid} = {
-            $courseidbuffer{$coursehombuf{$crsid}}.='&'.
+             'description' => $coursedescrbuf{$crsid},
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
+             'inst_code'    => $courseinstcodebuf{$crsid},
-                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
+             'type'        => $coursetypebuf{$crsid},
-         } else {
+             'owner'       => $courseownerbuf{$crsid},
-            $courseidbuffer{$coursehombuf{$crsid}}=
+         };
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid});
-         }
      }
  #
  # Write course id database (reverse lookup) to homeserver of courses
  # Is used in pickcourse
  #
-     foreach (keys %courseidbuffer) {
+     foreach my $crs_home (keys(%courseidbuffer)) {
-         &courseidput($hostdom{$_},$courseidbuffer{$_},$_);
+         my $response = &courseidput(&host_domain($crs_home),
+                                     $courseidbuffer{$crs_home},
+                                     $crs_home,'timeonly');
      }
  #
  # File accesses
- Line 1568  sub flushcourselogs {
+ Line 2815  sub flushcourselogs {
      foreach my $entry (keys(%accesshash)) {
          if ($entry =~ /___count$/) {
              my ($dom,$name);
-             ($dom,$name,undef)=($entry=~m:___(\w+)/(\w+)/(.*)___count$:);
+             ($dom,$name,undef)=
+ 		($entry=~m{___($match_domain)/($match_name)/(.*)___count$});
              if (! defined($dom) || $dom eq '' ||
                  ! defined($name) || $name eq '') {
                  my $cid = $env{'request.course.id'};
- Line 1589  sub flushcourselogs {
+ Line 2837  sub flushcourselogs {
                  }
              }
          } else {
-             my ($dom,$name) = ($entry=~m:___(\w+)/(\w+)/(.*)___(\w+)$:);
+             my ($dom,$name) = ($entry=~m{___($match_domain)/($match_name)/(.*)___(\w+)$});
              my %temphash=($entry => $accesshash{$entry});
              if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') {
                  delete $accesshash{$entry};
- Line 1600  sub flushcourselogs {
+ Line 2848  sub flushcourselogs {
  # Roles
  # Reverse lookup of user roles for course faculty/staff and co-authorship
  #
-     foreach (keys %userrolehash) {
+     foreach my $entry (keys(%userrolehash)) {
-         my $entry=$_;
          my ($role,$uname,$udom,$runame,$rudom,$rsec)=
  	    split(/\:/,$entry);
          if (&Apache::lonnet::put('nohist_userroles',
- Line 1614  sub flushcourselogs {
+ Line 2861  sub flushcourselogs {
  # Reverse lookup of domain roles (dc, ad, li, sc, au)
  #
      my %domrolebuffer = ();
-     foreach my $entry (keys %domainrolehash) {
+     foreach my $entry (keys(%domainrolehash)) {
-         my ($role,$uname,$udom,$runame,$rudom,$rsec)=split/:/,$entry;
+         my ($role,$uname,$udom,$runame,$rudom,$rsec)=split(/:/,$entry);
          if ($domrolebuffer{$rudom}) {
              $domrolebuffer{$rudom}.='&'.&escape($entry).
                        '='.&escape($domainrolehash{$entry});
- Line 1626  sub flushcourselogs {
+ Line 2873  sub flushcourselogs {
          delete $domainrolehash{$entry};
      }
      foreach my $dom (keys(%domrolebuffer)) {
-         foreach my $tryserver (keys %libserv) {
+ 	my %servers = &get_servers($dom,'library');
-             if ($hostdom{$tryserver} eq $dom) {
+ 	foreach my $tryserver (keys(%servers)) {
-                 unless (&reply('domroleput:'.$dom.':'.
+ 	    unless (&reply('domroleput:'.$dom.':'.
-                   $domrolebuffer{$dom},$tryserver) eq 'ok') {
+ 			   $domrolebuffer{$dom},$tryserver) eq 'ok') {
-                     &logthis('Put of domain roles failed for '.$dom.' and  '.$tryserver);
+ 		&logthis('Put of domain roles failed for '.$dom.' and  '.$tryserver);
-                 }
+ 	    }
-             }
          }
      }
      $dumpcount++;
- Line 1654  sub courselog {
+ Line 2900  sub courselog {
         $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'};
      $courseownerbuf{$env{'request.course.id'}}=
         $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'};
+     $coursetypebuf{$env{'request.course.id'}}=
+        $env{'course.'.$env{'request.course.id'}.'.type'};
      if (defined $courselogs{$env{'request.course.id'}}) {
  	$courselogs{$env{'request.course.id'}}.='&'.$what;
      } else {
- Line 1671  sub courseacclog {
+ Line 2919  sub courseacclog {
      if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) {
          $what.=':POST';
          # FIXME: Probably ought to escape things....
- 	foreach (keys %env) {
+ 	foreach my $key (keys(%env)) {
-             if ($_=~/^form\.(.*)/) {
+             if ($key=~/^form\.(.*)/) {
- 		$what.=':'.$1.'='.$env{$_};
+                 my $formitem = $1;
+                 if ($formitem =~ /^HWFILE(?:SIZE|TOOBIG)/) {
+                     $what.=':'.$formitem.'='.$env{$key};
+                 } elsif ($formitem !~ /^HWFILE(?:[^.]+)$/) {
+                     $what.=':'.$formitem.'='.$env{$key};
+                 }
              }
          }
      } elsif ($fnsymb =~ m:^/adm/searchcat:) {
- Line 1713  sub userrolelog {
+ Line 2966  sub userrolelog {
      if (($trole=~/^ca/) || ($trole=~/^aa/) ||
          ($trole=~/^in/) || ($trole=~/^cc/) ||
          ($trole=~/^ep/) || ($trole=~/^cr/) ||
-         ($trole=~/^ta/)) {
+         ($trole=~/^ta/) || ($trole=~/^co/)) {
         my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
         $userrolehash
           {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
                      =$tend.':'.$tstart;
      }
+     if (($env{'request.role'} =~ /dc\./) &&
+ 	(($trole=~/^au/) || ($trole=~/^in/) ||
+ 	 ($trole=~/^cc/) || ($trole=~/^ep/) ||
+ 	 ($trole=~/^cr/) || ($trole=~/^ta/) ||
+          ($trole=~/^co/))) {
+        $userrolehash
+          {$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'}
+                     =$tend.':'.$tstart;
+     }
      if (($trole=~/^dc/) || ($trole=~/^ad/) ||
          ($trole=~/^li/) || ($trole=~/^li/) ||
          ($trole=~/^au/) || ($trole=~/^dg/) ||
- Line 1730  sub userrolelog {
+ Line 2992  sub userrolelog {
      }
  }
+ sub courserolelog {
+     my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_;
+     if (($trole eq 'cc') || ($trole eq 'in') ||
+         ($trole eq 'ep') || ($trole eq 'ad') ||
+         ($trole eq 'ta') || ($trole eq 'st') ||
+         ($trole=~/^cr/) || ($trole eq 'gr') ||
+         ($trole eq 'co')) {
+         if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) {
+             my $cdom = $1;
+             my $cnum = $2;
+             my $sec = $3;
+             my $namespace = 'rolelog';
+             my %storehash = (
+                                role    => $trole,
+                                start   => $tstart,
+                                end     => $tend,
+                                selfenroll => $selfenroll,
+                                context    => $context,
+                             );
+             if ($trole eq 'gr') {
+                 $namespace = 'groupslog';
+                 $storehash{'group'} = $sec;
+             } else {
+                 $storehash{'section'} = $sec;
+             }
+             &instructor_log($namespace,\%storehash,$delflag,$username,$domain,$cnum,$cdom);
+             if (($trole ne 'st') || ($sec ne '')) {
+                 &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
+             }
+         }
+     }
+     return;
+ }
  sub get_course_adv_roles {
-     my $cid=shift;
+     my ($cid,$codes) = @_;
      $cid=$env{'request.course.id'} unless (defined($cid));
      my %coursehash=&coursedescription($cid);
+     my $crstype = &Apache::loncommon::course_type($cid);
      my %nothide=();
-     foreach (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+     foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
- 	$nothide{join(':',split(/[\@\:]/,$_))}=1;
+         if ($user !~ /:/) {
+ 	    $nothide{join(':',split(/[\@]/,$user))}=1;
+         } else {
+             $nothide{$user}=1;
+         }
      }
      my %returnhash=();
      my %dumphash=
              &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
      my $now=time;
-     foreach (keys %dumphash) {
+     my %privileged;
- 	my ($tend,$tstart)=split(/\:/,$dumphash{$_});
+     foreach my $entry (keys(%dumphash)) {
+ 	my ($tend,$tstart)=split(/\:/,$dumphash{$entry});
          if (($tstart) && ($tstart<0)) { next; }
          if (($tend) && ($tend<$now)) { next; }
          if (($tstart) && ($now<$tstart)) { next; }
-         my ($role,$username,$domain,$section)=split(/\:/,$_);
+         my ($role,$username,$domain,$section)=split(/\:/,$entry);
  	if ($username eq '' || $domain eq '') { next; }
- 	if ((&privileged($username,$domain)) &&
+         unless (ref($privileged{$domain}) eq 'HASH') {
- 	    (!$nothide{$username.':'.$domain})) { next; }
+             my %dompersonnel =
+                 &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+             $privileged{$domain} = {};
+             foreach my $server (keys(%dompersonnel)) {
+                 if (ref($dompersonnel{$server}) eq 'HASH') {
+                     foreach my $user (keys(%{$dompersonnel{$server}})) {
+                         my ($trole,$uname,$udom) = split(/:/,$user);
+                         $privileged{$udom}{$uname} = 1;
+                     }
+                 }
+             }
+         }
+         if ((exists($privileged{$domain}{$username})) &&
+             (!$nothide{$username.':'.$domain})) { next; }
  	if ($role eq 'cr') { next; }
-         my $key=&plaintext($role);
+         if ($codes) {
- 	if ($role =~ /^cr/) {
+             if ($section) { $role .= ':'.$section; }
- 	    $key=(split('/',$role))[3];
+             if ($returnhash{$role}) {
- 	}
+                 $returnhash{$role}.=','.$username.':'.$domain;
-         if ($section) { $key.=' (Sec/Grp '.$section.')'; }
+             } else {
-         if ($returnhash{$key}) {
+                 $returnhash{$role}=$username.':'.$domain;
- 	    $returnhash{$key}.=','.$username.':'.$domain;
+             }
          } else {
-             $returnhash{$key}=$username.':'.$domain;
+             my $key=&plaintext($role,$crstype);
+             if ($section) { $key.=' ('.&Apache::lonlocal::mt('Section [_1]',$section).')'; }
+             if ($returnhash{$key}) {
+ 	        $returnhash{$key}.=','.$username.':'.$domain;
+             } else {
+                 $returnhash{$key}=$username.':'.$domain;
+             }
          }
-      }
+     }
      return %returnhash;
  }
  sub get_my_roles {
-     my ($uname,$udom)=@_;
+     my ($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv)=@_;
      unless (defined($uname)) { $uname=$env{'user.name'}; }
      unless (defined($udom)) { $udom=$env{'user.domain'}; }
-     my %dumphash=
+     my (%dumphash,%nothide);
+     if ($context eq 'userroles') {
+         my $extra = &freeze_escape({'skipcheck' => 1});
+         %dumphash = &dump('roles',$udom,$uname,'.',undef,$extra);
+     } else {
+         %dumphash=
              &dump('nohist_userroles',$udom,$uname);
+         if ($hidepriv) {
+             my %coursehash=&coursedescription($udom.'_'.$uname);
+             foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
+                 if ($user !~ /:/) {
+                     $nothide{join(':',split(/[\@]/,$user))} = 1;
+                 } else {
+                     $nothide{$user} = 1;
+                 }
+             }
+         }
+     }
      my %returnhash=();
      my $now=time;
-     foreach (keys %dumphash) {
+     my %privileged;
- 	my ($tend,$tstart)=split(/\:/,$dumphash{$_});
+     foreach my $entry (keys(%dumphash)) {
+         my ($role,$tend,$tstart);
+         if ($context eq 'userroles') {
+ 	    ($role,$tend,$tstart)=split(/_/,$dumphash{$entry});
+         } else {
+             ($tend,$tstart)=split(/\:/,$dumphash{$entry});
+         }
          if (($tstart) && ($tstart<0)) { next; }
-         if (($tend) && ($tend<$now)) { next; }
+         my $status = 'active';
-         if (($tstart) && ($now<$tstart)) { next; }
+         if (($tend) && ($tend<=$now)) {
-         my ($role,$username,$domain,$section)=split(/\:/,$_);
+             $status = 'previous';
- 	$returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend;
+         }
-      }
+         if (($tstart) && ($now<$tstart)) {
+             $status = 'future';
+         }
+         if (ref($types) eq 'ARRAY') {
+             if (!grep(/^\Q$status\E$/,@{$types})) {
+                 next;
+             }
+         } else {
+             if ($status ne 'active') {
+                 next;
+             }
+         }
+         my ($rolecode,$username,$domain,$section,$area);
+         if ($context eq 'userroles') {
+             ($area,$rolecode) = split(/_/,$entry);
+             (undef,$domain,$username,$section) = split(/\//,$area);
+         } else {
+             ($role,$username,$domain,$section) = split(/\:/,$entry);
+         }
+         if (ref($roledoms) eq 'ARRAY') {
+             if (!grep(/^\Q$domain\E$/,@{$roledoms})) {
+                 next;
+             }
+         }
+         if (ref($roles) eq 'ARRAY') {
+             if (!grep(/^\Q$role\E$/,@{$roles})) {
+                 if ($role =~ /^cr\//) {
+                     if (!grep(/^cr$/,@{$roles})) {
+                         next;
+                     }
+                 } else {
+                     next;
+                 }
+             }
+         }
+         if ($hidepriv) {
+             if ($context eq 'userroles') {
+                 if ((&privileged($username,$domain)) &&
+                     (!$nothide{$username.':'.$domain})) {
+                     next;
+                 }
+             } else {
+                 unless (ref($privileged{$domain}) eq 'HASH') {
+                     my %dompersonnel =
+                         &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+                     $privileged{$domain} = {};
+                     if (keys(%dompersonnel)) {
+                         foreach my $server (keys(%dompersonnel)) {
+                             if (ref($dompersonnel{$server}) eq 'HASH') {
+                                 foreach my $user (keys(%{$dompersonnel{$server}})) {
+                                     my ($trole,$uname,$udom) = split(/:/,$user);
+                                     $privileged{$udom}{$uname} = $trole;
+                                 }
+                             }
+                         }
+                     }
+                 }
+                 if (exists($privileged{$domain}{$username})) {
+                     if (!$nothide{$username.':'.$domain}) {
+                         next;
+                     }
+                 }
+             }
+         }
+         if ($withsec) {
+             $returnhash{$username.':'.$domain.':'.$role.':'.$section} =
+                 $tstart.':'.$tend;
+         } else {
+             $returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend;
+         }
+     }
      return %returnhash;
  }
- Line 1791  sub get_my_roles {
+ Line 3204  sub get_my_roles {
  sub postannounce {
      my ($server,$text)=@_;
-     unless (&allowed('psa',$hostdom{$server})) { return 'refused'; }
+     unless (&allowed('psa',&host_domain($server))) { return 'refused'; }
      unless ($text=~/\w/) { $text=''; }
      return &reply('setannounce:'.&escape($text),$server);
  }
- Line 1800  sub getannounce {
+ Line 3213  sub getannounce {
      if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) {
  	my $announcement='';
- 	while (<$fh>) { $announcement .=$_; }
+ 	while (my $line = <$fh>) { $announcement .= $line; }
  	close($fh);
  	if ($announcement=~/\w/) {
  	    return
- Line 1819  sub getannounce {
+ Line 3232  sub getannounce {
  #
  sub courseidput {
-     my ($domain,$what,$coursehome)=@_;
+     my ($domain,$storehash,$coursehome,$caller) = @_;
-     return &reply('courseidput:'.$domain.':'.$what,$coursehome);
+     return unless (ref($storehash) eq 'HASH');
+     my $outcome;
+     if ($caller eq 'timeonly') {
+         my $cids = '';
+         foreach my $item (keys(%$storehash)) {
+             $cids.=&escape($item).'&';
+         }
+         $cids=~s/\&$//;
+         $outcome = &reply('courseidputhash:'.$domain.':'.$caller.':'.$cids,
+                           $coursehome);
+     } else {
+         my $items = '';
+         foreach my $item (keys(%$storehash)) {
+             $items.= &escape($item).'='.
+                      &freeze_escape($$storehash{$item}).'&';
+         }
+         $items=~s/\&$//;
+         $outcome = &reply('courseidputhash:'.$domain.':'.$caller.':'.$items,
+                           $coursehome);
+     }
+     if ($outcome eq 'unknown_cmd') {
+         my $what;
+         foreach my $cid (keys(%$storehash)) {
+             $what .= &escape($cid).'=';
+             foreach my $item ('description','inst_code','owner','type') {
+                 $what .= &escape($storehash->{$cid}{$item}).':';
+             }
+             $what =~ s/\:$/&/;
+         }
+         $what =~ s/\&$//;
+         return &reply('courseidput:'.$domain.':'.$what,$coursehome);
+     } else {
+         return $outcome;
+     }
  }
  sub courseiddump {
-     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref)=@_;
+     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,
-     my %returnhash=();
+         $coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok,
-     unless ($domfilter) { $domfilter=''; }
+         $selfenrollonly,$catfilter,$showhidden,$caller,$cloner,$cc_clone,
-     foreach my $tryserver (keys %libserv) {
+         $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner)=@_;
-         if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) {
+     my $as_hash = 1;
- 	    if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+     my %returnhash;
- 	        foreach (
+     if (!$domfilter) { $domfilter=''; }
-                  split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+     my %libserv = &all_library();
- 			       $sincefilter.':'.&escape($descfilter).':'.
+     foreach my $tryserver (keys(%libserv)) {
-                                &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter),
+         if ( (  $hostidflag == 1
-                                $tryserver))) {
+ 	        && grep(/^\Q$tryserver\E$/,@{$hostidref}) )
- 		    my ($key,$value)=split(/\=/,$_);
+ 	     || (!defined($hostidflag)) ) {
-                     if (($key) && ($value)) {
- 		        $returnhash{&unescape($key)}=$value;
+ 	    if (($domfilter eq '') ||
+ 		(&host_domain($tryserver) eq $domfilter)) {
+                 my $rep =
+                   &reply('courseiddump:'.&host_domain($tryserver).':'.
+                          $sincefilter.':'.&escape($descfilter).':'.
+                          &escape($instcodefilter).':'.&escape($ownerfilter).
+                          ':'.&escape($coursefilter).':'.&escape($typefilter).
+                          ':'.&escape($regexp_ok).':'.$as_hash.':'.
+                          &escape($selfenrollonly).':'.&escape($catfilter).':'.
+                          $showhidden.':'.$caller.':'.&escape($cloner).':'.
+                          &escape($cc_clone).':'.$cloneonly.':'.
+                          &escape($createdbefore).':'.&escape($createdafter).':'.
+                          &escape($creationcontext).':'.$domcloner,
+                          $tryserver);
+                 my @pairs=split(/\&/,$rep);
+                 foreach my $item (@pairs) {
+                     my ($key,$value)=split(/\=/,$item,2);
+                     $key = &unescape($key);
+                     next if ($key =~ /^error: 2 /);
+                     my $result = &thaw_unescape($value);
+                     if (ref($result) eq 'HASH') {
+                         $returnhash{$key}=$result;
+                     } else {
+                         my @responses = split(/:/,$value);
+                         my @items = ('description','inst_code','owner','type');
+                         for (my $i=0; $i<@responses; $i++) {
+                             $returnhash{$key}{$items[$i]} = &unescape($responses[$i]);
+                         }
                      }
                  }
              }
- Line 1846  sub courseiddump {
+ Line 3319  sub courseiddump {
      return %returnhash;
  }
+ sub courselastaccess {
+     my ($cdom,$cnum,$hostidref) = @_;
+     my %returnhash;
+     if ($cdom && $cnum) {
+         my $chome = &homeserver($cnum,$cdom);
+         if ($chome ne 'no_host') {
+             my $rep = &reply('courselastaccess:'.$cdom.':'.$cnum,$chome);
+             &extract_lastaccess(\%returnhash,$rep);
+         }
+     } else {
+         if (!$cdom) { $cdom=''; }
+         my %libserv = &all_library();
+         foreach my $tryserver (keys(%libserv)) {
+             if (ref($hostidref) eq 'ARRAY') {
+                 next unless (grep(/^\Q$tryserver\E$/,@{$hostidref}));
+             }
+             if (($cdom eq '') || (&host_domain($tryserver) eq $cdom)) {
+                 my $rep = &reply('courselastaccess:'.&host_domain($tryserver).':',$tryserver);
+                 &extract_lastaccess(\%returnhash,$rep);
+             }
+         }
+     }
+     return %returnhash;
+ }
+ sub extract_lastaccess {
+     my ($returnhash,$rep) = @_;
+     if (ref($returnhash) eq 'HASH') {
+         unless ($rep eq 'unknown_command' || $rep eq 'no_such_host' ||
+                 $rep eq 'con_lost' || $rep eq 'rejected' || $rep eq 'refused' ||
+                  $rep eq '') {
+             my @pairs=split(/\&/,$rep);
+             foreach my $item (@pairs) {
+                 my ($key,$value)=split(/\=/,$item,2);
+                 $key = &unescape($key);
+                 next if ($key =~ /^error: 2 /);
+                 $returnhash->{$key} = &thaw_unescape($value);
+             }
+         }
+     }
+     return;
+ }
  # ---------------------------------------------------------- DC e-mail
  sub dcmailput {
-     my ($domain,$msgid,$contents,$server)=@_;
+     my ($domain,$msgid,$message,$server)=@_;
      my $status = &Apache::lonnet::critical(
-        'dcmailput:'.$domain.':'.&Apache::lonnet::escape($msgid).'='.
+        'dcmailput:'.$domain.':'.&escape($msgid).'='.
-        &Apache::lonnet::escape($$contents{$server}),$server);
+        &escape($message),$server);
      return $status;
  }
  sub dcmaildump {
      my ($dom,$startdate,$enddate,$senders) = @_;
      my %returnhash=();
-     foreach my $tryserver (keys(%libserv)) {
-         if ($hostdom{$tryserver} eq $dom) {
+     if (defined(&domain($dom,'primary'))) {
-             %{$returnhash{$tryserver}}=();
+         my $cmd='dcmaildump:'.$dom.':'.&escape($startdate).':'.
-             foreach (
+                                                          &escape($enddate).':';
-                 split(/\&/,&reply('dcmaildump:'.$dom.':'.
+ 	my @esc_senders=map { &escape($_)} @$senders;
-                    &escape($startdate).':'.&escape($enddate).':'.
+ 	$cmd.=&escape(join('&',@esc_senders));
-                    &escape($senders), $tryserver))) {
+ 	foreach my $line (split(/\&/,&reply($cmd,&domain($dom,'primary')))) {
-                 my ($key,$value) = split(/\=/,$_);
+             my ($key,$value) = split(/\=/,$line,2);
-                 if (($key) && ($value)) {
+             if (($key) && ($value)) {
-                     $returnhash{$tryserver}{&unescape($key)} = &unescape($value);
+                 $returnhash{&unescape($key)} = &unescape($value);
-                 }
              }
          }
      }
- Line 1879  sub dcmaildump {
+ Line 3394  sub dcmaildump {
  sub get_domain_roles {
      my ($dom,$roles,$startdate,$enddate)=@_;
-     if (undef($startdate) || $startdate eq '') {
+     if ((!defined($startdate)) || ($startdate eq '')) {
          $startdate = '.';
      }
-     if (undef($enddate) || $enddate eq '') {
+     if ((!defined($enddate)) || ($enddate eq '')) {
          $enddate = '.';
      }
-     my $rolelist = join(':',@{$roles});
+     my $rolelist;
+     if (ref($roles) eq 'ARRAY') {
+         $rolelist = join(':',@{$roles});
+     }
      my %personnel = ();
-     foreach my $tryserver (keys(%libserv)) {
-         if ($hostdom{$tryserver} eq $dom) {
+     my %servers = &get_servers($dom,'library');
-             %{$personnel{$tryserver}}=();
+     foreach my $tryserver (keys(%servers)) {
-             foreach (
+ 	%{$personnel{$tryserver}}=();
-                 split(/\&/,&reply('domrolesdump:'.$dom.':'.
+ 	foreach my $line (split(/\&/,&reply('domrolesdump:'.$dom.':'.
-                    &escape($startdate).':'.&escape($enddate).':'.
+ 					    &escape($startdate).':'.
-                    &escape($rolelist), $tryserver))) {
+ 					    &escape($enddate).':'.
-                 my($key,$value) = split(/\=/,$_);
+ 					    &escape($rolelist), $tryserver))) {
-                 if (($key) && ($value)) {
+ 	    my ($key,$value) = split(/\=/,$line,2);
-                     $personnel{$tryserver}{&unescape($key)} = &unescape($value);
+ 	    if (($key) && ($value)) {
-                 }
+ 		$personnel{$tryserver}{&unescape($key)} = &unescape($value);
-             }
+ 	    }
-         }
+ 	}
      }
      return %personnel;
  }
- # ----------------------------------------------------------- Check out an item
+ # ----------------------------------------------------------- Interval timing
  sub get_first_access {
      my ($type,$argsymb)=@_;
-     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$courseid,$udom,$uname)=&whichuser();
      if ($argsymb) { $symb=$argsymb; }
      my ($map,$id,$res)=&decode_symb($symb);
-     if ($type eq 'map') {
+     if ($type eq 'course') {
+ 	$res='course';
+     } elsif ($type eq 'map') {
  	$res=&symbread($map);
      } else {
  	$res=$symb;
- Line 1922  sub get_first_access {
+ Line 3442  sub get_first_access {
  sub set_first_access {
      my ($type)=@_;
-     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+     my ($symb,$courseid,$udom,$uname)=&whichuser();
      my ($map,$id,$res)=&decode_symb($symb);
-     if ($type eq 'map') {
+     if ($type eq 'course') {
+ 	$res='course';
+     } elsif ($type eq 'map') {
  	$res=&symbread($map);
      } else {
  	$res=$symb;
- Line 1936  sub set_first_access {
+ Line 3458  sub set_first_access {
      return 'already_set';
  }
- sub checkout {
-     my ($symb,$tuname,$tudom,$tcrsid)=@_;
-     my $now=time;
-     my $lonhost=$perlvar{'lonHostID'};
-     my $infostr=&escape(
-                  'CHECKOUTTOKEN&'.
-                  $tuname.'&'.
-                  $tudom.'&'.
-                  $tcrsid.'&'.
-                  $symb.'&'.
- 		 $now.'&'.$ENV{'REMOTE_ADDR'});
-     my $token=&reply('tmpput:'.$infostr,$lonhost);
-     if ($token=~/^error\:/) {
-         &logthis("<font color=blue>WARNING: ".
-                 "Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb.
-                  "</font>");
-         return '';
-     }
-     $token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/;
-     $token=~tr/a-z/A-Z/;
-     my %infohash=('resource.0.outtoken' => $token,
-                   'resource.0.checkouttime' => $now,
-                   'resource.0.outremote' => $ENV{'REMOTE_ADDR'});
-     unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
-        return '';
-     } else {
-         &logthis("<font color=blue>WARNING: ".
-                 "Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb.
-                  "</font>");
-     }
-     if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
-                          &escape('Checkout '.$infostr.' - '.
-                                                  $token)) ne 'ok') {
- 	return '';
-     } else {
-         &logthis("<font color=blue>WARNING: ".
-                 "Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb.
-                  "</font>");
-     }
-     return $token;
- }
- # ------------------------------------------------------------ Check in an item
- sub checkin {
-     my $token=shift;
-     my $now=time;
-     my ($ta,$tb,$lonhost)=split(/\*/,$token);
-     $lonhost=~tr/A-Z/a-z/;
-     my $dtoken=$ta.'_'.$hostname{$lonhost}.'_'.$tb;
-     $dtoken=~s/\W/\_/g;
-     my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
-                  split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
-     unless (($tuname) && ($tudom)) {
-         &logthis('Check in '.$token.' ('.$dtoken.') failed');
-         return '';
-     }
-     unless (&allowed('mgr',$tcrsid)) {
-         &logthis('Check in '.$token.' ('.$dtoken.') unauthorized: '.
-                  $env{'user.name'}.' - '.$env{'user.domain'});
-         return '';
-     }
-     my %infohash=('resource.0.intoken' => $token,
-                   'resource.0.checkintime' => $now,
-                   'resource.0.inremote' => $ENV{'REMOTE_ADDR'});
-     unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
-        return '';
-     }
-     if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
-                          &escape('Checkin - '.$token)) ne 'ok') {
- 	return '';
-     }
-     return ($symb,$tuname,$tudom,$tcrsid);
- }
  # --------------------------------------------- Set Expire Date for Spreadsheet
  sub expirespread {
- Line 2116  sub hash2str {
+ Line 3553  sub hash2str {
  sub hashref2str {
    my ($hashref)=@_;
    my $result='__HASH_REF__';
-   foreach (sort(keys(%$hashref))) {
+   foreach my $key (sort(keys(%$hashref))) {
-     if (ref($_) eq 'ARRAY') {
+     if (ref($key) eq 'ARRAY') {
-       $result.=&arrayref2str($_).'=';
+       $result.=&arrayref2str($key).'=';
-     } elsif (ref($_) eq 'HASH') {
+     } elsif (ref($key) eq 'HASH') {
-       $result.=&hashref2str($_).'=';
+       $result.=&hashref2str($key).'=';
-     } elsif (ref($_)) {
+     } elsif (ref($key)) {
        $result.='=';
-       #print("Got a ref of ".(ref($_))." skipping.");
+       #print("Got a ref of ".(ref($key))." skipping.");
      } else {
- 	if ($_) {$result.=&escape($_).'=';} else { last; }
+ 	if ($key) {$result.=&escape($key).'=';} else { last; }
      }
-     if(ref($hashref->{$_}) eq 'ARRAY') {
+     if(ref($hashref->{$key}) eq 'ARRAY') {
-       $result.=&arrayref2str($hashref->{$_}).'&';
+       $result.=&arrayref2str($hashref->{$key}).'&';
-     } elsif(ref($hashref->{$_}) eq 'HASH') {
+     } elsif(ref($hashref->{$key}) eq 'HASH') {
-       $result.=&hashref2str($hashref->{$_}).'&';
+       $result.=&hashref2str($hashref->{$key}).'&';
-     } elsif(ref($hashref->{$_})) {
+     } elsif(ref($hashref->{$key})) {
         $result.='&';
-       #print("Got a ref of ".(ref($hashref->{$_}))." skipping.");
+       #print("Got a ref of ".(ref($hashref->{$key}))." skipping.");
      } else {
-       $result.=&escape($hashref->{$_}).'&';
+       $result.=&escape($hashref->{$key}).'&';
      }
    }
    $result=~s/\&$//;
- Line 2282  sub tmpreset {
+ Line 3719  sub tmpreset {
    if (tie(%hash,'GDBM_File',
  	  $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db',
  	  &GDBM_WRCREAT(),0640)) {
-     foreach my $key (keys %hash) {
+     foreach my $key (keys(%hash)) {
        if ($key=~ /:$symb/) {
  	delete($hash{$key});
        }
- Line 2416  sub store {
+ Line 3853  sub store {
      $$storehash{'host'}=$perlvar{'lonHostID'};
      my $namevalue='';
-     foreach (keys %$storehash) {
+     foreach my $key (keys(%$storehash)) {
-         $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+         $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
      }
      $namevalue=~s/\&$//;
      &courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue);
- Line 2452  sub cstore {
+ Line 3889  sub cstore {
      $$storehash{'host'}=$perlvar{'lonHostID'};
      my $namevalue='';
-     foreach (keys %$storehash) {
+     foreach my $key (keys(%$storehash)) {
-         $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+         $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
      }
      $namevalue=~s/\&$//;
      &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue);
- Line 2485  sub restore {
+ Line 3922  sub restore {
      my $answer=&reply("restore:$domain:$stuname:$namespace:$symb","$home");
      my %returnhash=();
-     foreach (split(/\&/,$answer)) {
+     foreach my $line (split(/\&/,$answer)) {
- 	my ($name,$value)=split(/\=/,$_);
+ 	my ($name,$value)=split(/\=/,$line);
          $returnhash{&unescape($name)}=&thaw_unescape($value);
      }
      my $version;
      for ($version=1;$version<=$returnhash{'version'};$version++) {
-        foreach (split(/\:/,$returnhash{$version.':keys'})) {
+        foreach my $item (split(/\:/,$returnhash{$version.':keys'})) {
-           $returnhash{$_}=$returnhash{$version.':'.$_};
+           $returnhash{$item}=$returnhash{$version.':'.$item};
         }
      }
      return %returnhash;
- Line 2501  sub restore {
+ Line 3938  sub restore {
  # ---------------------------------------------------------- Course Description
  sub coursedescription {
-     my $courseid=shift;
+     my ($courseid,$args)=@_;
      $courseid=~s/^\///;
      $courseid=~s/\_/\//g;
      my ($cdomain,$cnum)=split(/\//,$courseid);
- Line 2511  sub coursedescription {
+ Line 3948  sub coursedescription {
      # trying and trying and trying to get the course description.
      my %envhash=();
      my %returnhash=();
-     $envhash{'course.'.$normalid.'.last_cache'}=time;
+     my $expiretime=600;
+     if ($env{'request.course.id'} eq $normalid) {
+ 	$expiretime=120;
+     }
+     my $prefix='course.'.$cdomain.'_'.$cnum.'.';
+     if (!$args->{'freshen_cache'}
+ 	&& ((time-$env{$prefix.'last_cache'}) < $expiretime) ) {
+ 	foreach my $key (keys(%env)) {
+ 	    next if ($key !~ /^\Q$prefix\E(.*)/);
+ 	    my ($setting) = $1;
+ 	    $returnhash{$setting} = $env{$key};
+ 	}
+ 	return %returnhash;
+     }
+     # get the data agin
+     if (!$args->{'one_time'}) {
+ 	$envhash{'course.'.$normalid.'.last_cache'}=time;
+     }
      if ($chome ne 'no_host') {
         %returnhash=&dump('environment',$cdomain,$cnum);
         if (!exists($returnhash{'con_lost'})) {
             $returnhash{'home'}= $chome;
  	   $returnhash{'domain'} = $cdomain;
  	   $returnhash{'num'} = $cnum;
+            if (!defined($returnhash{'type'})) {
+                $returnhash{'type'} = 'Course';
+            }
             while (my ($name,$value) = each %returnhash) {
                 $envhash{'course.'.$normalid.'.'.$name}=$value;
             }
- Line 2529  sub coursedescription {
+ Line 3990  sub coursedescription {
             $envhash{'course.'.$normalid.'.num'}=$cnum;
         }
      }
-     &appenv(%envhash);
+     if (!$args->{'one_time'}) {
+ 	&appenv(\%envhash);
+     }
      return %returnhash;
  }
+ sub update_released_required {
+     my ($needsrelease,$cdom,$cnum,$chome,$cid) = @_;
+     if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') {
+         $cid = $env{'request.course.id'};
+         $cdom = $env{'course.'.$cid.'.domain'};
+         $cnum = $env{'course.'.$cid.'.num'};
+         $chome = $env{'course.'.$cid.'.home'};
+     }
+     if ($needsrelease) {
+         my %curr_reqd_hash = &userenvironment($cdom,$cnum,'internal.releaserequired');
+         my $needsupdate;
+         if ($curr_reqd_hash{'internal.releaserequired'} eq '') {
+             $needsupdate = 1;
+         } else {
+             my ($currmajor,$currminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
+             my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
+             if (($currmajor < $needsmajor) || ($currmajor == $needsmajor && $currminor < $needsminor)) {
+                 $needsupdate = 1;
+             }
+         }
+         if ($needsupdate) {
+             my %needshash = (
+                              'internal.releaserequired' => $needsrelease,
+                             );
+             my $putresult = &put('environment',\%needshash,$cdom,$cnum);
+             if ($putresult eq 'ok') {
+                 &appenv({'course.'.$cid.'.internal.releaserequired' => $needsrelease});
+                 my %crsinfo = &courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
+                 if (ref($crsinfo{$cid}) eq 'HASH') {
+                     $crsinfo{$cid}{'releaserequired'} = $needsrelease;
+                     &courseidput($cdom,\%crsinfo,$chome,'notime');
+                 }
+             }
+         }
+     }
+     return;
+ }
  # -------------------------------------------------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; }
+     if (($rolesdump eq 'con_lost') || ($rolesdump eq '') ||
+         ($rolesdump =~ /^error:/)) {
+         return 0;
+     }
      my $now=time;
      if ($rolesdump ne '') {
-         foreach (split(/&/,$rolesdump)) {
+         foreach my $entry (split(/&/,$rolesdump)) {
- 	    if ($_!~/^rolesdef_/) {
+ 	    if ($entry!~/^rolesdef_/) {
- 		my ($area,$role)=split(/=/,$_);
+ 		my ($area,$role)=split(/=/,$entry);
  		$area=~s/\_\w\w$//;
  		my ($trole,$tend,$tstart)=split(/_/,$role);
  		if (($trole eq 'dc') || ($trole eq 'su')) {
- Line 2567  sub privileged {
+ Line 4071  sub privileged {
  sub rolesinit {
      my ($domain,$username,$authhost)=@_;
-     my $rolesdump=reply("dump:$domain:$username:roles",$authhost);
-     if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return ''; }
-     my %allroles=();
      my $now=time;
-     my $userroles="user.login.time=$now\n";
+     my %userroles = ('user.login.time' => $now);
+     my $extra = &freeze_escape({'skipcheck' => 1});
+     my $rolesdump=reply("dump:$domain:$username:roles:.::$extra",$authhost);
+     if (($rolesdump eq 'con_lost') || ($rolesdump eq '') ||
+         ($rolesdump =~ /^error:/)) {
+         return \%userroles;
+     }
+     my %allroles=();
+     my %allgroups=();
+     my $group_privs;
      if ($rolesdump ne '') {
-         foreach (split(/&/,$rolesdump)) {
+         foreach my $entry (split(/&/,$rolesdump)) {
- 	  if ($_!~/^rolesdef_/) {
+ 	  if ($entry!~/^rolesdef_/) {
-             my ($area,$role)=split(/=/,$_);
+             my ($area,$role)=split(/=/,$entry);
  	    $area=~s/\_\w\w$//;
-             my ($trole,$tend,$tstart);
+             my ($trole,$tend,$tstart,$group_privs);
  	    if ($role=~/^cr/) {
- 		if ($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|) {
+ 		if ($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|) {
- 		    ($trole,my $trest)=($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|);
+ 		    ($trole,my $trest)=($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|);
  		    ($tend,$tstart)=split('_',$trest);
  		} else {
  		    $trole=$role;
  		}
+             } elsif ($role =~ m|^gr/|) {
+                 ($trole,$tend,$tstart) = split(/_/,$role);
+                 ($trole,$group_privs) = split(/\//,$trole);
+                 $group_privs = &unescape($group_privs);
  	    } else {
  		($trole,$tend,$tstart)=split(/_/,$role);
  	    }
-             $userroles.=&set_arearole($trole,$area,$tstart,$tend,$domain,$username);
+ 	    my %new_role = &set_arearole($trole,$area,$tstart,$tend,$domain,
+ 					 $username);
+ 	    @userroles{keys(%new_role)} = @new_role{keys(%new_role)};
              if (($tend!=0) && ($tend<$now)) { $trole=''; }
              if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
              if (($area ne '') && ($trole ne '')) {
- Line 2597  sub rolesinit {
+ Line 4113  sub rolesinit {
  		my ($tdummy,$tdomain,$trest)=split(/\//,$area);
  		if ($trole =~ /^cr\//) {
                      &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area);
+                 } elsif ($trole eq 'gr') {
+                     &group_roleprivs(\%allgroups,$area,$group_privs,$tend,$tstart);
  		} else {
                      &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
  		}
              }
            }
          }
-         my ($author,$adv) = &set_userprivs(\$userroles,\%allroles);
+         my ($author,$adv) = &set_userprivs(\%userroles,\%allroles,\%allgroups);
-         $userroles.='user.adv='.$adv."\n".
+         $userroles{'user.adv'}    = $adv;
- 	            'user.author='.$author."\n";
+ 	$userroles{'user.author'} = $author;
          $env{'user.adv'}=$adv;
      }
-     return $userroles;
+     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";
+     return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend);
  }
  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 '') {
+     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)) {
+                 if ($trest =~ /^$match_community$/) {
+                     $syspriv =~ s/bre\&S//;
+                 }
                  $$allroles{'cm./'}.=':'.$syspriv;
                  $$allroles{$spec.'./'}.=':'.$syspriv;
              }
- Line 2645  sub custom_roleprivs {
+ Line 4166  sub custom_roleprivs {
      }
  }
+ sub group_roleprivs {
+     my ($allgroups,$area,$group_privs,$tend,$tstart) = @_;
+     my $access = 1;
+     my $now = time;
+     if (($tend!=0) && ($tend<$now)) { $access = 0; }
+     if (($tstart!=0) && ($tstart>$now)) { $access=0; }
+     if ($access) {
+         my ($course,$group) = ($area =~ m|(/$match_domain/$match_courseid)/([^/]+)$|);
+         $$allgroups{$course}{$group} .=':'.$group_privs;
+     }
+ }
  sub standard_roleprivs {
      my ($allroles,$trole,$tdomain,$spec,$trest,$area) = @_;
- Line 2665  sub standard_roleprivs {
+ Line 4197  sub standard_roleprivs {
  }
  sub set_userprivs {
-     my ($userroles,$allroles) = @_;
+     my ($userroles,$allroles,$allgroups,$groups_roles) = @_;
      my $author=0;
      my $adv=0;
-     foreach (keys %{$allroles}) {
+     my %grouproles = ();
-         my %thesepriv=();
+     if (keys(%{$allgroups}) > 0) {
-         if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; }
+         my @groupkeys;
-         foreach (split(/:/,$$allroles{$_})) {
+         foreach my $role (keys(%{$allroles})) {
-             if ($_ ne '') {
+             push(@groupkeys,$role);
-                 my ($privilege,$restrictions)=split(/&/,$_);
+         }
+         if (ref($groups_roles) eq 'HASH') {
+             foreach my $key (keys(%{$groups_roles})) {
+                 unless (grep(/^\Q$key\E$/,@groupkeys)) {
+                     push(@groupkeys,$key);
+                 }
+             }
+         }
+         if (@groupkeys > 0) {
+             foreach my $role (@groupkeys) {
+                 my ($trole,$area,$sec,$extendedarea);
+                 if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)\.-) {
+                     $trole = $1;
+                     $area = $2;
+                     $sec = $3;
+                     $extendedarea = $area.$sec;
+                     if (exists($$allgroups{$area})) {
+                         foreach my $group (keys(%{$$allgroups{$area}})) {
+                             my $spec = $trole.'.'.$extendedarea;
+                             $grouproles{$spec.'.'.$area.'/'.$group} =
+                                                 $$allgroups{$area}{$group};
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     foreach my $group (keys(%grouproles)) {
+         $$allroles{$group} = $grouproles{$group};
+     }
+     foreach my $role (keys(%{$allroles})) {
+         my %thesepriv;
+         if (($role=~/^au/) || ($role=~/^ca/) || ($role=~/^aa/)) { $author=1; }
+         foreach my $item (split(/:/,$$allroles{$role})) {
+             if ($item ne '') {
+                 my ($privilege,$restrictions)=split(/&/,$item);
                  if ($restrictions eq '') {
                      $thesepriv{$privilege}='F';
                  } elsif ($thesepriv{$privilege} ne 'F') {
- Line 2683  sub set_userprivs {
+ Line 4250  sub set_userprivs {
              }
          }
          my $thesestr='';
-         foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; }
+         foreach my $priv (keys(%thesepriv)) {
-         $$userroles.='user.priv.'.$_.'='.$thesestr."\n";
+ 	    $thesestr.=':'.$priv.'&'.$thesepriv{$priv};
+ 	}
+         $userroles->{'user.priv.'.$role} = $thesestr;
      }
      return ($author,$adv);
  }
+ sub role_status {
+     my ($rolekey,$then,$refresh,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_;
+     my @pwhere = ();
+     if (exists($env{$rolekey}) && $env{$rolekey} ne '') {
+         (undef,undef,$$role,@pwhere)=split(/\./,$rolekey);
+         unless (!defined($$role) || $$role eq '') {
+             $$where=join('.',@pwhere);
+             $$trolecode=$$role.'.'.$$where;
+             ($$tstart,$$tend)=split(/\./,$env{$rolekey});
+             $$tstatus='is';
+             if ($$tstart && $$tstart>$then) {
+                 $$tstatus='future';
+                 if ($$tstart<$now) {
+                     if ($$tstart && $$tstart>$refresh) {
+                         if (($$where ne '') && ($$role ne '')) {
+                             my (%allroles,%allgroups,$group_privs,
+                                 %groups_roles,@rolecodes);
+                             my %userroles = (
+                                 'user.role.'.$$role.'.'.$$where => $$tstart.'.'.$$tend
+                             );
+                             @rolecodes = ('cm');
+                             my $spec=$$role.'.'.$$where;
+                             my ($tdummy,$tdomain,$trest)=split(/\//,$$where);
+                             if ($$role =~ /^cr\//) {
+                                 &custom_roleprivs(\%allroles,$$role,$tdomain,$trest,$spec,$$where);
+                                 push(@rolecodes,'cr');
+                             } elsif ($$role eq 'gr') {
+                                 push(@rolecodes,$$role);
+                                 my %rolehash = &get('roles',[$$where.'_'.$$role],$env{'user.domain'},
+                                                     $env{'user.name'});
+                                 my ($trole) = split('_',$rolehash{$$where.'_'.$$role},2);
+                                 (undef,my $group_privs) = split(/\//,$trole);
+                                 $group_privs = &unescape($group_privs);
+                                 &group_roleprivs(\%allgroups,$$where,$group_privs,$$tend,$$tstart);
+                                 my %course_roles = &get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',['active'],['cc','co','in','ta','ep','ad','st','cr'],[$tdomain],1);
+                                 if (keys(%course_roles) > 0) {
+                                     my ($tnum) = ($trest =~ /^($match_courseid)/);
+                                     if ($tdomain ne '' && $tnum ne '') {
+                                         foreach my $key (keys(%course_roles)) {
+                                             if ($key =~ /^\Q$tnum\E:\Q$tdomain\E:([^:]+):?([^:]*)/) {
+                                                 my $crsrole = $1;
+                                                 my $crssec = $2;
+                                                 if ($crsrole =~ /^cr/) {
+                                                     unless (grep(/^cr$/,@rolecodes)) {
+                                                         push(@rolecodes,'cr');
+                                                     }
+                                                 } else {
+                                                     unless(grep(/^\Q$crsrole\E$/,@rolecodes)) {
+                                                         push(@rolecodes,$crsrole);
+                                                     }
+                                                 }
+                                                 my $rolekey = $crsrole.'./'.$tdomain.'/'.$tnum;
+                                                 if ($crssec ne '') {
+                                                     $rolekey .= '/'.$crssec;
+                                                 }
+                                                 $rolekey .= './';
+                                                 $groups_roles{$rolekey} = \@rolecodes;
+                                             }
+                                         }
+                                     }
+                                 }
+                             } else {
+                                 push(@rolecodes,$$role);
+                                 &standard_roleprivs(\%allroles,$$role,$tdomain,$spec,$trest,$$where);
+                             }
+                             my ($author,$adv)= &set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles);
+                             &appenv(\%userroles,\@rolecodes);
+                             &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+                         }
+                     }
+                     $$tstatus = 'is';
+                 }
+             }
+             if ($$tend) {
+                 if ($$tend<$then) {
+                     $$tstatus='expired';
+                 } elsif ($$tend<$now) {
+                     $$tstatus='will_not';
+                 }
+             }
+         }
+     }
+ }
+ sub check_adhoc_privs {
+     my ($cdom,$cnum,$then,$refresh,$now,$checkrole,$caller) = @_;
+     my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum;
+     if ($env{$cckey}) {
+         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
+         &role_status($cckey,$then,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
+         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
+             &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
+         }
+     } else {
+         &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
+     }
+ }
+ sub set_adhoc_privileges {
+ # role can be cc or ca
+     my ($dcdom,$pickedcourse,$role,$caller) = @_;
+     my $area = '/'.$dcdom.'/'.$pickedcourse;
+     my $spec = $role.'.'.$area;
+     my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
+                                   $env{'user.name'});
+     my %ccrole = ();
+     &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
+     my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
+     &appenv(\%userroles,[$role,'cm']);
+     &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
+     unless ($caller eq 'constructaccess' && $env{'request.course.id'}) {
+         &appenv( {'request.role'        => $spec,
+                   'request.role.domain' => $dcdom,
+                   'request.course.sec'  => ''
+                  }
+                );
+         my $tadv=0;
+         if (&allowed('adv') eq 'F') { $tadv=1; }
+         &appenv({'request.role.adv'    => $tadv});
+     }
+ }
  # --------------------------------------------------------------- get interface
  sub get {
     my ($namespace,$storearr,$udomain,$uname)=@_;
     my $items='';
-    foreach (@$storearr) {
+    foreach my $item (@$storearr) {
-        $items.=escape($_).'&';
+        $items.=&escape($item).'&';
     }
     $items=~s/\&$//;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
- Line 2709  sub get {
+ Line 4400  sub get {
     }
     my %returnhash=();
     my $i=0;
-    foreach (@$storearr) {
+    foreach my $item (@$storearr) {
-       $returnhash{$_}=&thaw_unescape($pairs[$i]);
+       $returnhash{$item}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
- Line 2721  sub get {
+ Line 4412  sub get {
  sub del {
     my ($namespace,$storearr,$udomain,$uname)=@_;
     my $items='';
-    foreach (@$storearr) {
+    foreach my $item (@$storearr) {
-        $items.=escape($_).'&';
+        $items.=&escape($item).'&';
     }
     $items=~s/\&$//;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
     return &reply("del:$udomain:$uname:$namespace:$items",$uhome);
  }
  # -------------------------------------------------------------- dump interface
  sub dump {
-    my ($namespace,$udomain,$uname,$regexp)=@_;
+     my ($namespace,$udomain,$uname,$regexp,$range,$extra)=@_;
+     if (!$udomain) { $udomain=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $uhome=&homeserver($uname,$udomain);
+     if ($regexp) {
+ 	$regexp=&escape($regexp);
+     } else {
+ 	$regexp='.';
+     }
+     my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range:$extra",$uhome);
+     my @pairs=split(/\&/,$rep);
+     my %returnhash=();
+     if (!($rep =~ /^error/ )) {
+ 	foreach my $item (@pairs) {
+ 	    my ($key,$value)=split(/=/,$item,2);
+ 	    $key = &unescape($key);
+ 	    next if ($key =~ /^error: 2 /);
+ 	    $returnhash{$key}=&thaw_unescape($value);
+ 	}
+     }
+     return %returnhash;
+ }
+ # --------------------------------------------------------- dumpstore interface
+ sub dumpstore {
+    my ($namespace,$udomain,$uname,$regexp,$range)=@_;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
- Line 2744  sub dump {
+ Line 4462  sub dump {
     } else {
         $regexp='.';
     }
-    my $rep=reply("dump:$udomain:$uname:$namespace:$regexp",$uhome);
+    my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
     my @pairs=split(/\&/,$rep);
     my %returnhash=();
-    foreach (@pairs) {
+    foreach my $item (@pairs) {
-       my ($key,$value)=split(/=/,$_);
+        my ($key,$value)=split(/=/,$item,2);
-       $returnhash{unescape($key)}=&thaw_unescape($value);
+        next if ($key =~ /^error: 2 /);
+        $returnhash{$key}=&thaw_unescape($value);
     }
     return %returnhash;
  }
- Line 2763  sub getkeys {
+ Line 4482  sub getkeys {
     my $uhome=&homeserver($uname,$udomain);
     my $rep=reply("keys:$udomain:$uname:$namespace",$uhome);
     my @keyarray=();
-    foreach (split(/\&/,$rep)) {
+    foreach my $key (split(/\&/,$rep)) {
-       push (@keyarray,&unescape($_));
+       next if ($key =~ /^error: 2 /);
+       push(@keyarray,&unescape($key));
     }
     return @keyarray;
  }
- Line 2784  sub currentdump {
+ Line 4504  sub currentdump {
     if ($rep eq "unknown_cmd") {
         # an old lond will not know currentdump
         # Do a dump and make it look like a currentdump
-        my @tmp = &dump($courseid,$sdom,$sname,'.');
+        my @tmp = &dumpstore($courseid,$sdom,$sname,'.');
         return if ($tmp[0] =~ /^(error:|no_such_host)/);
         my %hash = @tmp;
         @tmp=();
         %returnhash = %{&convert_dump_to_currentdump(\%hash)};
     } else {
         my @pairs=split(/\&/,$rep);
-        foreach (@pairs) {
+        foreach my $pair (@pairs) {
-            my ($key,$value)=split(/=/,$_);
+            my ($key,$value)=split(/=/,$pair,2);
             my ($symb,$param) = split(/:/,$key);
             $returnhash{&unescape($symb)}->{&unescape($param)} =
                                                          &thaw_unescape($value);
- Line 2809  sub convert_dump_to_currentdump{
+ Line 4529  sub convert_dump_to_currentdump{
      # we might run in to problems with parameter names =~ /^v\./
      while (my ($key,$value) = each(%hash)) {
          my ($v,$symb,$param) = split(/:/,$key);
+ 	$symb  = &unescape($symb);
+ 	$param = &unescape($param);
          next if ($v eq 'version' || $symb eq 'keys');
          next if (exists($returnhash{$symb}) &&
                   exists($returnhash{$symb}->{$param}) &&
- Line 2870  sub put {
+ Line 4592  sub put {
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
-    foreach (keys %$storehash) {
+    foreach my $item (keys(%$storehash)) {
-        $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+        $items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
     }
     $items=~s/\&$//;
     return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2895  sub newput {
+ Line 4617  sub newput {
  # ---------------------------------------------------------  putstore interface
  sub putstore {
-    my ($namespace,$storehash,$udomain,$uname)=@_;
+    my ($namespace,$symb,$version,$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 my $key (keys(%$storehash)) {
-    foreach (keys %$storehash) {
+        $items.= &escape($key).'='.&freeze_escape($storehash->{$key}).'&';
-        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);
+    my $esc_symb=&escape($symb);
+    my $esc_v=&escape($version);
+    my $reply =
+        &reply("putstore:$udomain:$uname:$namespace:$esc_symb:$esc_v:$items",
+ 	      $uhome);
+    if ($reply eq 'unknown_cmd') {
+        # gfall back to way things use to be done
+        return &old_putstore($namespace,$symb,$version,$storehash,$udomain,
+ 			    $uname);
+    }
+    return $reply;
+ }
+ sub old_putstore {
+     my ($namespace,$symb,$version,$storehash,$udomain,$uname)=@_;
+     if (!$udomain) { $udomain=$env{'user.domain'}; }
+     if (!$uname) { $uname=$env{'user.name'}; }
+     my $uhome=&homeserver($uname,$udomain);
+     my %newstorehash;
+     foreach my $item (keys(%$storehash)) {
+ 	my $key = $version.':'.&escape($symb).':'.$item;
+ 	$newstorehash{$key} = $storehash->{$item};
+     }
+     my $items='';
+     my %allitems = ();
+     foreach my $item (keys(%newstorehash)) {
+ 	if ($item =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) {
+ 	    my $key = $1.':keys:'.$2;
+ 	    $allitems{$key} .= $3.':';
+ 	}
+ 	$items.=$item.'='.&freeze_escape($newstorehash{$item}).'&';
+     }
+     foreach my $item (keys(%allitems)) {
+ 	$allitems{$item} =~ s/\:$//;
+ 	$items.= $item.'='.$allitems{$item}.'&';
+     }
+     $items=~s/\&$//;
+     return &reply("put:$udomain:$uname:$namespace:$items",$uhome);
  }
  # ------------------------------------------------------ critical put interface
- Line 2924  sub cput {
+ Line 4674  sub cput {
     if (!$uname) { $uname=$env{'user.name'}; }
     my $uhome=&homeserver($uname,$udomain);
     my $items='';
-    foreach (keys %$storehash) {
+    foreach my $item (keys(%$storehash)) {
-        $items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&';
+        $items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
     }
     $items=~s/\&$//;
     return &critical("put:$udomain:$uname:$namespace:$items",$uhome);
- Line 2936  sub cput {
+ Line 4686  sub cput {
  sub eget {
     my ($namespace,$storearr,$udomain,$uname)=@_;
     my $items='';
-    foreach (@$storearr) {
+    foreach my $item (@$storearr) {
-        $items.=escape($_).'&';
+        $items.=&escape($item).'&';
     }
     $items=~s/\&$//;
     if (!$udomain) { $udomain=$env{'user.domain'}; }
- Line 2947  sub eget {
+ Line 4697  sub eget {
     my @pairs=split(/\&/,$rep);
     my %returnhash=();
     my $i=0;
-    foreach (@$storearr) {
+    foreach my $item (@$storearr) {
-       $returnhash{$_}=&thaw_unescape($pairs[$i]);
+       $returnhash{$item}=&thaw_unescape($pairs[$i]);
        $i++;
     }
     return %returnhash;
  }
- # ---------------------------------------------- Custom access rule evaluation
+ # ------------------------------------------------------------ tmpput interface
+ sub tmpput {
+     my ($storehash,$server,$context)=@_;
+     my $items='';
+     foreach my $item (keys(%$storehash)) {
+ 	$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
+     }
+     $items=~s/\&$//;
+     if (defined($context)) {
+         $items .= ':'.&escape($context);
+     }
+     return &reply("tmpput:$items",$server);
+ }
- sub customaccess {
+ # ------------------------------------------------------------ tmpget interface
-     my ($priv,$uri)=@_;
+ sub tmpget {
-     my ($urole,$urealm)=split(/\./,$env{'request.role'});
+     my ($token,$server)=@_;
-     $urealm=~s/^\W//;
+     if (!defined($server)) { $server = $perlvar{'lonHostID'}; }
-     my ($udom,$ucrs,$usec)=split(/\//,$urealm);
+     my $rep=&reply("tmpget:$token",$server);
-     my $access=0;
+     my %returnhash;
-     foreach (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) {
+     foreach my $item (split(/\&/,$rep)) {
- 	my ($effect,$realm,$role)=split(/\:/,$_);
+ 	my ($key,$value)=split(/=/,$item);
-         if ($role) {
+         next if ($key =~ /^error: 2 /);
- 	   if ($role ne $urole) { next; }
+ 	$returnhash{&unescape($key)}=&thaw_unescape($value);
-         }
+     }
-         foreach (split(/\s*\,\s*/,$realm)) {
+     return %returnhash;
-             my ($tdom,$tcrs,$tsec)=split(/\_/,$_);
+ }
-             if ($tdom) {
- 		if ($tdom ne $udom) { next; }
+ # ------------------------------------------------------------ tmpget interface
+ sub tmpdel {
+     my ($token,$server)=@_;
+     if (!defined($server)) { $server = $perlvar{'lonHostID'}; }
+     return &reply("tmpdel:$token",$server);
+ }
+ # -------------------------------------------------- portfolio access checking
+ sub portfolio_access {
+     my ($requrl) = @_;
+     my (undef,$udom,$unum,$file_name,$group) = &parse_portfolio_url($requrl);
+     my $result = &get_portfolio_access($udom,$unum,$file_name,$group);
+     if ($result) {
+         my %setters;
+         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+             my ($startblock,$endblock) =
+                 &Apache::loncommon::blockcheck(\%setters,'port',$unum,$udom);
+             if ($startblock && $endblock) {
+                 return 'B';
              }
-             if ($tcrs) {
+         } else {
- 		if ($tcrs ne $ucrs) { next; }
+             my ($startblock,$endblock) =
+                 &Apache::loncommon::blockcheck(\%setters,'port');
+             if ($startblock && $endblock) {
+                 return 'B';
              }
-             if ($tsec) {
+         }
- 		if ($tsec ne $usec) { next; }
+     }
+     if ($result eq 'ok') {
+        return 'F';
+     } elsif ($result =~ /^[^:]+:guest_/) {
+        return 'A';
+     }
+     return '';
+ }
+ sub get_portfolio_access {
+     my ($udom,$unum,$file_name,$group,$access_hash) = @_;
+     if (!ref($access_hash)) {
+ 	my $current_perms = &get_portfile_permissions($udom,$unum);
+ 	my %access_controls = &get_access_controls($current_perms,$group,
+ 						   $file_name);
+ 	$access_hash = $access_controls{$file_name};
+     }
+     my ($public,$guest,@domains,@users,@courses,@groups);
+     my $now = time;
+     if (ref($access_hash) eq 'HASH') {
+         foreach my $key (keys(%{$access_hash})) {
+             my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+             if ($start > $now) {
+                 next;
+             }
+             if ($end && $end<$now) {
+                 next;
+             }
+             if ($scope eq 'public') {
+                 $public = $key;
+                 last;
+             } elsif ($scope eq 'guest') {
+                 $guest = $key;
+             } elsif ($scope eq 'domains') {
+                 push(@domains,$key);
+             } elsif ($scope eq 'users') {
+                 push(@users,$key);
+             } elsif ($scope eq 'course') {
+                 push(@courses,$key);
+             } elsif ($scope eq 'group') {
+                 push(@groups,$key);
+             }
+         }
+         if ($public) {
+             return 'ok';
+         }
+         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+             if ($guest) {
+                 return $guest;
+             }
+         } else {
+             if (@domains > 0) {
+                 foreach my $domkey (@domains) {
+                     if (ref($access_hash->{$domkey}{'dom'}) eq 'ARRAY') {
+                         if (grep(/^\Q$env{'user.domain'}\E$/,@{$access_hash->{$domkey}{'dom'}})) {
+                             return 'ok';
+                         }
+                     }
+                 }
+             }
+             if (@users > 0) {
+                 foreach my $userkey (@users) {
+                     if (ref($access_hash->{$userkey}{'users'}) eq 'ARRAY') {
+                         foreach my $item (@{$access_hash->{$userkey}{'users'}}) {
+                             if (ref($item) eq 'HASH') {
+                                 if (($item->{'uname'} eq $env{'user.name'}) &&
+                                     ($item->{'udom'} eq $env{'user.domain'})) {
+                                     return 'ok';
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+             my %roleshash;
+             my @courses_and_groups = @courses;
+             push(@courses_and_groups,@groups);
+             if (@courses_and_groups > 0) {
+                 my (%allgroups,%allroles);
+                 my ($start,$end,$role,$sec,$group);
+                 foreach my $envkey (%env) {
+                     if ($envkey =~ m-^user\.role\.(gr|cc|co|in|ta|ep|ad|st)\./($match_domain)/($match_courseid)/?([^/]*)$-) {
+                         my $cid = $2.'_'.$3;
+                         if ($1 eq 'gr') {
+                             $group = $4;
+                             $allgroups{$cid}{$group} = $env{$envkey};
+                         } else {
+                             if ($4 eq '') {
+                                 $sec = 'none';
+                             } else {
+                                 $sec = $4;
+                             }
+                             $allroles{$cid}{$1}{$sec} = $env{$envkey};
+                         }
+                     } elsif ($envkey =~ m-^user\.role\./cr/($match_domain/$match_username/\w*)./($match_domain)/($match_courseid)/?([^/]*)$-) {
+                         my $cid = $2.'_'.$3;
+                         if ($4 eq '') {
+                             $sec = 'none';
+                         } else {
+                             $sec = $4;
+                         }
+                         $allroles{$cid}{$1}{$sec} = $env{$envkey};
+                     }
+                 }
+                 if (keys(%allroles) == 0) {
+                     return;
+                 }
+                 foreach my $key (@courses_and_groups) {
+                     my %content = %{$$access_hash{$key}};
+                     my $cnum = $content{'number'};
+                     my $cdom = $content{'domain'};
+                     my $cid = $cdom.'_'.$cnum;
+                     if (!exists($allroles{$cid})) {
+                         next;
+                     }
+                     foreach my $role_id (keys(%{$content{'roles'}})) {
+                         my @sections = @{$content{'roles'}{$role_id}{'section'}};
+                         my @groups = @{$content{'roles'}{$role_id}{'group'}};
+                         my @status = @{$content{'roles'}{$role_id}{'access'}};
+                         my @roles = @{$content{'roles'}{$role_id}{'role'}};
+                         foreach my $role (keys(%{$allroles{$cid}})) {
+                             if ((grep/^all$/,@roles) || (grep/^\Q$role\E$/,@roles)) {
+                                 foreach my $sec (keys(%{$allroles{$cid}{$role}})) {
+                                     if (&course_group_datechecker($allroles{$cid}{$role}{$sec},$now,\@status) eq 'ok') {
+                                         if (grep/^all$/,@sections) {
+                                             return 'ok';
+                                         } else {
+                                             if (grep/^$sec$/,@sections) {
+                                                 return 'ok';
+                                             }
+                                         }
+                                     }
+                                 }
+                                 if (keys(%{$allgroups{$cid}}) == 0) {
+                                     if (grep/^none$/,@groups) {
+                                         return 'ok';
+                                     }
+                                 } else {
+                                     if (grep/^all$/,@groups) {
+                                         return 'ok';
+                                     }
+                                     foreach my $group (keys(%{$allgroups{$cid}})) {
+                                         if (grep/^$group$/,@groups) {
+                                             return 'ok';
+                                         }
+                                     }
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+             if ($guest) {
+                 return $guest;
              }
-             $access=($effect eq 'allow');
-             last;
          }
- 	if ($realm eq '' && $role eq '') {
+     }
-             $access=($effect eq 'allow');
+     return;
+ }
+ sub course_group_datechecker {
+     my ($dates,$now,$status) = @_;
+     my ($start,$end) = split(/\./,$dates);
+     if (!$start && !$end) {
+         return 'ok';
+     }
+     if (grep/^active$/,@{$status}) {
+         if (((!$start) || ($start && $start <= $now)) && ((!$end) || ($end && $end >= $now))) {
+             return 'ok';
+         }
+     }
+     if (grep/^previous$/,@{$status}) {
+         if ($end > $now ) {
+             return 'ok';
+         }
+     }
+     if (grep/^future$/,@{$status}) {
+         if ($start > $now) {
+             return 'ok';
+         }
+     }
+     return;
+ }
+ sub parse_portfolio_url {
+     my ($url) = @_;
+     my ($type,$udom,$unum,$group,$file_name);
+     if ($url =~  m-^/*(?:uploaded|editupload)/($match_domain)/($match_username)/portfolio(/.+)$-) {
+ 	$type = 1;
+         $udom = $1;
+         $unum = $2;
+         $file_name = $3;
+     } elsif ($url =~ m-^/*(?:uploaded|editupload)/($match_domain)/($match_courseid)/groups/([^/]+)/portfolio/(.+)$-) {
+ 	$type = 2;
+         $udom = $1;
+         $unum = $2;
+         $group = $3;
+         $file_name = $3.'/'.$4;
+     }
+     if (wantarray) {
+ 	return ($type,$udom,$unum,$file_name,$group);
+     }
+     return $type;
+ }
+ sub is_portfolio_url {
+     my ($url) = @_;
+     return scalar(&parse_portfolio_url($url));
+ }
+ sub is_portfolio_file {
+     my ($file) = @_;
+     if (($file =~ /^portfolio/) || ($file =~ /^groups\/\w+\/portfolio/)) {
+         return 1;
+     }
+     return;
+ }
+ sub usertools_access {
+     my ($uname,$udom,$tool,$action,$context,$userenvref,$domdefref,$is_advref)=@_;
+     my ($access,%tools);
+     if ($context eq '') {
+         $context = 'tools';
+     }
+     if ($context eq 'requestcourses') {
+         %tools = (
+                       official   => 1,
+                       unofficial => 1,
+                       community  => 1,
+                  );
+     } else {
+         %tools = (
+                       aboutme   => 1,
+                       blog      => 1,
+                       portfolio => 1,
+                  );
+     }
+     return if (!defined($tools{$tool}));
+     if ((!defined($udom)) || (!defined($uname))) {
+         $udom = $env{'user.domain'};
+         $uname = $env{'user.name'};
+     }
+     if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) {
+         if ($action ne 'reload') {
+             if ($context eq 'requestcourses') {
+                 return $env{'environment.canrequest.'.$tool};
+             } else {
+                 return $env{'environment.availabletools.'.$tool};
+             }
+         }
+     }
+     my ($toolstatus,$inststatus);
+     if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
+          ($action ne 'reload')) {
+         $toolstatus = $env{'environment.'.$context.'.'.$tool};
+         $inststatus = $env{'environment.inststatus'};
+     } else {
+         if (ref($userenvref) eq 'HASH') {
+             $toolstatus = $userenvref->{$context.'.'.$tool};
+             $inststatus = $userenvref->{'inststatus'};
+         } else {
+             my %userenv = &userenvironment($udom,$uname,$context.'.'.$tool,'inststatus');
+             $toolstatus = $userenv{$context.'.'.$tool};
+             $inststatus = $userenv{'inststatus'};
+         }
+     }
+     if ($toolstatus ne '') {
+         if ($toolstatus) {
+             $access = 1;
+         } else {
+             $access = 0;
+         }
+         return $access;
+     }
+     my ($is_adv,%domdef);
+     if (ref($is_advref) eq 'HASH') {
+         $is_adv = $is_advref->{'is_adv'};
+     } else {
+         $is_adv = &is_advanced_user($udom,$uname);
+     }
+     if (ref($domdefref) eq 'HASH') {
+         %domdef = %{$domdefref};
+     } else {
+         %domdef = &get_domain_defaults($udom);
+     }
+     if (ref($domdef{$tool}) eq 'HASH') {
+         if ($is_adv) {
+             if ($domdef{$tool}{'_LC_adv'} ne '') {
+                 if ($domdef{$tool}{'_LC_adv'}) {
+                     $access = 1;
+                 } else {
+                     $access = 0;
+                 }
+                 return $access;
+             }
+         }
+         if ($inststatus ne '') {
+             my ($hasaccess,$hasnoaccess);
+             foreach my $affiliation (split(/:/,$inststatus)) {
+                 if ($domdef{$tool}{$affiliation} ne '') {
+                     if ($domdef{$tool}{$affiliation}) {
+                         $hasaccess = 1;
+                     } else {
+                         $hasnoaccess = 1;
+                     }
+                 }
+             }
+             if ($hasaccess || $hasnoaccess) {
+                 if ($hasaccess) {
+                     $access = 1;
+                 } elsif ($hasnoaccess) {
+                     $access = 0;
+                 }
+                 return $access;
+             }
+         } else {
+             if ($domdef{$tool}{'default'} ne '') {
+                 if ($domdef{$tool}{'default'}) {
+                     $access = 1;
+                 } elsif ($domdef{$tool}{'default'} == 0) {
+                     $access = 0;
+                 }
+                 return $access;
+             }
+         }
+     } else {
+         if ($context eq 'tools') {
+             $access = 1;
+         } else {
+             $access = 0;
+         }
+         return $access;
+     }
+ }
+ sub is_course_owner {
+     my ($cdom,$cnum,$udom,$uname) = @_;
+     if (($udom eq '') || ($uname eq '')) {
+         $udom = $env{'user.domain'};
+         $uname = $env{'user.name'};
+     }
+     unless (($udom eq '') || ($uname eq '')) {
+         if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'})) {
+             if ($env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'} eq $uname.':'.$udom) {
+                 return 1;
+             } else {
+                 my %courseinfo = &Apache::lonnet::coursedescription($cdom.'/'.$cnum);
+                 if ($courseinfo{'internal.courseowner'} eq $uname.':'.$udom) {
+                     return 1;
+                 }
+             }
+         }
+     }
+     return;
+ }
+ sub is_advanced_user {
+     my ($udom,$uname) = @_;
+     if ($udom ne '' && $uname ne '') {
+         if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) {
+             return $env{'user.adv'};
+         }
+     }
+     my %roleshash = &get_my_roles($uname,$udom,'userroles',undef,undef,undef,1);
+     my %allroles;
+     my $is_adv;
+     foreach my $role (keys(%roleshash)) {
+         my ($trest,$tdomain,$trole,$sec) = split(/:/,$role);
+         my $area = '/'.$tdomain.'/'.$trest;
+         if ($sec ne '') {
+             $area .= '/'.$sec;
+         }
+         if (($area ne '') && ($trole ne '')) {
+             my $spec=$trole.'.'.$area;
+             if ($trole =~ /^cr\//) {
+                 &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area);
+             } elsif ($trole ne 'gr') {
+                 &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
+             }
+         }
+     }
+     foreach my $role (keys(%allroles)) {
+         last if ($is_adv);
+         foreach my $item (split(/:/,$allroles{$role})) {
+             if ($item ne '') {
+                 my ($privilege,$restrictions)=split(/&/,$item);
+                 if ($privilege eq 'adv') {
+                     $is_adv = 1;
+                     last;
+                 }
+             }
+         }
+     }
+     return $is_adv;
+ }
+ sub check_can_request {
+     my ($dom,$can_request,$request_domains) = @_;
+     my $canreq = 0;
+     my ($types,$typename) = &Apache::loncommon::course_types();
+     my @options = ('approval','validate','autolimit');
+     my $optregex = join('|',@options);
+     if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
+         foreach my $type (@{$types}) {
+             if (&usertools_access($env{'user.name'},
+                                   $env{'user.domain'},
+                                   $type,undef,'requestcourses')) {
+                 $canreq ++;
+                 if (ref($request_domains) eq 'HASH') {
+                     push(@{$request_domains->{$type}},$env{'user.domain'});
+                 }
+                 if ($dom eq $env{'user.domain'}) {
+                     $can_request->{$type} = 1;
+                 }
+             }
+             if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
+                 my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
+                 if (@curr > 0) {
+                     foreach my $item (@curr) {
+                         if (ref($request_domains) eq 'HASH') {
+                             my ($otherdom) = ($item =~ /^($match_domain):($optregex)(=?\d*)$/);
+                             if ($otherdom ne '') {
+                                 if (ref($request_domains->{$type}) eq 'ARRAY') {
+                                     unless (grep(/^\Q$otherdom\E$/,@{$request_domains->{$type}})) {
+                                         push(@{$request_domains->{$type}},$otherdom);
+                                     }
+                                 } else {
+                                     push(@{$request_domains->{$type}},$otherdom);
+                                 }
+                             }
+                         }
+                     }
+                     unless($dom eq $env{'user.domain'}) {
+                         $canreq ++;
+                         if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
+                             $can_request->{$type} = 1;
+                         }
+                     }
+                 }
+             }
+         }
+     }
+     return $canreq;
+ }
+ # ---------------------------------------------- Custom access rule evaluation
+ sub customaccess {
+     my ($priv,$uri)=@_;
+     my ($urole,$urealm)=split(/\./,$env{'request.role'},2);
+     my (undef,$udom,$ucrs,$usec)=split(/\//,$urealm);
+     $udom = &LONCAPA::clean_domain($udom);
+     $ucrs = &LONCAPA::clean_username($ucrs);
+     my $access=0;
+     foreach my $right (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) {
+ 	my ($effect,$realm,$role,$type)=split(/\:/,$right);
+ 	if ($type eq 'user') {
+ 	    foreach my $scope (split(/\s*\,\s*/,$realm)) {
+ 		my ($tdom,$tuname)=split(m{/},$scope);
+ 		if ($tdom) {
+ 		    if ($tdom ne $env{'user.domain'}) { next; }
+ 		}
+ 		if ($tuname) {
+ 		    if ($tuname ne $env{'user.name'}) { next; }
+ 		}
+ 		$access=($effect eq 'allow');
+ 		last;
+ 	    }
+ 	} else {
+ 	    if ($role) {
+ 		if ($role ne $urole) { next; }
+ 	    }
+ 	    foreach my $scope (split(/\s*\,\s*/,$realm)) {
+ 		my ($tdom,$tcrs,$tsec)=split(/\_/,$scope);
+ 		if ($tdom) {
+ 		    if ($tdom ne $udom) { next; }
+ 		}
+ 		if ($tcrs) {
+ 		    if ($tcrs ne $ucrs) { next; }
+ 		}
+ 		if ($tsec) {
+ 		    if ($tsec ne $usec) { next; }
+ 		}
+ 		$access=($effect eq 'allow');
+ 		last;
+ 	    }
+ 	    if ($realm eq '' && $role eq '') {
+ 		$access=($effect eq 'allow');
+ 	    }
  	}
      }
      return $access;
- Line 2991  sub customaccess {
+ Line 5267  sub customaccess {
  # ------------------------------------------------- Check for a user privilege
  sub allowed {
-     my ($priv,$uri,$symb)=@_;
+     my ($priv,$uri,$symb,$role)=@_;
+     my $ver_orguri=$uri;
      $uri=&deversion($uri);
      my $orguri=$uri;
      $uri=&declutter($uri);
+     if ($priv eq 'evb') {
+ # Evade communication block restrictions for specified role in a course
+         if ($env{'user.priv.'.$role} =~/evb\&([^\:]*)/) {
+             return $1;
+         } else {
+             return;
+         }
+     }
      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 !~ m{/(?:smppg|bulletinboard)$}))
- 	 || ($uri=~/\.meta$/)) && ($priv eq 'bre')) {
+ 	 || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) ))
+ 	&& ($priv eq 'bre')) {
  	return 'F';
      }
  # Free bre access to user's own portfolio contents
-     my ($space,$domain,$name,$dir)=split('/',$uri);
+     my ($space,$domain,$name,@dir)=split('/',$uri);
      if (($space=~/^(uploaded|editupload)$/) && ($env{'user.name'} eq $name) &&
- 	($env{'user.domain'} eq $domain) && ('portfolio' eq $dir)) {
+ 	($env{'user.domain'} eq $domain) && ('portfolio' eq $dir[0])) {
-         return 'F';
+         my %setters;
+         my ($startblock,$endblock) =
+             &Apache::loncommon::blockcheck(\%setters,'port');
+         if ($startblock && $endblock) {
+             return 'B';
+         } else {
+             return 'F';
+         }
+     }
+ # bre access to group portfolio for rgf priv in group, or mdg or vcg in course.
+     if (($space=~/^(uploaded|editupload)$/) && ($dir[0] eq 'groups')
+          && ($dir[2] eq 'portfolio') && ($priv eq 'bre')) {
+         if (exists($env{'request.course.id'})) {
+             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+             if (($domain eq $cdom) && ($name eq $cnum)) {
+                 my $courseprivid=$env{'request.course.id'};
+                 $courseprivid=~s/\_/\//;
+                 if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid
+                     .'/'.$dir[1]} =~/rgf\&([^\:]*)/) {
+                     return $1;
+                 } else {
+                     if ($env{'request.course.sec'}) {
+                         $courseprivid.='/'.$env{'request.course.sec'};
+                     }
+                     if ($env{'user.priv.'.$env{'request.role'}.'./'.
+                         $courseprivid} =~/(mdg|vcg)\&([^\:]*)/) {
+                         return $2;
+                     }
+                 }
+             }
+         }
      }
  # Free bre to public access
- Line 3044  sub allowed {
+ Line 5361  sub allowed {
      if (($priv eq 'ccc') && ($env{'request.role'} =~ /^dc\./)) {
          # uri is the requested domain in this case.
          # comparison to 'request.role.domain' shows if the user has selected
          # a role of dc for the domain in question.
          return 'F' if ($uri eq $env{'request.role.domain'});
      }
- Line 3052  sub allowed {
+ Line 5369  sub allowed {
      my $statecond=0;
      my $courseprivid='';
+     my $ownaccess;
+     # Community Coordinator or Assistant Co-author browsing resource space.
+     if (($priv eq 'bro') && ($env{'user.author'})) {
+         if ($uri eq '') {
+             $ownaccess = 1;
+         } else {
+             if (($env{'user.domain'} ne '') && ($env{'user.name'} ne '')) {
+                 my $udom = $env{'user.domain'};
+                 my $uname = $env{'user.name'};
+                 if ($uri =~ m{^\Q$udom\E/?$}) {
+                     $ownaccess = 1;
+                 } elsif ($uri =~ m{^\Q$udom\E/\Q$uname\E/?}) {
+                     unless ($uri =~ m{\.\./}) {
+                         $ownaccess = 1;
+                     }
+                 } elsif (($udom ne 'public') && ($uname ne 'public')) {
+                     my $now = time;
+                     if ($uri =~ m{^([^/]+)/?$}) {
+                         my $adom = $1;
+                         foreach my $key (keys(%env)) {
+                             if ($key =~ m{^user\.role\.(ca|aa)/\Q$adom\E}) {
+                                 my ($start,$end) = split('.',$env{$key});
+                                 if (($now >= $start) && (!$end || $end < $now)) {
+                                     $ownaccess = 1;
+                                     last;
+                                 }
+                             }
+                         }
+                     } elsif ($uri =~ m{^([^/]+)/([^/]+)/?}) {
+                         my $adom = $1;
+                         my $aname = $2;
+                         foreach my $role ('ca','aa') {
+                             if ($env{"user.role.$role./$adom/$aname"}) {
+                                 my ($start,$end) =
+                                     split('.',$env{"user.role.$role./$adom/$aname"});
+                                 if (($now >= $start) && (!$end || $end < $now)) {
+                                     $ownaccess = 1;
+                                     last;
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+     }
  # Course
      if ($env{'user.priv.'.$env{'request.role'}.'./'}=~/\Q$priv\E\&([^\:]*)/) {
-        $thisallowed.=$1;
+         unless (($priv eq 'bro') && (!$ownaccess)) {
+             $thisallowed.=$1;
+         }
      }
  # Domain
      if ($env{'user.priv.'.$env{'request.role'}.'./'.(split(/\//,$uri))[0].'/'}
         =~/\Q$priv\E\&([^\:]*)/) {
-        $thisallowed.=$1;
+         unless (($priv eq 'bro') && (!$ownaccess)) {
+             $thisallowed.=$1;
+         }
      }
  # Course: uri itself is a course
- Line 3072  sub allowed {
+ Line 5440  sub allowed {
      if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseuri}
         =~/\Q$priv\E\&([^\:]*)/) {
-        $thisallowed.=$1;
+         unless (($priv eq 'bro') && (!$ownaccess)) {
+             $thisallowed.=$1;
+         }
      }
- # URI is an uploaded document for this course
+ # URI is an uploaded document for this course, default permissions don't matter
  # not allowing 'edit' access (editupload) to uploaded course docs
      if (($priv eq 'bre') && ($uri=~m|^uploaded/|)) {
- 	my $refuri=$env{'httpref.'.$orguri};
+ 	$thisallowed='';
- 	if ($refuri) {
+         my ($match)=&is_on_map($uri);
- 	    if ($refuri =~ m|^/adm/|) {
+         if ($match) {
- 		$thisallowed='F';
+             if ($env{'user.priv.'.$env{'request.role'}.'./'}
- 	    }
+                   =~/\Q$priv\E\&([^\:]*)/) {
- 	}
+                 $thisallowed.=$1;
+             }
+         } else {
+             my $refuri = $env{'httpref.'.$orguri} || $env{'httpref.'.$ver_orguri};
+             if ($refuri) {
+                 if ($refuri =~ m|^/adm/|) {
+                     $thisallowed='F';
+                 } else {
+                     $refuri=&declutter($refuri);
+                     my ($match) = &is_on_map($refuri);
+                     if ($match) {
+                         $thisallowed='F';
+                     }
+                 }
+             }
+         }
      }
+     if ($priv eq 'bre'
+ 	&& $thisallowed ne 'F'
+ 	&& $thisallowed ne '2'
+ 	&& &is_portfolio_url($uri)) {
+ 	$thisallowed = &portfolio_access($uri);
+     }
  # Full access at system, domain or course-wide level? Exit.
      if ($thisallowed=~/F/) {
  	return 'F';
      }
- Line 3133  sub allowed {
+ Line 5524  sub allowed {
         if ($checkreferer) {
  	  my $refuri=$env{'httpref.'.$orguri};
              unless ($refuri) {
-                 foreach (keys %env) {
+                 foreach my $key (keys(%env)) {
- 		    if ($_=~/^httpref\..*\*/) {
+ 		    if ($key=~/^httpref\..*\*/) {
- 			my $pattern=$_;
+ 			my $pattern=$key;
                          $pattern=~s/^httpref\.\/res\///;
                          $pattern=~s/\*/\[\^\/\]\+/g;
                          $pattern=~s/\//\\\//g;
                          if ($orguri=~/$pattern/) {
- 			    $refuri=$env{$_};
+ 			    $refuri=$env{$key};
                          }
                      }
                  }
- Line 3191  sub allowed {
+ Line 5582  sub allowed {
      my $envkey;
      if ($thisallowed=~/L/) {
-         foreach $envkey (keys %env) {
+         foreach $envkey (keys(%env)) {
             if ($envkey=~/^user\.role\.(st|ta)\.([^\.]*)/) {
                 my $courseid=$2;
                 my $roleid=$1.'.'.$2;
- Line 3203  sub allowed {
+ Line 5594  sub allowed {
  	       my ($cdom,$cnum,$csec)=split(/\//,$courseid);
                 my $prefix='course.'.$cdom.'_'.$cnum.'.';
                 if ((time-$env{$prefix.'last_cache'})>$expiretime) {
- 		   &coursedescription($courseid);
+ 		   &coursedescription($courseid,{'freshen_cache' => 1});
                 }
                 if (($env{$prefix.'res.'.$uri.'.lock.sections'}=~/\,\Q$csec\E\,/)
                  || ($env{$prefix.'res.'.$uri.'.lock.sections'} eq 'all')) {
- Line 3236  sub allowed {
+ Line 5627  sub allowed {
  #
      unless ($env{'request.course.id'}) {
-        return '1';
+ 	if ($thisallowed eq 'A') {
+ 	    return 'A';
+         } elsif ($thisallowed eq 'B') {
+             return 'B';
+ 	} else {
+ 	    return '1';
+ 	}
      }
  #
- Line 3251  sub allowed {
+ Line 5648  sub allowed {
         my $unamedom=$env{'user.name'}.':'.$env{'user.domain'};
         if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.roles.denied'}
  	   =~/\Q$rolecode\E/) {
-            &log($env{'user.domain'},$env{'user.name'},$env{'user.host'},
+ 	   if ($priv ne 'pch') {
-                 'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
+ 	       &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'.
-                 $env{'request.course.id'});
+ 			'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
+ 			$env{'request.course.id'});
+ 	   }
             return '';
         }
         if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.users.denied'}
  	   =~/\Q$unamedom\E/) {
-            &log($env{'user.domain'},$env{'user.name'},$env{'user.host'},
+ 	   if ($priv ne 'pch') {
-                 'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '.
+ 	       &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.
-                 $env{'request.course.id'});
+ 			'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '.
+ 			$env{'request.course.id'});
+ 	   }
             return '';
         }
     }
- Line 3271  sub allowed {
+ Line 5672  sub allowed {
     if ($thisallowed=~/R/) {
         my $rolecode=(split(/\./,$env{'request.role'}))[0];
         if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) {
- 	  &log($env{'user.domain'},$env{'user.name'},$env{'user.host'},
+ 	   if ($priv ne 'pch') {
-                     'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
+ 	       &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'.
-           return '';
+ 			'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode);
+ 	   }
+ 	   return '';
         }
     }
- Line 3293  sub allowed {
+ Line 5696  sub allowed {
        }
     }
+     if ($thisallowed eq 'A') {
+ 	return 'A';
+     } elsif ($thisallowed eq 'B') {
+         return 'B';
+     }
     return 'F';
  }
+ sub split_uri_for_cond {
+     my $uri=&deversion(&declutter(shift));
+     my @uriparts=split(/\//,$uri);
+     my $filename=pop(@uriparts);
+     my $pathname=join('/',@uriparts);
+     return ($pathname,$filename);
+ }
  # --------------------------------------------------- Is a resource on the map?
  sub is_on_map {
-     my $uri=&deversion(&declutter(shift));
+     my ($pathname,$filename) = &split_uri_for_cond(shift);
-     my @uriparts=split(/\//,$uri);
-     my $filename=$uriparts[$#uriparts];
-     my $pathname=$uri;
-     $pathname=~s|/\Q$filename\E$||;
-     $pathname=~s/^adm\/wrapper\///;
      #Trying to find the conditional for the file
      my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~
  	       /\&\Q$filename\E\:([\d\|]+)\&/);
- Line 3343  sub get_symb_from_alias {
+ Line 5753  sub get_symb_from_alias {
  sub definerole {
    if (allowed('mcr','/')) {
      my ($rolename,$sysrole,$domrole,$courole)=@_;
-     foreach (split(':',$sysrole)) {
+     foreach my $role (split(':',$sysrole)) {
- 	my ($crole,$cqual)=split(/\&/,$_);
+ 	my ($crole,$cqual)=split(/\&/,$role);
          if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; }
          if ($pr{'cr:s'}=~/\Q$crole\E\&/) {
  	    if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
- Line 3352  sub definerole {
+ Line 5762  sub definerole {
              }
          }
      }
-     foreach (split(':',$domrole)) {
+     foreach my $role (split(':',$domrole)) {
- 	my ($crole,$cqual)=split(/\&/,$_);
+ 	my ($crole,$cqual)=split(/\&/,$role);
          if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; }
          if ($pr{'cr:d'}=~/\Q$crole\E\&/) {
  	    if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) {
- Line 3361  sub definerole {
+ Line 5771  sub definerole {
              }
          }
      }
-     foreach (split(':',$courole)) {
+     foreach my $role (split(':',$courole)) {
- 	my ($crole,$cqual)=split(/\&/,$_);
+ 	my ($crole,$cqual)=split(/\&/,$role);
          if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; }
          if ($pr{'cr:c'}=~/\Q$crole\E\&/) {
  	    if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) {
- Line 3385  sub definerole {
+ Line 5795  sub definerole {
  sub metadata_query {
      my ($query,$custom,$customshow,$server_array)=@_;
      my %rhash;
+     my %libserv = &all_library();
      my @server_list = (defined($server_array) ? @$server_array
                                                : keys(%libserv) );
      for my $server (@server_list) {
- Line 3408  sub log_query {
+ Line 5819  sub log_query {
      my ($uname,$udom,$query,%filters)=@_;
      my $uhome=&homeserver($uname,$udom);
      if ($uhome eq 'no_host') { return 'error: no_host'; }
-     my $uhost=$hostname{$uhome};
+     my $uhost=&hostname($uhome);
-     my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters));
+     my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys(%filters)));
      my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command,
                         $uhome);
      unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; }
      return get_query_reply($queryid);
  }
+ # -------------------------- Update MySQL table for portfolio file
+ sub update_portfolio_table {
+     my ($uname,$udom,$file_name,$query,$group,$action) = @_;
+     if ($group ne '') {
+         $file_name =~s /^\Q$group\E//;
+     }
+     my $homeserver = &homeserver($uname,$udom);
+     my $queryid=
+         &reply("querysend:".$query.':'.&escape($uname.':'.$udom.':'.$group).
+                ':'.&escape($file_name).':'.$action,$homeserver);
+     my $reply = &get_query_reply($queryid);
+     return $reply;
+ }
+ # -------------------------- Update MySQL allusers table
+ sub update_allusers_table {
+     my ($uname,$udom,$names) = @_;
+     my $homeserver = &homeserver($uname,$udom);
+     my $queryid=
+         &reply('querysend:allusers:'.&escape($uname).':'.&escape($udom).':'.
+                'lastname='.&escape($names->{'lastname'}).'%%'.
+                'firstname='.&escape($names->{'firstname'}).'%%'.
+                'middlename='.&escape($names->{'middlename'}).'%%'.
+                'generation='.&escape($names->{'generation'}).'%%'.
+                'permanentemail='.&escape($names->{'permanentemail'}).'%%'.
+                'id='.&escape($names->{'id'}),$homeserver);
+     return;
+ }
  # ------- Request retrieval of institutional classlists for course(s)
  sub fetch_enrollment_query {
- Line 3428  sub fetch_enrollment_query {
+ Line 5870  sub fetch_enrollment_query {
      } else {
          $homeserver = &homeserver($cnum,$dom);
      }
-     my $host=$hostname{$homeserver};
+     my $host=&hostname($homeserver);
      my $cmd = '';
-     foreach (keys %{$affiliatesref}) {
+     foreach my $affiliate (keys(%{$affiliatesref})) {
-         $cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%';
+         $cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%';
      }
      $cmd =~ s/%%$//;
      $cmd = &escape($cmd);
- Line 3450  sub fetch_enrollment_query {
+ Line 5892  sub fetch_enrollment_query {
      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;
+         my @responses = split(/:/,$reply);
          if ($homeserver eq $perlvar{'lonHostID'}) {
-             foreach (@responses) {
+             foreach my $line (@responses) {
-                 my ($key,$value) = split/=/,$_;
+                 my ($key,$value) = split(/=/,$line,2);
                  $$replyref{$key} = $value;
              }
          } else {
              my $pathname = $perlvar{'lonDaemons'}.'/tmp';
-             foreach (@responses) {
+             foreach my $line (@responses) {
-                 my ($key,$value) = split/=/,$_;
+                 my ($key,$value) = split(/=/,$line);
                  $$replyref{$key} = $value;
                  if ($value > 0) {
-                     foreach (@{$$affiliatesref{$key}}) {
+                     foreach my $item (@{$$affiliatesref{$key}}) {
-                         my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml';
+                         my $filename = $dom.'_'.$key.'_'.$item.'_classlist.xml';
                          my $destname = $pathname.'/'.$filename;
                          my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver);
                          if ($xml_classlist =~ /^error/) {
- Line 3493  sub get_query_reply {
+ Line 5935  sub get_query_reply {
  	sleep 2;
          if (-e $replyfile.'.end') {
  	    if (open(my $fh,$replyfile)) {
-                $reply.=<$fh>;
+ 		$reply = join('',<$fh>);
-                close($fh);
+ 		close($fh);
  	   } else { return 'error: reply_file_error'; }
             return &unescape($reply);
  	}
- Line 3525  sub courselog_query {
+ Line 5967  sub courselog_query {
  }
  sub userlog_query {
+ #
+ # possible filters:
+ # action: log check role
+ # start: timestamp
+ # end: timestamp
+ #
      my ($uname,$udom,%filters)=@_;
      return &log_query($uname,$udom,'userlog',%filters);
  }
- Line 3533  sub userlog_query {
+ Line 5981  sub userlog_query {
  sub auto_run {
      my ($cnum,$cdom) = @_;
-     my $homeserver = &homeserver($cnum,$cdom);
+     my $response = 0;
-     my $response = &reply('autorun:'.$cdom,$homeserver);
+     my $settings;
+     my %domconfig = &get_dom('configuration',['autoenroll'],$cdom);
+     if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+         $settings = $domconfig{'autoenroll'};
+         if ($settings->{'run'} eq '1') {
+             $response = 1;
+         }
+     } else {
+         my $homeserver;
+         if (&is_course($cdom,$cnum)) {
+             $homeserver = &homeserver($cnum,$cdom);
+         } else {
+             $homeserver = &domain($cdom,'primary');
+         }
+         if ($homeserver ne 'no_host') {
+             $response = &reply('autorun:'.$cdom,$homeserver);
+         }
+     }
      return $response;
  }
  sub auto_get_sections {
      my ($cnum,$cdom,$inst_coursecode) = @_;
-     my $homeserver = &homeserver($cnum,$cdom);
+     my $homeserver;
-     my @secs = ();
+     if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) {
-     my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver));
+         $homeserver = &homeserver($cnum,$cdom);
-     unless ($response eq 'refused') {
+     }
-         @secs = split/:/,$response;
+     if (!defined($homeserver)) {
+         if ($cdom =~ /^$match_domain$/) {
+             $homeserver = &domain($cdom,'primary');
+         }
+     }
+     my @secs;
+     if (defined($homeserver)) {
+         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 ($cnum,$cdom,$inst_course_id,$owner,$coowners) = @_;
      my $homeserver = &homeserver($cnum,$cdom);
-     my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver));
+     my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.&escape($owner).':'.$cdom.':'.&escape($coowners),$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_validate_instcode {
+     my ($cnum,$cdom,$instcode,$owner) = @_;
+     my ($homeserver,$response);
+     if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) {
+         $homeserver = &homeserver($cnum,$cdom);
+     }
+     if (!defined($homeserver)) {
+         if ($cdom =~ /^$match_domain$/) {
+             $homeserver = &domain($cdom,'primary');
+         }
+     }
+     $response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'.
+                         &escape($instcode).':'.&escape($owner),$homeserver));
+     my ($outcome,$description) = map { &unescape($_); } split('&',$response,2);
+     return ($outcome,$description);
+ }
  sub auto_create_password {
-     my ($cnum,$cdom,$authparam) = @_;
+     my ($cnum,$cdom,$authparam,$udom) = @_;
-     my $homeserver = &homeserver($cnum,$cdom);
+     my ($homeserver,$response);
      my $create_passwd = 0;
      my $authchk = '';
-     my $response=&unescape(&reply('autocreatepassword:'.$authparam.':'.$cdom,$homeserver));
+     if ($udom =~ /^$match_domain$/) {
-     if ($response eq 'refused') {
+         $homeserver = &domain($udom,'primary');
-         $authchk = 'refused';
+     }
+     if ($homeserver eq '') {
+         if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) {
+             $homeserver = &homeserver($cnum,$cdom);
+         }
+     }
+     if ($homeserver eq '') {
+         $authchk = 'nodomain';
      } else {
-         ($authparam,$create_passwd,$authchk) = split/:/,$response;
+         $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_photo_permission {
+     my ($cnum,$cdom,$students) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my ($outcome,$perm_reqd,$conditions) =
+ 	split(/:/,&unescape(&reply('autophotopermission:'.$cdom,$homeserver)),3);
+     if ($outcome =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+ 	return (undef,undef);
+     }
+     return ($outcome,$perm_reqd,$conditions);
+ }
+ sub auto_checkphotos {
+     my ($uname,$udom,$pid) = @_;
+     my $homeserver = &homeserver($uname,$udom);
+     my ($result,$resulttype);
+     my $outcome = &unescape(&reply('autophotocheck:'.&escape($udom).':'.
+ 				   &escape($uname).':'.&escape($pid),
+ 				   $homeserver));
+     if ($outcome =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+ 	return (undef,undef);
+     }
+     if ($outcome) {
+         ($result,$resulttype) = split(/:/,$outcome);
+     }
+     return ($result,$resulttype);
+ }
+ sub auto_photochoice {
+     my ($cnum,$cdom) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my ($update,$comment) = split(/:/,&unescape(&reply('autophotochoice:'.
+ 						       &escape($cdom),
+ 						       $homeserver)));
+     if ($update =~ /^(con_lost|unknown_cmd|no_such_host)$/) {
+ 	return (undef,undef);
+     }
+     return ($update,$comment);
+ }
+ sub auto_photoupdate {
+     my ($affiliatesref,$dom,$cnum,$photo) = @_;
+     my $homeserver = &homeserver($cnum,$dom);
+     my $host=&hostname($homeserver);
+     my $cmd = '';
+     my $maxtries = 1;
+     foreach my $affiliate (keys(%{$affiliatesref})) {
+         $cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%';
+     }
+     $cmd =~ s/%%$//;
+     $cmd = &escape($cmd);
+     my $query = 'institutionalphotos';
+     my $queryid=&reply("querysend:".$query.':'.$dom.':'.$cnum.':'.$cmd,$homeserver);
+     unless ($queryid=~/^\Q$host\E\_/) {
+         &logthis('institutionalphotos: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' and course: '.$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('institutionalphotos error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' course: '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries);
+     } else {
+         my @responses = split(/:/,$reply);
+         my $outcome = shift(@responses);
+         foreach my $item (@responses) {
+             my ($key,$value) = split(/=/,$item);
+             $$photo{$key} = $value;
+         }
+         return $outcome;
+     }
+     return 'error';
+ }
  sub auto_instcode_format {
-     my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_;
+     my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,
+ 	$cat_order) = @_;
      my $courses = '';
-     my $homeserver;
+     my @homeservers;
      if ($caller eq 'global') {
-         foreach my $tryserver (keys %libserv) {
+ 	my %servers = &get_servers($codedom,'library');
-             if ($hostdom{$tryserver} eq $codedom) {
+ 	foreach my $tryserver (keys(%servers)) {
-                 $homeserver = $tryserver;
+ 	    if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
-                 last;
+ 		push(@homeservers,$tryserver);
-             }
+ 	    }
          }
-         if (($env{'user.name'}) && ($env{'user.domain'} eq $codedom)) {
+     } elsif ($caller eq 'requests') {
-             $homeserver = &homeserver($env{'user.name'},$codedom);
+         if ($codedom =~ /^$match_domain$/) {
+             my $chome = &domain($codedom,'primary');
+             unless ($chome eq 'no_host') {
+                 push(@homeservers,$chome);
+             }
          }
      } else {
-         $homeserver = &homeserver($caller,$codedom);
+         push(@homeservers,&homeserver($caller,$codedom));
      }
-     foreach (keys %{$instcodes}) {
+     foreach my $code (keys(%{$instcodes})) {
-         $courses .= &escape($_).'='.&escape($$instcodes{$_}).'&';
+         $courses .= &escape($code).'='.&escape($$instcodes{$code}).'&';
      }
      chop($courses);
-     my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver);
+     my $ok_response = 0;
-     unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+     my $response;
-         my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response;
+     while (@homeservers > 0 && $ok_response == 0) {
-         %{$codes} = &str2hash($codes_str);
+         my $server = shift(@homeservers);
-         @{$codetitles} = &str2array($codetitles_str);
+         $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server);
-         %{$cat_titles} = &str2hash($cat_titles_str);
+         if ($response !~ /(con_lost|error|no_such_host|refused)/) {
-         %{$cat_order} = &str2hash($cat_order_str);
+             my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) =
+ 		split(/:/,$response);
+             %{$codes} = (%{$codes},&str2hash($codes_str));
+             push(@{$codetitles},&str2array($codetitles_str));
+             %{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str));
+             %{$cat_order} = (%{$cat_order},&str2hash($cat_order_str));
+             $ok_response = 1;
+         }
+     }
+     if ($ok_response) {
          return 'ok';
+     } else {
+         return $response;
+     }
+ }
+ sub auto_instcode_defaults {
+     my ($domain,$returnhash,$code_order) = @_;
+     my @homeservers;
+     my %servers = &get_servers($domain,'library');
+     foreach my $tryserver (keys(%servers)) {
+ 	if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
+ 	    push(@homeservers,$tryserver);
+ 	}
      }
+     my $response;
+     foreach my $server (@homeservers) {
+         $response=&reply('autoinstcodedefaults:'.$domain,$server);
+         next if ($response =~ /(con_lost|error|no_such_host|refused)/);
+ 	foreach my $pair (split(/\&/,$response)) {
+ 	    my ($name,$value)=split(/\=/,$pair);
+ 	    if ($name eq 'code_order') {
+ 		@{$code_order} = split(/\&/,&unescape($value));
+ 	    } else {
+ 		$returnhash->{&unescape($name)}=&unescape($value);
+ 	    }
+ 	}
+ 	return 'ok';
+     }
      return $response;
  }
+ sub auto_possible_instcodes {
+     my ($domain,$codetitles,$cat_titles,$cat_orders,$code_order) = @_;
+     unless ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') &&
+             (ref($cat_orders) eq 'HASH') && (ref($code_order) eq 'ARRAY')) {
+         return;
+     }
+     my (@homeservers,$uhome);
+     if (defined(&domain($domain,'primary'))) {
+         $uhome=&domain($domain,'primary');
+         push(@homeservers,&domain($domain,'primary'));
+     } else {
+         my %servers = &get_servers($domain,'library');
+         foreach my $tryserver (keys(%servers)) {
+             if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
+                 push(@homeservers,$tryserver);
+             }
+         }
+     }
+     my $response;
+     foreach my $server (@homeservers) {
+         $response=&reply('autopossibleinstcodes:'.$domain,$server);
+         next if ($response =~ /(con_lost|error|no_such_host|refused)/);
+         my ($codetitlestr,$codeorderstr,$cat_title,$cat_order) =
+             split(':',$response);
+         @{$codetitles} = map { &unescape($_); } (split('&',$codetitlestr));
+         @{$code_order} = map { &unescape($_); } (split('&',$codeorderstr));
+         foreach my $item (split('&',$cat_title)) {
+             my ($name,$value)=split('=',$item);
+             $cat_titles->{&unescape($name)}=&thaw_unescape($value);
+         }
+         foreach my $item (split('&',$cat_order)) {
+             my ($name,$value)=split('=',$item);
+             $cat_orders->{&unescape($name)}=&thaw_unescape($value);
+         }
+         return 'ok';
+     }
+     return $response;
+ }
+ sub auto_courserequest_checks {
+     my ($dom) = @_;
+     my ($homeserver,%validations);
+     if ($dom =~ /^$match_domain$/) {
+         $homeserver = &domain($dom,'primary');
+     }
+     unless ($homeserver eq 'no_host') {
+         my $response=&reply('autocrsreqchecks:'.$dom,$homeserver);
+         unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
+             my @items = split(/&/,$response);
+             foreach my $item (@items) {
+                 my ($key,$value) = split('=',$item);
+                 $validations{&unescape($key)} = &thaw_unescape($value);
+             }
+         }
+     }
+     return %validations;
+ }
+ sub auto_courserequest_validation {
+     my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = @_;
+     my ($homeserver,$response);
+     if ($dom =~ /^$match_domain$/) {
+         $homeserver = &domain($dom,'primary');
+     }
+     unless ($homeserver eq 'no_host') {
+         $response=&unescape(&reply('autocrsreqvalidation:'.$dom.':'.&escape($owner).
+                                     ':'.&escape($crstype).':'.&escape($inststatuslist).
+                                     ':'.&escape($instcode).':'.&escape($instseclist),
+                                     $homeserver));
+     }
+     return $response;
+ }
+ sub auto_validate_class_sec {
+     my ($cdom,$cnum,$owners,$inst_class) = @_;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $ownerlist;
+     if (ref($owners) eq 'ARRAY') {
+         $ownerlist = join(',',@{$owners});
+     } else {
+         $ownerlist = $owners;
+     }
+     my $response=&reply('autovalidateclass_sec:'.$inst_class.':'.
+                         &escape($ownerlist).':'.$cdom,$homeserver);
+     return $response;
+ }
+ # ------------------------------------------------------- Course Group routines
+ sub get_coursegroups {
+     my ($cdom,$cnum,$group,$namespace) = @_;
+     return(&dump($namespace,$cdom,$cnum,$group));
+ }
+ sub modify_coursegroup {
+     my ($cdom,$cnum,$groupsettings) = @_;
+     return(&put('coursegroups',$groupsettings,$cdom,$cnum));
+ }
+ sub toggle_coursegroup_status {
+     my ($cdom,$cnum,$group,$action) = @_;
+     my ($from_namespace,$to_namespace);
+     if ($action eq 'delete') {
+         $from_namespace = 'coursegroups';
+         $to_namespace = 'deleted_groups';
+     } else {
+         $from_namespace = 'deleted_groups';
+         $to_namespace = 'coursegroups';
+     }
+     my %curr_group = &get_coursegroups($cdom,$cnum,$group,$from_namespace);
+     if (my $tmp = &error(%curr_group)) {
+         &Apache::lonnet::logthis('Error retrieving group: '.$tmp.' in '.$cnum.':'.$cdom);
+         return ('read error',$tmp);
+     } else {
+         my %savedsettings = %curr_group;
+         my $result = &put($to_namespace,\%savedsettings,$cdom,$cnum);
+         my $deloutcome;
+         if ($result eq 'ok') {
+             $deloutcome = &del($from_namespace,[$group],$cdom,$cnum);
+         } else {
+             return ('write error',$result);
+         }
+         if ($deloutcome eq 'ok') {
+             return 'ok';
+         } else {
+             return ('delete error',$deloutcome);
+         }
+     }
+ }
+ sub modify_group_roles {
+     my ($cdom,$cnum,$group_id,$user,$end,$start,$userprivs,$selfenroll,$context) = @_;
+     my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id;
+     my $role = 'gr/'.&escape($userprivs);
+     my ($uname,$udom) = split(/:/,$user);
+     my $result = &assignrole($udom,$uname,$url,$role,$end,$start,'',$selfenroll,$context);
+     if ($result eq 'ok') {
+         &devalidate_getgroups_cache($udom,$uname,$cdom,$cnum);
+     }
+     return $result;
+ }
+ sub modify_coursegroup_membership {
+     my ($cdom,$cnum,$membership) = @_;
+     my $result = &put('groupmembership',$membership,$cdom,$cnum);
+     return $result;
+ }
+ sub get_active_groups {
+     my ($udom,$uname,$cdom,$cnum) = @_;
+     my $now = time;
+     my %groups = ();
+     foreach my $key (keys(%env)) {
+         if ($key =~ m-user\.role\.gr\./($match_domain)/($match_courseid)/(\w+)$-) {
+             my ($start,$end) = split(/\./,$env{$key});
+             if (($end!=0) && ($end<$now)) { next; }
+             if (($start!=0) && ($start>$now)) { next; }
+             if ($1 eq $cdom && $2 eq $cnum) {
+                 $groups{$3} = $env{$key} ;
+             }
+         }
+     }
+     return %groups;
+ }
+ sub get_group_membership {
+     my ($cdom,$cnum,$group) = @_;
+     return(&dump('groupmembership',$cdom,$cnum,$group));
+ }
+ sub get_users_groups {
+     my ($udom,$uname,$courseid) = @_;
+     my @usersgroups;
+     my $cachetime=1800;
+     my $hashid="$udom:$uname:$courseid";
+     my ($grouplist,$cached)=&is_cached_new('getgroups',$hashid);
+     if (defined($cached)) {
+         @usersgroups = split(/:/,$grouplist);
+     } else {
+         $grouplist = '';
+         my $courseurl = &courseid_to_courseurl($courseid);
+         my $extra = &freeze_escape({'skipcheck' => 1});
+         my %roleshash = &dump('roles',$udom,$uname,$courseurl,undef,$extra);
+         my $access_end = $env{'course.'.$courseid.
+                               '.default_enrollment_end_date'};
+         my $now = time;
+         foreach my $key (keys(%roleshash)) {
+             if ($key =~ /^\Q$courseurl\E\/(\w+)\_gr$/) {
+                 my $group = $1;
+                 if ($roleshash{$key} =~ /_(\d+)_(\d+)$/) {
+                     my $start = $2;
+                     my $end = $1;
+                     if ($start == -1) { next; } # deleted from group
+                     if (($start!=0) && ($start>$now)) { next; }
+                     if (($end!=0) && ($end<$now)) {
+                         if ($access_end && $access_end < $now) {
+                             if ($access_end - $end < 86400) {
+                                 push(@usersgroups,$group);
+                             }
+                         }
+                         next;
+                     }
+                     push(@usersgroups,$group);
+                 }
+             }
+         }
+         @usersgroups = &sort_course_groups($courseid,@usersgroups);
+         $grouplist = join(':',@usersgroups);
+         &do_cache_new('getgroups',$hashid,$grouplist,$cachetime);
+     }
+     return @usersgroups;
+ }
+ sub devalidate_getgroups_cache {
+     my ($udom,$uname,$cdom,$cnum)=@_;
+     my $courseid = $cdom.'_'.$cnum;
+     my $hashid="$udom:$uname:$courseid";
+     &devalidate_cache_new('getgroups',$hashid);
+ }
  # ------------------------------------------------------------------ Plain Text
  sub plaintext {
-     my $short=shift;
+     my ($short,$type,$cid,$forcedefault) = @_;
-     return &mt($prp{$short});
+     if ($short =~ m{^cr/}) {
+ 	return (split('/',$short))[-1];
+     }
+     if (!defined($cid)) {
+         $cid = $env{'request.course.id'};
+     }
+     my %rolenames = (
+                       Course    => 'std',
+                       Community => 'alt1',
+                     );
+     if ($cid ne '') {
+         if ($env{'course.'.$cid.'.'.$short.'.plaintext'} ne '') {
+             unless ($forcedefault) {
+                 my $roletext = $env{'course.'.$cid.'.'.$short.'.plaintext'};
+                 &Apache::lonlocal::mt_escape(\$roletext);
+                 return &Apache::lonlocal::mt($roletext);
+             }
+         }
+     }
+     if ((defined($type)) && (defined($rolenames{$type})) &&
+         (defined($rolenames{$type})) &&
+         (defined($prp{$short}{$rolenames{$type}}))) {
+         return &Apache::lonlocal::mt($prp{$short}{$rolenames{$type}});
+     } elsif ($cid ne '') {
+         my $crstype = $env{'course.'.$cid.'.type'};
+         if (($crstype ne '') && (defined($rolenames{$crstype})) &&
+             (defined($prp{$short}{$rolenames{$crstype}}))) {
+             return &Apache::lonlocal::mt($prp{$short}{$rolenames{$crstype}});
+         }
+     }
+     return &Apache::lonlocal::mt($prp{$short}{'std'});
  }
  # ----------------------------------------------------------------- Assign Role
  sub assignrole {
-     my ($udom,$uname,$url,$role,$end,$start,$deleteflag)=@_;
+     my ($udom,$uname,$url,$role,$end,$start,$deleteflag,$selfenroll,
+         $context)=@_;
      my $mrole;
      if ($role =~ /^cr\//) {
          my $cwosec=$url;
-         $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
+         $cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/;
  	unless (&allowed('ccr',$cwosec)) {
-            &logthis('Refused custom assignrole: '.
+            my $refused = 1;
-              $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
+            if ($context eq 'requestcourses') {
- 		    $env{'user.name'}.' at '.$env{'user.domain'});
+                if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
-            return 'refused';
+                    if ($role =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) {
+                        if (($1 eq $env{'user.domain'}) && ($2 eq $env{'user.name'})) {
+                            my ($cdom,$cnum) = ($cwosec =~ m{^/?($match_domain)/($match_courseid)$});
+                            my %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner'));
+                            if ($crsenv{'internal.courseowner'} eq
+                                $env{'user.name'}.':'.$env{'user.domain'}) {
+                                $refused = '';
+                            }
+                        }
+                    }
+                }
+            }
+            if ($refused) {
+                &logthis('Refused custom assignrole: '.
+                         $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.
+                         ' by '.$env{'user.name'}.' at '.$env{'user.domain'});
+                return 'refused';
+            }
          }
          $mrole='cr';
+     } elsif ($role =~ /^gr\//) {
+         my $cwogrp=$url;
+         $cwogrp=~s{^/($match_domain)/($match_courseid)/.*}{$1/$2};
+         unless (&allowed('mdg',$cwogrp)) {
+             &logthis('Refused group assignrole: '.
+               $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
+                     $env{'user.name'}.' at '.$env{'user.domain'});
+             return 'refused';
+         }
+         $mrole='gr';
      } else {
          my $cwosec=$url;
-         $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/;
+         $cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/;
-         unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) {
+         if (!(&allowed('c'.$role,$cwosec)) && !(&allowed('c'.$role,$udom))) {
-            &logthis('Refused assignrole: '.
+             my $refused;
-              $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '.
+             if (($env{'request.course.sec'}  ne '') && ($role eq 'st')) {
- 		    $env{'user.name'}.' at '.$env{'user.domain'});
+                 if (!(&allowed('c'.$role,$url))) {
-            return 'refused';
+                     $refused = 1;
+                 }
+             } else {
+                 $refused = 1;
+             }
+             if ($refused) {
+                 my ($cdom,$cnum) = ($cwosec =~ m{^/?($match_domain)/($match_courseid)$});
+                 if (!$selfenroll && $context eq 'course') {
+                     my %crsenv;
+                     if ($role eq 'cc' || $role eq 'co') {
+                         %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner'));
+                         if (($role eq 'cc') && ($cnum !~ /^$match_community$/)) {
+                             if ($env{'request.role'} eq 'cc./'.$cdom.'/'.$cnum) {
+                                 if ($crsenv{'internal.courseowner'} eq
+                                     $env{'user.name'}.':'.$env{'user.domain'}) {
+                                     $refused = '';
+                                 }
+                             }
+                         } elsif (($role eq 'co') && ($cnum =~ /^$match_community$/)) {
+                             if ($env{'request.role'} eq 'co./'.$cdom.'/'.$cnum) {
+                                 if ($crsenv{'internal.courseowner'} eq
+                                     $env{'user.name'}.':'.$env{'user.domain'}) {
+                                     $refused = '';
+                                 }
+                             }
+                         }
+                     }
+                 } elsif (($selfenroll == 1) && ($role eq 'st') && ($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) {
+                     $refused = '';
+                 } elsif ($context eq 'requestcourses') {
+                     my @possroles = ('st','ta','ep','in','cc','co');
+                     if ((grep(/^\Q$role\E$/,@possroles)) && ($env{'user.name'} ne '' && $env{'user.domain'} ne '')) {
+                         my $wrongcc;
+                         if ($cnum =~ /^$match_community$/) {
+                             $wrongcc = 1 if ($role eq 'cc');
+                         } else {
+                             $wrongcc = 1 if ($role eq 'co');
+                         }
+                         unless ($wrongcc) {
+                             my %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner'));
+                             if ($crsenv{'internal.courseowner'} eq
+                                  $env{'user.name'}.':'.$env{'user.domain'}) {
+                                 $refused = '';
+                             }
+                         }
+                     }
+                 }
+                 if ($refused) {
+                     &logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url.
+                              ' '.$role.' '.$end.' '.$start.' by '.
+ 	  	             $env{'user.name'}.' at '.$env{'user.domain'});
+                     return 'refused';
+                 }
+             }
          }
          $mrole=$role;
      }
- Line 3653  sub assignrole {
+ Line 6612  sub assignrole {
             $command.='_0_'.$start;
          }
      }
+     my $origstart = $start;
+     my $origend = $end;
+     my $delflag;
  # actually delete
      if ($deleteflag) {
  	if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) {
- Line 3663  sub assignrole {
+ Line 6625  sub assignrole {
  # set start and finish to negative values for userrolelog
             $start=-1;
             $end=-1;
+            $delflag = 1;
          }
      }
  # send command
      my $answer=&reply($command,&homeserver($uname,$udom));
  # log new user role if status is ok
      if ($answer eq 'ok') {
- 	&userrolelog($mrole,$uname,$udom,$url,$start,$end);
+ 	&userrolelog($role,$uname,$udom,$url,$start,$end);
+ # for course roles, perform group memberships changes triggered by role change.
+         &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,$selfenroll,$context);
+         unless ($role =~ /^gr/) {
+             &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
+                                              $origstart,$selfenroll,$context);
+         }
+         if ($role eq 'cc') {
+             &autoupdate_coowners($url,$end,$start,$uname,$udom);
+         }
      }
      return $answer;
  }
+ sub autoupdate_coowners {
+     my ($url,$end,$start,$uname,$udom) = @_;
+     my ($cdom,$cnum) = ($url =~ m{^/($match_domain)/($match_courseid)});
+     if (($cdom ne '') && ($cnum ne '')) {
+         my $now = time;
+         my %domdesign = &Apache::loncommon::get_domainconf($cdom);
+         if ($domdesign{$cdom.'.autoassign.co-owners'}) {
+             my %coursehash = &coursedescription($cdom.'_'.$cnum);
+             my $instcode = $coursehash{'internal.coursecode'};
+             if ($instcode ne '') {
+                 if (($start && $start <= $now) && ($end == 0) || ($end > $now)) {
+                     unless ($coursehash{'internal.courseowner'} eq $uname.':'.$udom) {
+                         my ($delcoowners,@newcoowners,$putresult,$delresult,$coowners);
+                         my ($result,$desc) = &auto_validate_instcode($cnum,$cdom,$instcode,$uname.':'.$udom);
+                         if ($result eq 'valid') {
+                             if ($coursehash{'internal.co-owners'}) {
+                                 foreach my $coowner (split(',',$coursehash{'internal.co-owners'})) {
+                                     push(@newcoowners,$coowner);
+                                 }
+                                 unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) {
+                                     push(@newcoowners,$uname.':'.$udom);
+                                 }
+                                 @newcoowners = sort(@newcoowners);
+                             } else {
+                                 push(@newcoowners,$uname.':'.$udom);
+                             }
+                         } else {
+                             if ($coursehash{'internal.co-owners'}) {
+                                 foreach my $coowner (split(',',$coursehash{'internal.co-owners'})) {
+                                     unless ($coowner eq $uname.':'.$udom) {
+                                         push(@newcoowners,$coowner);
+                                     }
+                                 }
+                                 unless (@newcoowners > 0) {
+                                     $delcoowners = 1;
+                                     $coowners = '';
+                                 }
+                             }
+                         }
+                         if (@newcoowners || $delcoowners) {
+                             &store_coowners($cdom,$cnum,$coursehash{'home'},
+                                             $delcoowners,@newcoowners);
+                         }
+                     }
+                 }
+             }
+         }
+     }
+ }
+ sub store_coowners {
+     my ($cdom,$cnum,$chome,$delcoowners,@newcoowners) = @_;
+     my $cid = $cdom.'_'.$cnum;
+     my ($coowners,$delresult,$putresult);
+     if (@newcoowners) {
+         $coowners = join(',',@newcoowners);
+         my %coownershash = (
+                             'internal.co-owners' => $coowners,
+                            );
+         $putresult = &put('environment',\%coownershash,$cdom,$cnum);
+         if ($putresult eq 'ok') {
+             if ($env{'course.'.$cid.'.num'} eq $cnum) {
+                 &appenv({'course.'.$cid.'.internal.co-owners' => $coowners});
+             }
+         }
+     }
+     if ($delcoowners) {
+         $delresult = &Apache::lonnet::del('environment',['internal.co-owners'],$cdom,$cnum);
+         if ($delresult eq 'ok') {
+             if ($env{'course.'.$cid.'.internal.co-owners'}) {
+                 &Apache::lonnet::delenv('course.'.$cid.'.internal.co-owners');
+             }
+         }
+     }
+     if (($putresult eq 'ok') || ($delresult eq 'ok')) {
+         my %crsinfo =
+             &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
+         if (ref($crsinfo{$cid}) eq 'HASH') {
+             $crsinfo{$cid}{'co-owners'} = \@newcoowners;
+             my $cidput = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
+         }
+     }
+ }
  # -------------------------------------------------- Modify user authentication
  # Overrides without validation
- Line 3706  sub modifyuser {
+ Line 6762  sub modifyuser {
      my ($udom,    $uname, $uid,
          $umode,   $upass, $first,
          $middle,  $last,  $gene,
-         $forceid, $desiredhome, $email)=@_;
+         $forceid, $desiredhome, $email, $inststatus, $candelete)=@_;
-     $udom=~s/\W//g;
+     $udom= &LONCAPA::clean_domain($udom);
-     $uname=~s/\W//g;
+     $uname=&LONCAPA::clean_username($uname);
+     my $showcandelete = 'none';
+     if (ref($candelete) eq 'ARRAY') {
+         if (@{$candelete} > 0) {
+             $showcandelete = join(', ',@{$candelete});
+         }
+     }
      &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '.
               $umode.', '.$first.', '.$middle.', '.
- 	     $last.', '.$gene.'(forceid: '.$forceid.')'.
+ 	     $last.', '.$gene.'(forceid: '.$forceid.'; candelete: '.$showcandelete.')'.
               (defined($desiredhome) ? ' desiredhome = '.$desiredhome :
                                       ' desiredhome not specified').
               ' by '.$env{'user.name'}.' at '.$env{'user.domain'}.
               ' in domain '.$env{'request.role.domain'});
      my $uhome=&homeserver($uname,$udom,'true');
+     my $newuser;
+     if ($uhome eq 'no_host') {
+         $newuser = 1;
+     }
  # ----------------------------------------------------------------- Create User
      if (($uhome eq 'no_host') &&
  	(($umode && $upass) || ($umode eq 'localauth'))) {
          my $unhome='';
-         if (defined($desiredhome) && $hostdom{$desiredhome} eq $udom) {
+         if (defined($desiredhome) && &host_domain($desiredhome) eq $udom) {
              $unhome = $desiredhome;
  	} elsif($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom) {
  	    $unhome=$env{'course.'.$env{'request.course.id'}.'.home'};
          } else { # load balancing routine for determining $unhome
-             my $tryserver;
              my $loadm=10000000;
-             foreach $tryserver (keys %libserv) {
+ 	    my %servers = &get_servers($udom,'library');
- 	       if ($hostdom{$tryserver} eq $udom) {
+ 	    foreach my $tryserver (keys(%servers)) {
-                   my $answer=reply('load',$tryserver);
+ 		my $answer=reply('load',$tryserver);
-                   if (($answer=~/\d+/) && ($answer<$loadm)) {
+ 		if (($answer=~/\d+/) && ($answer<$loadm)) {
- 		      $loadm=$answer;
+ 		    $loadm=$answer;
-                       $unhome=$tryserver;
+ 		    $unhome=$tryserver;
-                   }
+ 		}
- 	       }
  	    }
          }
          if (($unhome eq '') || ($unhome eq 'no_host')) {
- Line 3768  sub modifyuser {
+ Line 6832  sub modifyuser {
      }
  # -------------------------------------------------------------- Add names, etc
      my @tmp=&get('environment',
- 		   ['firstname','middlename','lastname','generation'],
+ 		   ['firstname','middlename','lastname','generation','id',
+                     'permanentemail','inststatus'],
  		   $udom,$uname);
-     my %names;
+     my (%names,%oldnames);
      if ($tmp[0] =~ m/^error:.*/) {
          %names=();
      } else {
          %names = @tmp;
+         %oldnames = %names;
      }
  #
- # Make sure to not trash student environment if instructor does not bother
+ # If name, email and/or uid are blank (e.g., because an uploaded file
- # to supply name and email information
+ # of users did not contain them), do not overwrite existing values
- #
+ # unless field is in $candelete array ref.
+ #
+     my @fields = ('firstname','middlename','lastname','generation',
+                   'permanentemail','id');
+     my %newvalues;
+     if (ref($candelete) eq 'ARRAY') {
+         foreach my $field (@fields) {
+             if (grep(/^\Q$field\E$/,@{$candelete})) {
+                 if ($field eq 'firstname') {
+                     $names{$field} = $first;
+                 } elsif ($field eq 'middlename') {
+                     $names{$field} = $middle;
+                 } elsif ($field eq 'lastname') {
+                     $names{$field} = $last;
+                 } elsif ($field eq 'generation') {
+                     $names{$field} = $gene;
+                 } elsif ($field eq 'permanentemail') {
+                     $names{$field} = $email;
+                 } elsif ($field eq 'id') {
+                     $names{$field}  = $uid;
+                 }
+             }
+         }
+     }
      if ($first)  { $names{'firstname'}  = $first; }
      if (defined($middle)) { $names{'middlename'} = $middle; }
      if ($last)   { $names{'lastname'}   = $last; }
      if (defined($gene))   { $names{'generation'} = $gene; }
      if ($email) {
         $email=~s/[^\w\@\.\-\,]//gs;
-        if ($email=~/\@/) { $names{'notification'} = $email;
+        if ($email=~/\@/) { $names{'permanentemail'} = $email; }
- 			   $names{'critnotification'} = $email;
+     }
- 			   $names{'permanentemail'} = $email; }
+     if ($uid) { $names{'id'}  = $uid; }
+     if (defined($inststatus)) {
+         $names{'inststatus'} = '';
+         my ($usertypes,$typesorder) = &retrieve_inst_usertypes($udom);
+         if (ref($usertypes) eq 'HASH') {
+             my @okstatuses;
+             foreach my $item (split(/:/,$inststatus)) {
+                 if (defined($usertypes->{$item})) {
+                     push(@okstatuses,$item);
+                 }
+             }
+             if (@okstatuses) {
+                 $names{'inststatus'} = join(':', map { &escape($_); } @okstatuses);
+             }
+         }
+     }
+     my $logmsg = $udom.', '.$uname.', '.$uid.', '.
+                  $umode.', '.$first.', '.$middle.', '.
+                  $last.', '.$gene.', '.$email.', '.$inststatus;
+     if ($env{'user.name'} ne '' && $env{'user.domain'}) {
+         $logmsg .= ' by '.$env{'user.name'}.' at '.$env{'user.domain'};
+     } else {
+         $logmsg .= ' during self creation';
+     }
+     my $changed;
+     if ($newuser) {
+         $changed = 1;
+     } else {
+         foreach my $field (@fields) {
+             if ($names{$field} ne $oldnames{$field}) {
+                 $changed = 1;
+                 last;
+             }
+         }
+     }
+     unless ($changed) {
+         $logmsg = 'No changes in user information needed for: '.$logmsg;
+         &logthis($logmsg);
+         return 'ok';
      }
      my $reply = &put('environment', \%names, $udom,$uname);
-     if ($reply ne 'ok') { return 'error: '.$reply; }
+     if ($reply ne 'ok') {
-     &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
+         return 'error: '.$reply;
-              $umode.', '.$first.', '.$middle.', '.
+     }
- 	     $last.', '.$gene.' by '.
+     if ($names{'permanentemail'} ne $oldnames{'permanentemail'}) {
-              $env{'user.name'}.' at '.$env{'user.domain'});
+         &Apache::lonnet::devalidate_cache_new('emailscache',$uname.':'.$udom);
+     }
+     my $sqlresult = &update_allusers_table($uname,$udom,\%names);
+     &devalidate_cache_new('namescache',$uname.':'.$udom);
+     $logmsg = 'Success modifying user '.$logmsg;
+     &logthis($logmsg);
      return 'ok';
  }
- Line 3803  sub modifyuser {
+ Line 6936  sub modifyuser {
  sub modifystudent {
      my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
-         $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid)=@_;
+         $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid,
+         $selfenroll,$context,$inststatus)=@_;
      if (!$cid) {
  	unless ($cid=$env{'request.course.id'}) {
  	    return 'not_in_class';
- Line 3812  sub modifystudent {
+ Line 6946  sub modifystudent {
  # --------------------------------------------------------------- Make the user
      my $reply=&modifyuser
  	($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid,
-          $desiredhome,$email);
+          $desiredhome,$email,$inststatus);
      unless ($reply eq 'ok') { return $reply; }
      # This will cause &modify_student_enrollment to get the uid from the
      # students environment
      $uid = undef if (!$forceid);
      $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
- 					$gene,$usec,$end,$start,$type,$locktype,$cid);
+ 					$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context);
      return $reply;
  }
  sub modify_student_enrollment {
-     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid) = @_;
+     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_;
      my ($cdom,$cnum,$chome);
      if (!$cid) {
  	unless ($cid=$env{'request.course.id'}) {
- Line 3856  sub modify_student_enrollment {
+ Line 6990  sub modify_student_enrollment {
                         ['firstname','middlename','lastname', 'generation','id']
                         ,$udom,$uname);
-         #foreach (keys(%tmp)) {
+         #foreach my $key (keys(%tmp)) {
-         #    &logthis("key $_ = ".$tmp{$_});
+         #    &logthis("key $key = ".$tmp{$key});
          #}
          $first  = $tmp{'firstname'}  if (!defined($first)  || $first  eq '');
          $middle = $tmp{'middlename'} if (!defined($middle) || $middle eq '');
- Line 3881  sub modify_student_enrollment {
+ Line 7015  sub modify_student_enrollment {
      if ($usec) {
  	$uurl.='/'.$usec;
      }
-     return &assignrole($udom,$uname,$uurl,'st',$end,$start);
+     return &assignrole($udom,$uname,$uurl,'st',$end,$start,undef,$selfenroll,$context);
  }
  sub format_name {
- Line 3915  sub writecoursepref {
+ Line 7049  sub writecoursepref {
  	return 'error: no such course';
      }
      my $cstring='';
-     foreach (keys %prefs) {
+     foreach my $pref (keys(%prefs)) {
- 	$cstring.=escape($_).'='.escape($prefs{$_}).'&';
+ 	$cstring.=&escape($pref).'='.&escape($prefs{$pref}).'&';
      }
      $cstring=~s/\&$//;
      return reply('put:'.$cdomain.':'.$cnum.':environment:'.$cstring,$chome);
- Line 3925  sub writecoursepref {
+ Line 7059  sub writecoursepref {
  # ---------------------------------------------------------- Make/modify course
  sub createcourse {
-     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner)=@_;
+     my ($udom,$description,$url,$course_server,$nonstandard,$inst_code,
+         $course_owner,$crstype,$cnum,$context,$category)=@_;
      $url=&declutter($url);
      my $cid='';
-     unless (&allowed('ccc',$udom)) {
+     if ($context eq 'requestcourses') {
+         my $can_create = 0;
+         my ($ownername,$ownerdom) = split(':',$course_owner);
+         if ($udom eq $ownerdom) {
+             if (&usertools_access($ownername,$ownerdom,$category,undef,
+                                   $context)) {
+                 $can_create = 1;
+             }
+         } else {
+             my %userenv = &userenvironment($ownerdom,$ownername,'reqcrsotherdom.'.
+                                            $category);
+             if ($userenv{'reqcrsotherdom.'.$category} ne '') {
+                 my @curr = split(',',$userenv{'reqcrsotherdom.'.$category});
+                 if (@curr > 0) {
+                     my @options = qw(approval validate autolimit);
+                     my $optregex = join('|',@options);
+                     if (grep(/^\Q$udom\E:($optregex)(=?\d*)$/,@curr)) {
+                         $can_create = 1;
+                     }
+                 }
+             }
+         }
+         if ($can_create) {
+             unless ($ownername eq $env{'user.name'} && $ownerdom eq $env{'user.domain'}) {
+                 unless (&allowed('ccc',$udom)) {
+                     return 'refused';
+                 }
+             }
+         } else {
+             return 'refused';
+         }
+     } elsif (!&allowed('ccc',$udom)) {
          return 'refused';
      }
- # ------------------------------------------------------------------- Create ID
+ # --------------------------------------------------------------- Get Unique ID
-    my $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
+     my $uname;
-        unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+     if ($cnum =~ /^$match_courseid$/) {
- # ----------------------------------------------- Make sure that does not exist
+         my $chome=&homeserver($cnum,$udom,'true');
-    my $uhome=&homeserver($uname,$udom,'true');
+         if (($chome eq '') || ($chome eq 'no_host')) {
-    unless (($uhome eq '') || ($uhome eq 'no_host')) {
+             $uname = $cnum;
-        $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)).
+         } else {
-         unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+             $uname = &generate_coursenum($udom,$crstype);
-        $uhome=&homeserver($uname,$udom,'true');
+         }
-        unless (($uhome eq '') || ($uhome eq 'no_host')) {
+     } else {
-            return 'error: unable to generate unique course-ID';
+         $uname = &generate_coursenum($udom,$crstype);
-        }
+     }
-    }
+     return $uname if ($uname =~ /^error/);
- # ------------------------------------------------ Check supplied server name
+ # -------------------------------------------------- Check supplied server name
-     $course_server = $env{'user.homeserver'} if (! defined($course_server));
+     if (!defined($course_server)) {
-     if (! exists($libserv{$course_server})) {
+         if (defined(&domain($udom,'primary'))) {
-         return 'error:bad server name '.$course_server;
+             $course_server = &domain($udom,'primary');
+         } else {
+             $course_server = $env{'user.home'};
+         }
+     }
+     my %host_servers =
+         &Apache::lonnet::get_servers($udom,'library');
+     unless ($host_servers{$course_server}) {
+         return 'error: invalid home server for course: '.$course_server;
      }
  # ------------------------------------------------------------- Make the course
      my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::',
                        $course_server);
      unless ($reply eq 'ok') { return 'error: '.$reply; }
-     $uhome=&homeserver($uname,$udom,'true');
+     my $uhome=&homeserver($uname,$udom,'true');
      if (($uhome eq '') || ($uhome eq 'no_host')) {
  	return 'error: no such course';
      }
  # ----------------------------------------------------------------- Course made
  # log existence
-     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
+     my $now = time;
-                  ':'.&escape($inst_code).':'.&escape($course_owner),$uhome);
+     my $newcourse = {
-     &flushcourselogs();
+                     $udom.'_'.$uname => {
+                                      description => $description,
+                                      inst_code   => $inst_code,
+                                      owner       => $course_owner,
+                                      type        => $crstype,
+                                      creator     => $env{'user.name'}.':'.
+                                                     $env{'user.domain'},
+                                      created     => $now,
+                                      context     => $context,
+                                                 },
+                     };
+     &courseidput($udom,$newcourse,$uhome,'notime');
  # set toplevel url
      my $topurl=$url;
      unless ($nonstandard) {
- Line 3983  ENDINITMAP
+ Line 7168  ENDINITMAP
      }
  # ----------------------------------------------------------- Write preferences
      &writecoursepref($udom.'_'.$uname,
-                      ('description' => $description,
+                      ('description'              => $description,
-                       'url'         => $topurl));
+                       'url'                      => $topurl,
+                       'internal.creator'         => $env{'user.name'}.':'.
+                                                     $env{'user.domain'},
+                       'internal.created'         => $now,
+                       'internal.creationcontext' => $context)
+                     );
      return '/'.$udom.'/'.$uname;
  }
+ # ------------------------------------------------------------------- Create ID
+ sub generate_coursenum {
+     my ($udom,$crstype) = @_;
+     my $domdesc = &domain($udom);
+     return 'error: invalid domain' if ($domdesc eq '');
+     my $first;
+     if ($crstype eq 'Community') {
+         $first = '0';
+     } else {
+         $first = int(1+rand(9));
+     }
+     my $uname=$first.
+         ('a'..'z','A'..'Z','0'..'9')[int(rand(62))].
+         substr($$.time,0,5).unpack("H8",pack("I32",time)).
+         unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+ # ----------------------------------------------- Make sure that does not exist
+     my $uhome=&homeserver($uname,$udom,'true');
+     unless (($uhome eq '') || ($uhome eq 'no_host')) {
+         if ($crstype eq 'Community') {
+             $first = '0';
+         } else {
+             $first = int(1+rand(9));
+         }
+         $uname=$first.
+                ('a'..'z','A'..'Z','0'..'9')[int(rand(62))].
+                substr($$.time,0,5).unpack("H8",pack("I32",time)).
+                unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'};
+         $uhome=&homeserver($uname,$udom,'true');
+         unless (($uhome eq '') || ($uhome eq 'no_host')) {
+             return 'error: unable to generate unique course-ID';
+         }
+     }
+     return $uname;
+ }
+ sub is_course {
+     my ($cdom,$cnum) = @_;
+     my %courses = &courseiddump($cdom,'.',1,'.','.',$cnum,undef,
+ 				undef,'.');
+     if (exists($courses{$cdom.'_'.$cnum})) {
+         return 1;
+     }
+     return 0;
+ }
+ sub store_userdata {
+     my ($storehash,$datakey,$namespace,$udom,$uname) = @_;
+     my $result;
+     if ($datakey ne '') {
+         if (ref($storehash) eq 'HASH') {
+             if ($udom eq '' || $uname eq '') {
+                 $udom = $env{'user.domain'};
+                 $uname = $env{'user.name'};
+             }
+             my $uhome=&homeserver($uname,$udom);
+             if (($uhome eq '') || ($uhome eq 'no_host')) {
+                 $result = 'error: no_host';
+             } else {
+                 $storehash->{'ip'} = $ENV{'REMOTE_ADDR'};
+                 $storehash->{'host'} = $perlvar{'lonHostID'};
+                 my $namevalue='';
+                 foreach my $key (keys(%{$storehash})) {
+                     $namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
+                 }
+                 $namevalue=~s/\&$//;
+                 $result =  &reply("store:$env{'user.domain'}:$env{'user.name'}:".
+                                   "$namespace:$datakey:$namevalue",$uhome);
+             }
+         } else {
+             $result = 'error: data to store was not a hash reference';
+         }
+     } else {
+         $result= 'error: invalid requestkey';
+     }
+     return $result;
+ }
  # ---------------------------------------------------------- Assign Custom Role
  sub assigncustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag,$selfenroll,$context)=@_;
      return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename,
-                        $end,$start,$deleteflag);
+                        $end,$start,$deleteflag,$selfenroll,$context);
  }
  # ----------------------------------------------------------------- Revoke Role
  sub revokerole {
-     my ($udom,$uname,$url,$role,$deleteflag)=@_;
+     my ($udom,$uname,$url,$role,$deleteflag,$selfenroll,$context)=@_;
      my $now=time;
-     return &assignrole($udom,$uname,$url,$role,$now,$deleteflag);
+     return &assignrole($udom,$uname,$url,$role,$now,undef,$deleteflag,$selfenroll,$context);
  }
  # ---------------------------------------------------------- Revoke Custom Role
  sub revokecustomrole {
-     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag)=@_;
+     my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag,$selfenroll,$context)=@_;
      my $now=time;
      return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now,
-            $deleteflag);
+            $deleteflag,$selfenroll,$context);
  }
  # ------------------------------------------------------------ Disk usage
  sub diskusage {
-     my ($udom,$uname,$directoryRoot)=@_;
+     my ($udom,$uname,$directorypath,$getpropath)=@_;
-     $directoryRoot =~ s/\/$//;
+     $directorypath =~ s/\/$//;
-     my $listing=&reply('du:'.$directoryRoot,homeserver($uname,$udom));
+     my $listing=&reply('du2:'.&escape($directorypath).':'
+                        .&escape($getpropath).':'.&escape($uname).':'
+                        .&escape($udom),homeserver($uname,$udom));
+     if ($listing eq 'unknown_cmd') {
+         if ($getpropath) {
+             $directorypath = &propath($udom,$uname).'/'.$directorypath;
+         }
+         $listing = &reply('du:'.$directorypath,homeserver($uname,$udom));
+     }
      return $listing;
  }
  sub is_locked {
-     my ($file_name, $domain, $user) = @_;
+     my ($file_name, $domain, $user, $which) = @_;
      my @check;
      my $is_locked;
-     push @check, $file_name;
+     push (@check,$file_name);
      my %locked = &get('file_permissions',\@check,
  		      $env{'user.domain'},$env{'user.name'});
      my ($tmp)=keys(%locked);
      if ($tmp=~/^error:/) { undef(%locked); }
      if (ref($locked{$file_name}) eq 'ARRAY') {
-         $is_locked = 'true';
+         $is_locked = 'false';
+         foreach my $entry (@{$locked{$file_name}}) {
+            if (ref($entry) eq 'ARRAY') {
+                $is_locked = 'true';
+                if (ref($which) eq 'ARRAY') {
+                    push(@{$which},$entry);
+                } else {
+                    last;
+                }
+            }
+        }
      } else {
          $is_locked = 'false';
      }
+     return $is_locked;
+ }
+ sub declutter_portfile {
+     my ($file) = @_;
+     $file =~ s{^(/portfolio/|portfolio/)}{/};
+     return $file;
  }
  # ------------------------------------------------------------- Mark as Read Only
- Line 4046  sub mark_as_readonly {
+ Line 7339  sub mark_as_readonly {
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
      foreach my $file (@{$files}) {
+ 	$file = &declutter_portfile($file);
          push(@{$current_permissions{$file}},$what);
      }
      &put('file_permissions',\%current_permissions,$domain,$user);
- Line 4058  sub save_selected_files {
+ Line 7352  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);
+     open (OUT, '>'.$tmpdir.$filename);
      foreach my $file (@files) {
          print (OUT $env{'form.currentpath'}.$file."\n");
      }
- Line 4104  sub files_not_in_path {
+ Line 7398  sub files_not_in_path {
      my $filename = $user."savedfiles";
      my @return_files;
      my $path_part;
-     open (IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
+     open(IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename);
-     while (<IN>) {
+     while (my $line = <IN>) {
          #ok, I know it's clunky, but I want it to work
-         my @paths_and_file = split m!/!, $_;
+         my @paths_and_file = split(m|/|, $line);
-         my $file_part = pop (@paths_and_file);
+         my $file_part = pop(@paths_and_file);
-         chomp ($file_part);
+         chomp($file_part);
-         my $path_part = join ('/', @paths_and_file);
+         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));
+             push(@return_files, ($path_and_file));
          }
      }
-     close (OUT);
+     close(OUT);
      return (@return_files);
  }
- #--------------------------------------------------------------Get Marked as Read Only
+ #----------------------------------------------Get portfolio file permissions
- sub get_marked_as_readonly {
+ sub get_portfile_permissions {
-     my ($domain,$user,$what) = @_;
+     my ($domain,$user) = @_;
      my %current_permissions = &dump('file_permissions',$domain,$user);
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
+     return \%current_permissions;
+ }
+ #---------------------------------------------Get portfolio file access controls
+ sub get_access_controls {
+     my ($current_permissions,$group,$file) = @_;
+     my %access;
+     my $real_file = $file;
+     $file =~ s/\.meta$//;
+     if (defined($file)) {
+         if (ref($$current_permissions{$file."\0".'accesscontrol'}) eq 'HASH') {
+             foreach my $control (keys(%{$$current_permissions{$file."\0".'accesscontrol'}})) {
+                 $access{$real_file}{$control} = $$current_permissions{$file."\0".$control};
+             }
+         }
+     } else {
+         foreach my $key (keys(%{$current_permissions})) {
+             if ($key =~ /\0accesscontrol$/) {
+                 if (defined($group)) {
+                     if ($key !~ m-^\Q$group\E/-) {
+                         next;
+                     }
+                 }
+                 my ($fullpath) = split(/\0/,$key);
+                 if (ref($$current_permissions{$key}) eq 'HASH') {
+                     foreach my $control (keys(%{$$current_permissions{$key}})) {
+                         $access{$fullpath}{$control}=$$current_permissions{$fullpath."\0".$control};
+                     }
+                 }
+             }
+         }
+     }
+     return %access;
+ }
+ sub modify_access_controls {
+     my ($file_name,$changes,$domain,$user)=@_;
+     my ($outcome,$deloutcome);
+     my %store_permissions;
+     my %new_values;
+     my %new_control;
+     my %translation;
+     my @deletions = ();
+     my $now = time;
+     if (exists($$changes{'activate'})) {
+         if (ref($$changes{'activate'}) eq 'HASH') {
+             my @newitems = sort(keys(%{$$changes{'activate'}}));
+             my $numnew = scalar(@newitems);
+             for (my $i=0; $i<$numnew; $i++) {
+                 my $newkey = $newitems[$i];
+                 my $newid = &Apache::loncommon::get_cgi_id();
+                 if ($newkey =~ /^\d+:/) {
+                     $newkey =~ s/^(\d+)/$newid/;
+                     $translation{$1} = $newid;
+                 } elsif ($newkey =~ /^\d+_\d+_\d+:/) {
+                     $newkey =~ s/^(\d+_\d+_\d+)/$newid/;
+                     $translation{$1} = $newid;
+                 }
+                 $new_values{$file_name."\0".$newkey} =
+                                           $$changes{'activate'}{$newitems[$i]};
+                 $new_control{$newkey} = $now;
+             }
+         }
+     }
+     my %todelete;
+     my %changed_items;
+     foreach my $action ('delete','update') {
+         if (exists($$changes{$action})) {
+             if (ref($$changes{$action}) eq 'HASH') {
+                 foreach my $key (keys(%{$$changes{$action}})) {
+                     my ($itemnum) = ($key =~ /^([^:]+):/);
+                     if ($action eq 'delete') {
+                         $todelete{$itemnum} = 1;
+                     } else {
+                         $changed_items{$itemnum} = $key;
+                     }
+                 }
+             }
+         }
+     }
+     # get lock on access controls for file.
+     my $lockhash = {
+                   $file_name."\0".'locked_access_records' => $env{'user.name'}.
+                                                        ':'.$env{'user.domain'},
+                    };
+     my $tries = 0;
+     my $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
+     while (($gotlock ne 'ok') && $tries <3) {
+         $tries ++;
+         sleep 1;
+         $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
+     }
+     if ($gotlock eq 'ok') {
+         my %curr_permissions = &dump('file_permissions',$domain,$user,$file_name);
+         my ($tmp)=keys(%curr_permissions);
+         if ($tmp=~/^error:/) { undef(%curr_permissions); }
+         if (exists($curr_permissions{$file_name."\0".'accesscontrol'})) {
+             my $curr_controls = $curr_permissions{$file_name."\0".'accesscontrol'};
+             if (ref($curr_controls) eq 'HASH') {
+                 foreach my $control_item (keys(%{$curr_controls})) {
+                     my ($itemnum) = ($control_item =~ /^([^:]+):/);
+                     if (defined($todelete{$itemnum})) {
+                         push(@deletions,$file_name."\0".$control_item);
+                     } else {
+                         if (defined($changed_items{$itemnum})) {
+                             $new_control{$changed_items{$itemnum}} = $now;
+                             push(@deletions,$file_name."\0".$control_item);
+                             $new_values{$file_name."\0".$changed_items{$itemnum}} = $$changes{'update'}{$changed_items{$itemnum}};
+                         } else {
+                             $new_control{$control_item} = $$curr_controls{$control_item};
+                         }
+                     }
+                 }
+             }
+         }
+         my ($group);
+         if (&is_course($domain,$user)) {
+             ($group,my $file) = split(/\//,$file_name,2);
+         }
+         $deloutcome = &del('file_permissions',\@deletions,$domain,$user);
+         $new_values{$file_name."\0".'accesscontrol'} = \%new_control;
+         $outcome = &put('file_permissions',\%new_values,$domain,$user);
+         #  remove lock
+         my @del_lock = ($file_name."\0".'locked_access_records');
+         my $dellockoutcome = &del('file_permissions',\@del_lock,$domain,$user);
+         my $sqlresult =
+             &update_portfolio_table($user,$domain,$file_name,'portfolio_access',
+                                     $group);
+     } else {
+         $outcome = "error: could not obtain lockfile\n";
+     }
+     return ($outcome,$deloutcome,\%new_values,\%translation);
+ }
+ sub make_public_indefinitely {
+     my ($requrl) = @_;
+     my $now = time;
+     my $action = 'activate';
+     my $aclnum = 0;
+     if (&is_portfolio_url($requrl)) {
+         my (undef,$udom,$unum,$file_name,$group) =
+             &parse_portfolio_url($requrl);
+         my $current_perms = &get_portfile_permissions($udom,$unum);
+         my %access_controls = &get_access_controls($current_perms,
+                                                    $group,$file_name);
+         foreach my $key (keys(%{$access_controls{$file_name}})) {
+             my ($num,$scope,$end,$start) =
+                 ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+             if ($scope eq 'public') {
+                 if ($start <= $now && $end == 0) {
+                     $action = 'none';
+                 } else {
+                     $action = 'update';
+                     $aclnum = $num;
+                 }
+                 last;
+             }
+         }
+         if ($action eq 'none') {
+              return 'ok';
+         } else {
+             my %changes;
+             my $newend = 0;
+             my $newstart = $now;
+             my $newkey = $aclnum.':public_'.$newend.'_'.$newstart;
+             $changes{$action}{$newkey} = {
+                 type => 'public',
+                 time => {
+                     start => $newstart,
+                     end   => $newend,
+                 },
+             };
+             my ($outcome,$deloutcome,$new_values,$translation) =
+                 &modify_access_controls($file_name,\%changes,$udom,$unum);
+             return $outcome;
+         }
+     } else {
+         return 'invalid';
+     }
+ }
+ #------------------------------------------------------Get Marked as Read Only
+ sub get_marked_as_readonly {
+     my ($domain,$user,$what,$group) = @_;
+     my $current_permissions = &get_portfile_permissions($domain,$user);
      my @readonly_files;
      my $cmp1=$what;
      if (ref($what)) { $cmp1=join('',@{$what}) };
-     while (my ($file_name,$value) = each(%current_permissions)) {
+     while (my ($file_name,$value) = each(%{$current_permissions})) {
+         if (defined($group)) {
+             if ($file_name !~ m-^\Q$group\E/-) {
+                 next;
+             }
+         }
          if (ref($value) eq "ARRAY"){
              foreach my $stored_what (@{$value}) {
                  my $cmp2=$stored_what;
-                 if (ref($stored_what)) { $cmp2=join('',@{$stored_what}) };
+                 if (ref($stored_what) eq 'ARRAY') {
+                     $cmp2=join('',@{$stored_what});
+                 }
                  if ($cmp1 eq $cmp2) {
                      push(@readonly_files, $file_name);
+                     last;
                  } elsif (!defined($what)) {
                      push(@readonly_files, $file_name);
+                     last;
                  }
              }
          }
      }
      return @readonly_files;
  }
  #-----------------------------------------------------------Get Marked as Read Only Hash
  sub get_marked_as_readonly_hash {
-     my ($domain,$user,$what) = @_;
+     my ($current_permissions,$group,$what) = @_;
-     my %current_permissions = &dump('file_permissions',$domain,$user);
-     my ($tmp)=keys(%current_permissions);
-     if ($tmp=~/^error:/) { undef(%current_permissions); }
      my %readonly_files;
-     while (my ($file_name,$value) = each(%current_permissions)) {
+     while (my ($file_name,$value) = each(%{$current_permissions})) {
+         if (defined($group)) {
+             if ($file_name !~ m-^\Q$group\E/-) {
+                 next;
+             }
+         }
          if (ref($value) eq "ARRAY"){
              foreach my $stored_what (@{$value}) {
-                 if ($stored_what eq $what) {
+                 if (ref($stored_what) eq 'ARRAY') {
-                     $readonly_files{$file_name} = 'locked';
+                     foreach my $lock_descriptor(@{$stored_what}) {
-                 } elsif (!defined($what)) {
+                         if ($lock_descriptor eq 'graded') {
-                     $readonly_files{$file_name} = 'locked';
+                             $readonly_files{$file_name} = 'graded';
-                 }
+                         } elsif ($lock_descriptor eq 'handback') {
+                             $readonly_files{$file_name} = 'handback';
+                         } else {
+                             if (!exists($readonly_files{$file_name})) {
+                                 $readonly_files{$file_name} = 'locked';
+                             }
+                         }
+                     }
+                 }
              }
          }
      }
- Line 4174  sub get_marked_as_readonly_hash {
+ Line 7673  sub get_marked_as_readonly_hash {
  sub unmark_as_readonly {
      # unmarks $file_name (if $file_name is defined), or all files locked by $what
      # for portfolio submissions, $what contains [$symb,$crsid]
-     my ($domain,$user,$what,$file_name) = @_;
+     my ($domain,$user,$what,$file_name,$group) = @_;
+     $file_name = &declutter_portfile($file_name);
      my $symb_crs = $what;
      if (ref($what)) { $symb_crs=join('',@$what); }
-     my %current_permissions = &dump('file_permissions',$domain,$user);
+     my %current_permissions = &dump('file_permissions',$domain,$user,$group);
      my ($tmp)=keys(%current_permissions);
      if ($tmp=~/^error:/) { undef(%current_permissions); }
-     my @readonly_files = &get_marked_as_readonly($domain,$user,$what);
+     my @readonly_files = &get_marked_as_readonly($domain,$user,$what,$group);
      foreach my $file (@readonly_files) {
- 	if (defined($file_name) && ($file_name ne $file)) { next; }
+ 	my $clean_file = &declutter_portfile($file);
+ 	if (defined($file_name) && ($file_name ne $clean_file)) { next; }
  	my $current_locks = $current_permissions{$file};
          my @new_locks;
          my @del_keys;
          if (ref($current_locks) eq "ARRAY"){
              foreach my $locker (@{$current_locks}) {
                  my $compare=$locker;
-                 if (ref($locker)) { $compare=join('',@{$locker}) };
+                 if (ref($locker) eq 'ARRAY') {
-                 if ($compare ne $symb_crs) {
+                     $compare=join('',@{$locker});
-                     push(@new_locks, $locker);
+                     if ($compare ne $symb_crs) {
+                         push(@new_locks, $locker);
+                     }
                  }
              }
              if (scalar(@new_locks) > 0) {
- Line 4210  sub unmark_as_readonly {
+ Line 7713  sub unmark_as_readonly {
  # ------------------------------------------------------------ Directory lister
  sub dirlist {
-     my ($uri,$userdomain,$username,$alternateDirectoryRoot)=@_;
+     my ($uri,$userdomain,$username,$getpropath,$getuserdir,$alternateRoot)=@_;
      $uri=~s/^\///;
      $uri=~s/\/$//;
      my ($udom, $uname);
-     (undef,$udom,$uname)=split(/\//,$uri);
+     if ($getuserdir) {
-     if(defined($userdomain)) {
          $udom = $userdomain;
-     }
-     if(defined($username)) {
          $uname = $username;
+     } else {
+         (undef,$udom,$uname)=split(/\//,$uri);
+         if(defined($userdomain)) {
+             $udom = $userdomain;
+         }
+         if(defined($username)) {
+             $uname = $username;
+         }
      }
+     my ($dirRoot,$listing,@listing_results);
-     my $dirRoot = $perlvar{'lonDocRoot'};
+     $dirRoot = $perlvar{'lonDocRoot'};
-     if(defined($alternateDirectoryRoot)) {
+     if (defined($getpropath)) {
-         $dirRoot = $alternateDirectoryRoot;
+         $dirRoot = &propath($udom,$uname);
          $dirRoot =~ s/\/$//;
+     } elsif (defined($getuserdir)) {
+         my $subdir=$uname.'__';
+         $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+         $dirRoot = $Apache::lonnet::perlvar{'lonUsersDir'}
+                    ."/$udom/$subdir/$uname";
+     } elsif (defined($alternateRoot)) {
+         $dirRoot = $alternateRoot;
      }
      if($udom) {
          if($uname) {
-             my $listing=reply('ls2:'.$dirRoot.'/'.$uri,
+             $listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':'
-                               homeserver($uname,$udom));
+                               .$getuserdir.':'.&escape($dirRoot)
-             my @listing_results;
+                               .':'.&escape($uname).':'.&escape($udom),
+                               &homeserver($uname,$udom));
              if ($listing eq 'unknown_cmd') {
-                 $listing=reply('ls:'.$dirRoot.'/'.$uri,
+                 $listing = &reply('ls2:'.$dirRoot.'/'.$uri,
-                                homeserver($uname,$udom));
+                                   &homeserver($uname,$udom));
+             } else {
+                 @listing_results = map { &unescape($_); } split(/:/,$listing);
+             }
+             if ($listing eq 'unknown_cmd') {
+                 $listing = &reply('ls:'.$dirRoot.'/'.$uri,
+ 				  &homeserver($uname,$udom));
                  @listing_results = split(/:/,$listing);
              } else {
                  @listing_results = map { &unescape($_); } split(/:/,$listing);
              }
              return @listing_results;
-         } elsif(!defined($alternateDirectoryRoot)) {
+         } elsif(!$alternateRoot) {
-             my $tryserver;
+             my %allusers;
-             my %allusers=();
+ 	    my %servers = &get_servers($udom,'library');
-             foreach $tryserver (keys %libserv) {
+  	    foreach my $tryserver (keys(%servers)) {
-                 if($hostdom{$tryserver} eq $udom) {
+                 $listing = &reply('ls3:'.&escape("/res/$udom").':::::'.
-                     my $listing=reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'.
+                                   &escape($udom),$tryserver);
-                                       $udom, $tryserver);
+                 if ($listing eq 'unknown_cmd') {
-                     my @listing_results;
+ 		    $listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'.
-                     if ($listing eq 'unknown_cmd') {
+ 				      $udom, $tryserver);
-                         $listing=reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.
+                 } else {
-                                        $udom, $tryserver);
+                     @listing_results = map { &unescape($_); } split(/:/,$listing);
-                         @listing_results = split(/:/,$listing);
-                     } else {
-                         @listing_results =
-                             map { &unescape($_); } split(/:/,$listing);
-                     }
-                     if ($listing_results[0] ne 'no_such_dir' &&
-                         $listing_results[0] ne 'empty'       &&
-                         $listing_results[0] ne 'con_lost') {
-                         foreach (@listing_results) {
-                             my ($entry,@stat)=split(/&/,$_);
-                             $allusers{$entry}=1;
-                         }
-                     }
                  }
+ 		if ($listing eq 'unknown_cmd') {
+ 		    $listing = &reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.
+ 				      $udom, $tryserver);
+ 		    @listing_results = split(/:/,$listing);
+ 		} else {
+ 		    @listing_results =
+ 			map { &unescape($_); } split(/:/,$listing);
+ 		}
+ 		if ($listing_results[0] ne 'no_such_dir' &&
+ 		    $listing_results[0] ne 'empty'       &&
+ 		    $listing_results[0] ne 'con_lost') {
+ 		    foreach my $line (@listing_results) {
+ 			my ($entry) = split(/&/,$line,2);
+ 			$allusers{$entry} = 1;
+ 		    }
+ 		}
              }
              my $alluserstr='';
-             foreach (sort keys %allusers) {
+             foreach my $user (sort(keys(%allusers))) {
-                 $alluserstr.=$_.'&user:';
+                 $alluserstr.=$user.'&user:';
              }
              $alluserstr=~s/:$//;
              return split(/:/,$alluserstr);
          } else {
-             my @emptyResults = ();
+             return ('missing user name');
-             push(@emptyResults, 'missing user name');
+         }
-             return split(':',@emptyResults);
+     } elsif(!defined($getpropath)) {
-         }
+         my @all_domains = sort(&all_domains());
-     } elsif(!defined($alternateDirectoryRoot)) {
+         foreach my $domain (@all_domains) {
-         my $tryserver;
+             $domain = $perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain';
-         my %alldom=();
+         }
-         foreach $tryserver (keys %libserv) {
+         return @all_domains;
-             $alldom{$hostdom{$tryserver}}=1;
+     } else {
-         }
+         return ('missing domain');
-         my $alldomstr='';
-         foreach (sort keys %alldom) {
-             $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:';
-         }
-         $alldomstr=~s/:$//;
-         return split(/:/,$alldomstr);
-     } else {
-         my @emptyResults = ();
-         push(@emptyResults, 'missing domain');
-         return split(':',@emptyResults);
      }
  }
- Line 4303  sub dirlist {
+ Line 7818  sub dirlist {
  # when it was last modified.  It will also return an error of -1
  # if an error occurs
- ##
- ## FIXME: This subroutine assumes its caller knows something about the
- ## directory structure of the home server for the student ($root).
- ## Not a good assumption to make.  Since this is for looking up files
- ## in user directories, the full path should be constructed by lond, not
- ## whatever machine we request data from.
- ##
  sub GetFileTimestamp {
-     my ($studentDomain,$studentName,$filename,$root)=@_;
+     my ($studentDomain,$studentName,$filename,$getuserdir)=@_;
-     $studentDomain=~s/\W//g;
+     $studentDomain = &LONCAPA::clean_domain($studentDomain);
-     $studentName=~s/\W//g;
+     $studentName   = &LONCAPA::clean_username($studentName);
-     my $subdir=$studentName.'__';
+     my ($fileStat) =
-     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
+         &Apache::lonnet::dirlist($filename,$studentDomain,$studentName,
-     my $proname="$studentDomain/$subdir/$studentName";
+                                  undef,$getuserdir);
-     $proname .= '/'.$filename;
-     my ($fileStat) = &Apache::lonnet::dirlist($proname, $studentDomain,
-                                               $studentName, $root);
      my @stats = split('&', $fileStat);
      if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
          # @stats contains first the filename, then the stat output
- Line 4329  sub GetFileTimestamp {
+ Line 7834  sub GetFileTimestamp {
      }
  }
+ sub stat_file {
+     my ($uri) = @_;
+     $uri = &clutter_with_no_wrapper($uri);
+     my ($udom,$uname,$file);
+     if ($uri =~ m-^/(uploaded|editupload)/-) {
+ 	($udom,$uname,$file) =
+ 	    ($uri =~ m-/(?:uploaded|editupload)/?($match_domain)/?($match_name)/?(.*)-);
+ 	$file = 'userfiles/'.$file;
+     }
+     if ($uri =~ m-^/res/-) {
+ 	($udom,$uname) =
+ 	    ($uri =~ m-/(?:res)/?($match_domain)/?($match_username)/-);
+ 	$file = $uri;
+     }
+     if (!$udom || !$uname || !$file) {
+ 	# unable to handle the uri
+ 	return ();
+     }
+     my $getpropath;
+     if ($file =~ /^userfiles\//) {
+         $getpropath = 1;
+     }
+     my ($result) = &dirlist($file,$udom,$uname,$getpropath);
+     my @stats = split('&', $result);
+     if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') {
+ 	shift(@stats); #filename is first
+ 	return @stats;
+     }
+     return ();
+ }
  # -------------------------------------------------------- Value of a Condition
+ # gets the value of a specific preevaluated condition
+ #    stored in the string  $env{user.state.<cid>}
+ # or looks up a condition reference in the bighash and if if hasn't
+ # already been evaluated recurses into docondval to get the value of
+ # the condition, then memoizing it to
+ #   $env{user.state.<cid>.<condition>}
  sub directcondval {
      my $number=shift;
      if (!defined($env{'user.state.'.$env{'request.course.id'}})) {
  	&Apache::lonuserstate::evalstate();
      }
+     if (exists($env{'user.state.'.$env{'request.course.id'}.".$number"})) {
+ 	return $env{'user.state.'.$env{'request.course.id'}.".$number"};
+     } elsif ($number =~ /^_/) {
+ 	my $sub_condition;
+ 	if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+ 		&GDBM_READER(),0640)) {
+ 	    $sub_condition=$bighash{'conditions'.$number};
+ 	    untie(%bighash);
+ 	}
+ 	my $value = &docondval($sub_condition);
+ 	&appenv({'user.state.'.$env{'request.course.id'}.".$number" => $value});
+ 	return $value;
+     }
      if ($env{'user.state.'.$env{'request.course.id'}}) {
         return substr($env{'user.state.'.$env{'request.course.id'}},$number,1);
      } else {
- Line 4343  sub directcondval {
+ Line 7901  sub directcondval {
      }
  }
+ # get the collection of conditions for this resource
  sub condval {
      my $condidx=shift;
-     my $result=0;
      my $allpathcond='';
-     foreach (split(/\|/,$condidx)) {
+     foreach my $cond (split(/\|/,$condidx)) {
-        if (defined($env{'acc.cond.'.$env{'request.course.id'}.'.'.$_})) {
+ 	if (defined($env{'acc.cond.'.$env{'request.course.id'}.'.'.$cond})) {
- 	   $allpathcond.=
+ 	    $allpathcond.=
-                '('.$env{'acc.cond.'.$env{'request.course.id'}.'.'.$_}.')|';
+ 		'('.$env{'acc.cond.'.$env{'request.course.id'}.'.'.$cond}.')|';
-        }
+ 	}
      }
      $allpathcond=~s/\|$//;
-     if ($env{'request.course.id'}) {
+     return &docondval($allpathcond);
-        if ($allpathcond) {
+ }
-           my $operand='|';
- 	  my @stack;
+ #evaluates an expression of conditions
-            foreach ($allpathcond=~/(\d+|\(|\)|\&|\|)/g) {
+ sub docondval {
-               if ($_ eq '(') {
+     my ($allpathcond) = @_;
-                  push @stack,($operand,$result)
+     my $result=0;
-               } elsif ($_ eq ')') {
+     if ($env{'request.course.id'}
-                   my $before=pop @stack;
+ 	&& defined($allpathcond)) {
- 		  if (pop @stack eq '&') {
+ 	my $operand='|';
- 		      $result=$result>$before?$before:$result;
+ 	my @stack;
-                   } else {
+ 	foreach my $chunk ($allpathcond=~/(\d+|_\d+\.\d+|\(|\)|\&|\|)/g) {
-                       $result=$result>$before?$result:$before;
+ 	    if ($chunk eq '(') {
-                   }
+ 		push @stack,($operand,$result);
-               } elsif (($_ eq '&') || ($_ eq '|')) {
+ 	    } elsif ($chunk eq ')') {
-                   $operand=$_;
+ 		my $before=pop @stack;
-               } else {
+ 		if (pop @stack eq '&') {
-                   my $new=directcondval($_);
+ 		    $result=$result>$before?$before:$result;
-                   if ($operand eq '&') {
+ 		} else {
-                      $result=$result>$new?$new:$result;
+ 		    $result=$result>$before?$result:$before;
-                   } else {
+ 		}
-                      $result=$result>$new?$result:$new;
+ 	    } elsif (($chunk eq '&') || ($chunk eq '|')) {
-                   }
+ 		$operand=$chunk;
-               }
+ 	    } else {
-           }
+ 		my $new=directcondval($chunk);
-        }
+ 		if ($operand eq '&') {
+ 		    $result=$result>$new?$new:$result;
+ 		} else {
+ 		    $result=$result>$new?$result:$new;
+ 		}
+ 	    }
+ 	}
      }
      return $result;
  }
- Line 4392  sub devalidatecourseresdata {
+ Line 7956  sub devalidatecourseresdata {
      &devalidate_cache_new('courseres',$hashid);
  }
  # --------------------------------------------------- Course Resourcedata Query
+ #
+ #  Parameters:
+ #      $coursenum    - Number of the course.
+ #      $coursedomain - Domain at which the course was created.
+ #  Returns:
+ #     A hash of the course parameters along (I think) with timestamps
+ #     and version info.
  sub get_courseresdata {
      my ($coursenum,$coursedomain)=@_;
- Line 4440  sub get_userresdata {
+ Line 8012  sub get_userresdata {
      }
      #error 2 occurs when the .db doesn't exist
      if ($tmp!~/error: 2 /) {
- 	&logthis("<font color=blue>WARNING:".
+ 	&logthis("<font color=\"blue\">WARNING:".
  		 " Trying to get resource data for ".
  		 $uname." at ".$udom.": ".
  		 $tmp."</font>");
- Line 4451  sub get_userresdata {
+ Line 8023  sub get_userresdata {
      }
      return $tmp;
  }
+ #----------------------------------------------- resdata - return resource data
+ #  Purpose:
+ #    Return resource data for either users or for a course.
+ #  Parameters:
+ #     $name      - Course/user name.
+ #     $domain    - Name of the domain the user/course is registered on.
+ #     $type      - Type of thing $name is (must be 'course' or 'user'
+ #     @which     - Array of names of resources desired.
+ #  Returns:
+ #     The value of the first reasource in @which that is found in the
+ #     resource hash.
+ #  Exceptional Conditions:
+ #     If the $type passed in is not valid (not the string 'course' or
+ #     'user', an undefined  reference is returned.
+ #     If none of the resources are found, an undef is returned
  sub resdata {
      my ($name,$domain,$type,@which)=@_;
      my $result;
- Line 4462  sub resdata {
+ Line 8048  sub resdata {
      }
      if (!ref($result)) { return $result; }
      foreach my $item (@which) {
- 	if (defined($result->{$item})) {
+ 	if (defined($result->{$item->[0]})) {
- 	    return $result->{$item};
+ 	    return [$result->{$item->[0]},$item->[1]];
  	}
      }
      return undef;
- Line 4491  sub EXT_cache_status {
+ Line 8077  sub EXT_cache_status {
  sub EXT_cache_set {
      my ($target_domain,$target_user) = @_;
      my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain;
-     #&appenv($cachename => time);
+     #&appenv({$cachename => time});
  }
  # --------------------------------------------------------- Value of a Variable
  sub EXT {
-     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
+     my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
      unless ($varname) { return ''; }
      #get real user name/domain, courseid and symb
      my $courseid;
- Line 4506  sub EXT {
+ Line 8092  sub EXT {
  	$symbparm=&get_symb_from_alias($symbparm);
      }
      if (!($uname && $udom)) {
-       (my $cursymb,$courseid,$udom,$uname,$publicuser)=
+       (my $cursymb,$courseid,$udom,$uname,$publicuser)= &whichuser($symbparm);
- 	  &Apache::lonxml::whichuser($symbparm);
        if (!$symbparm) {	$symbparm=$cursymb; }
      } else {
  	$courseid=$env{'request.course.id'};
- Line 4530  sub EXT {
+ Line 8115  sub EXT {
  	    if ( (defined($Apache::lonhomework::parsing_a_problem)
  		  || defined($Apache::lonhomework::parsing_a_task))
  		 &&
  		 ($symbparm eq &symbread()) ) {
- 		return $Apache::lonhomework::history{$qualifierrest};
+ 		# if we are in the middle of processing the resource the
+ 		# get the value we are planning on committing
+                 if (defined($Apache::lonhomework::results{$qualifierrest})) {
+                     return $Apache::lonhomework::results{$qualifierrest};
+                 } else {
+                     return $Apache::lonhomework::history{$qualifierrest};
+                 }
  	    } else {
  		my %restored;
  		if ($publicuser || $env{'request.state'} eq 'construct') {
- Line 4594  sub EXT {
+ Line 8185  sub EXT {
  # ------------------------------------------------------------- request.browser
          if ($space eq 'browser') {
  	    if ($qualifier eq 'textremote') {
- 		if (&mt('textual_remote_display') eq 'on') {
+ 		if (&Apache::lonlocal::mt('textual_remote_display') eq 'on') {
  		    return 1;
  		} else {
  		    return 0;
- Line 4611  sub EXT {
+ Line 8202  sub EXT {
          return $env{'course.'.$courseid.'.'.$spacequalifierrest};
      } elsif ($realm eq 'resource') {
- 	my $section;
  	if (defined($courseid) && $courseid eq $env{'request.course.id'}) {
  	    if (!$symbparm) { $symbparm=&symbread(); }
  	}
+ 	if ($space eq 'title') {
+ 	    if (!$symbparm) { $symbparm = $env{'request.filename'}; }
+ 	    return &gettitle($symbparm);
+ 	}
+ 	if ($space eq 'map') {
+ 	    my ($map) = &decode_symb($symbparm);
+ 	    return &symbread($map);
+ 	}
+ 	if ($space eq 'filename') {
+ 	    if ($symbparm) {
+ 		return &clutter((&decode_symb($symbparm))[2]);
+ 	    }
+ 	    return &hreflocation('',$env{'request.filename'});
+ 	}
+ 	my ($section, $group, @groups);
  	my ($courselevelm,$courselevel);
  	if ($symbparm && defined($courseid) &&
  	    $courseid eq $env{'request.course.id'}) {
- Line 4623  sub EXT {
+ Line 8231  sub EXT {
  # ----------------------------------------------------- Cascading lookup scheme
  	    my $symbp=$symbparm;
- 	    my $mapp=(&decode_symb($symbp))[0];
+ 	    my $mapp=&deversion((&decode_symb($symbp))[0]);
  	    my $symbparm=$symbp.'.'.$spacequalifierrest;
  	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
- Line 4631  sub EXT {
+ Line 8239  sub EXT {
  	    if (($env{'user.name'} eq $uname) &&
  		($env{'user.domain'} eq $udom)) {
  		$section=$env{'request.course.sec'};
+                 @groups = split(/:/,$env{'request.course.groups'});
+                 @groups=&sort_course_groups($courseid,@groups);
  	    } else {
  		if (! defined($usection)) {
  		    $section=&getsection($udom,$uname,$courseid);
  		} else {
  		    $section = $usection;
  		}
+                 @groups = &get_users_groups($udom,$uname,$courseid);
  	    }
  	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
- Line 4650  sub EXT {
+ Line 8261  sub EXT {
  # ----------------------------------------------------------- first, check user
  	    my $userreply=&resdata($uname,$udom,'user',
- 				       ($courselevelr,$courselevelm,
+ 				       ([$courselevelr,'resource'],
- 					$courselevel));
+ 					[$courselevelm,'map'     ],
+ 					[$courselevel, 'course'  ]));
- 	    if (defined($userreply)) { return $userreply; }
+ 	    if (defined($userreply)) { return &get_reply($userreply); }
  # ------------------------------------------------ second, check some of course
+             my $coursereply;
+             if (@groups > 0) {
+                 $coursereply = &check_group_parms($courseid,\@groups,$symbparm,
+                                        $mapparm,$spacequalifierrest);
+                 if (defined($coursereply)) { return &get_reply($coursereply); }
+             }
- 	    my $coursereply=&resdata($env{'course.'.$courseid.'.num'},
+ 	    $coursereply=&resdata($env{'course.'.$courseid.'.num'},
- 				     $env{'course.'.$courseid.'.domain'},
+ 				  $env{'course.'.$courseid.'.domain'},
- 				     'course',
+ 				  'course',
- 				     ($seclevelr,$seclevelm,$seclevel,
+ 				  ([$seclevelr,   'resource'],
- 				      $courselevelr));
+ 				   [$seclevelm,   'map'     ],
- 	    if (defined($coursereply)) { return $coursereply; }
+ 				   [$seclevel,    'course'  ],
+ 				   [$courselevelr,'resource']));
+ 	    if (defined($coursereply)) { return &get_reply($coursereply); }
  # ------------------------------------------------------ third, check map parms
  	    my %parmhash=();
- Line 4673  sub EXT {
+ Line 8292  sub EXT {
  		$thisparm=$parmhash{$symbparm};
  		untie(%parmhash);
  	    }
- 	    if ($thisparm) { return $thisparm; }
+ 	    if ($thisparm) { return &get_reply([$thisparm,'resource']); }
  	}
  # ------------------------------------------ fourth, look in resource metadata
- Line 4686  sub EXT {
+ Line 8305  sub EXT {
  	    $filename=$env{'request.filename'};
  	}
  	my $metadata=&metadata($filename,$spacequalifierrest);
- 	if (defined($metadata)) { return $metadata; }
+ 	if (defined($metadata)) { return &get_reply([$metadata,'resource']); }
  	$metadata=&metadata($filename,'parameter_'.$spacequalifierrest);
- 	if (defined($metadata)) { return $metadata; }
+ 	if (defined($metadata)) { return &get_reply([$metadata,'resource']); }
- # ---------------------------------------------- fourth, look in rest pf course
+ # ---------------------------------------------- fourth, look in rest of course
  	if ($symbparm && defined($courseid) &&
  	    $courseid eq $env{'request.course.id'}) {
  	    my $coursereply=&resdata($env{'course.'.$courseid.'.num'},
  				     $env{'course.'.$courseid.'.domain'},
  				     'course',
- 				     ($courselevelm,$courselevel));
+ 				     ([$courselevelm,'map'   ],
- 	    if (defined($coursereply)) { return $coursereply; }
+ 				      [$courselevel, 'course']));
+ 	    if (defined($coursereply)) { return &get_reply($coursereply); }
  	}
  # ------------------------------------------------------------------ Cascade up
  	unless ($space eq '0') {
- Line 4705  sub EXT {
+ Line 8325  sub EXT {
  	    my $id=pop(@parts);
  	    my $part=join('_',@parts);
  	    if ($part eq '') { $part='0'; }
- 	    my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
+ 	    my @partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest,
  				 $symbparm,$udom,$uname,$section,1);
- 	    if (defined($partgeneral)) { return $partgeneral; }
+ 	    if (defined($partgeneral[0])) { return &get_reply(\@partgeneral); }
  	}
  	if ($recurse) { return undef; }
  	my $pack_def=&packages_tab_default($filename,$varname);
- 	if (defined($pack_def)) { return $pack_def; }
+ 	if (defined($pack_def)) { return &get_reply([$pack_def,'resource']); }
  # ---------------------------------------------------- Any other user namespace
      } elsif ($realm eq 'environment') {
  # ----------------------------------------------------------------- environment
  	if (($uname eq $env{'user.name'})&&($udom eq $env{'user.domain'})) {
  	    return $env{'environment.'.$spacequalifierrest};
  	} else {
+ 	    if ($uname eq 'anonymous' && $udom eq '') {
+ 		return '';
+ 	    }
  	    my %returnhash=&userenvironment($udom,$uname,
  					    $spacequalifierrest);
  	    return $returnhash{$spacequalifierrest};
- Line 4728  sub EXT {
+ Line 8350  sub EXT {
  	if ($space eq 'time') {
  	    return time;
          }
+     } elsif ($realm eq 'server') {
+ # ----------------------------------------------------------------- system.time
+ 	if ($space eq 'name') {
+ 	    return $ENV{'SERVER_NAME'};
+         }
      }
      return '';
  }
+ sub get_reply {
+     my ($reply_value) = @_;
+     if (ref($reply_value) eq 'ARRAY') {
+         if (wantarray) {
+ 	    return @$reply_value;
+         }
+         return $reply_value->[0];
+     } else {
+         return $reply_value;
+     }
+ }
+ sub check_group_parms {
+     my ($courseid,$groups,$symbparm,$mapparm,$what) = @_;
+     my @groupitems = ();
+     my $resultitem;
+     my @levels = ([$symbparm,'resource'],[$mapparm,'map'],[$what,'course']);
+     foreach my $group (@{$groups}) {
+         foreach my $level (@levels) {
+              my $item = $courseid.'.['.$group.'].'.$level->[0];
+              push(@groupitems,[$item,$level->[1]]);
+         }
+     }
+     my $coursereply = &resdata($env{'course.'.$courseid.'.num'},
+                             $env{'course.'.$courseid.'.domain'},
+                                      'course',@groupitems);
+     return $coursereply;
+ }
+ sub sort_course_groups { # Sort groups based on defined rankings. Default is sort().
+     my ($courseid,@groups) = @_;
+     @groups = sort(@groups);
+     return @groups;
+ }
  sub packages_tab_default {
      my ($uri,$varname)=@_;
      my (undef,$part,$name)=split(/\./,$varname);
-     my $packages=&metadata($uri,'packages');
-     foreach my $package (split(/,/,$packages)) {
+     my (@extension,@specifics,$do_default);
+     foreach my $package (split(/,/,&metadata($uri,'packages'))) {
  	my ($pack_type,$pack_part)=split(/_/,$package,2);
+ 	if ($pack_type eq 'default') {
+ 	    $do_default=1;
+ 	} elsif ($pack_type eq 'extension') {
+ 	    push(@extension,[$package,$pack_type,$pack_part]);
+ 	} elsif ($pack_part eq $part || $pack_type eq 'part') {
+ 	    # only look at packages defaults for packages that this id is
+ 	    push(@specifics,[$package,$pack_type,$pack_part]);
+ 	}
+     }
+     # first look for a package that matches the requested part id
+     foreach my $package (@specifics) {
+ 	my (undef,$pack_type,$pack_part)=@{$package};
+ 	next if ($pack_part ne $part);
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
+ 	    return $packagetab{"$pack_type&$name&default"};
+ 	}
+     }
+     # look for any possible matching non extension_ package
+     foreach my $package (@specifics) {
+ 	my (undef,$pack_type,$pack_part)=@{$package};
  	if (defined($packagetab{"$pack_type&$name&default"})) {
  	    return $packagetab{"$pack_type&$name&default"};
  	}
- Line 4746  sub packages_tab_default {
+ Line 8429  sub packages_tab_default {
  	    return $packagetab{$pack_type."_".$pack_part."&$name&default"};
  	}
      }
+     # look for any posible extension_ match
+     foreach my $package (@extension) {
+ 	my ($package,$pack_type)=@{$package};
+ 	if (defined($packagetab{"$pack_type&$name&default"})) {
+ 	    return $packagetab{"$pack_type&$name&default"};
+ 	}
+ 	if (defined($packagetab{$package."&$name&default"})) {
+ 	    return $packagetab{$package."&$name&default"};
+ 	}
+     }
+     # look for a global default setting
+     if ($do_default && defined($packagetab{"default&$name&default"})) {
+ 	return $packagetab{"default&$name&default"};
+     }
      return undef;
  }
- Line 4768  sub add_prefix_and_part {
+ Line 8465  sub add_prefix_and_part {
  # ---------------------------------------------------------------- Get metadata
  my %metaentry;
+ my %importedpartids;
  sub metadata {
      my ($uri,$what,$liburi,$prefix,$depthcount)=@_;
      $uri=&declutter($uri);
- Line 4775  sub metadata {
+ Line 8473  sub metadata {
      if (($uri eq '') ||
  	(($uri =~ m|^/*adm/|) &&
  	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
-         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
+         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$}) || ($uri =~ m{^/*uploaded/$match_domain/$match_courseid/docs/})) {
- 	($uri =~ m|home/[^/]+/public_html/|)) {
+ 	return undef;
+     }
+     if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/})
+ 	&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) {
  	return undef;
      }
      my $filename=$uri;
- Line 4791  sub metadata {
+ Line 8492  sub metadata {
  	if (defined($cached)) { return $result->{':'.$what}; }
      }
      {
+ # Imported parts would go here
+         my %importedids=();
+         my @origfileimportpartids=();
+         my $importedparts=0;
  #
  # Is this a recursive call for a library?
  #
  #	if (! exists($metacache{$uri})) {
  #	    $metacache{$uri}={};
  #	}
+ 	my $cachetime = 60*60;
          if ($liburi) {
  	    $liburi=&declutter($liburi);
              $filename=$liburi;
- Line 4807  sub metadata {
+ Line 8513  sub metadata {
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
  	my $metastring;
- 	if ($uri !~ m -^(uploaded|editupload)/-) {
+ 	if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) {
+ 	    my $which = &hreflocation('','/'.($liburi || $uri));
+ 	    $metastring =
+ 		&Apache::lonnet::ssi_body($which,
+ 					  ('grade_target' => 'meta'));
+ 	    $cachetime = 1; # only want this cached in the child not long term
+ 	} elsif ($uri !~ m -^(editupload)/-) {
  	    my $file=&filelocation('',&clutter($filename));
  	    #push(@{$metaentry{$uri.'.file'}},$file);
  	    $metastring=&getfile($file);
- Line 4831  sub metadata {
+ Line 8543  sub metadata {
  		    } else {
  			$metaentry{':packages'}=$package.$keyroot;
  		    }
- 		    foreach (sort keys %packagetab) {
+ 		    foreach my $pack_entry (keys(%packagetab)) {
  			my $part=$keyroot;
  			$part=~s/^\_//;
- 			if ($_=~/^\Q$package\E\&/ ||
+ 			if ($pack_entry=~/^\Q$package\E\&/ ||
- 			    $_=~/^\Q$package\E_0\&/) {
+ 			    $pack_entry=~/^\Q$package\E_0\&/) {
- 			    my ($pack,$name,$subp)=split(/\&/,$_);
+ 			    my ($pack,$name,$subp)=split(/\&/,$pack_entry);
  			    # ignore package.tab specified default values
                              # here &package_tab_default() will fetch those
  			    if ($subp eq 'default') { next; }
- 			    my $value=$packagetab{$_};
+ 			    my $value=$packagetab{$pack_entry};
  			    my $unikey;
  			    if ($pack =~ /_0$/) {
  				$unikey='parameter_0_'.$name;
- Line 4867  sub metadata {
+ Line 8579  sub metadata {
  # This is not a package - some other kind of start tag
  #
  		    my $entry=$token->[1];
- 		    my $unikey;
+ 		    my $unikey='';
- 		    if ($entry eq 'import') {
- 			$unikey='';
- 		    } else {
- 			$unikey=$entry;
- 		    }
- 		    $unikey.=&add_prefix_and_part($prefix,$token->[2]->{'part'});
- 		    if (defined($token->[2]->{'id'})) {
- 			$unikey.='_'.$token->[2]->{'id'};
- 		    }
  		    if ($entry eq 'import') {
  #
  # Importing a library here
  #
+                         my $location=$parser->get_text('/import');
+                         my $dir=$filename;
+                         $dir=~s|[^/]*$||;
+                         $location=&filelocation($dir,$location);
+                         my $importmode=$token->[2]->{'importmode'};
+                         if ($importmode eq 'problem') {
+ # Import as problem/response
+                            $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
+                         } elsif ($importmode eq 'part') {
+ # Import as part(s)
+                            $importedparts=1;
+ # We need to get the original file and the imported file to get the part order correct
+ # Good news: we do not need to worry about nested libraries, since parts cannot be nested
+ # Load and inspect original file
+                            if ($#origfileimportpartids<0) {
+                               undef(%importedpartids);
+                               my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
+                               my $origfile=&getfile($origfilelocation);
+                               @origfileimportpartids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                            }
+ # Load and inspect imported file
+                            my $impfile=&getfile($location);
+                            my @impfilepartids=($impfile=~/<part[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                            if ($#impfilepartids>=0) {
+ # This problem had parts
+                                $importedpartids{$token->[2]->{'id'}}=join(',',@impfilepartids);
+                            } else {
+ # Importing by turning a single problem into a problem part
+ # It gets the import-tags ID as part-ID
+                                $unikey=&add_prefix_and_part($prefix,$token->[2]->{'id'});
+                                $importedpartids{$token->[2]->{'id'}}=$token->[2]->{'id'};
+                            }
+                         } else {
+ # Normal import
+                            $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
+                            if (defined($token->[2]->{'id'})) {
+                               $unikey.='_'.$token->[2]->{'id'};
+                            }
+                         }
  			if ($depthcount<20) {
- 			    my $location=$parser->get_text('/import');
+ 			    my $metadata =
- 			    my $dir=$filename;
+ 				&metadata($uri,'keys', $location,$unikey,
- 			    $dir=~s|[^/]*$||;
+ 					  $depthcount+1);
- 			    $location=&filelocation($dir,$location);
+ 			    foreach my $meta (split(',',$metadata)) {
- 			    foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 				$metaentry{':'.$meta}=$metaentry{':'.$meta};
- 							       $location,$unikey,
+ 				$metathesekeys{$meta}=1;
- 							       $depthcount+1)))) {
- 				$metaentry{':'.$_}=$metaentry{':'.$_};
- 				$metathesekeys{$_}=1;
  			    }
- 			}
- 		    } else {
+                         }
+ 		    } else {
+ #
+ # Not importing, some other kind of non-package, non-library start tag
+ #
+                         $unikey=$entry.&add_prefix_and_part($prefix,$token->[2]->{'part'});
+                         if (defined($token->[2]->{'id'})) {
+                             $unikey.='_'.$token->[2]->{'id'};
+                         }
  			if (defined($token->[2]->{'name'})) {
  			    $unikey.='_'.$token->[2]->{'name'};
  			}
  			$metathesekeys{$unikey}=1;
- 			foreach (@{$token->[3]}) {
+ 			foreach my $param (@{$token->[3]}) {
- 			    $metaentry{':'.$unikey.'.'.$_}=$token->[2]->{$_};
+ 			    $metaentry{':'.$unikey.'.'.$param} =
+ 				$token->[2]->{$param};
  			}
  			my $internaltext=&HTML::Entities::decode($parser->get_text('/'.$entry));
  			my $default=$metaentry{':'.$unikey.'.default'};
- Line 4910  sub metadata {
+ Line 8659  sub metadata {
  		 # only ws inside the tag, and not in default, so use default
  		 # as value
  			    $metaentry{':'.$unikey}=$default;
- 			} else {
+ 			} elsif ( $internaltext =~ /\S/ ) {
- 		  # either something interesting inside the tag or default
+ 		  # something interesting inside the tag
-                   # uninteresting
  			    $metaentry{':'.$unikey}=$internaltext;
+ 			} else {
+ 		  # no interesting values, don't set a default
  			}
  # end of not-a-package not-a-library import
  		    }
- Line 4923  sub metadata {
+ Line 8673  sub metadata {
  	    }
  	}
  	my ($extension) = ($uri =~ /\.(\w+)$/);
- 	foreach my $key (sort(keys(%packagetab))) {
+ 	$extension = lc($extension);
+ 	if ($extension eq 'htm') { $extension='html'; }
+ 	foreach my $key (keys(%packagetab)) {
  	    #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($metaentry{':packages'})) {
- 	    foreach my $key (sort(keys(%packagetab))) {
+ 	if (!exists($metaentry{':packages'})
+ 	    || $packagetab{"import_defaults&extension_$extension"}) {
+ 	    foreach my $key (keys(%packagetab)) {
  		#no specific packages well let's get default then
  		if ($key!~/^default&/) { next; }
  		&metadata_create_package_def($uri,$key,'default',
- Line 4948  sub metadata {
+ Line 8703  sub metadata {
  		my $dir=$filename;
  		$dir=~s|[^/]*$||;
  		$location=&filelocation($dir,$location);
- 		foreach (sort(split(/\,/,&metadata($uri,'keys',
+ 		my $rights_metadata =
- 						   $location,'_rights',
+ 		    &metadata($uri,'keys',$location,'_rights',
- 						   $depthcount+1)))) {
+ 			      $depthcount+1);
- 		    #$metaentry{':'.$_}=$metacache{$uri}->{':'.$_};
+ 		foreach my $rights (split(',',$rights_metadata)) {
- 		    $metathesekeys{$_}=1;
+ 		    #$metaentry{':'.$rights}=$metacache{$uri}->{':'.$rights};
+ 		    $metathesekeys{$rights}=1;
  		}
  	    }
  	}
- 	$metaentry{':keys'}=join(',',keys %metathesekeys);
+ 	# uniqifiy package listing
+ 	my %seen;
+ 	my @uniq_packages =
+ 	    grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'}));
+ 	$metaentry{':packages'} = join(',',@uniq_packages);
+         if ($importedparts) {
+ # We had imported parts and need to rebuild partorder
+            $metaentry{':partorder'}='';
+            $metathesekeys{'partorder'}=1;
+            for (my $index=0;$index<$#origfileimportpartids;$index+=2) {
+                if ($origfileimportpartids[$index] eq 'part') {
+ # original part, part of the problem
+                   $metaentry{':partorder'}.=','.$origfileimportpartids[$index+1];
+                } else {
+ # we have imported parts at this position
+                   $metaentry{':partorder'}.=','.$importedpartids{$origfileimportpartids[$index+1]};
+                }
+            }
+            $metaentry{':partorder'}=~s/^\,//;
+         }
+ 	$metaentry{':keys'} = join(',',keys(%metathesekeys));
  	&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
  	$metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
- 	&do_cache_new('meta',$uri,\%metaentry,60*60*24);
+ 	&do_cache_new('meta',$uri,\%metaentry,$cachetime);
  # this is the end of "was not already recently cached
      }
      return $metaentry{':'.$what};
- Line 4992  sub metadata_create_package_def {
+ Line 8770  sub metadata_create_package_def {
  sub metadata_generate_part0 {
      my ($metadata,$metacache,$uri) = @_;
      my %allnames;
-     foreach my $metakey (sort keys %$metadata) {
+     foreach my $metakey (keys(%$metadata)) {
  	if ($metakey=~/^parameter\_(.*)/) {
  	  my $part=$$metacache{':'.$metakey.'.part'};
  	  my $name=$$metacache{':'.$metakey.'.name'};
- Line 5017  sub metadata_generate_part0 {
+ Line 8795  sub metadata_generate_part0 {
      }
  }
+ # ------------------------------------------------------ Devalidate title cache
+ sub devalidate_title_cache {
+     my ($url)=@_;
+     if (!$env{'request.course.id'}) { return; }
+     my $symb=&symbread($url);
+     if (!$symb) { return; }
+     my $key=$env{'request.course.id'}."\0".$symb;
+     &devalidate_cache_new('title',$key);
+ }
+ # ------------------------------------------------- Get the title of a course
+ sub current_course_title {
+     return $env{ 'course.' . $env{'request.course.id'} . '.description' };
+ }
  # ------------------------------------------------- Get the title of a resource
  sub gettitle {
- Line 5030  sub gettitle {
+ Line 8824  sub gettitle {
  	}
  	my ($map,$resid,$url)=&decode_symb($symb);
  	my $title='';
- 	my %bighash;
+ 	if (!$map && $resid == 0 && $url =~/default\.sequence$/) {
- 	if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
+ 	    $title = $env{'course.'.$env{'request.course.id'}.'.description'};
- 		&GDBM_READER(),0640)) {
+ 	} else {
- 	    my $mapid=$bighash{'map_pc_'.&clutter($map)};
+ 	    if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
- 	    $title=$bighash{'title_'.$mapid.'.'.$resid};
+ 		    &GDBM_READER(),0640)) {
- 	    untie %bighash;
+ 		my $mapid=$bighash{'map_pc_'.&clutter($map)};
+ 		$title=$bighash{'title_'.$mapid.'.'.$resid};
+ 		untie(%bighash);
+ 	    }
  	}
  	$title=~s/\&colon\;/\:/gs;
  	if ($title) {
- Line 5051  sub gettitle {
+ Line 8848  sub gettitle {
  sub get_slot {
      my ($which,$cnum,$cdom)=@_;
      if (!$cnum || !$cdom) {
- 	(undef,my $courseid)=&Apache::lonxml::whichuser();
+ 	(undef,my $courseid)=&whichuser();
  	$cdom=$env{'course.'.$courseid.'.domain'};
  	$cnum=$env{'course.'.$courseid.'.num'};
      }
-     my %slotinfo=&get('slots',[$which],$cdom,$cnum);
+     my $key=join("\0",'slots',$cdom,$cnum,$which);
-     &Apache::lonhomework::showhash(%slotinfo);
+     my %slotinfo;
-     my ($tmp)=keys(%slotinfo);
+     if (exists($remembered{$key})) {
-     if ($tmp=~/^error:/) { return (); }
+ 	$slotinfo{$which} = $remembered{$key};
+     } else {
+ 	%slotinfo=&get('slots',[$which],$cdom,$cnum);
+ 	&Apache::lonhomework::showhash(%slotinfo);
+ 	my ($tmp)=keys(%slotinfo);
+ 	if ($tmp=~/^error:/) { return (); }
+ 	$remembered{$key} = $slotinfo{$which};
+     }
      if (ref($slotinfo{$which}) eq 'HASH') {
  	return %{$slotinfo{$which}};
      }
- Line 5073  sub symblist {
+ Line 8877  sub symblist {
      if (($env{'request.course.fn'}) && (%newhash)) {
          if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                        &GDBM_WRCREAT(),0640)) {
- 	    foreach (keys %newhash) {
+ 	    foreach my $url (keys(%newhash)) {
-                 $hash{declutter($_)}=&encode_symb($mapname,$newhash{$_}->[1],
+ 		next if ($url eq 'last_known'
- 						  $newhash{$_}->[0]);
+ 			 && $env{'form.no_update_last_known'});
+ 		$hash{declutter($url)}=&encode_symb($mapname,
+ 						    $newhash{$url}->[1],
+ 						    $newhash{$url}->[0]);
              }
              if (untie(%hash)) {
  		return 'ok';
- Line 5090  sub symblist {
+ Line 8897  sub symblist {
  sub symbverify {
      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 5109  sub symbverify {
+ Line 8914  sub symbverify {
      if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
                              &GDBM_READER(),0640)) {
+         if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) {
+             $thisurl =~ s/\?.+$//;
+         }
          my $ids=$bighash{'ids_'.&clutter($thisurl)};
          unless ($ids) {
             $ids=$bighash{'ids_/'.$thisurl};
          }
          if ($ids) {
  # ------------------------------------------------------------------- Has ID(s)
- 	    foreach (split(/\,/,$ids)) {
+ 	    foreach my $id (split(/\,/,$ids)) {
- 	       my ($mapid,$resid)=split(/\./,$_);
+ 	       my ($mapid,$resid)=split(/\./,$id);
+                if ($thisfn =~ m{^/adm/wrapper/ext/}) {
+                    $symb =~ s/\?.+$//;
+                }
                 if (
    &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn)
     eq $symb) {
  		   if (($env{'request.role.adv'}) ||
- 		       $bighash{'encrypted_'.$_} eq $env{'request.enc'}) {
+ 		       $bighash{'encrypted_'.$id} eq $env{'request.enc'}) {
  		       $okay=1;
  		   }
  	       }
- Line 5146  sub symbclean {
+ Line 8957  sub symbclean {
  # remove wrapper
      $symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/;
+     $symb=~s/(\_\_\_\d+\_\_\_)adm\/coursedocs\/showdoc\/(res\/)*/$1/;
      return $symb;
  }
- Line 5222  sub symbread {
+ Line 9034  sub symbread {
          if ( ($thisfn =~ m/^(uploaded|editupload)\//) && ($thisfn !~ m/\.(page|sequence)$/) ) {
              $targetfn = 'adm/wrapper/'.$thisfn;
          }
+ 	if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) {
+ 	    $targetfn=$1;
+ 	}
          if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                        &GDBM_READER(),0640)) {
  	    $syval=$hash{$targetfn};
- Line 5231  sub symbread {
+ Line 9046  sub symbread {
          if ($syval) {
  	    #unless ($syval=~/\_\d+$/) {
  		#unless ($env{'form.request.prefix'}=~/\.(\d+)\_$/) {
- 		    #&appenv('request.ambiguous' => $thisfn);
+ 		    #&appenv({'request.ambiguous' => $thisfn});
  		    #return $env{$cache_str}='';
  		#}
  		#$syval.=$1;
- Line 5260  sub symbread {
+ Line 9075  sub symbread {
                   } elsif (!$donotrecurse) {
  # ------------------------------------------ There is more than one possibility
                       my $realpossible=0;
-                      foreach (@possibilities) {
+                      foreach my $id (@possibilities) {
- 			 my $file=$bighash{'src_'.$_};
+ 			 my $file=$bighash{'src_'.$id};
                           if (&allowed('bre',$file)) {
-          		    my ($mapid,$resid)=split(/\./,$_);
+          		    my ($mapid,$resid)=split(/\./,$id);
                              if ($bighash{'map_type_'.$mapid} ne 'page') {
  				$realpossible++;
                                  $syval=&encode_symb($bighash{'map_id_'.$mapid},
- Line 5283  sub symbread {
+ Line 9098  sub symbread {
  	    return $env{$cache_str}=$syval;
          }
      }
-     &appenv('request.ambiguous' => $thisfn);
+     &appenv({'request.ambiguous' => $thisfn});
      return $env{$cache_str}='';
  }
- Line 5335  sub numval3 {
+ Line 9150  sub numval3 {
      return $total;
  }
+ sub digest {
+     my ($data)=@_;
+     my $digest=&Digest::MD5::md5($data);
+     my ($a,$b,$c,$d)=unpack("iiii",$digest);
+     my ($e,$f);
+     {
+         use integer;
+         $e=($a+$b);
+         $f=($c+$d);
+         if ($_64bit) {
+             $e=(($e<<32)>>32);
+             $f=(($f<<32)>>32);
+         }
+     }
+     if (wantarray) {
+ 	return ($e,$f);
+     } else {
+ 	my $g;
+ 	{
+ 	    use integer;
+ 	    $g=($e+$f);
+ 	    if ($_64bit) {
+ 		$g=(($g<<32)>>32);
+ 	    }
+ 	}
+ 	return $g;
+     }
+ }
  sub latest_rnd_algorithm_id {
-     return '64bit4';
+     return '64bit5';
  }
  sub get_rand_alg {
      my ($courseid)=@_;
-     if (!$courseid) { $courseid=(&Apache::lonxml::whichuser())[1]; }
+     if (!$courseid) { $courseid=(&whichuser())[1]; }
      if ($courseid) {
  	return $env{"course.$courseid.rndseed"};
      }
- Line 5366  sub getCODE {
+ Line 9210  sub getCODE {
  sub rndseed {
      my ($symb,$courseid,$domain,$username)=@_;
+     my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser();
-     my ($wsymb,$wcourseid,$wdomain,$wusername)=&Apache::lonxml::whichuser();
+     if (!defined($symb)) {
-     if (!$symb) {
  	unless ($symb=$wsymb) { return time; }
      }
      if (!$courseid) { $courseid=$wcourseid; }
      if (!$domain) { $domain=$wdomain; }
      if (!$username) { $username=$wusername }
      my $which=&get_rand_alg();
      if (defined(&getCODE())) {
- 	if ($which eq '64bit4') {
+ 	if ($which eq '64bit5') {
+ 	    return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
+ 	} elsif ($which eq '64bit4') {
  	    return &rndseed_CODE_64bit4($symb,$courseid,$domain,$username);
  	} else {
  	    return &rndseed_CODE_64bit($symb,$courseid,$domain,$username);
  	}
+     } elsif ($which eq '64bit5') {
+ 	return &rndseed_64bit5($symb,$courseid,$domain,$username);
      } elsif ($which eq '64bit4') {
  	return &rndseed_64bit4($symb,$courseid,$domain,$username);
      } elsif ($which eq '64bit3') {
- Line 5404  sub rndseed_32bit {
+ Line 9252  sub rndseed_32bit {
  	my $domainseed=unpack("%32C*",$domain) << 7;
  	my $courseseed=unpack("%32C*",$courseid);
  	my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck;
- 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	#&logthis("rndseed :$num:$symb");
  	if ($_64bit) { $num=(($num<<32)>>32); }
  	return $num;
      }
- Line 5425  sub rndseed_64bit {
+ Line 9273  sub rndseed_64bit {
  	my $num1=$symbchck+$symbseed+$namechck;
  	my $num2=$nameseed+$domainseed+$courseseed;
- 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	#&logthis("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 5449  sub rndseed_64bit2 {
+ Line 9296  sub rndseed_64bit2 {
  	my $num1=$symbchck+$symbseed+$namechck;
  	my $num2=$nameseed+$domainseed+$courseseed;
- 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num:$symb");
+ 	#&logthis("rndseed :$num:$symb");
+ 	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
  	return "$num1,$num2";
      }
  }
- Line 5471  sub rndseed_64bit3 {
+ Line 9319  sub rndseed_64bit3 {
  	my $num1=$symbchck+$symbseed+$namechck;
  	my $num2=$nameseed+$domainseed+$courseseed;
- 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+ 	#&logthis("rndseed :$num1:$num2:$_64bit");
  	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
  	return "$num1:$num2";
- Line 5495  sub rndseed_64bit4 {
+ Line 9343  sub rndseed_64bit4 {
  	my $num1=$symbchck+$symbseed+$namechck;
  	my $num2=$nameseed+$domainseed+$courseseed;
- 	#&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
+ 	#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit");
+ 	#&logthis("rndseed :$num1:$num2:$_64bit");
  	if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); }
  	return "$num1:$num2";
      }
  }
+ sub rndseed_64bit5 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     my ($num1,$num2)=&digest("$symb,$courseid,$domain,$username");
+     return "$num1:$num2";
+ }
  sub rndseed_CODE_64bit {
      my ($symb,$courseid,$domain,$username)=@_;
      {
- Line 5514  sub rndseed_CODE_64bit {
+ Line 9368  sub rndseed_CODE_64bit {
  	my $courseseed=unpack("%32S*",$courseid.' ');
  	my $num1=$symbseed+$CODEchck;
  	my $num2=$CODEseed+$courseseed+$symbchck;
- 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
+ 	#&logthis("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
+ 	#&logthis("rndseed :$num1:$num2:$symb");
  	if ($_64bit) { $num1=(($num1<<32)>>32); }
  	if ($_64bit) { $num2=(($num2<<32)>>32); }
  	return "$num1:$num2";
- Line 5533  sub rndseed_CODE_64bit4 {
+ Line 9387  sub rndseed_CODE_64bit4 {
  	my $courseseed=unpack("%32S*",$courseid.' ');
  	my $num1=$symbseed+$CODEchck;
  	my $num2=$CODEseed+$courseseed+$symbchck;
- 	#&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
+ 	#&logthis("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck");
- 	#&Apache::lonxml::debug("rndseed :$num1:$num2:$symb");
+ 	#&logthis("rndseed :$num1:$num2:$symb");
  	if ($_64bit) { $num1=(($num1<<32)>>32); }
  	if ($_64bit) { $num2=(($num2<<32)>>32); }
  	return "$num1:$num2";
      }
  }
+ sub rndseed_CODE_64bit5 {
+     my ($symb,$courseid,$domain,$username)=@_;
+     my $code = &getCODE();
+     my ($num1,$num2)=&digest("$symb,$courseid,$code");
+     return "$num1:$num2";
+ }
  sub setup_random_from_rndseed {
      my ($rndseed)=@_;
      if ($rndseed =~/([,:])/) {
- Line 5552  sub setup_random_from_rndseed {
+ Line 9413  sub setup_random_from_rndseed {
  }
  sub latest_receipt_algorithm_id {
-     return 'receipt2';
+     return 'receipt3';
  }
  sub recunique {
      my $fucourseid=shift;
      my $unique;
-     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2' ||
+ 	$env{"course.$fucourseid.receiptalg"} eq 'receipt3' ) {
  	$unique=$env{"course.$fucourseid.internal.encseed"};
      } else {
  	$unique=$perlvar{'lonReceipt'};
- Line 5569  sub recunique {
+ Line 9431  sub recunique {
  sub recprefix {
      my $fucourseid=shift;
      my $prefix;
-     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2') {
+     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2'||
+ 	$env{"course.$fucourseid.receiptalg"} eq 'receipt3' ) {
  	$prefix=$env{"course.$fucourseid.internal.encpref"};
      } else {
  	$prefix=$perlvar{'lonHostID'};
- Line 5579  sub recprefix {
+ Line 9442  sub recprefix {
  sub ireceipt {
      my ($funame,$fudom,$fucourseid,$fusymb,$part)=@_;
+     my $return =&recprefix($fucourseid).'-';
+     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt3' ||
+ 	$env{'request.state'} eq 'construct') {
+ 	$return .= (&digest("$funame,$fudom,$fucourseid,$fusymb,$part")%10000);
+ 	return $return;
+     }
      my $cuname=unpack("%32C*",$funame);
      my $cudom=unpack("%32C*",$fudom);
      my $cucourseid=unpack("%32C*",$fucourseid);
      my $cusymb=unpack("%32C*",$fusymb);
      my $cunique=&recunique($fucourseid);
      my $cpart=unpack("%32S*",$part);
-     my $return =&recprefix($fucourseid).'-';
+     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2') {
-     if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2' ||
- 	$env{'request.state'} eq 'construct') {
+ 	#&logthis("doing receipt2  using parts $cpart, uname $cuname and udom $cudom gets  ".($cpart%$cuname)." and ".($cpart%$cudom));
- 	&Apache::lonxml::debug("doing receipt2  using parts $cpart, uname $cuname and udom $cudom gets  ".($cpart%$cuname).
- 			       " and ".($cpart%$cudom));
  	$return.= ($cunique%$cuname+
  		   $cunique%$cudom+
- Line 5612  sub ireceipt {
+ Line 9482  sub ireceipt {
  sub receipt {
      my ($part)=@_;
-     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     my ($symb,$courseid,$domain,$name) = &whichuser();
      return &ireceipt($name,$domain,$courseid,$symb,$part);
  }
+ sub whichuser {
+     my ($passedsymb)=@_;
+     my ($symb,$courseid,$domain,$name,$publicuser);
+     if (defined($env{'form.grade_symb'})) {
+ 	my ($tmp_courseid)=&get_env_multiple('form.grade_courseid');
+ 	my $allowed=&allowed('vgr',$tmp_courseid);
+ 	if (!$allowed &&
+ 	    exists($env{'request.course.sec'}) &&
+ 	    $env{'request.course.sec'} !~ /^\s*$/) {
+ 	    $allowed=&allowed('vgr',$tmp_courseid.
+ 			      '/'.$env{'request.course.sec'});
+ 	}
+ 	if ($allowed) {
+ 	    ($symb)=&get_env_multiple('form.grade_symb');
+ 	    $courseid=$tmp_courseid;
+ 	    ($domain)=&get_env_multiple('form.grade_domain');
+ 	    ($name)=&get_env_multiple('form.grade_username');
+ 	    return ($symb,$courseid,$domain,$name,$publicuser);
+ 	}
+     }
+     if (!$passedsymb) {
+ 	$symb=&symbread();
+     } else {
+ 	$symb=$passedsymb;
+     }
+     $courseid=$env{'request.course.id'};
+     $domain=$env{'user.domain'};
+     $name=$env{'user.name'};
+     if ($name eq 'public' && $domain eq 'public') {
+ 	if (!defined($env{'form.username'})) {
+ 	    $env{'form.username'}.=time.rand(10000000);
+ 	}
+ 	$name.=$env{'form.username'};
+     }
+     return ($symb,$courseid,$domain,$name,$publicuser);
+ }
  # ------------------------------------------------------------ Serves up a file
  # returns either the contents of the file or
  # -1 if the file doesn't exist
- Line 5638  sub repcopy_userfile {
+ Line 9546  sub repcopy_userfile {
      if ($file =~ m -^/*(uploaded|editupload)/-) { $file=&filelocation("",$file); }
      if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; }
      my ($cdom,$cnum,$filename) =
- 	($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+([^/]+)/+([^/]+)/+(.*)|);
+ 	($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+($match_domain)/+($match_name)/+(.*)|);
-     my ($info,$rtncode);
      my $uri="/uploaded/$cdom/$cnum/$filename";
      if (-e "$file") {
+ # we already have a local copy, check it out
  	my @fileinfo = stat($file);
+ 	my $rtncode;
+ 	my $info;
  	my $lwpresp = &getuploaded('HEAD',$uri,$cdom,$cnum,\$info,\$rtncode);
  	if ($lwpresp ne 'ok') {
+ # there is no such file anymore, even though we had a local copy
  	    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]) {
+ # nice, the file we have is up-to-date, just say okay
  	    return 'ok';
+ 	} else {
+ # the file is outdated, get rid of it
+ 	    unlink($file);
  	}
- 	$info = '';
+     }
- 	$lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+ # one way or the other, at this point, we don't have the file
- 	if ($lwpresp ne 'ok') {
+ # construct the correct path for the file
- 	    return -1;
+     my @parts = ($cdom,$cnum);
- 	}
+     if ($filename =~ m|^(.+)/[^/]+$|) {
-     } else {
+ 	push @parts, split(/\//,$1);
- 	my $lwpresp = &getuploaded('GET',$uri,$cdom,$cnum,\$info,\$rtncode);
+     }
- 	if ($lwpresp ne 'ok') {
+     my $path = $perlvar{'lonDocRoot'}.'/userfiles';
- 	    my $ua=new LWP::UserAgent;
+     foreach my $part (@parts) {
- 	    my $request=new HTTP::Request('GET',&tokenwrapper($uri));
+ 	$path .= '/'.$part;
- 	    my $response=$ua->request($request);
+ 	if (!-e $path) {
- 	    if ($response->is_success()) {
+ 	    mkdir($path,0770);
- 		$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");
+ # now the path exists for sure
-     print FILE $info;
+ # get a user agent
-     close(FILE);
+     my $ua=new LWP::UserAgent;
+     my $transferfile=$file.'.in.transfer';
+ # FIXME: this should flock
+     if (-e $transferfile) { return 'ok'; }
+     my $request;
+     $uri=~s/^\///;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $protocol = $protocol{$homeserver};
+     $protocol = 'http' if ($protocol ne 'https');
+     $request=new HTTP::Request('GET',$protocol.'://'.&hostname($homeserver).'/raw/'.$uri);
+     my $response=$ua->request($request,$transferfile);
+ # did it work?
+     if ($response->is_error()) {
+ 	unlink($transferfile);
+ 	&logthis("Userfile repcopy failed for $uri");
+ 	return -1;
+     }
+ # worked, rename the transfer file
+     rename($transferfile,$file);
      return 'ok';
  }
  sub tokenwrapper {
      my $uri=shift;
-     $uri=~s|^http\://([^/]+)||;
+     $uri=~s|^https?\://([^/]+)||;
      $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'});
+         &appenv({"userfile.$udom/$uname/$file" => $env{'request.course.id'}});
-         return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri.
+         my $homeserver = &homeserver($uname,$udom);
+         my $protocol = $protocol{$homeserver};
+         $protocol = 'http' if ($protocol ne 'https');
+         return $protocol.'://'.&hostname($homeserver).'/'.$uri.
                 (($uri=~/\?/)?'&':'?').'token='.$token.
                                 '&tokenissued='.$perlvar{'lonHostID'};
      } else {
- Line 5714  sub tokenwrapper {
+ Line 9627  sub tokenwrapper {
      }
  }
+ # call with reqtype HEAD: get last modification time
+ # call with reqtype GET: get the file contents
+ # Do not call this with reqtype GET for large files! It loads everything into memory
+ #
  sub getuploaded {
      my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_;
      $uri=~s/^\///;
-     $uri = 'http://'.$hostname{ &homeserver($cnum,$cdom)}.'/raw/'.$uri;
+     my $homeserver = &homeserver($cnum,$cdom);
+     my $protocol = $protocol{$homeserver};
+     $protocol = 'http' if ($protocol ne 'https');
+     $uri = $protocol.'://'.&hostname($homeserver).'/raw/'.$uri;
      my $ua=new LWP::UserAgent;
      my $request=new HTTP::Request($reqtype,$uri);
      my $response=$ua->request($request);
- Line 5739  sub readfile {
+ Line 9659  sub readfile {
      my $fh;
      open($fh,"<$file");
      my $a='';
-     while (<$fh>) { $a .=$_; }
+     while (my $line = <$fh>) { $a .= $line; }
      return $a;
  }
- Line 5747  sub filelocation {
+ Line 9667  sub filelocation {
      my ($dir,$file) = @_;
      my $location;
      $file=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
+     if ($file =~ m-^/adm/-) {
+ 	$file=~s-^/adm/wrapper/-/-;
+ 	$file=~s-^/adm/coursedocs/showdoc/-/-;
+     }
      if ($file=~m:^/~:) { # is a contruction space reference
          $location = $file;
          $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:;
-     } elsif ($file=~m:^/home/[^/]*/public_html/:) {
+     } elsif ($file=~m{^/home/$match_username/public_html/}) {
  	# is a correct contruction space reference
          $location = $file;
+     } elsif ($file =~ m-^\Q$Apache::lonnet::perlvar{'lonTabDir'}\E/-) {
+         $location = $file;
      } elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file
          my ($udom,$uname,$filename)=
-   	    ($file=~m -^/+(?:uploaded|editupload)/+([^/]+)/+([^/]+)/+(.*)$-);
+   	    ($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-);
          my $home=&homeserver($uname,$udom);
          my $is_me=0;
          my @ids=&current_machine_ids();
          foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } }
          if ($is_me) {
-   	    $location=&Apache::loncommon::propath($udom,$uname).
+   	    $location=&propath($udom,$uname).'/userfiles/'.$filename;
-   	      '/userfiles/'.$filename;
          } else {
    	  $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.
    	      $udom.'/'.$uname.'/'.$filename;
          }
+     } elsif ($file =~ m-^/adm/-) {
+ 	$location = $perlvar{'lonDocRoot'}.'/'.$file;
      } else {
          $file=~s/^\Q$perlvar{'lonDocRoot'}\E//;
          $file=~s:^/res/:/:;
- Line 5777  sub filelocation {
+ Line 9706  sub filelocation {
          }
      }
      $location=~s://+:/:g; # remove duplicate /
-     while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/..
+     while ($location=~m{/\.\./}) {
+ 	if ($location =~ m{/[^/]+/\.\./}) {
+ 	    $location=~ s{/[^/]+/\.\./}{/}g;
+ 	} else {
+ 	    $location=~ s{/\.\./}{/}g;
+ 	}
+     } #remove dir/..
      while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./
      return $location;
  }
  sub hreflocation {
      my ($dir,$file)=@_;
-     unless (($file=~m-^http://-i) || ($file=~m-^/-)) {
+     unless (($file=~m-^https?\://-i) || ($file=~m-^/-)) {
- 	my $finalpath=filelocation($dir,$file);
+ 	$file=filelocation($dir,$file);
- 	$finalpath=~s-^/home/httpd/html--;
+     } elsif ($file=~m-^/adm/-) {
- 	$finalpath=~s-^/home/(\w+)/public_html/-/~$1/-;
+ 	$file=~s-^/adm/wrapper/-/-;
- 	return $finalpath;
+ 	$file=~s-^/adm/coursedocs/showdoc/-/-;
-     } elsif ($file=~m-^/home-) {
+     }
- 	$file=~s-^/home/httpd/html--;
+     if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) {
- 	$file=~s-^/home/(\w+)/public_html/-/~$1/-;
+ 	$file=~s-^\Q$perlvar{'lonDocRoot'}\E--;
- 	return $file;
+     } elsif ($file=~m-/home/($match_username)/public_html/-) {
+ 	$file=~s-^/home/($match_username)/public_html/-/~$1/-;
+     } elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) {
+ 	$file=~s-^/home/httpd/lonUsers/($match_domain)/./././($match_name)/userfiles/
+ 	    -/uploaded/$1/$2/-x;
+     }
+     if ($file=~ m{^/userfiles/}) {
+ 	$file =~ s{^/userfiles/}{/uploaded/};
      }
      return $file;
  }
  sub current_machine_domains {
-     my $hostname=$hostname{$perlvar{'lonHostID'}};
+     return &machine_domains(&hostname($perlvar{'lonHostID'}));
+ }
+ sub machine_domains {
+     my ($hostname) = @_;
      my @domains;
+     my %hostname = &all_hostnames();
      while( my($id, $name) = each(%hostname)) {
  #	&logthis("-$id-$name-$hostname-");
  	if ($hostname eq $name) {
- 	    push(@domains,$hostdom{$id});
+ 	    push(@domains,&host_domain($id));
  	}
      }
      return @domains;
  }
  sub current_machine_ids {
-     my $hostname=$hostname{$perlvar{'lonHostID'}};
+     return &machine_ids(&hostname($perlvar{'lonHostID'}));
+ }
+ sub machine_ids {
+     my ($hostname) = @_;
+     $hostname ||= &hostname($perlvar{'lonHostID'});
      my @ids;
-     while( my($id, $name) = each(%hostname)) {
+     my %name_to_host = &all_names();
- #	&logthis("-$id-$name-$hostname-");
+     if (ref($name_to_host{$hostname}) eq 'ARRAY') {
- 	if ($hostname eq $name) {
+ 	return @{ $name_to_host{$hostname} };
- 	    push(@ids,$id);
+     }
- 	}
+     return;
+ }
+ sub additional_machine_domains {
+     my @domains;
+     open(my $fh,"<$perlvar{'lonTabDir'}/expected_domains.tab");
+     while( my $line = <$fh>) {
+         $line =~ s/\s//g;
+         push(@domains,$line);
+     }
+     return @domains;
+ }
+ sub default_login_domain {
+     my $domain = $perlvar{'lonDefDomain'};
+     my $testdomain=(split(/\./,$ENV{'HTTP_HOST'}))[0];
+     foreach my $posdom (&current_machine_domains(),
+                         &additional_machine_domains()) {
+         if (lc($posdom) eq lc($testdomain)) {
+             $domain=$posdom;
+             last;
+         }
      }
-     return @ids;
+     return $domain;
  }
  # ------------------------------------------------------------- Declutters URLs
- Line 5828  sub declutter {
+ Line 9801  sub declutter {
      if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
      $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
      $thisfn=~s/^\///;
+     $thisfn=~s|^adm/wrapper/||;
+     $thisfn=~s|^adm/coursedocs/showdoc/||;
      $thisfn=~s/^res\///;
-     $thisfn=~s/\?.+$//;
+     unless (($thisfn =~ /^ext/) || ($thisfn =~ /\.(page|sequence)___\d+___ext/)) {
+         $thisfn=~s/\?.+$//;
+     }
      return $thisfn;
  }
- Line 5837  sub declutter {
+ Line 9814  sub declutter {
  sub clutter {
      my $thisfn='/'.&declutter(shift);
-     unless ($thisfn=~/^\/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)\//) {
+     if ($thisfn !~ m{^/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)/}
+ 	|| $thisfn =~ m{^/adm/(includes|pages)} ) {
         $thisfn='/res'.$thisfn;
      }
+     if ($thisfn !~m|^/adm|) {
+ 	if ($thisfn =~ m|^/ext/|) {
+ 	    $thisfn='/adm/wrapper'.$thisfn;
+ 	} else {
+ 	    my ($ext) = ($thisfn =~ /\.(\w+)$/);
+ 	    my $embstyle=&Apache::loncommon::fileembstyle($ext);
+ 	    if ($embstyle eq 'ssi'
+ 		|| ($embstyle eq 'hdn')
+ 		|| ($embstyle eq 'rat')
+ 		|| ($embstyle eq 'prv')
+ 		|| ($embstyle eq 'ign')) {
+ 		#do nothing with these
+ 	    } elsif (($embstyle eq 'img')
+ 		|| ($embstyle eq 'emb')
+ 		|| ($embstyle eq 'wrp')) {
+ 		$thisfn='/adm/wrapper'.$thisfn;
+ 	    } elsif ($embstyle eq 'unk'
+ 		     && $thisfn!~/\.(sequence|page)$/) {
+ 		$thisfn='/adm/coursedocs/showdoc'.$thisfn;
+ 	    } else {
+ #		&logthis("Got a blank emb style");
+ 	    }
+ 	}
+     }
      return $thisfn;
  }
+ sub clutter_with_no_wrapper {
+     my $uri = &clutter(shift);
+     if ($uri =~ m-^/adm/-) {
+ 	$uri =~ s-^/adm/wrapper/-/-;
+ 	$uri =~ s-^/adm/coursedocs/showdoc/-/-;
+     }
+     return $uri;
+ }
  sub freeze_escape {
      my ($value)=@_;
      if (ref($value)) {
- Line 5852  sub freeze_escape {
+ Line 9863  sub freeze_escape {
      return &escape($value);
  }
- # -------------------------------------------------------- Escape Special Chars
- sub escape {
-     my $str=shift;
-     $str =~ s/(\W)/"%".unpack('H2',$1)/eg;
-     return $str;
- }
- # ----------------------------------------------------- Un-Escape Special Chars
- sub unescape {
-     my $str=shift;
-     $str =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
-     return $str;
- }
  sub thaw_unescape {
      my ($value)=@_;
- Line 5878  sub thaw_unescape {
+ Line 9874  sub thaw_unescape {
      return &unescape($value);
  }
- sub mod_perl_version {
-     return 1;
-     if (defined($perlvar{'MODPERL2'})) {
- 	return 2;
-     }
- }
  sub correct_line_ends {
      my ($result)=@_;
      $$result =~s/\r\n/\n/mg;
- Line 5895  sub correct_line_ends {
+ Line 9884  sub correct_line_ends {
  sub goodbye {
     &logthis("Starting Shut down");
  #not converted to using infrastruture and probably shouldn't be
-    &logthis(sprintf("%-20s is %s",'%badServerCache',length(&freeze(\%badServerCache))));
+    &logthis(sprintf("%-20s is %s",'%badServerCache',length(&nfreeze(\%badServerCache))));
  #converted
  #   &logthis(sprintf("%-20s is %s",'%metacache',scalar(%metacache)));
-    &logthis(sprintf("%-20s is %s",'%homecache',length(&freeze(\%homecache))));
+    &logthis(sprintf("%-20s is %s",'%homecache',length(&nfreeze(\%homecache))));
- #   &logthis(sprintf("%-20s is %s",'%titlecache',length(&freeze(\%titlecache))));
+ #   &logthis(sprintf("%-20s is %s",'%titlecache',length(&nfreeze(\%titlecache))));
- #   &logthis(sprintf("%-20s is %s",'%courseresdatacache',length(&freeze(\%courseresdatacache))));
+ #   &logthis(sprintf("%-20s is %s",'%courseresdatacache',length(&nfreeze(\%courseresdatacache))));
  #1.1 only
- #   &logthis(sprintf("%-20s is %s",'%userresdatacache',length(&freeze(\%userresdatacache))));
+ #   &logthis(sprintf("%-20s is %s",'%userresdatacache',length(&nfreeze(\%userresdatacache))));
- #   &logthis(sprintf("%-20s is %s",'%getsectioncache',length(&freeze(\%getsectioncache))));
+ #   &logthis(sprintf("%-20s is %s",'%getsectioncache',length(&nfreeze(\%getsectioncache))));
- #   &logthis(sprintf("%-20s is %s",'%courseresversioncache',length(&freeze(\%courseresversioncache))));
+ #   &logthis(sprintf("%-20s is %s",'%courseresversioncache',length(&nfreeze(\%courseresversioncache))));
- #   &logthis(sprintf("%-20s is %s",'%resversioncache',length(&freeze(\%resversioncache))));
+ #   &logthis(sprintf("%-20s is %s",'%resversioncache',length(&nfreeze(\%resversioncache))));
-    &logthis(sprintf("%-20s is %s",'%remembered',length(&freeze(\%remembered))));
+    &logthis(sprintf("%-20s is %s",'%remembered',length(&nfreeze(\%remembered))));
     &logthis(sprintf("%-20s is %s",'kicks',$kicks));
     &logthis(sprintf("%-20s is %s",'hits',$hits));
     &flushcourselogs();
     &logthis("Shutting down");
-    return DONE;
  }
- BEGIN {
+ sub get_dns {
- # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
+     my ($url,$func,$ignore_cache) = @_;
-     unless ($readit) {
+     if (!$ignore_cache) {
- {
+ 	my ($content,$cached)=
-     # FIXME: Use LONCAPA::Configuration::read_conf here and omit next block
+ 	    &Apache::lonnet::is_cached_new('dns',$url);
-     open(my $config,"</etc/httpd/conf/loncapa.conf");
+ 	if ($cached) {
+ 	    &$func($content);
+ 	    return;
+ 	}
+     }
-     while (my $configline=<$config>) {
+     my %alldns;
-         if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) {
+     open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
- 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+     foreach my $dns (<$config>) {
-            chomp($varvalue);
+ 	next if ($dns !~ /^\^(\S*)/x);
-            $perlvar{$varname}=$varvalue;
+         my $line = $1;
-         }
+         my ($host,$protocol) = split(/:/,$line);
+         if ($protocol ne 'https') {
+             $protocol = 'http';
+         }
+ 	$alldns{$host} = $protocol;
+     }
+     while (%alldns) {
+ 	my ($dns) = keys(%alldns);
+ 	my $ua=new LWP::UserAgent;
+ 	my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url");
+ 	my $response=$ua->request($request);
+         delete($alldns{$dns});
+ 	next if ($response->is_error());
+ 	my @content = split("\n",$response->content);
+ 	&Apache::lonnet::do_cache_new('dns',$url,\@content,30*24*60*60);
+ 	&$func(\@content);
+ 	return;
      }
      close($config);
+     my $which = (split('/',$url))[3];
+     &logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
+     open($config,"<$perlvar{'lonTabDir'}/dns_$which.tab");
+     my @content = <$config>;
+     &$func(\@content);
+     return;
  }
+ # ------------------------------------------------------------ Read domain file
  {
-     open(my $config,"</etc/httpd/conf/loncapa_apache.conf");
+     my $loaded;
+     my %domain;
-     while (my $configline=<$config>) {
+     sub parse_domain_tab {
-         if ($configline =~ /^[^\#]*PerlSetVar/) {
+ 	my ($lines) = @_;
- 	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+ 	foreach my $line (@$lines) {
-            chomp($varvalue);
+ 	    next if ($line =~ /^(\#|\s*$ )/x);
-            $perlvar{$varname}=$varvalue;
-         }
+ 	    chomp($line);
+ 	    my ($name,@elements) = split(/:/,$line,9);
+ 	    my %this_domain;
+ 	    foreach my $field ('description', 'auth_def', 'auth_arg_def',
+ 			       'lang_def', 'city', 'longi', 'lati',
+ 			       'primary') {
+ 		$this_domain{$field} = shift(@elements);
+ 	    }
+ 	    $domain{$name} = \%this_domain;
+ 	}
      }
-     close($config);
- }
- # ------------------------------------------------------------ Read domain file
+     sub reset_domain_info {
- {
+ 	undef($loaded);
-     %domaindescription = ();
+ 	undef(%domain);
-     %domain_auth_def = ();
+     }
-     %domain_auth_arg_def = ();
-     my $fh;
+     sub load_domain_tab {
-     if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) {
+ 	my ($ignore_cache) = @_;
-        while (<$fh>) {
+ 	&get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache);
-            next if (/^(\#|\s*$)/);
+ 	my $fh;
- #           next if /^\#/;
+ 	if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) {
-            chomp;
+ 	    my @lines = <$fh>;
-            my ($domain, $domain_description, $def_auth, $def_auth_arg,
+ 	    &parse_domain_tab(\@lines);
- 	       $def_lang, $city, $longi, $lati) = split(/:/,$_);
+ 	}
- 	   $domain_auth_def{$domain}=$def_auth;
+ 	close($fh);
-            $domain_auth_arg_def{$domain}=$def_auth_arg;
+ 	$loaded = 1;
- 	   $domaindescription{$domain}=$domain_description;
+     }
- 	   $domain_lang_def{$domain}=$def_lang;
- 	   $domain_city{$domain}=$city;
+     sub domain {
- 	   $domain_longi{$domain}=$longi;
+ 	&load_domain_tab() if (!$loaded);
- 	   $domain_lati{$domain}=$lati;
+ 	my ($name,$what) = @_;
+ 	return if ( !exists($domain{$name}) );
-  #         &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}");
+ 	if (!$what) {
- #          &logthis("Domain.tab: $domain ".$domaindescription{$domain} );
+ 	    return $domain{$name}{'description'};
  	}
+ 	return $domain{$name}{$what};
      }
-     close ($fh);
+     sub domain_info {
+         &load_domain_tab() if (!$loaded);
+         return %domain;
+     }
  }
  # ------------------------------------------------------------- Read hosts file
  {
-     open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
+     my %hostname;
+     my %hostdom;
+     my %libserv;
+     my $loaded;
+     my %name_to_host;
+     my %internetdom;
+     sub parse_hosts_tab {
+ 	my ($file) = @_;
+ 	foreach my $configline (@$file) {
+ 	    next if ($configline =~ /^(\#|\s*$ )/x);
+ 	    next if ($configline =~ /^\^/);
+ 	    chomp($configline);
+ 	    my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline);
+ 	    $name=~s/\s//g;
+ 	    if ($id && $domain && $role && $name) {
+ 		$hostname{$id}=$name;
+ 		push(@{$name_to_host{$name}}, $id);
+ 		$hostdom{$id}=$domain;
+ 		if ($role eq 'library') { $libserv{$id}=$name; }
+                 if (defined($protocol)) {
+                     if ($protocol eq 'https') {
+                         $protocol{$id} = $protocol;
+                     } else {
+                         $protocol{$id} = 'http';
+                     }
+                 } else {
+                     $protocol{$id} = 'http';
+                 }
+                 if (defined($intdom)) {
+                     $internetdom{$id} = $intdom;
+                 }
+ 	    }
+ 	}
+     }
+     sub reset_hosts_info {
+ 	&purge_remembered();
+ 	&reset_domain_info();
+ 	&reset_hosts_ip_info();
+ 	undef(%name_to_host);
+ 	undef(%hostname);
+ 	undef(%hostdom);
+ 	undef(%libserv);
+ 	undef($loaded);
+     }
-     while (my $configline=<$config>) {
+     sub load_hosts_tab {
-        next if ($configline =~ /^(\#|\s*$)/);
+ 	my ($ignore_cache) = @_;
-        chomp($configline);
+ 	&get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache);
-        my ($id,$domain,$role,$name)=split(/:/,$configline);
+ 	open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
-        $name=~s/\s//g;
+ 	my @config = <$config>;
-        if ($id && $domain && $role && $name) {
+ 	&parse_hosts_tab(\@config);
- 	 $hostname{$id}=$name;
+ 	close($config);
- 	 $hostdom{$id}=$domain;
+ 	$loaded=1;
- 	 if ($role eq 'library') { $libserv{$id}=$name; }
+     }
-        }
+     sub hostname {
+ 	&load_hosts_tab() if (!$loaded);
+ 	my ($lonid) = @_;
+ 	return $hostname{$lonid};
+     }
+     sub all_hostnames {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return %hostname;
+     }
+     sub all_names {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return %name_to_host;
+     }
+     sub all_host_domain {
+         &load_hosts_tab() if (!$loaded);
+         return %hostdom;
+     }
+     sub is_library {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return exists($libserv{$_[0]});
+     }
+     sub all_library {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return %libserv;
+     }
+     sub unique_library {
+ 	#2x reverse removes all hostnames that appear more than once
+         my %unique = reverse &all_library();
+         return reverse %unique;
+     }
+     sub get_servers {
+ 	&load_hosts_tab() if (!$loaded);
+ 	my ($domain,$type) = @_;
+ 	my %possible_hosts = ($type eq 'library') ? %libserv
+ 	                                          : %hostname;
+ 	my %result;
+ 	if (ref($domain) eq 'ARRAY') {
+ 	    while ( my ($host,$hostname) = each(%possible_hosts)) {
+ 		if (grep(/^\Q$hostdom{$host}\E$/,@$domain)) {
+ 		    $result{$host} = $hostname;
+ 		}
+ 	    }
+ 	} else {
+ 	    while ( my ($host,$hostname) = each(%possible_hosts)) {
+ 		if ($hostdom{$host} eq $domain) {
+ 		    $result{$host} = $hostname;
+ 		}
+ 	    }
+ 	}
+ 	return %result;
+     }
+     sub get_unique_servers {
+         my %unique = reverse &get_servers(@_);
+ 	return reverse %unique;
+     }
+     sub host_domain {
+ 	&load_hosts_tab() if (!$loaded);
+ 	my ($lonid) = @_;
+ 	return $hostdom{$lonid};
+     }
+     sub all_domains {
+ 	&load_hosts_tab() if (!$loaded);
+ 	my %seen;
+ 	my @uniq = grep(!$seen{$_}++, values(%hostdom));
+ 	return @uniq;
+     }
+     sub internet_dom {
+         &load_hosts_tab() if (!$loaded);
+         my ($lonid) = @_;
+         return $internetdom{$lonid};
      }
-     close($config);
-     # FIXME: dev server don't want this, production servers _do_ want this
-     #&get_iphost();
  }
- sub get_iphost {
+ {
-     if (%iphost) { return %iphost; }
+     my %iphost;
      my %name_to_ip;
-     foreach my $id (keys(%hostname)) {
+     my %lonid_to_ip;
- 	my $name=$hostname{$id};
- 	my $ip;
+     sub get_hosts_from_ip {
- 	if (!exists($name_to_ip{$name})) {
+ 	my ($ip) = @_;
- 	    $ip = gethostbyname($name);
+ 	my %iphosts = &get_iphost();
- 	    if (!$ip || length($ip) ne 4) {
+ 	if (ref($iphosts{$ip})) {
- 		&logthis("Skipping host $id name $name no IP found\n");
+ 	    return @{$iphosts{$ip}};
- 		next;
+ 	}
+ 	return;
+     }
+     sub reset_hosts_ip_info {
+ 	undef(%iphost);
+ 	undef(%name_to_ip);
+ 	undef(%lonid_to_ip);
+     }
+     sub get_host_ip {
+ 	my ($lonid) = @_;
+ 	if (exists($lonid_to_ip{$lonid})) {
+ 	    return $lonid_to_ip{$lonid};
+ 	}
+ 	my $name=&hostname($lonid);
+    	my $ip = gethostbyname($name);
+ 	return if (!$ip || length($ip) ne 4);
+ 	$ip=inet_ntoa($ip);
+ 	$name_to_ip{$name}   = $ip;
+ 	$lonid_to_ip{$lonid} = $ip;
+ 	return $ip;
+     }
+     sub get_iphost {
+ 	my ($ignore_cache) = @_;
+ 	if (!$ignore_cache) {
+ 	    if (%iphost) {
+ 		return %iphost;
+ 	    }
+ 	    my ($ip_info,$cached)=
+ 		&Apache::lonnet::is_cached_new('iphost','iphost');
+ 	    if ($cached) {
+ 		%iphost      = %{$ip_info->[0]};
+ 		%name_to_ip  = %{$ip_info->[1]};
+ 		%lonid_to_ip = %{$ip_info->[2]};
+ 		return %iphost;
  	    }
- 	    $ip=inet_ntoa($ip);
- 	    $name_to_ip{$name} = $ip;
- 	} else {
- 	    $ip = $name_to_ip{$name};
  	}
- 	push(@{$iphost{$ip}},$id);
+ 	# get yesterday's info for fallback
+ 	my %old_name_to_ip;
+ 	my ($ip_info,$cached)=
+ 	    &Apache::lonnet::is_cached_new('iphost','iphost');
+ 	if ($cached) {
+ 	    %old_name_to_ip = %{$ip_info->[1]};
+ 	}
+ 	my %name_to_host = &all_names();
+ 	foreach my $name (keys(%name_to_host)) {
+ 	    my $ip;
+ 	    if (!exists($name_to_ip{$name})) {
+ 		$ip = gethostbyname($name);
+ 		if (!$ip || length($ip) ne 4) {
+ 		    if (defined($old_name_to_ip{$name})) {
+ 			$ip = $old_name_to_ip{$name};
+ 			&logthis("Can't find $name defaulting to old $ip");
+ 		    } else {
+ 			&logthis("Name $name no IP found");
+ 			next;
+ 		    }
+ 		} else {
+ 		    $ip=inet_ntoa($ip);
+ 		}
+ 		$name_to_ip{$name} = $ip;
+ 	    } else {
+ 		$ip = $name_to_ip{$name};
+ 	    }
+ 	    foreach my $id (@{ $name_to_host{$name} }) {
+ 		$lonid_to_ip{$id} = $ip;
+ 	    }
+ 	    push(@{$iphost{$ip}},@{$name_to_host{$name}});
+ 	}
+ 	&Apache::lonnet::do_cache_new('iphost','iphost',
+ 				      [\%iphost,\%name_to_ip,\%lonid_to_ip],
+*60*60);
+ 	return %iphost;
      }
-     return %iphost;
+     #
+     #  Given a DNS returns the loncapa host name for that DNS
+     #
+     sub host_from_dns {
+         my ($dns) = @_;
+         my @hosts;
+         my $ip;
+         if (exists($name_to_ip{$dns})) {
+             $ip = $name_to_ip{$dns};
+         }
+         if (!$ip) {
+             $ip = gethostbyname($dns); # Initial translation to IP is in net order.
+             if (length($ip) == 4) {
+ 	        $ip   = &IO::Socket::inet_ntoa($ip);
+             }
+         }
+         if ($ip) {
+ 	    @hosts = get_hosts_from_ip($ip);
+ 	    return $hosts[0];
+         }
+         return undef;
+     }
+     sub get_internet_names {
+         my ($lonid) = @_;
+         return if ($lonid eq '');
+         my ($idnref,$cached)=
+             &Apache::lonnet::is_cached_new('internetnames',$lonid);
+         if ($cached) {
+             return $idnref;
+         }
+         my $ip = &get_host_ip($lonid);
+         my @hosts = &get_hosts_from_ip($ip);
+         my %iphost = &get_iphost();
+         my (@idns,%seen);
+         foreach my $id (@hosts) {
+             my $dom = &host_domain($id);
+             my $prim_id = &domain($dom,'primary');
+             my $prim_ip = &get_host_ip($prim_id);
+             next if ($seen{$prim_ip});
+             if (ref($iphost{$prim_ip}) eq 'ARRAY') {
+                 foreach my $id (@{$iphost{$prim_ip}}) {
+                     my $intdom = &internet_dom($id);
+                     unless (grep(/^\Q$intdom\E$/,@idns)) {
+                         push(@idns,$intdom);
+                     }
+                 }
+             }
+             $seen{$prim_ip} = 1;
+         }
+         return &Apache::lonnet::do_cache_new('internetnames',$lonid,\@idns,12*60*60);
+     }
+ }
+ sub all_loncaparevs {
+     return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10);
+ }
+ BEGIN {
+ # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
+     unless ($readit) {
+ {
+     my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf');
+     %perlvar = (%perlvar,%{$configvars});
  }
  # ------------------------------------------------------ Read spare server file
  {
      open(my $config,"<$perlvar{'lonTabDir'}/spare.tab");
- Line 6021  sub get_iphost {
+ Line 10323  sub get_iphost {
      while (my $configline=<$config>) {
         chomp($configline);
         if ($configline) {
-           $spareid{$configline}=1;
+ 	   my ($host,$type) = split(':',$configline,2);
+ 	   if (!defined($type) || $type eq '') { $type = 'default' };
+ 	   push(@{ $spareid{$type} }, $host);
         }
      }
      close($config);
- Line 6047  sub get_iphost {
+ Line 10351  sub get_iphost {
      while (my $configline=<$config>) {
  	chomp($configline);
  	if ($configline) {
- 	    my ($short,$plain)=split(/:/,$configline);
+ 	    my ($short,@plain)=split(/:/,$configline);
- 	    if ($plain ne '') { $prp{$short}=$plain; }
+             %{$prp{$short}} = ();
+ 	    if (@plain > 0) {
+                 $prp{$short}{'std'} = $plain[0];
+                 for (my $i=1; $i<@plain; $i++) {
+                     $prp{$short}{'alt'.$i} = $plain[$i];
+                 }
+             }
  	}
      }
      close($config);
- Line 6071  sub get_iphost {
+ Line 10381  sub get_iphost {
      close($config);
  }
+ # ---------------------------------------------------------- Read loncaparev table
+ {
+     if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
+         if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
+             while (my $configline=<$config>) {
+                 chomp($configline);
+                 my ($hostid,$loncaparev)=split(/:/,$configline);
+                 $loncaparevs{$hostid}=$loncaparev;
+             }
+             close($config);
+         }
+     }
+ }
+ # ---------------------------------------------------------- Read serverhostID table
+ {
+     if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
+         if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
+             while (my $configline=<$config>) {
+                 chomp($configline);
+                 my ($name,$id)=split(/:/,$configline);
+                 $serverhomeIDs{$name}=$id;
+             }
+             close($config);
+         }
+     }
+ }
+ {
+     my $file = $Apache::lonnet::perlvar{'lonTabDir'}.'/releaseslist.xml';
+     if (-e $file) {
+         my $parser = HTML::LCParser->new($file);
+         while (my $token = $parser->get_token()) {
+             if ($token->[0] eq 'S') {
+                 my $item = $token->[1];
+                 my $name = $token->[2]{'name'};
+                 my $value = $token->[2]{'value'};
+                 if ($item ne '' && $name ne '' && $value ne '') {
+                     my $release = $parser->get_text();
+                     $release =~ s/(^\s*|\s*$ )//gx;
+                     $needsrelease{$item.':'.$name.':'.$value} = $release;
+                 }
+             }
+         }
+     }
+ }
  # ------------- set up temporary directory
  {
      $tmpdir = $perlvar{'lonDaemons'}.'/tmp/';
  }
- $memcache=new Cache::Memcached({'servers'=>['127.0.0.1:11211']});
+ $memcache=new Cache::Memcached({'servers'           => ['127.0.0.1:11211'],
+ 				'compress_threshold'=> 20_000,
+  			        });
  $processmarker='_'.time.'_'.$perlvar{'lonHostID'};
  $dumpcount=0;
+ $locknum=0;
  &logtouch();
- &logthis('<font color=yellow>INFO: Read configuration</font>');
+ &logthis('<font color="yellow">INFO: Read configuration</font>');
  $readit=1;
      {
  	use integer;
- Line 6248  when the connection is brought back up
+ Line 10608  when the connection is brought back up
  =item * B<con_failed>: unable to contact remote host and unable to save message
  for later delivery
- =item * B<error:>: an error a occured, a description of the error follows the :
+ =item * B<error:>: an error a occurred, a description of the error follows the :
  =item * B<no_such_host>: unable to fund a host associated with the user/domain
  that was requested
- Line 6263  that was requested
+ Line 10623  that was requested
  =item *
  X<appenv()>
- B<appenv(%hash)>: the value of %hash is written to
+ B<appenv($hashref,$rolesarrayref)>: the value of %{$hashref} is written to
  the user envirnoment file, and will be restored for each access this
  user makes during this session, also modifies the %env for the current
- process
+ process. Optional rolesarrayref - if defined contains a reference to an array
+ of roles which are exempt from the restriction on modifying user.role entries
+ in the user's environment.db and in %env.
  =item *
  X<delenv()>
- B<delenv($regexp)>: removes all items from the session
+ B<delenv($delthis,$regexp)>: removes all items from the session
- environment file that matches the regular expression in $regexp. The
+ environment file that begin with $delthis. If the
- values are also delted from the current processes %env.
+ optional second arg - $regexp - is true, $delthis is treated as a
+ regular expression, otherwise \Q$delthis\E is used.
+ The values are also deleted from the current processes %env.
+ =item * get_env_multiple($name)
+ gets $name from the %env hash, it seemlessly handles the cases where multiple
+ values may be defined and end up as an array ref.
+ returns an array of values
  =back
- Line 6287  authentication scheme
+ Line 10658  authentication scheme
  =item *
  X<authenticate()>
- B<authenticate($uname,$upass,$udom)>: try to
+ B<authenticate($uname,$upass,$udom,$checkdefauth,$clientcancheckhost)>: try to
  authenticate user from domain's lib servers (first use the current
  one). C<$upass> should be the users password.
+ $checkdefauth is optional (value is 1 if a check should be made to
+    authenticate user using default authentication method, and allow
+    account creation if username does not have account in the domain).
+ $clientcancheckhost is optional (value is 1 if checking whether the
+    server can host will occur on the client side in lonauth.pm).
  =item *
  X<homeserver()>
- Line 6328  X<userenvironment()>
+ Line 10704  X<userenvironment()>
  B<userenvironment($udom,$uname,@what)>: gets the values of the keys
  passed in @what from the requested user's environment, returns a hash
+ =item *
+ X<userlog_query()>
+ B<userlog_query($uname,$udom,%filters)>: retrieves data from a user's
+ activity.log file. %filters defines filters applied when parsing the
+ log file. These can be start or end timestamps, or the type of action
+ - log to look for Login or Logout events, check for Checkin or
+ Checkout, role for role selection. The response is in the form
+ timestamp1:hostid1:event1&timestamp2:hostid2:event2 where events are
+ escaped strings of the action recorded in the activity.log file.
  =back
  =head2 User Roles
- Line 6336  passed in @what from the requested user'
+ Line 10722  passed in @what from the requested user'
  =item *
- allowed($priv,$uri) : check for a user privilege; returns codes for allowed
+ allowed($priv,$uri,$symb,$role) : check for a user privilege; returns codes for allowed actions
- actions
   F: full access
   U,I,K: authentication modes (cxx only)
   '': forbidden
 : user needs to choose course
 : browse allowed
+  A: passphrase authentication needed
  =item *
- Line 6352  and course level
+ Line 10738  and course level
  =item *
- plaintext($short) : return value in %prp hash (rolesplain.tab); plain text
+ plaintext($short,$type,$cid,$forcedefault) : return value in %prp hash
- explanation of a user role term
+ (rolesplain.tab); plain text explanation of a user role term.
+ $type is Course (default) or Community.
+ If $forcedefault evaluates to true, text returned will be default
+ text for $type. Otherwise, if this is a course, the text returned
+ will be a custom name for the role (if defined in the course's
+ environment).  If no custom name is defined the default is returned.
+ =item *
+ get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) :
+ All arguments are optional. Returns a hash of a roles, either for
+ co-author/assistant author roles for a user's Construction Space
+ (default), or if $context is 'userroles', roles for the user himself,
+ In the hash, keys are set to colon-separated $uname,$udom,$role, and
+ (optionally) if $withsec is true, a fourth colon-separated item - $section.
+ For each key, value is set to colon-separated start and end times for
+ the role.  If no username and domain are specified, will default to
+ current user/domain. Types, roles, and roledoms are references to arrays
+ of role statuses (active, future or previous), roles
+ (e.g., cc,in, st etc.) and domains of the roles which can be used
+ to restrict the list of roles reported. If no array ref is
+ provided for types, will default to return only active roles.
  =back
- Line 6363  explanation of a user role term
+ Line 10770  explanation of a user role term
  =item *
- assignrole($udom,$uname,$url,$role,$end,$start) : assign role; give a role to a
+ assignrole($udom,$uname,$url,$role,$end,$start,$deleteflag,$selfenroll,$context) : assign role; give a role to a
  user for the level given by URL.  Optional start and end dates (leave empty
  string or zero for "no date")
- Line 6380  modifyuserauth($udom,$uname,$umode,$upas
+ Line 10787  modifyuserauth($udom,$uname,$umode,$upas
  =item *
- modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene) :
+ modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last, $gene,
- modify user
+            $forceid,$desiredhome,$email,$inststatus,$candelete) :
+ will update user information (firstname,middlename,lastname,generation,
+ permanentemail), and if forceid is true, student/employee ID also.
+ A user's institutional affiliation(s) can also be updated.
+ User information fields will not be overwritten with empty entries
+ unless the field is included in the $candelete array reference.
+ This array is included when a single user is modified via "Manage Users",
+ or when Autoupdate.pl is run by cron in a domain.
  =item *
  modifystudent
- modify a students enrollment and identification information.
+ modify a student's enrollment and identification information.
  The course id is resolved based on the current users environment.
  This means the envoking user must be a course coordinator or otherwise
  associated with a course.
- Line 6399  Inputs:
+ Line 10814  Inputs:
  =over 4
- =item B<$udom> Students loncapa domain
+ =item B<$udom> Student's loncapa domain
- =item B<$uname> Students loncapa login name
+ =item B<$uname> Student's loncapa login name
- =item B<$uid> Students id/student number
+ =item B<$uid> Student/Employee ID
- =item B<$umode> Students authentication mode
+ =item B<$umode> Student's authentication mode
- =item B<$upass> Students password
+ =item B<$upass> Student's password
- =item B<$first> Students first name
+ =item B<$first> Student's first name
- =item B<$middle> Students middle name
+ =item B<$middle> Student's middle name
- =item B<$last> Students last name
+ =item B<$last> Student's last name
- =item B<$gene> Students generation
+ =item B<$gene> Student's generation
- =item B<$usec> Students section in course
+ =item B<$usec> Student's section in course
  =item B<$end> Unix time of the roles expiration
- Line 6427  Inputs:
+ Line 10842  Inputs:
  =item B<$desiredhome> server to use as home server for student
+ =item B<$email> Student's permanent e-mail address
+ =item B<$type> Type of enrollment (auto or manual)
+ =item B<$locktype> boolean - enrollment type locked to prevent Autoenroll.pl changing manual to auto
+ =item B<$cid> courseID - needed if a course role is assigned by a user whose current role is DC
+ =item B<$selfenroll> boolean - 1 if user role change occurred via self-enrollment
+ =item B<$context> role change context (shown in User Management Logs display in a course)
+ =item B<$inststatus> institutional status of user - : separated string of escaped status types
  =back
  =item *
- Line 6460  Inputs:
+ Line 10889  Inputs:
  =item $start
+ =item $type
+ =item $locktype
+ =item $cid
+ =item $selfenroll
+ =item $context
  =back
- Line 6497  setting for a specific $type, where $typ
+ Line 10936  setting for a specific $type, where $typ
  @what should be a list of parameters to ask about. This routine caches
  answers for 5 minutes.
+ =item *
+ get_courseresdata($courseid, $domain) : dump the entire course resource
+ data base, returning a hash that is keyed by the resource name and has
+ values that are the resource value.  I believe that the timestamps and
+ versions are also returned.
  =back
  =head2 Course Modification
- Line 6510  database) for a course
+ Line 10957  database) for a course
  =item *
- createcourse($udom,$description,$url) : make/modify course
+ createcourse($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner,$crstype,$cnum) : make course
+ =item *
+ generate_coursenum($udom,$crstype) : get a unique (unused) course number in domain $udom for course type $crstype (Course or Community).
  =back
- Line 6663  all args are optional
+ Line 11114  all args are optional
  =item *
+ dumpstore($namespace,$udom,$uname,$regexp,$range) :
+ dumps the complete (or key matching regexp) namespace into a hash
+ ($udom, $uname, $regexp, $range are optional) for a namespace that is
+ normally &store()ed into
+ $range should be either an integer '100' (give me the first 100
+                                            matching records)
+               or be  two integers sperated by a - with no spaces
+                  '30-50' (give me the 30th through the 50th matching
+                           records)
+ =item *
+ putstore($namespace,$symb,$version,$storehash,$udomain,$uname) :
+ replaces a &store() version of data with a replacement set of data
+ for a particular resource in a namespace passed in the $storehash hash
+ reference
+ =item *
  tmpstore($storehash,$symb,$namespace,$udom,$uname) : storage that
  works very similar to store/cstore, but all data is stored in a
  temporary location and can be reset using tmpreset, $storehash should
- Line 6692  namesp ($udom and $uname are optional)
+ Line 11164  namesp ($udom and $uname are optional)
  =item *
- dump($namespace,$udom,$uname,$regexp) :
+ dump($namespace,$udom,$uname,$regexp,$range) :
  dumps the complete (or key matching regexp) namespace into a hash
- ($udom, $uname and $regexp are optional)
+ ($udom, $uname, $regexp, $range are optional)
+ $range should be either an integer '100' (give me the first 100
+                                            matching records)
+               or be  two integers sperated by a - with no spaces
+                  '30-50' (give me the 30th through the 50th matching
+                           records)
  =item *
  inc($namespace,$store,$udom,$uname) : increments $store in $namespace.
- Line 6711  put($namespace,$storehash,$udom,$uname)
+ Line 11188  put($namespace,$storehash,$udom,$uname)
  =item *
- putstore($namespace,$storehash,$udomain,$uname) : stores hash in namesp
+ cput($namespace,$storehash,$udom,$uname) : critical put
- keys used in storehash include version information (e.g., 1:$symb:message etc.) as
+ ($udom and $uname are optional)
- 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
+ newput($namespace,$storehash,$udom,$uname) :
- ($udom and $uname are optional)
+ Attempts to store the items in the $storehash, but only if they don't
+ currently exist, if this succeeds you can be certain that you have
+ successfully created a new key value pair in the $namespace db.
+ Args:
+  $namespace: name of database to store values to
+  $storehash: hashref to store to the db
+  $udom: (optional) domain of user containing the db
+  $uname: (optional) name of user caontaining the db
+ Returns:
+  'ok' -> succeeded in storing all keys of $storehash
+  'key_exists: <key>' -> failed to anything out of $storehash, as at
+                         least <key> already existed in the db (other
+                         requested keys may also already exist)
+  'error: <msg>' -> unable to tie the DB or other error occurred
+  'con_lost' -> unable to contact request server
+  'refused' -> action was not allowed by remote machine
  =item *
- Line 6736  reference filled in from namesp (encrypt
+ Line 11227  reference filled in from namesp (encrypt
  log($udom,$name,$home,$message) : write to permanent log for user; use
  critical subroutine
+ =item *
+ get_dom($namespace,$storearr,$udom,$uhome) : returns hash with keys from
+ array reference filled in from namespace found in domain level on either
+ specified domain server ($uhome) or primary domain server ($udom and $uhome are optional).
+ =item *
+ put_dom($namespace,$storehash,$udom,$uhome) :  stores hash in namespace at
+ domain level either on specified domain server ($uhome) or primary domain
+ server ($udom and $uhome are optional)
+ =item *
+ get_domain_defaults($target_domain) : returns hash with defaults for
+ authentication and language in the domain. Keys are: auth_def, auth_arg_def,
+ lang_def; corresponsing values are authentication type (internal, krb4, krb5,
+ or localauth), initial password or a kerberos realm, language (e.g., en-us).
+ Values are retrieved from cache (if current), or from domain's configuration.db
+ (if available), or lastly from values in lonTabs/dns_domain,tab,
+ or lonTabs/domain.tab.
+ %domdefaults = &get_auth_defaults($target_domain);
  =back
  =head2 Network Status Functions
- Line 6750  dirlist($uri) : return directory list ba
+ Line 11265  dirlist($uri) : return directory list ba
  spareserver() : find server with least workload from spare.tab
+ =item *
+ host_from_dns($dns) : Returns the loncapa hostname corresponding to a DNS name or undef
+ if there is no corresponding loncapa host.
  =back
  =head2 Apache Request
  =over 4
- Line 6851  getfile($file,$caller) : two cases - req
+ Line 11373  getfile($file,$caller) : two cases - req
     - returns the entire contents of a file or -1;
     it properly subscribes to and replicates the file if neccessary.
+ =item *
+ stat_file($url) : $url is expected to be a /res/ or /uploaded/ style file
+                   reference
+ returns either a stat() list of data about the file or an empty list
+ if the file doesn't exist or couldn't find out about it (connection
+ problems or user unknown)
  =item *
  filelocation($dir,$file) : returns file system location of a file
- Line 6882  userfileupload(): main rotine for puttin
+ Line 11414  userfileupload(): main rotine for puttin
             filename, and the contents of the file to create/modifed exist
             the filename is in $env{'form.'.$formname.'.filename'} and the
             contents of the file is located in $env{'form.'.$formname}
-  coursedoc - if true, store the file in the course of the active role
+  context - if coursedoc, store the file in the course of the active role
-              of the current user
+              of the current user;
+            if 'existingfile': store in 'overwrites' in /home/httpd/perl/tmp
+            if 'canceloverwrite': delete file in tmp/overwrites directory
   subdir - required - subdirectory to put the file in under ../userfiles/
           if undefined, it will be placed in "unknown"
- Line 6905  returns: the new clean filename
+ Line 11439  returns: the new clean filename
  =item *
- finishuserfileupload(): routine that creaes and sends the file to
+ finishuserfileupload(): routine that creates and sends the file to
  userspace, probably shouldn't be called directly
    docuname: username or courseid of destination for the file
    docudom: domain of user/course of destination for the file
    formname: same as for userfileupload()
-   fname: filename (inculding subdirectories) for the file
+   fname: filename (including subdirectories) for the file
+   parser: if 'parse', will parse (html) file to extract references to objects, links etc.
+   allfiles: reference to hash used to store objects found by parser
+   codebase: reference to hash used for codebases of java objects found by parser
+   thumbwidth: width (pixels) of thumbnail to be created for uploaded image
+   thumbheight: height (pixels) of thumbnail to be created for uploaded image
+   resizewidth: width to be used to resize image using resizeImage from ImageMagick
+   resizeheight: height to be used to resize image using resizeImage from ImageMagick
+   context: if 'overwrite', will move the uploaded file from its temporary location to
+             userfiles to facilitate overwriting a previously uploaded file with same name.
+   mimetype: reference to scalar to accommodate mime type determined
+             from File::MMagic if $parser = parse.
   returns either the url of the uploaded file (/uploaded/....) if successful
-  and /adm/notfound.html if unsuccessful
+  and /adm/notfound.html if unsuccessful (or an error message if context
+  was 'overwrite').
  =item *
- Line 6951  removeuploadedurl(): convience function
+ Line 11498  removeuploadedurl(): convience function
    Args:
     url:  a full /uploaded/... url to delete
+ =item *
+ get_portfile_permissions():
+   Args:
+     domain: domain of user or course contain the portfolio files
+     user: name of user or num of course contain the portfolio files
+   Returns:
+     hashref of a dump of the proper file_permissions.db
+ =item *
+ get_access_controls():
+ Args:
+   current_permissions: the hash ref returned from get_portfile_permissions()
+   group: (optional) the group you want the files associated with
+   file: (optional) the file you want access info on
+ Returns:
+     a hash (keys are file names) of hashes containing
+         keys are: path to file/file_name\0uniqueID:scope_end_start (see below)
+         values are XML containing access control settings (see below)
+ Internal notes:
+  access controls are stored in file_permissions.db as key=value pairs.
+     key -> path to file/file_name\0uniqueID:scope_end_start
+         where scope -> public,guest,course,group,domains or users.
+               end -> UNIX time for end of access (0 -> no end date)
+               start -> UNIX time for start of access
+     value -> XML description of access control
+            <scope type=""> (type =1 of: public,guest,course,group,domains,users">
+             <start></start>
+             <end></end>
+             <password></password>  for scope type = guest
+             <domain></domain>     for scope type = course or group
+             <number></number>
+             <roles id="">
+              <role></role>
+              <access></access>
+              <section></section>
+              <group></group>
+             </roles>
+             <dom></dom>         for scope type = domains
+             <users>             for scope type = users
+              <user>
+               <uname></uname>
+               <udom></udom>
+              </user>
+             </users>
+            </scope>
+  Access data is also aggregated for each file in an additional key=value pair:
+  key -> path to file/file_name\0accesscontrol
+  value -> reference to hash
+           hash contains key = value pairs
+           where key = uniqueID:scope_end_start
+                 value = UNIX time record was last updated
+           Used to improve speed of look-ups of access controls for each file.
+  Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays.
+ modify_access_controls():
+ Modifies access controls for a portfolio file
+ Args
+. file name
+. reference to hash of required changes,
+. domain
+. username
+   where domain,username are the domain of the portfolio owner
+   (either a user or a course)
+ Returns:
+. result of additions or updates ('ok' or 'error', with error message).
+. result of deletions ('ok' or 'error', with error message).
+. reference to hash of any new or updated access controls.
+. reference to hash used to map incoming IDs to uniqueIDs assigned to control.
+    key = integer (inbound ID)
+    value = uniqueID
  =back
  =head2 HTTP Helper Routines
- Line 7029  symblist($mapname,%newhash) : update sym
+ Line 11664  symblist($mapname,%newhash) : update sym
  =back
  =cut

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

Removed from v.1.662
changed lines
	Added in v.1.1100