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.824.2.3 and 1.944

-version 1.824.2.3, 2007/03/17 04:13:06
+version 1.944, 2008/02/26 10:39:44
  Line 31  package Apache::lonnet;
  use strict;
  use LWP::UserAgent();
- use HTTP::Headers;
  use HTTP::Date;
  # use Date::Parse;
- use vars
+ use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
- qw(%perlvar %hostname %badServerCache %iphost %spareid %hostdom
+             $_64bit %env);
-    %libserv %pr %prp $memcache %packagetab
-    %courselogs %accesshash %userrolehash %domainrolehash $processmarker $dumpcount
+ my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash,
-    %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseownerbuf %coursetypebuf
+     %userrolehash, $processmarker, $dumpcount, %coursedombuf,
-    %domaindescription %domain_auth_def %domain_auth_arg_def
+     %coursenumbuf, %coursehombuf, %coursedescrbuf, %courseinstcodebuf,
-    %domain_lang_def %domain_city %domain_longi %domain_lati %domain_primary
+     %courseownerbuf, %coursetypebuf);
-    $tmpdir $_64bit %env);
  use IO::Socket;
  use GDBM_File;
  use HTML::LCParser;
- use HTML::Parser;
  use Fcntl qw(:flock);
- use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze);
+ use Storable qw(thaw nfreeze);
  use Time::HiRes qw( gettimeofday tv_interval );
  use Cache::Memcached;
  use Digest::MD5;
- Line 146  sub logperm {
+ Line 143  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;
+ }
  # -------------------------------------------------- Non-critical communication
  sub subreply {
      my ($cmd,$server)=@_;
-     my $peerfile="$perlvar{'lonSockDir'}/".$hostname{$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 170  sub subreply {
+ Line 181  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) {
- Line 189  sub subreply {
+ Line 202  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:".
- Line 201  sub reply {
+ Line 214  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 211  sub reconlonc {
+ Line 241  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:".
                 " 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 231  sub reconlonc {
+ Line 255  sub reconlonc {
  sub critical {
      my ($cmd,$server)=@_;
-     unless ($hostname{$server}) {
+     unless (&hostname($server)) {
          &logthis("<font color=\"blue\">WARNING:".
                 " Critical message to unknown server ($server)</font>");
          return 'no_such_host';
- Line 296  sub convert_and_load_session_env {
+ Line 320  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);
- Line 335  sub transfer_profile_to_env {
+ Line 362  sub transfer_profile_to_env {
      my $convert;
      {
-     	open(my $idf,"$lonidsdir/$handle.id");
+     	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)) {
- Line 367  sub transfer_profile_to_env {
+ Line 397  sub transfer_profile_to_env {
      }
  }
+ # ---------------------------------------------------- Check for valid session
+ sub check_for_valid_session {
+     my ($r) = @_;
+     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
+     my $lonid=$cookies{'lonID'};
+     return undef if (!$lonid);
+     my $handle=&LONCAPA::clean_handle($lonid->value);
+     my $lonidsdir=$r->dir_config('lonIDsDir');
+     return undef if (!-e "$lonidsdir/$handle.id");
+     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;
+     }
+     if (!defined($disk_env{'user.name'})
+ 	|| !defined($disk_env{'user.domain'})) {
+ 	return undef;
+     }
+     return $handle;
+ }
  sub timed_flock {
      my ($file,$lock_type) = @_;
      my $failed=0;
- Line 401  sub appenv {
+ Line 459  sub appenv {
              $env{$key}=$newenv{$key};
          }
      }
-     open(my $env_file,$env{'user.environment'});
+     my $opened = open(my $env_file,'+<',$env{'user.environment'});
-     if (&timed_flock($env_file,LOCK_EX)
+     if ($opened
+ 	&& &timed_flock($env_file,LOCK_EX)
  	&&
  	tie(my %disk_env,'GDBM_File',$env{'user.environment'},
  	    (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
- Line 422  sub delenv {
+ Line 481  sub delenv {
                  "Attempt to delete from environment ".$delthis);
          return 'error';
      }
-     open(my $env_file,$env{'user.environment'});
+     my $opened = open(my $env_file,'+<',$env{'user.environment'});
-     if (&timed_flock($env_file,LOCK_EX)
+     if ($opened
+ 	&& &timed_flock($env_file,LOCK_EX)
  	&&
  	tie(my %disk_env,'GDBM_File',$env{'user.environment'},
  	    (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) {
  	foreach my $key (keys(%disk_env)) {
  	    if ($key=~/^$delthis/) {
-                 delete($env{$key});
+ 		delete($env{$key});
-                 delete($disk_env{$key});
+ 		delete($disk_env{$key});
-             }
+ 	    }
  	}
  	untie(%disk_env);
      }
- Line 453  sub get_env_multiple {
+ Line 513  sub get_env_multiple {
  }
  # ------------------------------------------ Find out current server userload
- # there is a copy in lond
  sub userload {
      my $numusers=0;
      {
- Line 461  sub userload {
+ Line 520  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 524  sub spareserver {
+ Line 584  sub spareserver {
      }
      if (!$want_server_name) {
- 	$spare_server="http://$hostname{$spare_server}";
+ 	$spare_server="http://".&hostname($spare_server);
      }
      return $spare_server;
  }
- Line 558  sub compare_server_load {
+ Line 618  sub compare_server_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;
+ }
  # --------------------------------------------- Try to change a user's password
  sub changepass {
- Line 615  sub authenticate {
+ Line 696  sub authenticate {
      my ($uname,$upass,$udom)=@_;
      $upass=&escape($upass);
      $uname= &LONCAPA::clean_username($uname);
-     my $uhome=&homeserver($uname,$udom);
+     my $uhome=&homeserver($uname,$udom,1);
-     if (!$uhome) {
+     if ((!$uhome) || ($uhome eq 'no_host')) {
- 	&logthis("User $uname at $udom is unknown in authenticate");
+ # Maybe the machine was offline and only re-appeared again recently?
+         &reconlonc();
+ # One more
+ 	my $uhome=&homeserver($uname,$udom,1);
+ 	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);
- Line 641  sub homeserver {
+ Line 728  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 663  sub idget {
+ Line 751  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 722  sub idput {
+ Line 808  sub idput {
  # ------------------------------------------- get items from domain db files
  sub get_dom {
-     my ($namespace,$storearr,$udom)=@_;
+     my ($namespace,$storearr,$udom,$uhome)=@_;
      my $items='';
      foreach my $item (@$storearr) {
          $items.=&escape($item).'&';
      }
      $items=~s/\&$//;
-     if (!$udom) { $udom=$env{'user.domain'}; }
+     if (!$udom) {
-     if (exists($domain_primary{$udom})) {
+         $udom=$env{'user.domain'};
-         my $uhome=$domain_primary{$udom};
+         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 %returnhash=();
          my $i=0;
          foreach my $item (@$storearr) {
              $returnhash{$item}=&thaw_unescape($pairs[$i]);
- Line 744  sub get_dom {
+ Line 845  sub get_dom {
          }
          return %returnhash;
      } else {
-         &logthis("get_dom failed - no primary domain server for $udom");
+         &logthis("get_dom failed - no homeserver and/or domain ($udom) ($uhome)");
      }
  }
  # -------------------------------------------- put items in domain db files
  sub put_dom {
-     my ($namespace,$storehash,$udom)=@_;
+     my ($namespace,$storehash,$udom,$uhome)=@_;
-     if (!$udom) { $udom=$env{'user.domain'}; }
+     if (!$udom) {
-     if (exists($domain_primary{$udom})) {
+         $udom=$env{'user.domain'};
-         my $uhome=$domain_primary{$udom};
+         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}).'&';
- Line 762  sub put_dom {
+ Line 875  sub put_dom {
          $items=~s/\&$//;
          return &reply("putdom:$udom:$namespace:$items",$uhome);
      } else {
-         &logthis("put_dom failed - no primary domain server for $udom");
+         &logthis("put_dom failed - no homeserver and/or domain");
+     }
+ }
+ sub retrieve_inst_usertypes {
+     my ($udom) = @_;
+     my (%returnhash,@order);
+     if (defined(&domain($udom,'primary'))) {
+         my $uhome=&domain($udom,'primary');
+         my $rep=&reply("inst_usertypes:$udom",$uhome);
+         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 'selfenroll') {
+                     $response=&unescape(&reply('instselfenrollcheck:'.
+                                                &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 and Language Defaults for Domain
+ sub get_domain_defaults {
+     my ($domain) = @_;
+     my $cachetime = 60*60*24;
+     my ($defauthtype,$defautharg,$deflang);
+     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'],$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'};
+     } else {
+         $domdefaults{'lang_def'} = &domain($domain,'lang_def');
+         $domdefaults{'auth_def'} = &domain($domain,'auth_def');
+         $domdefaults{'auth_arg_def'} = &domain($domain,'auth_arg_def');
+     }
+     &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults,
+                                   $cachetime);
+     return %domdefaults;
  }
  # --------------------------------------------------- Assign a key to a student
- Line 992  my $kicks=0;
+ Line 1377  my $kicks=0;
  my $hits=0;
  sub make_key {
      my ($name,$id) = @_;
-     if (length($id) > 200) { $id=length($id).':'.&Digest::MD5::md5_hex($id); }
+     if (length($id) > 65
+ 	&& length(&escape($id)) > 200) {
+ 	$id=length($id).':'.&Digest::MD5::md5_hex($id);
+     }
      return &escape($name.':'.$id);
  }
- Line 1039  sub do_cache_new {
+ Line 1427  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 1208  sub repcopy {
+ Line 1602  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 1276  sub ssi_body {
+ Line 1671  sub ssi_body {
                                       &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;
  }
- Line 1291  sub absolute_url {
+ Line 1686  sub absolute_url {
      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 reply.
+ #   Array context:  2 element list of the content and the full response variable.
+ #
+ # Returns:
+ #    The content of the response.
  sub ssi {
      my ($fn,%form)=@_;
+     my $count = scalar(@_);
      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',&absolute_url().$fn);
        $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));
- Line 1310  sub ssi {
+ Line 1719  sub ssi {
      $request->header(Cookie => $ENV{'HTTP_COOKIE'});
      my $response=$ua->request($request);
+     my $status = $response->code;
-     return $response->content;
+     if (wantarray) {
+ 	return ($response->content, $response);
+     } else {
+ 	return $response->content;
+     }
  }
  sub externalssi {
- Line 1456  sub store_edited_file {
+ Line 1870  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;
- Line 1477  sub clean_filename {
+ Line 1893  sub clean_filename {
  #        $coursedoc - if true up to the current course
  #                     if false
  #        $subdir - directory in userfile to store the file into
- #        $parser, $allfiles, $codebase - unknown
+ #        $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
+ #
  # 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,$destuname,$destudom)=@_;
+     my ($formname,$coursedoc,$subdir,$parser,$allfiles,$codebase,$destuname,
+         $destudom,$thumbwidth,$thumbheight)=@_;
      if (!defined($subdir)) { $subdir='unknown'; }
      my $fname=$env{'form.'.$formname.'.filename'};
      $fname=&clean_filename($fname);
- Line 1531  sub userfileupload {
+ Line 1954  sub userfileupload {
          if ($env{'form.folder'} =~ m/^(default|supplemental)/) {
              return &finishuserfileupload($docuname,$docudom,
  					 $formname,$fname,$parser,$allfiles,
- 					 $codebase);
+ 					 $codebase,$thumbwidth,$thumbheight);
          } else {
              $fname=$env{'form.folder'}.'/'.$fname;
              return &process_coursefile('uploaddoc',$docuname,$docudom,
- Line 1541  sub userfileupload {
+ Line 1964  sub userfileupload {
      } elsif (defined($destuname)) {
          my $docuname=$destuname;
          my $docudom=$destudom;
- 	return &finishuserfileupload($docuname,$docudom,$formname,
+ 	return &finishuserfileupload($docuname,$docudom,$formname,$fname,
- 				     $fname,$parser,$allfiles,$codebase);
+ 				     $parser,$allfiles,$codebase,
+                                      $thumbwidth,$thumbheight);
      } else {
          my $docuname=$env{'user.name'};
- Line 1551  sub userfileupload {
+ Line 1975  sub userfileupload {
              $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
              $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
          }
- 	return &finishuserfileupload($docuname,$docudom,$formname,
+ 	return &finishuserfileupload($docuname,$docudom,$formname,$fname,
- 				     $fname,$parser,$allfiles,$codebase);
+ 				     $parser,$allfiles,$codebase,
+                                      $thumbwidth,$thumbheight);
      }
  }
  sub finishuserfileupload {
-     my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase) = @_;
+     my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase,
+         $thumbwidth,$thumbheight) = @_;
      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 1596  sub finishuserfileupload {
+ Line 2022  sub finishuserfileupload {
  		     ' for embedded media: '.$parse_result);
          }
      }
+     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 1608  sub finishuserfileupload {
+ Line 2051  sub finishuserfileupload {
          &logthis('Failed to transfer '.$path.$file.' to host '.$docuhome.
  		 ': '.$fetchresult);
          return '/adm/notfound.html';
      }
  }
  sub extract_embedded_items {
- Line 1632  sub extract_embedded_items {
+ Line 2075  sub extract_embedded_items {
      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 1795  sub flushcourselogs {
+ Line 2241  sub flushcourselogs {
  # times and course titles for all courseids
  #
      my %courseidbuffer=();
-     foreach my $crsid (keys %courselogs) {
+     foreach my $crsid (keys(%courselogs)) {
          if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'.
  		          &escape($courselogs{$crsid}),
  		          $coursehombuf{$crsid}) eq 'ok') {
- Line 1808  sub flushcourselogs {
+ Line 2254  sub flushcourselogs {
                 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}).':'.&escape($coursetypebuf{$crsid});
+             'type'        => $coursetypebuf{$crsid},
-         } else {
+             'owner'       => $courseownerbuf{$crsid},
-            $courseidbuffer{$coursehombuf{$crsid}}=
+         };
- 			 &escape($crsid).'='.&escape($coursedescrbuf{$crsid}).
-                          ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid});
-         }
      }
  #
  # Write course id database (reverse lookup) to homeserver of courses
  # Is used in pickcourse
  #
-     foreach my $crsid (keys(%courseidbuffer)) {
+     foreach my $crs_home (keys(%courseidbuffer)) {
-         &courseidput($hostdom{$crsid},$courseidbuffer{$crsid},$crsid);
+         my $response = &courseidput(&host_domain($crs_home),
+                                     $courseidbuffer{$crs_home},
+                                     $crs_home,'timeonly');
      }
  #
  # File accesses
- Line 1879  sub flushcourselogs {
+ Line 2324  sub flushcourselogs {
  #
      my %domrolebuffer = ();
      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 1890  sub flushcourselogs {
+ Line 2335  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 1985  sub userrolelog {
+ Line 2429  sub userrolelog {
           {$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/))) {
+        $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 2002  sub get_course_adv_roles {
+ Line 2454  sub get_course_adv_roles {
      my %coursehash=&coursedescription($cid);
      my %nothide=();
      foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
- 	$nothide{join(':',split(/[\@\:]/,$user))}=1;
+         if ($user !~ /:/) {
+ 	    $nothide{join(':',split(/[\@]/,$user))}=1;
+         } else {
+             $nothide{$user}=1;
+         }
      }
      my %returnhash=();
      my %dumphash=
- Line 2030  sub get_course_adv_roles {
+ Line 2486  sub get_course_adv_roles {
  }
  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') {
+         %dumphash = &dump('roles',$udom,$uname);
+     } 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 my $entry (keys(%dumphash)) {
- 	my ($tend,$tstart)=split(/\:/,$dumphash{$entry});
+         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(/\:/,$entry);
+             $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 ((&privileged($username,$domain)) &&
+                 (!$nothide{$username.':'.$domain})) {
+                 next;
+             }
+         }
+         if ($withsec) {
+             $returnhash{$username.':'.$domain.':'.$role.':'.$section} =
+                 $tstart.':'.$tend;
+         } else {
+             $returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend;
+         }
+     }
      return %returnhash;
  }
- Line 2054  sub get_my_roles {
+ Line 2577  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 2082  sub getannounce {
+ Line 2605  sub getannounce {
  #
  sub courseidput {
-     my ($domain,$what,$coursehome)=@_;
+     my ($domain,$storehash,$coursehome,$caller) = @_;
-     return &reply('courseidput:'.$domain.':'.$what,$coursehome);
+     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,$typefilter,$regexp_ok)=@_;
+     my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,
-     my %returnhash=();
+         $coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok)=@_;
-     unless ($domfilter) { $domfilter=''; }
+     my $as_hash = 1;
-     foreach my $tryserver (keys %libserv) {
+     my %returnhash;
-         if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) {
+     if (!$domfilter) { $domfilter=''; }
- 	    if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) {
+     my %libserv = &all_library();
- 	        foreach my $line (
+     foreach my $tryserver (keys(%libserv)) {
-                  split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'.
+         if ( (  $hostidflag == 1
- 			       $sincefilter.':'.&escape($descfilter).':'.
+ 	        && grep(/^\Q$tryserver\E$/,@{$hostidref}) )
-                                &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter).':'.&escape($regexp_ok),
+ 	     || (!defined($hostidflag)) ) {
-                                $tryserver))) {
- 		    my ($key,$value)=split(/\=/,$line,2);
+ 	    if (($domfilter eq '') ||
-                     if (($key) && ($value)) {
+ 		(&host_domain($tryserver) eq $domfilter)) {
- 		        $returnhash{&unescape($key)}=$value;
+                 my $rep =
-                     }
+                   &reply('courseiddump:'.&host_domain($tryserver).':'.
+                          $sincefilter.':'.&escape($descfilter).':'.
+                          &escape($instcodefilter).':'.&escape($ownerfilter).
+                          ':'.&escape($coursefilter).':'.&escape($typefilter).
+                          ':'.&escape($regexp_ok).':'.$as_hash,$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 2122  sub dcmailput {
+ Line 2696  sub dcmailput {
  sub dcmaildump {
      my ($dom,$startdate,$enddate,$senders) = @_;
      my %returnhash=();
-     if (exists($domain_primary{$dom})) {
+     if (defined(&domain($dom,'primary'))) {
          my $cmd='dcmaildump:'.$dom.':'.&escape($startdate).':'.
                                                           &escape($enddate).':';
  	my @esc_senders=map { &escape($_)} @$senders;
  	$cmd.=&escape(join('&',@esc_senders));
- 	foreach my $line (split(/\&/,&reply($cmd,$domain_primary{$dom}))) {
+ 	foreach my $line (split(/\&/,&reply($cmd,&domain($dom,'primary')))) {
              my ($key,$value) = split(/\=/,$line,2);
              if (($key) && ($value)) {
                  $returnhash{&unescape($key)} = &unescape($value);
- Line 2146  sub get_domain_roles {
+ Line 2721  sub get_domain_roles {
      if (undef($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 my $line (
+ 	%{$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(/\=/,$line,2);
+ 					    &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;
  }
- Line 2172  sub get_first_access {
+ Line 2750  sub get_first_access {
      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 2185  sub set_first_access {
+ Line 2765  sub set_first_access {
      my ($type)=@_;
      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 2250  sub checkin {
+ Line 2832  sub checkin {
      my $now=time;
      my ($ta,$tb,$lonhost)=split(/\*/,$token);
      $lonhost=~tr/A-Z/a-z/;
-     my $dtoken=$ta.'_'.$hostname{$lonhost}.'_'.$tb;
+     my $dtoken=$ta.'_'.&hostname($lonhost).'_'.$tb;
      $dtoken=~s/\W/\_/g;
      my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
                   split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
- Line 2919  sub custom_roleprivs {
+ Line 3501  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 '')) {
- Line 2980  sub set_userprivs {
+ Line 3562  sub set_userprivs {
      if (keys(%{$allgroups}) > 0) {
          foreach my $role (keys %{$allroles}) {
              my ($trole,$area,$sec,$extendedarea);
-             if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)-) {
+             if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)\.-) {
                  $trole = $1;
                  $area = $2;
                  $sec = $3;
- Line 3000  sub set_userprivs {
+ Line 3582  sub set_userprivs {
      }
      foreach my $role (keys(%{$allroles})) {
          my %thesepriv;
-         if (($role=~/^au/) || ($role=~/^ca/)) { $author=1; }
+         if (($role=~/^au/) || ($role=~/^ca/) || ($role=~/^aa/)) { $author=1; }
          foreach my $item (split(/:/,$$allroles{$role})) {
              if ($item ne '') {
                  my ($privilege,$restrictions)=split(/&/,$item);
- Line 3461  sub get_portfolio_access {
+ Line 4043  sub get_portfolio_access {
              }
              if (@users > 0) {
                  foreach my $userkey (@users) {
-                     if (exists($access_hash->{$userkey}{'users'}{$env{'user.name'}.':'.$env{'user.domain'}})) {
+                     if (ref($access_hash->{$userkey}{'users'}) eq 'ARRAY') {
-                         return 'ok';
+                         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;
- Line 3623  sub customaccess {
+ Line 4212  sub customaccess {
      $ucrs = &LONCAPA::clean_username($ucrs);
      my $access=0;
      foreach my $right (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) {
- 	my ($effect,$realm,$role)=split(/\:/,$right);
+ 	my ($effect,$realm,$role,$type)=split(/\:/,$right);
-         if ($role) {
+ 	if ($type eq 'user') {
- 	   if ($role ne $urole) { next; }
+ 	    foreach my $scope (split(/\s*\,\s*/,$realm)) {
-         }
+ 		my ($tdom,$tuname)=split(m{/},$scope);
-         foreach my $scope (split(/\s*\,\s*/,$realm)) {
+ 		if ($tdom) {
-             my ($tdom,$tcrs,$tsec)=split(/\_/,$scope);
+ 		    if ($tdom ne $env{'user.domain'}) { next; }
-             if ($tdom) {
+ 		}
- 		if ($tdom ne $udom) { next; }
+ 		if ($tuname) {
-             }
+ 		    if ($tuname ne $env{'user.name'}) { next; }
-             if ($tcrs) {
+ 		}
- 		if ($tcrs ne $ucrs) { next; }
+ 		$access=($effect eq 'allow');
-             }
+ 		last;
-             if ($tsec) {
+ 	    }
- 		if ($tsec ne $usec) { next; }
+ 	} else {
-             }
+ 	    if ($role) {
-             $access=($effect eq 'allow');
+ 		if ($role ne $urole) { next; }
-             last;
+ 	    }
-         }
+ 	    foreach my $scope (split(/\s*\,\s*/,$realm)) {
- 	if ($realm eq '' && $role eq '') {
+ 		my ($tdom,$tcrs,$tsec)=split(/\_/,$scope);
-             $access=($effect eq 'allow');
+ 		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 4127  sub definerole {
+ Line 4730  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 4150  sub log_query {
+ Line 4754  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 $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command,
                         $uhome);
- Line 4170  sub update_portfolio_table {
+ Line 4774  sub update_portfolio_table {
      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);
+     my $reply = &get_query_reply($queryid);
+     return $reply;
+ }
  # ------- Request retrieval of institutional classlists for course(s)
  sub fetch_enrollment_query {
- Line 4182  sub fetch_enrollment_query {
+ Line 4803  sub fetch_enrollment_query {
      } else {
          $homeserver = &homeserver($cnum,$dom);
      }
-     my $host=$hostname{$homeserver};
+     my $host=&hostname($homeserver);
      my $cmd = '';
      foreach my $affiliate (keys %{$affiliatesref}) {
          $cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%';
- Line 4204  sub fetch_enrollment_query {
+ Line 4825  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 my $line (@responses) {
                  my ($key,$value) = split(/=/,$line,2);
- Line 4247  sub get_query_reply {
+ Line 4868  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 4279  sub courselog_query {
+ Line 4900  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 4287  sub userlog_query {
+ Line 4914  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;
  }
- Line 4298  sub auto_get_sections {
+ Line 4942  sub auto_get_sections {
      my @secs = ();
      my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver));
      unless ($response eq 'refused') {
-         @secs = split/:/,$response;
+         @secs = split(/:/,$response);
      }
      return @secs;
  }
- Line 4318  sub auto_validate_courseID {
+ Line 4962  sub auto_validate_courseID {
  }
  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);
  }
- Line 4373  sub auto_photochoice {
+ Line 5029  sub auto_photochoice {
  sub auto_photoupdate {
      my ($affiliatesref,$dom,$cnum,$photo) = @_;
      my $homeserver = &homeserver($cnum,$dom);
-     my $host=$hostname{$homeserver};
+     my $host=&hostname($homeserver);
      my $cmd = '';
      my $maxtries = 1;
      foreach my $affiliate (keys(%{$affiliatesref})) {
- Line 4413  sub auto_instcode_format {
+ Line 5069  sub auto_instcode_format {
      my $courses = '';
      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)) {
-                 if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
+ 	    if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
-                     push(@homeservers,$tryserver);
+ 		push(@homeservers,$tryserver);
-                 }
+ 	    }
-             }
          }
      } else {
          push(@homeservers,&homeserver($caller,$codedom));
- Line 4434  sub auto_instcode_format {
+ Line 5089  sub auto_instcode_format {
          $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server);
          if ($response !~ /(con_lost|error|no_such_host|refused)/) {
              my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) =
- 		split/:/,$response;
+ 		split(/:/,$response);
              %{$codes} = (%{$codes},&str2hash($codes_str));
              push(@{$codetitles},&str2array($codetitles_str));
              %{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str));
- Line 4452  sub auto_instcode_format {
+ Line 5107  sub auto_instcode_format {
  sub auto_instcode_defaults {
      my ($domain,$returnhash,$code_order) = @_;
      my @homeservers;
-     foreach my $tryserver (keys(%libserv)) {
-         if ($hostdom{$tryserver} eq $domain) {
+     my %servers = &get_servers($domain,'library');
-             if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
+     foreach my $tryserver (keys(%servers)) {
-                 push(@homeservers,$tryserver);
+ 	if (!grep(/^\Q$tryserver\E$/,@homeservers)) {
-             }
+ 	    push(@homeservers,$tryserver);
-         }
+ 	}
      }
-     my $ok_response = 0;
      my $response;
-     while (@homeservers > 0 && $ok_response == 0) {
+     foreach my $server (@homeservers) {
-         my $server = shift(@homeservers);
          $response=&reply('autoinstcodedefaults:'.$domain,$server);
-         if ($response !~ /(con_lost|error|no_such_host|refused)/) {
+         next if ($response =~ /(con_lost|error|no_such_host|refused)/);
-             foreach my $pair (split(/\&/,$response)) {
-                 my ($name,$value)=split(/\=/,$pair);
+ 	foreach my $pair (split(/\&/,$response)) {
-                 if ($name eq 'code_order') {
+ 	    my ($name,$value)=split(/\=/,$pair);
-                     @{$code_order} = split(/\&/,&unescape($value));
+ 	    if ($name eq 'code_order') {
-                 } else {
+ 		@{$code_order} = split(/\&/,&unescape($value));
-                     $returnhash->{&unescape($name)}=&unescape($value);
+ 	    } else {
-                 }
+ 		$returnhash->{&unescape($name)}=&unescape($value);
-             }
+ 	    }
-             $ok_response = 1;
+ 	}
-         }
+ 	return 'ok';
-     }
-     if ($ok_response) {
-         return 'ok';
-     } else {
-         return $response;
      }
+     return $response;
  }
  sub auto_validate_class_sec {
-     my ($cdom,$cnum,$owner,$inst_class) = @_;
+     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($owner).':'.$cdom,$homeserver);
+                         &escape($ownerlist).':'.$cdom,$homeserver);
      return $response;
  }
- Line 4680  sub assignrole {
+ Line 5337  sub assignrole {
      } else {
          my $cwosec=$url;
          $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) {
+                 &logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url.
+                          ' '.$role.' '.$end.' '.$start.' by '.
+ 	  	         $env{'user.name'}.' at '.$env{'user.domain'});
+                 return 'refused';
+             }
          }
          $mrole=$role;
      }
- Line 4773  sub modifyuser {
+ Line 5440  sub modifyuser {
      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 4820  sub modifyuser {
+ Line 5485  sub modifyuser {
      }
  # -------------------------------------------------------------- Add names, etc
      my @tmp=&get('environment',
- 		   ['firstname','middlename','lastname','generation'],
+ 		   ['firstname','middlename','lastname','generation','id',
+                     'permanentemail'],
  		   $udom,$uname);
      my %names;
      if ($tmp[0] =~ m/^error:.*/) {
- Line 4842  sub modifyuser {
+ Line 5508  sub modifyuser {
  			   $names{'critnotification'} = $email;
  			   $names{'permanentemail'} = $email; }
      }
+     if ($uid) { $names{'id'}  = $uid; }
      my $reply = &put('environment', \%names, $udom,$uname);
      if ($reply ne 'ok') { return 'error: '.$reply; }
+     my $sqlresult = &update_allusers_table($uname,$udom,\%names);
      &devalidate_cache_new('namescache',$uname.':'.$udom);
      &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '.
               $umode.', '.$first.', '.$middle.', '.
- Line 5002  sub createcourse {
+ Line 5670  sub createcourse {
     }
  # ------------------------------------------------ Check supplied server name
      $course_server = $env{'user.homeserver'} if (! defined($course_server));
-     if (! exists($libserv{$course_server})) {
+     if (! &is_library($course_server)) {
          return 'error:bad server name '.$course_server;
      }
  # ------------------------------------------------------------- Make the course
- Line 5015  sub createcourse {
+ Line 5683  sub createcourse {
      }
  # ----------------------------------------------------------------- Course made
  # log existence
-     &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description).
+     my $newcourse = {
-                  ':'.&escape($inst_code).':'.&escape($course_owner).':'.
+                     $udom.'_'.$uname => {
-                   &escape($crstype),$uhome);
+                                      description => $description,
-     &flushcourselogs();
+                                      inst_code   => $inst_code,
+                                      owner       => $course_owner,
+                                      type        => $crstype,
+                                                 },
+                     };
+     &courseidput($udom,$newcourse,$uhome,'notime');
  # set toplevel url
      my $topurl=$url;
      unless ($nonstandard) {
- Line 5048  ENDINITMAP
+ Line 5721  ENDINITMAP
  sub is_course {
      my ($cdom,$cnum) = @_;
      my %courses = &courseiddump($cdom,'.',1,'.','.',$cnum,undef,
- 				undef,'.');
+ 				undef,'.',undef,1);
      if (exists($courses{$cdom.'_'.$cnum})) {
          return 1;
      }
- Line 5113  sub is_locked {
+ Line 5786  sub is_locked {
  sub declutter_portfile {
      my ($file) = @_;
-     &logthis("got $file");
+     $file =~ s{^(/portfolio/|portfolio/)}{/};
-     $file =~ s-^(/portfolio/|portfolio/)-/-;
-     &logthis("ret $file");
      return $file;
  }
- Line 5140  sub save_selected_files {
+ Line 5811  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 5348  sub modify_access_controls {
+ Line 6019  sub modify_access_controls {
      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 {
- Line 5490  sub dirlist {
+ Line 6208  sub dirlist {
              return @listing_results;
          } elsif(!defined($alternateDirectoryRoot)) {
              my %allusers;
-             foreach my $tryserver (keys(%libserv)) {
+ 	    my %servers = &get_servers($udom,'library');
-                 if($hostdom{$tryserver} eq $udom) {
+ 	    foreach my $tryserver (keys(%servers)) {
-                     my $listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'.
+ 		my $listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'.
- 					 $udom, $tryserver);
+ 				     $udom, $tryserver);
-                     my @listing_results;
+ 		my @listing_results;
-                     if ($listing eq 'unknown_cmd') {
+ 		if ($listing eq 'unknown_cmd') {
-                         $listing = &reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.
+ 		    $listing = &reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'.
- 					  $udom, $tryserver);
+ 				      $udom, $tryserver);
-                         @listing_results = split(/:/,$listing);
+ 		    @listing_results = split(/:/,$listing);
-                     } else {
+ 		} else {
-                         @listing_results =
+ 		    @listing_results =
-                             map { &unescape($_); } split(/:/,$listing);
+ 			map { &unescape($_); } split(/:/,$listing);
-                     }
+ 		}
-                     if ($listing_results[0] ne 'no_such_dir' &&
+ 		if ($listing_results[0] ne 'no_such_dir' &&
-                         $listing_results[0] ne 'empty'       &&
+ 		    $listing_results[0] ne 'empty'       &&
-                         $listing_results[0] ne 'con_lost') {
+ 		    $listing_results[0] ne 'con_lost') {
-                         foreach my $line (@listing_results) {
+ 		    foreach my $line (@listing_results) {
-                             my ($entry) = split(/&/,$line,2);
+ 			my ($entry) = split(/&/,$line,2);
-                             $allusers{$entry} = 1;
+ 			$allusers{$entry} = 1;
-                         }
+ 		    }
-                     }
+ 		}
-                 }
              }
              my $alluserstr='';
              foreach my $user (sort(keys(%allusers))) {
- Line 5523  sub dirlist {
+ Line 6240  sub dirlist {
              return ('missing user name');
          }
      } elsif(!defined($alternateDirectoryRoot)) {
-         my $tryserver;
+         my @all_domains = sort(&all_domains());
-         my %alldom=();
+          foreach my $domain (@all_domains) {
-         foreach $tryserver (keys(%libserv)) {
+              $domain = $perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain';
-             $alldom{$hostdom{$tryserver}}=1;
+          }
-         }
+          return @all_domains;
-         my $alldomstr='';
+      } else {
-         foreach my $domain (sort(keys(%alldom))) {
-             $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain:';
-         }
-         $alldomstr=~s/:$//;
-         return split(/:/,$alldomstr);
-     } else {
          return ('missing domain');
      }
  }
- Line 5692  sub devalidatecourseresdata {
+ Line 6403  sub devalidatecourseresdata {
  # --------------------------------------------------- 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 5750  sub get_userresdata {
+ Line 6468  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 5761  sub resdata {
+ Line 6493  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 5928  sub EXT {
+ Line 6660  sub EXT {
  	    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);
- Line 5968  sub EXT {
+ Line 6706  sub EXT {
  # ----------------------------------------------------------- first, check user
  	    my $userreply=&resdata($uname,$udom,'user',
- 				       ($courselevelr,$courselevelm,
+ 				       ([$courselevelr,'resource'],
- 					$courselevel));
+ 					[$courselevelm,'map'     ],
- 	    if (defined($userreply)) { return $userreply; }
+ 					[$courselevel, 'course'  ]));
+ 	    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 $coursereply; }
+                 if (defined($coursereply)) { return &get_reply($coursereply); }
              }
  	    $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 5996  sub EXT {
+ Line 6737  sub EXT {
  		$thisparm=$parmhash{$symbparm};
  		untie(%parmhash);
  	    }
- 	    if ($thisparm) { return $thisparm; }
+ 	    if ($thisparm) { return &get_reply([$thisparm,'resource']); }
  	}
  # ------------------------------------------ fourth, look in resource metadata
- Line 6009  sub EXT {
+ Line 6750  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 6028  sub EXT {
+ Line 6770  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
- Line 6063  sub EXT {
+ Line 6804  sub EXT {
      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,$mapparm,$what);
+     my @levels = ([$symbparm,'resource'],[$mapparm,'map'],[$what,'course']);
      foreach my $group (@{$groups}) {
          foreach my $level (@levels) {
-              my $item = $courseid.'.['.$group.'].'.$level;
+              my $item = $courseid.'.['.$group.'].'.$level->[0];
-              push(@groupitems,$item);
+              push(@groupitems,[$item,$level->[1]]);
          }
      }
      my $coursereply = &resdata($env{'course.'.$courseid.'.num'},
- Line 6097  sub packages_tab_default {
+ Line 6850  sub packages_tab_default {
  	    $do_default=1;
  	} elsif ($pack_type eq 'extension') {
  	    push(@extension,[$package,$pack_type,$pack_part]);
- 	} else {
+ 	} 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]);
  	}
      }
- Line 6163  sub metadata {
+ Line 6917  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|home/$match_username/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 6185  sub metadata {
+ Line 6942  sub metadata {
  #	if (! exists($metacache{$uri})) {
  #	    $metacache{$uri}={};
  #	}
+ 	my $cachetime = 60*60;
          if ($liburi) {
  	    $liburi=&declutter($liburi);
              $filename=$liburi;
- Line 6195  sub metadata {
+ Line 6953  sub metadata {
          my %metathesekeys=();
          unless ($filename=~/\.meta$/) { $filename.='.meta'; }
  	my $metastring;
- 	if ($uri !~ m -^(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 6300  sub metadata {
+ Line 7064  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 6313  sub metadata {
+ Line 7078  sub metadata {
  	    }
  	}
  	my ($extension) = ($uri =~ /\.(\w+)$/);
+ 	$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'})) {
+ 	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; }
- Line 6356  sub metadata {
+ Line 7126  sub metadata {
  	$metaentry{':keys'} = join(',',keys(%metathesekeys));
  	&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
  	$metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
- 	&do_cache_new('meta',$uri,\%metaentry,60*60);
+ 	&do_cache_new('meta',$uri,\%metaentry,$cachetime);
  # this is the end of "was not already recently cached
      }
      return $metaentry{':'.$what};
- Line 6438  sub gettitle {
+ Line 7208  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 6815  sub getCODE {
+ Line 7588  sub getCODE {
  sub rndseed {
      my ($symb,$courseid,$domain,$username)=@_;
      my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser();
-     if (!$symb) {
+     if (!defined($symb)) {
  	unless ($symb=$wsymb) { return time; }
      }
      if (!$courseid) { $courseid=$wcourseid; }
- Line 7019  sub setup_random_from_rndseed {
+ Line 7791  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 7036  sub recunique {
+ Line 7809  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 7046  sub recprefix {
+ Line 7820  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));
  	$return.= ($cunique%$cuname+
- Line 7143  sub repcopy_userfile {
+ Line 7925  sub repcopy_userfile {
      if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; }
      my ($cdom,$cnum,$filename) =
  	($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';
- 	    return -1;
+     foreach my $part (@parts) {
- 	}
+ 	$path .= '/'.$part;
- 	my @parts = ($cdom,$cnum);
+ 	if (!-e $path) {
- 	if ($filename =~ m|^(.+)/[^/]+$|) {
+ 	    mkdir($path,0770);
- 	    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/^\///;
+     $request=new HTTP::Request('GET','http://'.&hostname(&homeserver($cnum,$cdom)).'/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';
  }
- Line 7203  sub tokenwrapper {
+ Line 7991  sub tokenwrapper {
      if ($udom && $uname && $file) {
  	$file=~s|(\?\.*)*$||;
          &appenv("userfile.$udom/$uname/$file" => $env{'request.course.id'});
-         return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri.
+         return 'http://'.&hostname(&homeserver($uname,$udom)).'/'.$uri.
                 (($uri=~/\?/)?'&':'?').'token='.$token.
                                 '&tokenissued='.$perlvar{'lonHostID'};
      } else {
- Line 7211  sub tokenwrapper {
+ Line 7999  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;
+     $uri = 'http://'.&hostname(&homeserver($cnum,$cdom)).'/raw/'.$uri;
      my $ua=new LWP::UserAgent;
      my $request=new HTTP::Request($reqtype,$uri);
      my $response=$ua->request($request);
- Line 7249  sub filelocation {
+ Line 8041  sub filelocation {
  	$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:;
- Line 7269  sub filelocation {
+ Line 8062  sub filelocation {
    	  $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 7279  sub filelocation {
+ Line 8074  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;
  }
- Line 7300  sub hreflocation {
+ Line 8101  sub hreflocation {
  	$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 @ids;
+     return;
  }
  sub additional_machine_domains {
- Line 7368  sub declutter {
+ Line 8180  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|) {
- Line 7437  sub correct_line_ends {
+ Line 8250  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");
  }
- BEGIN {
+ sub get_dns {
- # ----------------------------------- Read loncapa.conf and loncapa_apache.conf
+     my ($url,$func,$ignore_cache) = @_;
-     unless ($readit) {
+     if (!$ignore_cache) {
- {
+ 	my ($content,$cached)=
-     my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf');
+ 	    &Apache::lonnet::is_cached_new('dns',$url);
-     %perlvar = (%perlvar,%{$configvars});
+ 	if ($cached) {
- }
+ 	    &$func($content);
+ 	    return;
+ 	}
+     }
+     my %alldns;
+     open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
+     foreach my $dns (<$config>) {
+ 	next if ($dns !~ /^\^(\S*)/x);
+ 	$alldns{$1} = 1;
+     }
+     while (%alldns) {
+ 	my ($dns) = keys(%alldns);
+ 	delete($alldns{$dns});
+ 	my $ua=new LWP::UserAgent;
+ 	my $request=new HTTP::Request('GET',"http://$dns$url");
+ 	my $response=$ua->request($request);
+ 	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
  {
-     %domaindescription = ();
+     my $loaded;
-     %domain_auth_def = ();
+     my %domain;
-     %domain_auth_arg_def = ();
-     my $fh;
+     sub parse_domain_tab {
-     if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) {
+ 	my ($lines) = @_;
- 	while (my $line = <$fh>) {
+ 	foreach my $line (@$lines) {
-            next if ($line =~ /^(\#|\s*$)/);
+ 	    next if ($line =~ /^(\#|\s*$ )/x);
- #           next if /^\#/;
-            chomp $line;
+ 	    chomp($line);
-            my ($domain, $domain_description, $def_auth, $def_auth_arg,
+ 	    my ($name,@elements) = split(/:/,$line,9);
- 	       $def_lang, $city, $longi, $lati, $primary) = split(/:/,$line,9);
+ 	    my %this_domain;
- 	   $domain_auth_def{$domain}=$def_auth;
+ 	    foreach my $field ('description', 'auth_def', 'auth_arg_def',
-            $domain_auth_arg_def{$domain}=$def_auth_arg;
+ 			       'lang_def', 'city', 'longi', 'lati',
- 	   $domaindescription{$domain}=$domain_description;
+ 			       'primary') {
- 	   $domain_lang_def{$domain}=$def_lang;
+ 		$this_domain{$field} = shift(@elements);
- 	   $domain_city{$domain}=$city;
+ 	    }
- 	   $domain_longi{$domain}=$longi;
+ 	    $domain{$name} = \%this_domain;
- 	   $domain_lati{$domain}=$lati;
+ 	}
-            $domain_primary{$domain}=$primary;
+     }
+     sub reset_domain_info {
+ 	undef($loaded);
+ 	undef(%domain);
+     }
+     sub load_domain_tab {
+ 	my ($ignore_cache) = @_;
+ 	&get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache);
+ 	my $fh;
+ 	if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) {
+ 	    my @lines = <$fh>;
+ 	    &parse_domain_tab(\@lines);
+ 	}
+ 	close($fh);
+ 	$loaded = 1;
+     }
+     sub domain {
+ 	&load_domain_tab() if (!$loaded);
-  #         &logthis("Domain.tab: $domain, $domain_auth_def{$domain}, $domain_auth_arg_def{$domain},$domaindescription{$domain}");
+ 	my ($name,$what) = @_;
- #          &logthis("Domain.tab: $domain ".$domaindescription{$domain} );
+ 	return if ( !exists($domain{$name}) );
+ 	if (!$what) {
+ 	    return $domain{$name}{'description'};
  	}
+ 	return $domain{$name}{$what};
      }
-     close ($fh);
  }
  # ------------------------------------------------------------- Read hosts file
  {
-     open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
+     my %hostname;
+     my %hostdom;
+     my %libserv;
+     my $loaded;
+     my %name_to_host;
+     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)=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; }
+ 	    }
+ 	}
+     }
+     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 is_library {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return exists($libserv{$_[0]});
+     }
+     sub all_library {
+ 	&load_hosts_tab() if (!$loaded);
+ 	return %libserv;
+     }
+     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 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;
      }
-     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;
  }
+ 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 7866  X<userenvironment()>
+ Line 8907  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 7893  and course level
+ Line 8944  and course level
  plaintext($short) : return value in %prp hash (rolesplain.tab); plain text
  explanation of a user role term
+ =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
  =head2 User Modification
- Line 8035  setting for a specific $type, where $typ
+ Line 9102  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 8316  critical subroutine
+ Line 9391  critical subroutine
  =item *
- get_dom($namespace,$storearr,$udomain) : returns hash with keys from array
+ get_dom($namespace,$storearr,$udom,$uhome) : returns hash with keys from
- reference filled in from namespace found in domain level on primary domain server ($udomain is optional)
+ 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,$udomain) :  stores hash in namespace at domain level on primary domain server ($udomain is optional)
+ 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
- Line 8714  symblist($mapname,%newhash) : update sym
+ Line 9804  symblist($mapname,%newhash) : update sym
  =back
  =cut

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

Removed from v.1.824.2.3
changed lines
	Added in v.1.944