--- loncom/lonnet/perl/lonnet.pm	2017/11/01 03:29:37	1.1172.2.93.4.5
+++ loncom/lonnet/perl/lonnet.pm	2015/05/21 23:10:57	1.1286
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.93.4.5 2017/11/01 03:29:37 raeburn Exp $
+# $Id: lonnet.pm,v 1.1286 2015/05/21 23:10:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,6 +75,9 @@ use LWP::UserAgent();
 use HTTP::Date;
 use Image::Magick;
 
+
+use Encode;
+
 use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
             %managerstab);
@@ -89,7 +92,7 @@ use GDBM_File;
 use HTML::LCParser;
 use Fcntl qw(:flock);
 use Storable qw(thaw nfreeze);
-use Time::HiRes qw( sleep gettimeofday tv_interval );
+use Time::HiRes qw( gettimeofday tv_interval );
 use Cache::Memcached;
 use Digest::MD5;
 use Math::Random;
@@ -102,13 +105,14 @@ use LONCAPA::Lond;
 use File::Copy;
 
 my $readit;
-my $max_connection_retries = 20;     # Or some such value.
+my $max_connection_retries = 10;     # Or some such value.
 
 require Exporter;
 
 our @ISA = qw (Exporter);
 our @EXPORT = qw(%env);
 
+
 # ------------------------------------ Logging (parameters, docs, slots, roles)
 {
     my $logid;
@@ -123,19 +127,19 @@ our @EXPORT = qw(%env);
 	$logid ++;
         my $now = time();
 	my $id=$now.'00000'.$$.'00000'.$logid;
-        my $logentry = {
-                         $id => {
-                                  'exe_uname' => $env{'user.name'},
-                                  'exe_udom'  => $env{'user.domain'},
-                                  'exe_time'  => $now,
-                                  'exe_ip'    => $ENV{'REMOTE_ADDR'},
-                                  'delflag'   => $delflag,
-                                  'logentry'  => $storehash,
-                                  'uname'     => $uname,
-                                  'udom'      => $udom,
-                                }
+        my $logentry = { 
+                          $id => {
+                                   'exe_uname' => $env{'user.name'},
+                                   'exe_udom'  => $env{'user.domain'},
+                                   'exe_time'  => $now,
+                                   'exe_ip'    => $ENV{'REMOTE_ADDR'},
+                                   'delflag'   => $delflag,
+                                   'logentry'  => $storehash,
+                                   'uname'     => $uname,
+                                   'udom'      => $udom,
+                                  }
                        };
-        return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
+	return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
     }
 }
 
@@ -356,7 +360,8 @@ sub remote_devalidate_cache {
     my $items;
     return unless (ref($cachekeys) eq 'ARRAY');
     my $cachestr = join('&',@{$cachekeys});
-    return &reply('devalidatecache:'.&escape($cachestr),$lonhost);
+    my $response = &reply('devalidatecache:'.&escape($cachestr),$lonhost);
+    return $response;
 }
 
 # -------------------------------------------------- Non-critical communication
@@ -370,7 +375,7 @@ sub subreply {
 
     my $lockfile=$peerfile.".lock";
     while (-e $lockfile) {	# Need to wait for the lockfile to disappear.
-	sleep(0.1);
+	sleep(1);
     }
     # At this point, either a loncnew parent is listening or an old lonc
     # or loncnew child is listening so we can connect or everything's dead.
@@ -388,7 +393,7 @@ sub subreply {
 	} else {
 	    &create_connection(&hostname($server),$server);
 	}
-        sleep(0.1);		# Try again later if failed connection.
+        sleep(1);		# Try again later if failed connection.
     }
     my $answer;
     if ($client) {
@@ -417,8 +422,8 @@ sub reply {
 
 sub reconlonc {
     my ($lonid) = @_;
+    my $hostname = &hostname($lonid);
     if ($lonid) {
-        my $hostname = &hostname($lonid);
 	my $peerfile="$perlvar{'lonSockDir'}/$hostname";
 	if ($hostname && -e $peerfile) {
 	    &logthis("Trying to reconnect lonc for $lonid ($hostname)");
@@ -464,7 +469,7 @@ sub critical {
     }
     my $answer=reply($cmd,$server);
     if ($answer eq 'con_lost') {
-	&reconlonc($server);
+	&reconlonc("$perlvar{'lonSockDir'}/$server");
 	my $answer=reply($cmd,$server);
         if ($answer eq 'con_lost') {
             my $now=time;
@@ -481,7 +486,7 @@ sub critical {
 		    close($dfh);
 		}
             }
-            sleep 1;
+            sleep 2;
             my $wcmd='';
             {
 		my $dfh;
@@ -601,7 +606,7 @@ sub transfer_profile_to_env {
 
 # ---------------------------------------------------- Check for valid session 
 sub check_for_valid_session {
-    my ($r,$name,$userhashref,$domref) = @_;
+    my ($r,$name,$userhashref) = @_;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     if ($name eq '') {
         $name = 'lonID';
@@ -616,16 +621,7 @@ sub check_for_valid_session {
     } else {
         $lonidsdir=$r->dir_config('lonIDsDir');
     }
-    if (!-e "$lonidsdir/$handle.id") {
-        if ((ref($domref)) && ($name eq 'lonID') &&
-            ($handle =~ /^($match_username)\_\d+\_($match_domain)\_(.+)$/)) {
-            my ($possuname,$possudom,$possuhome) = ($1,$2,$3);
-            if ((&domain($possudom) ne '') && (&homeserver($possuname,$possudom) eq $possuhome)) {
-                $$domref = $possudom;
-            }
-        }
-        return undef;
-    }
+    return undef if (!-e "$lonidsdir/$handle.id");
 
     my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id");
     return undef if (!$opened);
@@ -979,12 +975,12 @@ sub choose_server {
         }
     }
     foreach my $lonhost (keys(%servers)) {
-        my $loginvia;
         if ($skiploadbal) {
             if (ref($balancers) eq 'HASH') {
                 next if (exists($balancers->{$lonhost}));
             }
-        }
+        }   
+        my $loginvia;
         if ($checkloginvia) {
             $loginvia = $domconfhash{$udom.'.login.loginvia_'.$lonhost};
             if ($loginvia) {
@@ -1011,7 +1007,7 @@ sub choose_server {
     if ($login_host ne '') {
         $hostname = &hostname($login_host);
     }
-    return ($login_host,$hostname,$portal_path,$isredirect,$lowest_load);
+    return ($login_host,$hostname,$portal_path,$isredirect);
 }
 
 # --------------------------------------------- Try to change a user's password
@@ -1283,7 +1279,7 @@ sub get_lonbalancer_config {
 }
 
 sub check_loadbalancing {
-    my ($uname,$udom,$caller) = @_;
+    my ($uname,$udom) = @_;
     my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom,
         $rule_in_effect,$offloadto,$otherserver);
     my $lonhost = $perlvar{'lonHostID'};
@@ -1292,7 +1288,7 @@ sub check_loadbalancing {
     my $uintdom = &Apache::lonnet::internet_dom($uprimary_id);
     my $intdom = &Apache::lonnet::internet_dom($lonhost);
     my $serverhomedom = &host_domain($lonhost);
-    my $domneedscache; 
+
     my $cachetime = 60*60*24;
 
     if (($uintdom ne '') && ($uintdom eq $intdom)) {
@@ -1307,12 +1303,10 @@ sub check_loadbalancing {
             &Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use);
         if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
             $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
-        } else {
-            $domneedscache = $dom_in_use;
         }
     }
     if (ref($result) eq 'HASH') {
-        ($is_balancer,$currtargets,$currrules) =
+        ($is_balancer,$currtargets,$currrules) = 
             &check_balancer_result($result,@hosts);
         if ($is_balancer) {
             if (ref($currrules) eq 'HASH') {
@@ -1367,13 +1361,11 @@ sub check_loadbalancing {
             my %domconfig =
                 &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
             if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
-                $result = &do_cache_new('loadbalancing',$serverhomedom,$domconfig{'loadbalancing'},$cachetime);
-            } else {
-                $domneedscache = $serverhomedom;
+                $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
             }
         }
         if (ref($result) eq 'HASH') {
-            ($is_balancer,$currtargets,$currrules) =
+            ($is_balancer,$currtargets,$currrules) = 
                 &check_balancer_result($result,@hosts);
             if ($is_balancer) {
                 if (ref($currrules) eq 'HASH') {
@@ -1389,21 +1381,12 @@ sub check_loadbalancing {
                 $is_balancer = 1;
                 $offloadto = &this_host_spares($dom_in_use);
             }
-            unless (defined($cached)) {
-                $domneedscache = $serverhomedom;
-            }
         }
     } else {
         if ($perlvar{'lonBalancer'} eq 'yes') {
             $is_balancer = 1;
             $offloadto = &this_host_spares($dom_in_use);
         }
-        unless (defined($cached)) {
-            $domneedscache = $serverhomedom;
-        }
-    }
-    if ($domneedscache) {
-        &do_cache_new('loadbalancing',$domneedscache,$is_balancer,$cachetime);
     }
     if ($is_balancer) {
         my $lowest_load = 30000;
@@ -1434,15 +1417,13 @@ sub check_loadbalancing {
                 }
             }
         }
-        unless ($caller eq 'login') {
-            if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) {
-                $is_balancer = 0;
-                if ($uname ne '' && $udom ne '') {
-                    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
-
-                        &appenv({'user.loadbalexempt'     => $lonhost,
-                                 'user.loadbalcheck.time' => time});
-                    }
+        if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) {
+            $is_balancer = 0;
+            if ($uname ne '' && $udom ne '') {
+                if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
+                    
+                    &appenv({'user.loadbalexempt'     => $lonhost,  
+                             'user.loadbalcheck.time' => time});
                 }
             }
         }
@@ -1578,7 +1559,7 @@ sub idget {
     
     my %servers = &get_servers($udom,'library');
     foreach my $tryserver (keys(%servers)) {
-	my $idlist=join('&', map { &escape($_); } @ids);
+	my $idlist=join('&',@ids);
 	$idlist=~tr/A-Z/a-z/; 
 	my $reply=&reply("idget:$udom:".$idlist,$tryserver);
 	my @answer=();
@@ -1588,7 +1569,7 @@ sub idget {
 	my $i;
 	for ($i=0;$i<=$#ids;$i++) {
 	    if ($answer[$i]) {
-		$returnhash{$ids[$i]}=&unescape($answer[$i]);
+		$returnhash{$ids[$i]}=$answer[$i];
 	    } 
 	}
     } 
@@ -1630,7 +1611,7 @@ sub idput {
     }
 }
 
-# ---------------------------------------- Delete unwanted IDs from ids.db file
+# ---------------------------------------- Delete unwanted IDs from ids.db file 
 
 sub iddel {
     my ($udom,$idshashref,$uhome)=@_;
@@ -1697,12 +1678,7 @@ sub get_dom {
         }
     }
     if ($udom && $uhome && ($uhome ne 'no_host')) {
-        my $rep;
-        if ($namespace =~ /^enc/) {
-            $rep=&reply("encrypt:egetdom:$udom:$namespace:$items",$uhome);
-        } else {
-            $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
-        }
+        my $rep=&reply("getdom:$udom:$namespace:$items",$uhome);
         my %returnhash;
         if ($rep eq '' || $rep =~ /^error: 2 /) {
             return %returnhash;
@@ -1746,11 +1722,7 @@ sub put_dom {
             $items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&';
         }
         $items=~s/\&$//;
-        if ($namespace =~ /^enc/) {
-            return &reply("encrypt:putdom:$udom:$namespace:$items",$uhome);
-        } else {
-            return &reply("putdom:$udom:$namespace:$items",$uhome);
-        }
+        return &reply("putdom:$udom:$namespace:$items",$uhome);
     } else {
         &logthis("put_dom failed - no homeserver and/or domain");
     }
@@ -1826,7 +1798,7 @@ sub retrieve_inst_usertypes {
 
 sub is_domainimage {
     my ($url) = @_;
-    if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+[^/]-) {
+    if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+-) {
         if (&domain($1) ne '') {
             return '1';
         }
@@ -1841,24 +1813,13 @@ sub inst_directory_query {
     my $homeserver = &domain($udom,'primary');
     my $outcome;
     if ($homeserver ne '') {
-        unless ($homeserver eq $perlvar{'lonHostID'}) {
-            if ($srch->{'srchby'} eq 'email') {
-                my $lcrev = &get_server_loncaparev(undef,$homeserver);
-                my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.([\w.\-]+)\'?$/);
-                if (($major eq '' && $minor eq '') || ($major < 2) ||
-                    (($major == 2) && ($minor < 11)) || 
-                    (($major == 2) && ($minor == 11) && ($subver !~ /^2\.B/))) {
-                    return;
-                }
-            }
-        }
 	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('institutional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.' in domain '.$udom);
+	    &logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom);
 	    return;
 	}
 	my $response = &get_query_reply($queryid);
@@ -1893,15 +1854,6 @@ sub usersearch {
     my $query = 'usersearch';
     foreach my $tryserver (keys(%libserv)) {
         if (&host_domain($tryserver) eq $dom) {
-            unless ($tryserver eq $perlvar{'lonHostID'}) {
-                if ($srch->{'srchby'} eq 'email') {
-                    my $lcrev = &get_server_loncaparev(undef,$tryserver);
-                    my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.([\w.\-]+)\'?$/);
-                    next if (($major eq '' && $minor eq '') || ($major < 2) ||
-                             (($major == 2) && ($minor < 11)) || 
-                             (($major == 2) && ($minor == 11) && ($subver !~ /^2\.B/))) {
-                }
-            }
             my $host=&hostname($tryserver);
             my $queryid=
                 &reply("querysend:".&escape($query).':'.
@@ -1987,63 +1939,6 @@ sub get_instuser {
     return ($outcome,%userinfo);
 }
 
-sub get_multiple_instusers {
-    my ($udom,$users,$caller) = @_;
-    my ($outcome,$results);
-    if (ref($users) eq 'HASH') {
-        my $count = keys(%{$users});
-        my $requested = &freeze_escape($users);
-        my $homeserver = &domain($udom,'primary');
-        if ($homeserver ne '') {
-            my $queryid=&reply('querysend:getmultinstusers:::'.$caller.'='.$requested,$homeserver);
-            my $host=&hostname($homeserver);
-            if ($queryid !~/^\Q$host\E\_/) {
-                &logthis('get_multiple_instusers invalid queryid: '.$queryid.
-                         ' for host: '.$homeserver.'in domain '.$udom);
-                return ($outcome,$results);
-            }
-            my $response = &get_query_reply($queryid);
-            my $maxtries = 5;
-            if ($count > 100) {
-                $maxtries = 1+int($count/20);
-            }
-            my $tries = 1;
-            while (($response=~/^timeout/) && ($tries <= $maxtries)) {
-                $response = &get_query_reply($queryid);
-                $tries ++;
-            }
-            if ($response eq '') {
-                $results = {};
-                foreach my $key (keys(%{$users})) {
-                    my ($uname,$id);
-                    if ($caller eq 'id') {
-                        $id = $key;
-                    } else {
-                        $uname = $key;
-                    }
-                    my ($resp,%info) = &get_instuser($udom,$uname,$id);
-                    $outcome = $resp;
-                    if ($resp eq 'ok') {
-                        %{$results} = (%{$results}, %info);
-                    } else {
-                        last;
-                    }
-                }
-            } elsif(!&error($response) && ($response ne 'refused')) {
-                if (($response eq 'unavailable') || ($response eq 'invalid') || ($response eq 'timeout')) {
-                    $outcome = $response;
-                } else {
-                    ($outcome,my $userdata) = split(/=/,$response,2);
-                    if ($outcome eq 'ok') {
-                        $results = &thaw_unescape($userdata);
-                    }
-                }
-            }
-        }
-    }
-    return ($outcome,$results);
-}
-
 sub inst_rulecheck {
     my ($udom,$uname,$id,$item,$rules) = @_;
     my %returnhash;
@@ -2140,8 +2035,7 @@ sub get_domain_defaults {
                                   'requestcourses','inststatus',
                                   'coursedefaults','usersessions',
                                   'requestauthor','selfenrollment',
-                                  'coursecategories','autoenroll',
-                                  'helpsettings'],$domain);
+                                  'coursecategories'],$domain);
     my @coursetypes = ('official','unofficial','community','textbook');
     if (ref($domconfig{'defaults'}) eq 'HASH') {
         $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; 
@@ -2150,9 +2044,6 @@ sub get_domain_defaults {
         $domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'};
         $domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'};
         $domdefaults{'portal_def'} = $domconfig{'defaults'}{'portal_def'};
-        $domdefaults{'intauth_cost'} = $domconfig{'defaults'}{'intauth_cost'};
-        $domdefaults{'intauth_switch'} = $domconfig{'defaults'}{'intauth_switch'};
-        $domdefaults{'intauth_check'} = $domconfig{'defaults'}{'intauth_check'};
     } else {
         $domdefaults{'lang_def'} = &domain($domain,'lang_def');
         $domdefaults{'auth_def'} = &domain($domain,'auth_def');
@@ -2188,6 +2079,7 @@ sub get_domain_defaults {
         }
     }
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+        $domdefaults{'canuse_pdfforms'} = $domconfig{'coursedefaults'}{'canuse_pdfforms'};
         $domdefaults{'usejsme'} = $domconfig{'coursedefaults'}{'usejsme'};
         $domdefaults{'uselcmath'} = $domconfig{'coursedefaults'}{'uselcmath'};
         if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
@@ -2204,8 +2096,8 @@ sub get_domain_defaults {
             }
             if ($domdefaults{'postsubmit'} eq 'on') {
                 if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
-                    $domdefaults{$type.'postsubtimeout'} =
-                        $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
+                    $domdefaults{$type.'postsubtimeout'} = 
+                        $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; 
                 }
             }
         }
@@ -2262,42 +2154,17 @@ sub get_domain_defaults {
     if (ref($domconfig{'coursecategories'}) eq 'HASH') {
         $domdefaults{'catauth'} = 'std';
         $domdefaults{'catunauth'} = 'std';
-        if ($domconfig{'coursecategories'}{'auth'}) {
+        if ($domconfig{'coursecategories'}{'auth'}) { 
             $domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'};
         }
         if ($domconfig{'coursecategories'}{'unauth'}) {
             $domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'};
         }
     }
-    if (ref($domconfig{'autoenroll'}) eq 'HASH') {
-        $domdefaults{'autofailsafe'} = $domconfig{'autoenroll'}{'autofailsafe'};
-    }
-    if (ref($domconfig{'helpsettings'}) eq 'HASH') {
-        $domdefaults{'submitbugs'} = $domconfig{'helpsettings'}{'submitbugs'};
-        if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') {
-            $domdefaults{'adhocroles'} = $domconfig{'helpsettings'}{'adhoc'};
-        }
-    }
     &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
     return %domdefaults;
 }
 
-sub course_portal_url {
-    my ($cnum,$cdom) = @_;
-    my $chome = &homeserver($cnum,$cdom);
-    my $hostname = &hostname($chome);
-    my $protocol = $protocol{$chome};
-    $protocol = 'http' if ($protocol ne 'https');
-    my %domdefaults = &get_domain_defaults($cdom);
-    my $firsturl;
-    if ($domdefaults{'portal_def'}) {
-        $firsturl = $domdefaults{'portal_def'};
-    } else {
-        $firsturl = $protocol.'://'.$hostname;
-    }
-    return $firsturl;
-}
-
 # --------------------------------------------------- Assign a key to a student
 
 sub assign_access_key {
@@ -2534,25 +2401,21 @@ sub make_key {
 sub devalidate_cache_new {
     my ($name,$id,$debug) = @_;
     if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); }
-    my $remembered_id=$name.':'.$id;
     $id=&make_key($name,$id);
     $memcache->delete($id);
-    delete($remembered{$remembered_id});
-    delete($accessed{$remembered_id});
+    delete($remembered{$id});
+    delete($accessed{$id});
 }
 
 sub is_cached_new {
     my ($name,$id,$debug) = @_;
-    my $remembered_id=$name.':'.$id; # this is to avoid make_key (which is slow) for 
-                                     # keys in %remembered hash, which persists for
-                                     # duration of request (no restriction on key length).
-    if (exists($remembered{$remembered_id})) {
-	if ($debug) { &Apache::lonnet::logthis("Early return $remembered_id of $remembered{$remembered_id} "); }
-	$accessed{$remembered_id}=[&gettimeofday()];
+    $id=&make_key($name,$id);
+    if (exists($remembered{$id})) {
+	if ($debug) { &Apache::lonnet::logthis("Early return $id of $remembered{$id} "); }
+	$accessed{$id}=[&gettimeofday()];
 	$hits++;
-	return ($remembered{$remembered_id},1);
+	return ($remembered{$id},1);
     }
-    $id=&make_key($name,$id);
     my $value = $memcache->get($id);
     if (!(defined($value))) {
 	if ($debug) { &Apache::lonnet::logthis("getting $id is not defined"); }
@@ -2562,14 +2425,13 @@ sub is_cached_new {
 	if ($debug) { &Apache::lonnet::logthis("getting $id is __undef__"); }
 	$value=undef;
     }
-    &make_room($remembered_id,$value,$debug);
+    &make_room($id,$value,$debug);
     if ($debug) { &Apache::lonnet::logthis("getting $id is $value"); }
     return ($value,1);
 }
 
 sub do_cache_new {
     my ($name,$id,$value,$time,$debug) = @_;
-    my $remembered_id=$name.':'.$id;
     $id=&make_key($name,$id);
     my $setvalue=$value;
     if (!defined($setvalue)) {
@@ -2585,17 +2447,17 @@ sub do_cache_new {
 	$memcache->disconnect_all();
     }
     # need to make a copy of $value
-    &make_room($remembered_id,$value,$debug);
+    &make_room($id,$value,$debug);
     return $value;
 }
 
 sub make_room {
-    my ($remembered_id,$value,$debug)=@_;
+    my ($id,$value,$debug)=@_;
 
-    $remembered{$remembered_id}= (ref($value)) ? &Storable::dclone($value)
+    $remembered{$id}= (ref($value)) ? &Storable::dclone($value)
                                     : $value;
     if ($to_remember<0) { return; }
-    $accessed{$remembered_id}=[&gettimeofday()];
+    $accessed{$id}=[&gettimeofday()];
     if (scalar(keys(%remembered)) <= $to_remember) { return; }
     my $to_kick;
     my $max_time=0;
@@ -2889,11 +2751,11 @@ sub ssi {
     &Apache::lonenc::check_encrypt(\$fn);
     if (%form) {
       $request=new HTTP::Request('POST',&absolute_url().$fn);
-      $request->content(join('&',map {
+      $request->content(join('&',map { 
             my $name = escape($_);
-            "$name=" . ( ref($form{$_}) eq 'ARRAY'
-            ? join("&$name=", map {escape($_) } @{$form{$_}})
-            : &escape($form{$_}) );
+            "$name=" . ( ref($form{$_}) eq 'ARRAY' 
+            ? join("&$name=", map {escape($_) } @{$form{$_}}) 
+            : &escape($form{$_}) );    
         } keys(%form)));
     } else {
       $request=new HTTP::Request('GET',&absolute_url().$fn);
@@ -2901,10 +2763,13 @@ sub ssi {
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
     my $response= $ua->request($request);
+    my $content = $response->content;
+
+
     if (wantarray) {
-	return ($response->content, $response);
+	return ($content, $response);
     } else {
-	return $response->content;
+	return $content;
     }
 }
 
@@ -2936,7 +2801,7 @@ sub allowuploaded {
 #
 # Determine if the current user should be able to edit a particular resource,
 # when viewing in course context.
-# (a) When viewing resource used to determine if "Edit" item is included in
+# (a) When viewing resource used to determine if "Edit" item is included in 
 #     Functions.
 # (b) When displaying folder contents in course editor, used to determine if
 #     "Edit" link will be displayed alongside resource.
@@ -2944,12 +2809,12 @@ sub allowuploaded {
 #  input: six args -- filename (decluttered), course number, course domain,
 #                   url, symb (if registered) and group (if this is a group
 #                   item -- e.g., bulletin board, group page etc.).
-#  output: array of five scalars --
+#  output: array of five scalars -- 
 #          $cfile -- url for file editing if editable on current server
 #          $home -- homeserver of resource (i.e., for author if published,
 #                                           or course if uploaded.).
 #          $switchserver --  1 if server switch will be needed.
-#          $forceedit -- 1 if icon/link should be to go to edit mode
+#          $forceedit -- 1 if icon/link should be to go to edit mode 
 #          $forceview -- 1 if icon/link should be to go to view mode
 #
 
@@ -3038,7 +2903,7 @@ sub can_edit_resource {
                     $forceedit = 1;
                 }
                 $cfile = $resurl;
-            } elsif (($resurl ne '') && (&is_on_map($resurl))) {
+            } elsif (($resurl ne '') && (&is_on_map($resurl))) { 
                 if ($resurl =~ m{^/adm/$match_domain/$match_username/\d+/smppg|bulletinboard$}) {
                     $incourse = 1;
                     if ($env{'form.forceedit'}) {
@@ -3058,14 +2923,6 @@ sub can_edit_resource {
                         $forceedit = 1;
                     }
                     $cfile = $resurl;
-                } elsif ($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) {
-                    $incourse = 1;
-                    if ($env{'form.forceedit'}) {
-                        $forceview = 1;
-                    } else {
-                        $forceedit = 1;
-                    }
-                    $cfile = $resurl;
                 } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
                     $incourse = 1;
                     if ($env{'form.forceedit'}) {
@@ -3077,7 +2934,7 @@ sub can_edit_resource {
                 }
             } elsif ($resurl eq '/res/lib/templates/simpleproblem.problem/smpedit') {
                 my $template = '/res/lib/templates/simpleproblem.problem';
-                if (&is_on_map($template)) {
+                if (&is_on_map($template)) { 
                     $incourse = 1;
                     $forceview = 1;
                     $cfile = $template;
@@ -3090,14 +2947,6 @@ sub can_edit_resource {
                         $forceedit = 1;
                     }
                     $cfile = $resurl;
-            } elsif (($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) && ($env{'form.folderpath'} =~ /^supplemental/)) {
-                $incourse = 1;
-                if ($env{'form.forceedit'}) {
-                    $forceview = 1;
-                } else {
-                    $forceedit = 1;
-                }
-                $cfile = $resurl;
             } elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) {
                 $incourse = 1;
                 $forceview = 1;
@@ -3107,13 +2956,8 @@ sub can_edit_resource {
                     $cfile = &clutter($res);
                 } else {
                     $cfile = $env{'form.suppurl'};
-                    my $escfile = &unescape($cfile);
-                    if ($escfile =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
-                        $cfile = '/adm/wrapper'.$escfile;
-                    } else {
-                        $escfile =~ s{^http://}{};
-                        $cfile = &escape("/adm/wrapper/ext/$escfile");
-                    }
+                    $cfile =~ s{^http://}{};
+                    $cfile = '/adm/wrapper/ext/'.$cfile;
                 }
             } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
                 if ($env{'form.forceedit'}) {
@@ -3137,7 +2981,7 @@ sub can_edit_resource {
                 $cfile=$file;
             }
         }
-        if (($cfile ne '') && (!$incourse || $uploaded) &&
+        if (($cfile ne '') && (!$incourse || $uploaded) && 
             (($home ne '') && ($home ne 'no_host'))) {
             my @ids=&current_machine_ids();
             unless (grep(/^\Q$home\E$/,@ids)) {
@@ -3164,9 +3008,9 @@ sub in_course {
     if ($hideprivileged) {
         my $skipuser;
         my %coursehash = &coursedescription($cdom.'_'.$cnum);
-        my @possdoms = ($cdom);
-        if ($coursehash{'checkforpriv'}) {
-            push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
+        my @possdoms = ($cdom);  
+        if ($coursehash{'checkforpriv'}) { 
+            push(@possdoms,split(/,/,$coursehash{'checkforpriv'})); 
         }
         if (&privileged($uname,$udom,\@possdoms)) {
             $skipuser = 1;
@@ -3443,12 +3287,12 @@ sub userfileupload {
                          '_'.$env{'user.domain'}.'/pending';
         } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) {
             my ($docuname,$docudom);
-            if ($destudom =~ /^$match_domain$/) {
+            if ($destudom) {
                 $docudom = $destudom;
             } else {
                 $docudom = $env{'user.domain'};
             }
-            if ($destuname =~ /^$match_username$/) {
+            if ($destuname) {
                 $docuname = $destuname;
             } else {
                 $docuname = $env{'user.name'};
@@ -3670,7 +3514,7 @@ sub extract_embedded_items {
 	    }
 	    if (lc($tagname) eq 'a') {
                 unless (($attr->{'href'} =~ /^#/) || ($attr->{'href'} eq '')) {
-		    &add_filetype($allfiles,$attr->{'href'},'href');
+                    &add_filetype($allfiles,$attr->{'href'},'href');
                 }
 	    }
             if (lc($tagname) eq 'script') {
@@ -3995,7 +3839,7 @@ sub flushcourselogs {
         }
     }
 #
-# Reverse lookup of domain roles (dc, ad, li, sc, dh, da, au)
+# Reverse lookup of domain roles (dc, ad, li, sc, au)
 #
     my %domrolebuffer = ();
     foreach my $entry (keys(%domainrolehash)) {
@@ -4010,19 +3854,10 @@ sub flushcourselogs {
         delete $domainrolehash{$entry};
     }
     foreach my $dom (keys(%domrolebuffer)) {
-        my %servers;
-        if (defined(&domain($dom,'primary'))) {
-            my $primary=&domain($dom,'primary');
-            my $hostname=&hostname($primary);
-            $servers{$primary} = $hostname;
-        } else {
-            %servers = &get_servers($dom,'library');
-        }
+	my %servers = &get_servers($dom,'library');
 	foreach my $tryserver (keys(%servers)) {
-	    if (&reply('domroleput:'.$dom.':'.
-	               $domrolebuffer{$dom},$tryserver) eq 'ok') {
-	        last;
-	    } else {
+	    unless (&reply('domroleput:'.$dom.':'.
+			   $domrolebuffer{$dom},$tryserver) eq 'ok') {
 		&logthis('Put of domain roles failed for '.$dom.' and  '.$tryserver);
 	    }
         }
@@ -4142,7 +3977,7 @@ sub userrolelog {
          {$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'}
                     =$tend.':'.$tstart;
     }
-    if ($trole =~ /^(dc|ad|li|au|dg|sc|dh|da)/ ) {
+    if ($trole =~ /^(dc|ad|li|au|dg|sc)/ ) {
        my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
        $domainrolehash
          {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
@@ -4350,7 +4185,7 @@ sub get_my_roles {
             } else {
                 my $possdoms = [$domain];
                 if (ref($roledoms) eq 'ARRAY') {
-                   push(@{$possdoms},@{$roledoms});
+                   push(@{$possdoms},@{$roledoms}); 
                 }
                 if (&privileged($username,$domain,$possdoms,\@privroles)) {
                     if (!$nothide{$username.':'.$domain}) {
@@ -4369,195 +4204,6 @@ sub get_my_roles {
     return %returnhash;
 }
 
-sub get_all_adhocroles {
-    my ($dom) = @_;
-    my @roles_by_num = ();
-    my %domdefaults = &get_domain_defaults($dom);
-    my (%description,%access_in_dom,%access_info);
-    if (ref($domdefaults{'adhocroles'}) eq 'HASH') {
-        my $count = 0;
-        my %domcurrent = %{$domdefaults{'adhocroles'}};
-        my %ordered;
-        foreach my $role (sort(keys(%domcurrent))) {
-            my ($order,$desc,$access_in_dom);
-            if (ref($domcurrent{$role}) eq 'HASH') {
-                $order = $domcurrent{$role}{'order'};
-                $desc = $domcurrent{$role}{'desc'};
-                $access_in_dom{$role} = $domcurrent{$role}{'access'};
-                $access_info{$role} = $domcurrent{$role}{$access_in_dom{$role}};
-            }
-            if ($order eq '') {
-                $order = $count;
-            }
-            $ordered{$order} = $role;
-            if ($desc ne '') {
-                $description{$role} = $desc;
-            } else {
-                $description{$role}= $role;
-            }
-            $count++;
-        }
-        foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
-            push(@roles_by_num,$ordered{$item});
-        }
-    }
-    return (\@roles_by_num,\%description,\%access_in_dom,\%access_info);
-}
-
-sub get_my_adhocroles {
-    my ($cid,$checkreg) = @_;
-    my ($cdom,$cnum,%info,@possroles,$description,$roles_by_num);
-    if ($env{'request.course.id'} eq $cid) {
-        $cdom = $env{'course.'.$cid.'.domain'};
-        $cnum = $env{'course.'.$cid.'.num'};
-        $info{'internal.coursecode'} = $env{'course.'.$cid.'.internal.coursecode'};
-    } elsif ($cid =~ /^($match_domain)_($match_courseid)$/) {
-        $cdom = $1;
-        $cnum = $2;
-        %info = &Apache::lonnet::get('environment',['internal.coursecode'],
-                                     $cdom,$cnum);
-    }
-    if (($info{'internal.coursecode'} ne '') && ($checkreg)) {
-        my $user = $env{'user.name'}.':'.$env{'user.domain'};
-        my %rosterhash = &get('classlist',[$user],$cdom,$cnum);
-        if ($rosterhash{$user} ne '') {
-            my $type = (split(/:/,$rosterhash{$user}))[5];
-            return ([],{}) if ($type eq 'auto');
-        }
-    }
-    if (($cdom ne '') && ($cnum ne ''))  {
-        if (($env{"user.role.dh./$cdom/"}) || ($env{"user.role.da./$cdom/"})) {
-            my $then=$env{'user.login.time'};
-            my $update=$env{'user.update.time'};
-            if (!$update) {
-                $update = $then;
-            }
-            my @liveroles;
-            foreach my $role ('dh','da') {
-                if ($env{"user.role.$role./$cdom/"}) {
-                    my ($tstart,$tend)=split(/\./,$env{"user.role.$role./$cdom/"});
-                    my $limit = $update;
-                    if ($env{'request.role'} eq "$role./$cdom/") {
-                        $limit = $then;
-                    }
-                    my $activerole = 1;
-                    if ($tstart && $tstart>$limit) { $activerole = 0; }
-                    if ($tend   && $tend  <$limit) { $activerole = 0; }
-                    if ($activerole) {
-                        push(@liveroles,$role);
-                    }
-                }
-            }
-            if (@liveroles) {
-                if (&homeserver($cnum,$cdom) ne 'no_host') {
-                    my ($accessref,$accessinfo,%access_in_dom);
-                    ($roles_by_num,$description,$accessref,$accessinfo) = &get_all_adhocroles($cdom);
-                    if (ref($roles_by_num) eq 'ARRAY') {
-                        if (@{$roles_by_num}) {
-                            my %settings;
-                            if ($env{'request.course.id'} eq $cid) {
-                                foreach my $envkey (keys(%env)) {
-                                    if ($envkey =~ /^\Qcourse.$cid.\E(internal\.adhoc.+)$/) {
-                                        $settings{$1} = $env{$envkey};
-                                    }
-                                }
-                            } else {
-                                %settings = &dump('environment',$cdom,$cnum,'internal\.adhoc');
-                            }
-                            my %setincrs;
-                            if ($settings{'internal.adhocaccess'}) {
-                                map { $setincrs{$_} = 1; } split(/,/,$settings{'internal.adhocaccess'});
-                            }
-                            my @statuses;
-                            if ($env{'environment.inststatus'}) {
-                                @statuses = split(/,/,$env{'environment.inststatus'});
-                            }
-                            my $user = $env{'user.name'}.':'.$env{'user.domain'};
-                            if (ref($accessref) eq 'HASH') {
-                                %access_in_dom = %{$accessref};
-                            }
-                            foreach my $role (@{$roles_by_num}) {
-                                my ($curraccess,@okstatus,@personnel);
-                                if ($setincrs{$role}) {
-                                    ($curraccess,my $rest) = split(/=/,$settings{'internal.adhoc.'.$role});
-                                    if ($curraccess eq 'status') {
-                                        @okstatus = split(/\&/,$rest);
-                                    } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
-                                        @personnel = split(/\&/,$rest);
-                                    }
-                                } else {
-                                    $curraccess = $access_in_dom{$role};
-                                    if (ref($accessinfo) eq 'HASH') {
-                                        if ($curraccess eq 'status') {
-                                            if (ref($accessinfo->{$role}) eq 'ARRAY') {
-                                                @okstatus = @{$accessinfo->{$role}};
-                                            }
-                                        } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
-                                            if (ref($accessinfo->{$role}) eq 'ARRAY') {
-                                                @personnel = @{$accessinfo->{$role}};
-                                            }
-                                        }
-                                    }
-                                }
-                                if ($curraccess eq 'none') {
-                                    next;
-                                } elsif ($curraccess eq 'all') {
-                                    push(@possroles,$role);
-                                } elsif ($curraccess eq 'dh') {
-                                    if (grep(/^dh$/,@liveroles)) {
-                                        push(@possroles,$role);
-                                    } else {
-                                        next;
-                                    }
-                                } elsif ($curraccess eq 'da') {
-                                    if (grep(/^da$/,@liveroles)) {
-                                        push(@possroles,$role);
-                                    } else {
-                                        next;
-                                    }
-                                } elsif ($curraccess eq 'status') {
-                                    if (@okstatus) {
-                                        if (!@statuses) {
-                                            if (grep(/^default$/,@okstatus)) {
-                                                push(@possroles,$role);
-                                            }
-                                        } else {
-                                            foreach my $status (@okstatus) {
-                                                if (grep(/^\Q$status\E$/,@statuses)) {
-                                                    push(@possroles,$role);
-                                                    last;
-                                                }
-                                            }
-                                        }
-                                    }
-                                } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
-                                    if (grep(/^\Q$user\E$/,@personnel)) {
-                                        if ($curraccess eq 'exc') {
-                                            push(@possroles,$role);
-                                        }
-                                    } elsif ($curraccess eq 'inc') {
-                                        push(@possroles,$role);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    unless (ref($description) eq 'HASH') {
-        if (ref($roles_by_num) eq 'ARRAY') {
-            my %desc;
-            map { $desc{$_} = $_; } (@{$roles_by_num});
-            $description = \%desc;
-        } else {
-            $description = {};
-        }
-    }
-    return (\@possroles,$description);
-}
-
 # ----------------------------------------------------- Frontpage Announcements
 #
 #
@@ -4634,7 +4280,7 @@ sub courseiddump {
         $coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok,
         $selfenrollonly,$catfilter,$showhidden,$caller,$cloner,$cc_clone,
         $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner,
-        $hasuniquecode,$reqcrsdom,$reqinstcode)=@_;
+        $hasuniquecode)=@_;
     my $as_hash = 1;
     my %returnhash;
     if (!$domfilter) { $domfilter=''; }
@@ -4647,18 +4293,17 @@ sub courseiddump {
 	    if (($domfilter eq '') ||
 		(&host_domain($tryserver) eq $domfilter)) {
                 my $rep;
-                if (grep { $_ eq $tryserver } &current_machine_ids()) {
-                    $rep = &LONCAPA::Lond::dump_course_id_handler(
-                        join(":", (&host_domain($tryserver), $sincefilter,
-                                &escape($descfilter), &escape($instcodefilter),
+                if (grep { $_ eq $tryserver } current_machine_ids()) {
+                    $rep = LONCAPA::Lond::dump_course_id_handler(
+                        join(":", (&host_domain($tryserver), $sincefilter, 
+                                &escape($descfilter), &escape($instcodefilter), 
                                 &escape($ownerfilter), &escape($coursefilter),
-                                &escape($typefilter), &escape($regexp_ok),
-                                $as_hash, &escape($selfenrollonly),
-                                &escape($catfilter), $showhidden, $caller,
-                                &escape($cloner), &escape($cc_clone), $cloneonly,
-                                &escape($createdbefore), &escape($createdafter),
-                                &escape($creationcontext),$domcloner,$hasuniquecode,
-                                $reqcrsdom,&escape($reqinstcode))));
+                                &escape($typefilter), &escape($regexp_ok), 
+                                $as_hash, &escape($selfenrollonly), 
+                                &escape($catfilter), $showhidden, $caller, 
+                                &escape($cloner), &escape($cc_clone), $cloneonly, 
+                                &escape($createdbefore), &escape($createdafter), 
+                                &escape($creationcontext), $domcloner, $hasuniquecode)));
                 } else {
                     $rep = &reply('courseiddump:'.&host_domain($tryserver).':'.
                              $sincefilter.':'.&escape($descfilter).':'.
@@ -4669,10 +4314,10 @@ sub courseiddump {
                              $showhidden.':'.$caller.':'.&escape($cloner).':'.
                              &escape($cc_clone).':'.$cloneonly.':'.
                              &escape($createdbefore).':'.&escape($createdafter).':'.
-                             &escape($creationcontext).':'.$domcloner.':'.$hasuniquecode.
-                             ':'.$reqcrsdom.':'.&escape($reqinstcode),$tryserver);
+                             &escape($creationcontext).':'.$domcloner.':'.$hasuniquecode,
+                             $tryserver);
                 }
-
+                     
                 my @pairs=split(/\&/,$rep);
                 foreach my $item (@pairs) {
                     my ($key,$value)=split(/\=/,$item,2);
@@ -4798,21 +4443,6 @@ sub get_domain_roles {
     return %personnel;
 }
 
-sub get_active_domroles {
-    my ($dom,$roles) = @_;
-    return () unless (ref($roles) eq 'ARRAY');
-    my $now = time;
-    my %dompersonnel = &get_domain_roles($dom,$roles,$now,$now);
-    my %domroles;
-    foreach my $server (keys(%dompersonnel)) {
-        foreach my $user (sort(keys(%{$dompersonnel{$server}}))) {
-            my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user);
-            $domroles{$uname.':'.$udom} = $dompersonnel{$server}{$user};
-        }
-    }
-    return %domroles;
-}
-
 # ----------------------------------------------------------- Interval timing 
 
 {
@@ -4827,10 +4457,9 @@ my %cachedtimes=();
 my $cachedtime='';
 
 sub load_all_first_access {
-    my ($uname,$udom,$ignorecache)=@_;
+    my ($uname,$udom)=@_;
     if (($cachedkey eq $uname.':'.$udom) &&
-        (abs($cachedtime-time)<5) && (!$env{'form.markaccess'}) &&
-        (!$ignorecache)) {
+        (abs($cachedtime-time)<5) && (!$env{'form.markaccess'})) {
         return;
     }
     $cachedtime=time;
@@ -4839,7 +4468,7 @@ sub load_all_first_access {
 }
 
 sub get_first_access {
-    my ($type,$argsymb,$argmap,$ignorecache)=@_;
+    my ($type,$argsymb,$argmap)=@_;
     my ($symb,$courseid,$udom,$uname)=&whichuser();
     if ($argsymb) { $symb=$argsymb; }
     my ($map,$id,$res)=&decode_symb($symb);
@@ -4851,7 +4480,7 @@ sub get_first_access {
     } else {
 	$res=$symb;
     }
-    &load_all_first_access($uname,$udom,$ignorecache);
+    &load_all_first_access($uname,$udom);
     return $cachedtimes{"$courseid\0$res"};
 }
 
@@ -4888,91 +4517,6 @@ sub set_first_access {
 }
 }
 
-sub checkout {
-    my ($symb,$tuname,$tudom,$tcrsid)=@_;
-    my $now=time;
-    my $lonhost=$perlvar{'lonHostID'};
-    my $infostr=&escape(
-                 'CHECKOUTTOKEN&'.
-                 $tuname.'&'.
-                 $tudom.'&'.
-                 $tcrsid.'&'.
-                 $symb.'&'.
-                 $now.'&'.$ENV{'REMOTE_ADDR'});
-    my $token=&reply('tmpput:'.$infostr,$lonhost);
-    if ($token=~/^error\:/) {
-        &logthis("<font color=\"blue\">WARNING: ".
-                "Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb.
-                 "</font>");
-        return '';
-    }
-
-    $token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/;
-    $token=~tr/a-z/A-Z/;
-
-    my %infohash=('resource.0.outtoken' => $token,
-                  'resource.0.checkouttime' => $now,
-                  'resource.0.outremote' => $ENV{'REMOTE_ADDR'});
-
-    unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
-       return '';
-    } else {
-        &logthis("<font color=\"blue\">WARNING: ".
-                "Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb.
-                 "</font>");
-    }
-
-    if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
-                         &escape('Checkout '.$infostr.' - '.
-                                                 $token)) ne 'ok') {
-        return '';
-    } else {
-        &logthis("<font color=\"blue\">WARNING: ".
-                "Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb.
-                 "</font>");
-    }
-    return $token;
-}
-
-# ------------------------------------------------------------ Check in an item
-
-sub checkin {
-    my $token=shift;
-    my $now=time;
-    my ($ta,$tb,$lonhost)=split(/\*/,$token);
-    $lonhost=~tr/A-Z/a-z/;
-    my $dtoken=$ta.'_'.&hostname($lonhost).'_'.$tb;
-    $dtoken=~s/\W/\_/g;
-    my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
-                 split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
-
-    unless (($tuname) && ($tudom)) {
-        &logthis('Check in '.$token.' ('.$dtoken.') failed');
-        return '';
-    }
-
-    unless (&allowed('mgr',$tcrsid)) {
-        &logthis('Check in '.$token.' ('.$dtoken.') unauthorized: '.
-                 $env{'user.name'}.' - '.$env{'user.domain'});
-        return '';
-    }
-
-    my %infohash=('resource.0.intoken' => $token,
-                  'resource.0.checkintime' => $now,
-                  'resource.0.inremote' => $ENV{'REMOTE_ADDR'});
-
-    unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
-       return '';
-    }
-
-    if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
-                         &escape('Checkin - '.$token)) ne 'ok') {
-        return '';
-    }
-
-    return ($symb,$tuname,$tudom,$tcrsid);
-}
-
 # --------------------------------------------- Set Expire Date for Spreadsheet
 
 sub expirespread {
@@ -5566,7 +5110,7 @@ sub privileged {
     my $now = time;
     my $roles;
     if (ref($possroles) eq 'ARRAY') {
-        $roles = $possroles;
+        $roles = $possroles; 
     } else {
         $roles = ['dc','su'];
     }
@@ -5593,7 +5137,7 @@ sub privileged {
         for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys(%rolesdump)}) {
             my ($trole, $tend, $tstart) = split(/_/, $role);
             if (grep(/^\Q$trole\E$/,@{$roles})) {
-                return 1 unless ($tend && $tend < $now)
+                return 1 unless ($tend && $tend < $now) 
                         or ($tstart && $tstart > $now);
             }
         }
@@ -5631,7 +5175,7 @@ sub privileged_by_domain {
                         my ($trole,$uname,$udom,$rest) = split(/:/,$item,4);
                         my ($end,$start) = split(/:/,$dompersonnel{$server}{$item});
                         next if ($end && $end < $now);
-                        $privileged{$dom}{$trole}{$uname.':'.$udom} =
+                        $privileged{$dom}{$trole}{$uname.':'.$udom} = 
                             $dompersonnel{$server}{$item};
                     }
                 }
@@ -5752,10 +5296,9 @@ sub rolesinit {
         }
     }
 
-    @userroles{'user.author','user.adv','user.rar'} = &set_userprivs(\%userroles,
-                                                          \%allroles, \%allgroups);
+    @userroles{'user.author', 'user.adv'} = &set_userprivs(\%userroles,
+        \%allroles, \%allgroups);
     $env{'user.adv'} = $userroles{'user.adv'};
-    $env{'user.rar'} = $userroles{'user.rar'};
 
     return (\%userroles,\%firstaccenv,\%timerintenv);
 }
@@ -5791,10 +5334,6 @@ sub custom_roleprivs {
                     $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv;
                 }
                 if (($trest ne '') && (defined($coursepriv))) {
-                    if ($trole =~ m{^cr/$tdomain/$tdomain\Q-domainconfig\E/([^/]+)$}) {
-                        my $rolename = $1;
-                        $coursepriv = &course_adhocrole_privs($rolename,$tdomain,$trest,$coursepriv);
-                    }
                     $$allroles{'cm.'.$area}.=':'.$coursepriv;
                     $$allroles{$spec.'.'.$area}.=':'.$coursepriv;
                 }
@@ -5803,48 +5342,6 @@ sub custom_roleprivs {
     }
 }
 
-sub course_adhocrole_privs {
-    my ($rolename,$cdom,$cnum,$coursepriv) = @_;
-    my %overrides = &get('environment',["internal.adhocpriv.$rolename"],$cdom,$cnum);
-    if ($overrides{"internal.adhocpriv.$rolename"}) {
-        my (%currprivs,%storeprivs);
-        foreach my $item (split(/:/,$coursepriv)) {
-            my ($priv,$restrict) = split(/\&/,$item);
-            $currprivs{$priv} = $restrict;
-        }
-        my (%possadd,%possremove,%full);
-        foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
-            my ($priv,$restrict)=split(/\&/,$item);
-            $full{$priv} = $restrict;
-        }
-        foreach my $item (split(/,/,$overrides{"internal.adhocpriv.$rolename"})) {
-             next if ($item eq '');
-             my ($rule,$rest) = split(/=/,$item);
-             next unless (($rule eq 'off') || ($rule eq 'on'));
-             foreach my $priv (split(/:/,$rest)) {
-                 if ($priv ne '') {
-                     if ($rule eq 'off') {
-                         $possremove{$priv} = 1;
-                     } else {
-                         $possadd{$priv} = 1;
-                     }
-                 }
-             }
-         }
-         foreach my $priv (sort(keys(%full))) {
-             if (exists($currprivs{$priv})) {
-                 unless (exists($possremove{$priv})) {
-                     $storeprivs{$priv} = $currprivs{$priv};
-                 }
-             } elsif (exists($possadd{$priv})) {
-                 $storeprivs{$priv} = $full{$priv};
-             }
-         }
-         $coursepriv = ':'.join(':',map { $_.'&'.$storeprivs{$_}; } sort(keys(%storeprivs)));
-     }
-     return $coursepriv;
-}
-
 sub group_roleprivs {
     my ($allgroups,$area,$group_privs,$tend,$tstart) = @_;
     my $access = 1;
@@ -5879,7 +5376,6 @@ sub set_userprivs {
     my ($userroles,$allroles,$allgroups,$groups_roles) = @_; 
     my $author=0;
     my $adv=0;
-    my $rar=0;
     my %grouproles = ();
     if (keys(%{$allgroups}) > 0) {
         my @groupkeys; 
@@ -5927,7 +5423,6 @@ sub set_userprivs {
                     $thesepriv{$privilege}.=$restrictions;
                 }
                 if ($thesepriv{'adv'} eq 'F') { $adv=1; }
-                if ($thesepriv{'rar'} eq 'F') { $rar=1; }
             }
         }
         my $thesestr='';
@@ -5936,7 +5431,7 @@ sub set_userprivs {
 	}
         $userroles->{'user.priv.'.$role} = $thesestr;
     }
-    return ($author,$adv,$rar);
+    return ($author,$adv);
 }
 
 sub role_status {
@@ -5981,10 +5476,9 @@ sub role_status {
                                 push(@rolecodes,$$role);
                                 &standard_roleprivs(\%allroles,$$role,$tdomain,$spec,$trest,$$where);
                             }
-                            my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%allroles,\%allgroups,
-                                                                   \%groups_roles);
+                            my ($author,$adv)= &set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles);
                             &appenv(\%userroles,\@rolecodes);
-                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
+                            &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
                         }
                     }
                     $$tstatus = 'is';
@@ -6060,56 +5554,39 @@ sub delete_env_groupprivs {
 }
 
 sub check_adhoc_privs {
-    my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller,$sec) = @_;
+    my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller) = @_;
     my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum;
-    if ($sec) {
-        $cckey .= '/'.$sec;
-    }
     my $setprivs;
     if ($env{$cckey}) {
         my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
         &role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
         unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
-            &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec);
+            &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
             $setprivs = 1;
         }
     } else {
-        &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec);
+        &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
         $setprivs = 1;
     }
     return $setprivs;
 }
 
 sub set_adhoc_privileges {
-# role can be cc, ca, or cr/<dom>/<dom>-domainconfig/role
-    my ($dcdom,$pickedcourse,$role,$caller,$sec) = @_;
+# role can be cc or ca
+    my ($dcdom,$pickedcourse,$role,$caller) = @_;
     my $area = '/'.$dcdom.'/'.$pickedcourse;
-    if ($sec ne '') {
-        $area .= '/'.$sec;
-    }
     my $spec = $role.'.'.$area;
     my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
                                   $env{'user.name'},1);
-    my %rolehash = ();
-    if ($role =~ m{^\Qcr/$dcdom/$dcdom\E\-domainconfig/(\w+)$}) {
-        my $rolename = $1;
-        &custom_roleprivs(\%rolehash,$role,$dcdom,$pickedcourse,$spec,$area);
-        my %domdef = &get_domain_defaults($dcdom);
-        if (ref($domdef{'adhocroles'}) eq 'HASH') {
-            if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') {
-                &appenv({'request.role.desc' => $domdef{'adhocroles'}{$rolename}{'desc'},});
-            }
-        }
-    } else {
-        &standard_roleprivs(\%rolehash,$role,$dcdom,$spec,$pickedcourse,$area);
-    }
-    my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%rolehash);
+    my %ccrole = ();
+    &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
+    my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
     &appenv(\%userroles,[$role,'cm']);
-    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec);
+    &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
     unless ($caller eq 'constructaccess' && $env{'request.course.id'}) {
         &appenv( {'request.role'        => $spec,
                   'request.role.domain' => $dcdom,
-                  'request.course.sec'  => $sec, 
+                  'request.course.sec'  => ''
                  }
                );
         my $tadv=0;
@@ -6169,14 +5646,15 @@ sub unserialize {
     return {} if $rep =~ /^error/;
 
     my %returnhash=();
-    foreach my $item (split(/\&/,$rep)) {
-        my ($key, $value) = split(/=/, $item, 2);
-        $key = unescape($key) unless $escapedkeys;
-        next if $key =~ /^error: 2 /;
-        $returnhash{$key} = &thaw_unescape($value);
-    }
+	foreach my $item (split(/\&/,$rep)) {
+	    my ($key, $value) = split(/=/, $item, 2);
+	    $key = unescape($key) unless $escapedkeys;
+	    next if $key =~ /^error: 2 /;
+	    $returnhash{$key} = &thaw_unescape($value);
+	}
+    #return %returnhash;
     return \%returnhash;
-}
+}        
 
 # see Lond::dump_with_regexp
 # if $escapedkeys hash keys won't get unescaped.
@@ -6191,11 +5669,11 @@ sub dump {
     } else {
         $regexp='.';
     }
-    if (grep { $_ eq $uhome } &current_machine_ids()) {
+    if (grep { $_ eq $uhome } current_machine_ids()) {
         # user is hosted on this machine
-        my $reply = LONCAPA::Lond::dump_with_regexp(join(':', ($udomain,
+        my $reply = LONCAPA::Lond::dump_with_regexp(join(":", ($udomain,
                     $uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'});
-        return %{&unserialize($reply, $escapedkeys)};
+        return %{unserialize($reply, $escapedkeys)};
     }
     my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
     my @pairs=split(/\&/,$rep);
@@ -6203,7 +5681,8 @@ sub dump {
     if (!($rep =~ /^error/ )) {
 	foreach my $item (@pairs) {
 	    my ($key,$value)=split(/=/,$item,2);
-            $key = &unescape($key) unless ($escapedkeys);
+        $key = unescape($key) unless $escapedkeys;
+        #$key = &unescape($key);
 	    next if ($key =~ /^error: 2 /);
 	    $returnhash{$key}=&thaw_unescape($value);
 	}
@@ -6247,7 +5726,7 @@ sub currentdump {
    my $rep;
 
    if (grep { $_ eq $uhome } current_machine_ids()) {
-       $rep = LONCAPA::Lond::dump_profile_database(join(":", ($sdom, $sname,
+       $rep = LONCAPA::Lond::dump_profile_database(join(":", ($sdom, $sname, 
                    $courseid)));
    } else {
        $rep = reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome);
@@ -6257,7 +5736,7 @@ sub currentdump {
    #
    my %returnhash=();
    #
-   if ($rep eq 'unknown_cmd') { 
+   if ($rep eq "unknown_cmd") { 
        # an old lond will not know currentdump
        # Do a dump and make it look like a currentdump
        my @tmp = &dumpstore($courseid,$sdom,$sname,'.');
@@ -6491,11 +5970,9 @@ sub tmpget {
     if (!defined($server)) { $server = $perlvar{'lonHostID'}; }
     my $rep=&reply("tmpget:$token",$server);
     my %returnhash;
-    if ($rep =~ /^(con_lost|error|no_such_host)/i) {
-        return %returnhash;
-    }
     foreach my $item (split(/\&/,$rep)) {
 	my ($key,$value)=split(/=/,$item);
+        next if ($key =~ /^error: 2 /);
 	$returnhash{&unescape($key)}=&thaw_unescape($value);
     }
     return %returnhash;
@@ -6508,13 +5985,13 @@ sub tmpdel {
     return &reply("tmpdel:$token",$server);
 }
 
-# ------------------------------------------------------------ get_timebased_id
+# ------------------------------------------------------------ get_timebased_id 
 
 sub get_timebased_id {
     my ($prefix,$keyid,$namespace,$cdom,$cnum,$idtype,$who,$locktries,
         $maxtries) = @_;
     my ($newid,$error,$dellock);
-    unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) {
+    unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) {  
         return ('','ok','invalid call to get suffix');
     }
 
@@ -6528,7 +6005,7 @@ sub get_timebased_id {
     if (!$maxtries) {
         $maxtries = 10;
     }
-
+    
     if (($cdom eq '') || ($cnum eq '')) {
         if ($env{'request.course.id'}) {
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -6683,7 +6160,7 @@ sub get_portfolio_access {
                 if (ref($access_hash->{$ipkey}{'ip'}) eq 'ARRAY') {
                     if (&Apache::loncommon::check_ip_acc(join(',',@{$access_hash->{$ipkey}{'ip'}}),$clientip)) {
                         $allowed = 1;
-                        last;
+                        last; 
                     }
                 }
             }
@@ -6911,7 +6388,7 @@ sub usertools_access {
 
     my ($toolstatus,$inststatus,$envkey);
     if ($context eq 'requestauthor') {
-        $envkey = $context;
+        $envkey = $context; 
     } else {
         $envkey = $context.'.'.$tool;
     }
@@ -7190,7 +6667,7 @@ sub allowed {
 
     if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; }
 # Free bre access to adm and meta resources
-    if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard|ext\.tool)$})) 
+    if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) 
 	 || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) 
 	&& ($priv eq 'bre')) {
 	return 'F';
@@ -7411,7 +6888,7 @@ sub allowed {
 	&& &is_portfolio_url($uri)) {
 	$thisallowed = &portfolio_access($uri,$clientip);
     }
-    
+
 # Full access at system, domain or course-wide level? Exit.
     if ($thisallowed=~/F/) {
 	return 'F';
@@ -7678,7 +7155,7 @@ sub constructaccess {
     my ($ownername,$ownerdomain,$ownerhome);
 
     ($ownerdomain,$ownername) =
-        ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)(?:/|$)});
+        ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)/});
 
 # The URL does not really point to any authorspace, forget it
     unless (($ownername) && ($ownerdomain)) { return ''; }
@@ -7741,14 +7218,14 @@ sub constructaccess {
 #
 # User for whom data are being temporarily cached.
 my $cacheduser='';
-# Cached blockers for this user (a hash of blocking items).
+# Cached blockers for this user (a hash of blocking items). 
 my %cachedblockers=();
 # When the data were last cached.
 my $cachedlast='';
 
 sub load_all_blockers {
     my ($uname,$udom,$blocks)=@_;
-    if (($uname ne '') && ($udom ne '')) {
+    if (($uname ne '') && ($udom ne '')) { 
         if (($cacheduser eq $uname.':'.$udom) &&
             (abs($cachedlast-time)<5)) {
             return;
@@ -7790,7 +7267,7 @@ sub get_commblock_resources {
     } else {
         %commblocks = &get_comm_blocks();
     }
-    return %blockers unless (keys(%commblocks) > 0);
+    return %blockers unless (keys(%commblocks) > 0); 
     my $navmap = Apache::lonnavmaps::navmap->new();
     return %blockers unless (ref($navmap));
     my $now = time;
@@ -7802,7 +7279,7 @@ sub get_commblock_resources {
                     if (ref($commblocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
                         if (ref($commblocks{$block}{'blocks'}{'docs'}{'maps'}) eq 'HASH') {
                             if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'maps'}})) {
-                                $blockers{$block}{maps} = $commblocks{$block}{'blocks'}{'docs'}{'maps'};
+                                $blockers{$block}{maps} = $commblocks{$block}{'blocks'}{'docs'}{'maps'}; 
                             }
                         }
                         if (ref($commblocks{$block}{'blocks'}{'docs'}{'resources'}) eq 'HASH') {
@@ -7827,8 +7304,8 @@ sub get_commblock_resources {
                         if ($item =~ /___\d+___/) {
                             $type = 'resource';
                             @interval=&EXT("resource.0.interval",$item);
-                            if (ref($navmap)) {
-                                my $res = $navmap->getBySymb($item);
+                            if (ref($navmap)) {                        
+                                my $res = $navmap->getBySymb($item); 
                                 push(@to_test,$res);
                             }
                         } else {
@@ -7851,8 +7328,7 @@ sub get_commblock_resources {
                             }
                         }
                     }
-                    if ($interval[0] =~ /^(\d+)/) {
-                        my $timelimit = $1;
+                    if ($interval[0] =~ /^\d+$/) {
                         my $first_access;
                         if ($type eq 'resource') {
                             $first_access=&get_first_access($interval[1],$item);
@@ -7862,7 +7338,7 @@ sub get_commblock_resources {
                             $first_access=&get_first_access($interval[1]);
                         }
                         if ($first_access) {
-                            my $timesup = $first_access+$timelimit;
+                            my $timesup = $first_access+$interval[0];
                             if ($timesup > $now) {
                                 my $activeblock;
                                 foreach my $res (@to_test) {
@@ -7908,7 +7384,7 @@ sub has_comm_blocking {
     }
     if ($symb) {
         @symbs = ($symb);
-    } elsif (keys(%possibles)) {
+    } elsif (keys(%possibles)) { 
         @symbs = keys(%possibles);
     }
     my $noblock;
@@ -7946,7 +7422,7 @@ sub has_comm_blocking {
 }
 }
 
-# -------------------------------- Deversion and split uri into path an filename
+# -------------------------------- Deversion and split uri into path an filename   
 
 #
 #   Removes the version from a URI and
@@ -8017,7 +7493,7 @@ sub get_symb_from_alias {
 
 sub definerole {
   if (allowed('mcr','/')) {
-    my ($rolename,$sysrole,$domrole,$courole,$uname,$udom)=@_;
+    my ($rolename,$sysrole,$domrole,$courole)=@_;
     foreach my $role (split(':',$sysrole)) {
 	my ($crole,$cqual)=split(/\&/,$role);
         if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; }
@@ -8045,19 +7521,11 @@ sub definerole {
             }
         }
     }
-    my $uhome;
-    if (($uname ne '') && ($udom ne '')) {
-        $uhome = &homeserver($uname,$udom);
-        return $uhome if ($uhome eq 'no_host');
-    } else {
-        $uname = $env{'user.name'};
-        $udom = $env{'user.domain'};
-        $uhome = $env{'user.home'};
-    }
     my $command="encrypt:rolesput:$env{'user.domain'}:$env{'user.name'}:".
-                "$udom:$uname:rolesdef_$rolename=".
+                "$env{'user.domain'}:$env{'user.name'}:".
+	        "rolesdef_$rolename=".
                 escape($sysrole.'_'.$domrole.'_'.$courole);
-    return reply($command,$uhome);
+    return reply($command,$env{'user.home'});
   } else {
     return 'refused';
   }
@@ -8072,9 +7540,9 @@ sub metadata_query {
     my @server_list = (defined($server_array) ? @$server_array
                                               : keys(%libserv) );
     for my $server (@server_list) {
-        my $domains = '';
+        my $domains = ''; 
         if (ref($domains_hash) eq 'HASH') {
-            $domains = $domains_hash->{$server};    
+            $domains = $domains_hash->{$server}; 
         }
 	unless ($custom or $customshow) {
 	    my $reply=&reply("querysend:".&escape($query).':::'.&escape($domains),$server);
@@ -8139,12 +7607,10 @@ sub update_allusers_table {
 
 sub fetch_enrollment_query {
     my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_;
-    my ($homeserver,$sleep,$loopmax);
+    my $homeserver;
     my $maxtries = 1;
     if ($context eq 'automated') {
         $homeserver = $perlvar{'lonHostID'};
-        $sleep = 2;
-        $loopmax = 100;
         $maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout
     } else {
         $homeserver = &homeserver($cnum,$dom);
@@ -8162,17 +7628,17 @@ sub fetch_enrollment_query {
         &logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum); 
         return 'error: '.$queryid;
     }
-    my $reply = &get_query_reply($queryid,$sleep,$loopmax);
+    my $reply = &get_query_reply($queryid);
     my $tries = 1;
     while (($reply=~/^timeout/) && ($tries < $maxtries)) {
-        $reply = &get_query_reply($queryid,$sleep,$loopmax);
+        $reply = &get_query_reply($queryid);
         $tries ++;
     }
     if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
         &logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries);
     } else {
         my @responses = split(/:/,$reply);
-        if (grep { $_ eq $homeserver } &current_machine_ids()) {
+        if ($homeserver eq $perlvar{'lonHostID'}) {
             foreach my $line (@responses) {
                 my ($key,$value) = split(/=/,$line,2);
                 $$replyref{$key} = $value;
@@ -8207,17 +7673,11 @@ sub fetch_enrollment_query {
 }
 
 sub get_query_reply {
-    my ($queryid,$sleep,$loopmax) = @_;
-    if (($sleep eq '') || ($sleep !~ /^\d+\.?\d*$/)) {
-        $sleep = 0.2;
-    }
-    if (($loopmax eq '') || ($loopmax =~ /\D/)) {
-        $loopmax = 100;
-    }
+    my $queryid=shift;
     my $replyfile=LONCAPA::tempdir().$queryid;
     my $reply='';
-    for (1..$loopmax) {
-	sleep($sleep);
+    for (1..100) {
+	sleep 2;
         if (-e $replyfile.'.end') {
 	    if (open(my $fh,$replyfile)) {
 		$reply = join('',<$fh>);
@@ -8627,7 +8087,8 @@ sub auto_crsreq_update {
                             ':'.&escape($action).':'.&escape($ownername).':'.
                             &escape($ownerdomain).':'.&escape($fullname).':'.
                             &escape($title).':'.&escape($code).':'.
-                            &escape($accessstart).':'.&escape($accessend).':'.$info,$homeserver);
+                            &escape($accessstart).':'.&escape($accessend).':'.$info,
+                            $homeserver);
         unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
             my @items = split(/&/,$response);
             foreach my $item (@items) {
@@ -8639,107 +8100,6 @@ sub auto_crsreq_update {
     return \%crsreqresponse;
 }
 
-sub auto_export_grades {
-    my ($cdom,$cnum,$inforef,$gradesref) = @_;
-    my ($homeserver,%exportresponse);
-    if ($cdom =~ /^$match_domain$/) {
-        $homeserver = &domain($cdom,'primary');
-    }
-    unless (($homeserver eq 'no_host') || ($homeserver eq '')) {
-        my $info;
-        if (ref($inforef) eq 'HASH') {
-            $info = &freeze_escape($inforef);
-        }
-        if (ref($gradesref) eq 'HASH') {
-            my $grades = &freeze_escape($gradesref);
-            my $response=&reply('encrypt:autoexportgrades:'.$cdom.':'.$cnum.':'.
-                                $info.':'.$grades,$homeserver);
-            unless ($response =~ /(con_lost|error|no_such_host|refused|unknown_command)/) {
-                my @items = split(/&/,$response);
-                foreach my $item (@items) {
-                    my ($key,$value) = split('=',$item);
-                    $exportresponse{&unescape($key)} = &thaw_unescape($value);
-                }
-            }
-        }
-    }
-    return \%exportresponse;
-}
-
-sub check_instcode_cloning {
-    my ($codedefaults,$code_order,$cloner,$clonefromcode,$clonetocode) = @_;
-    unless ((ref($codedefaults) eq 'HASH') && (ref($code_order) eq 'ARRAY')) {
-        return;
-    }
-    my $canclone;
-    if (@{$code_order} > 0) {
-        my $instcoderegexp ='^';
-        my @clonecodes = split(/\&/,$cloner);
-        foreach my $item (@{$code_order}) {
-            if (grep(/^\Q$item\E=/,@clonecodes)) {
-                foreach my $pair (@clonecodes) {
-                    my ($key,$val) = split(/\=/,$pair,2);
-                    $val = &unescape($val);
-                    if ($key eq $item) {
-                        $instcoderegexp .= '('.$val.')';
-                        last;
-                    }
-                }
-            } else {
-                $instcoderegexp .= $codedefaults->{$item};
-            }
-        }
-        $instcoderegexp .= '$';
-        my (@from,@to);
-        eval {
-               (@from) = ($clonefromcode =~ /$instcoderegexp/);
-               (@to) = ($clonetocode =~ /$instcoderegexp/);
-        };
-        if ((@from > 0) && (@to > 0)) {
-            my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to);
-            if (!@diffs) {
-                $canclone = 1;
-            }
-        }
-    }
-    return $canclone;
-}
-
-sub default_instcode_cloning {
-    my ($clonedom,$domdefclone,$clonefromcode,$clonetocode,$codedefaultsref,$codeorderref) = @_;
-    my (%codedefaults,@code_order,$canclone);
-    if ((ref($codedefaultsref) eq 'HASH') && (ref($codeorderref) eq 'ARRAY')) {
-        %codedefaults = %{$codedefaultsref};
-        @code_order = @{$codeorderref};
-    } elsif ($clonedom) {
-        &auto_instcode_defaults($clonedom,\%codedefaults,\@code_order);
-    }
-    if (($domdefclone) && (@code_order)) {
-        my @clonecodes = split(/\+/,$domdefclone);
-        my $instcoderegexp ='^';
-        foreach my $item (@code_order) {
-            if (grep(/^\Q$item\E$/,@clonecodes)) {
-                $instcoderegexp .= '('.$codedefaults{$item}.')';
-            } else {
-                $instcoderegexp .= $codedefaults{$item};
-            }
-        }
-        $instcoderegexp .= '$';
-        my (@from,@to);
-        eval {
-            (@from) = ($clonefromcode =~ /$instcoderegexp/);
-            (@to) = ($clonetocode =~ /$instcoderegexp/);
-        };
-        if ((@from > 0) && (@to > 0)) {
-            my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to);
-            if (!@diffs) {
-                $canclone = 1;
-            }
-        }
-    }
-    return $canclone;
-}
-
 # ------------------------------------------------------- Course Group routines
 
 sub get_coursegroups {
@@ -9008,7 +8368,7 @@ sub assignrole {
                         }
                     }
                 } elsif ($context eq 'requestauthor') {
-                    if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
+                    if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) && 
                         ($url eq '/'.$udom.'/') && ($role eq 'au')) {
                         if ($env{'environment.requestauthor'} eq 'automatic') {
                             $refused = '';
@@ -9016,13 +8376,13 @@ sub assignrole {
                             my %domdefaults = &get_domain_defaults($udom);
                             if (ref($domdefaults{'requestauthor'}) eq 'HASH') {
                                 my $checkbystatus;
-                                if ($env{'user.adv'}) {
+                                if ($env{'user.adv'}) { 
                                     my $disposition = $domdefaults{'requestauthor'}{'_LC_adv'};
                                     if ($disposition eq 'automatic') {
                                         $refused = '';
                                     } elsif ($disposition eq '') {
                                         $checkbystatus = 1;
-                                    }
+                                    } 
                                 } else {
                                     $checkbystatus = 1;
                                 }
@@ -9104,13 +8464,12 @@ sub assignrole {
             &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
                            $selfenroll,$context);
         } elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') ||
-                 ($role eq 'au') || ($role eq 'dc') || ($role eq 'dh') ||
-                 ($role eq 'da')) {
+                 ($role eq 'au') || ($role eq 'dc')) {
             &domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
                            $context);
         } elsif (($role eq 'ca') || ($role eq 'aa')) {
             &coauthorrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
-                             $context);
+                             $context); 
         }
         if ($role eq 'cc') {
             &autoupdate_coowners($url,$end,$start,$uname,$udom);
@@ -9410,7 +8769,7 @@ sub modifyuser {
 sub modifystudent {
     my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
         $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid,
-        $selfenroll,$context,$inststatus,$credits,$instsec)=@_;
+        $selfenroll,$context,$inststatus,$credits)=@_;
     if (!$cid) {
 	unless ($cid=$env{'request.course.id'}) {
 	    return 'not_in_class';
@@ -9425,14 +8784,14 @@ sub modifystudent {
     # student's environment
     $uid = undef if (!$forceid);
     $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
-					$gene,$usec,$end,$start,$type,$locktype,
-                                        $cid,$selfenroll,$context,$credits,$instsec);
+                                        $gene,$usec,$end,$start,$type,$locktype,
+                                        $cid,$selfenroll,$context,$credits);
     return $reply;
 }
 
 sub modify_student_enrollment {
     my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
-        $locktype,$cid,$selfenroll,$context,$credits,$instsec) = @_;
+        $locktype,$cid,$selfenroll,$context,$credits) = @_;
     my ($cdom,$cnum,$chome);
     if (!$cid) {
 	unless ($cid=$env{'request.course.id'}) {
@@ -9479,7 +8838,7 @@ sub modify_student_enrollment {
     my %old_entry = &Apache::lonnet::get('classlist',[$user],$cdom,$cnum);
     my $reply=cput('classlist',
 		   {$user => 
-			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits,$instsec) },
+			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits) },
 		   $cdom,$cnum);
     if (($reply eq 'ok') || ($reply eq 'delayed')) {
         &devalidate_getsection_cache($udom,$uname,$cid);
@@ -9907,6 +9266,90 @@ sub files_not_in_path {
     return (@return_files);
 }
 
+#------------------------------Submitted/Handedback Portfolio Files Versioning
+ 
+sub portfiles_versioning {
+    my ($symb,$domain,$stu_name,$portfiles,$versioned_portfiles) = @_;
+    my $portfolio_root = '/userfiles/portfolio';
+    return unless ((ref($portfiles) eq 'ARRAY') && (ref($versioned_portfiles) eq 'ARRAY'));
+    foreach my $file (@{$portfiles}) {
+        &unmark_as_readonly($domain,$stu_name,[$symb,$env{'request.course.id'}],$file);
+        my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
+        my ($answer_name,$answer_ver,$answer_ext) = &file_name_version_ext($answer_file);
+        my $getpropath = 1;
+        my ($dir_list,$listerror) = &dirlist($portfolio_root.$directory,$domain,
+                                             $stu_name,$getpropath);
+        my $version = &get_next_version($answer_name,$answer_ext,$dir_list);
+        my $new_answer = 
+            &version_selected_portfile($domain,$stu_name,$directory,$answer_file,$version);
+        if ($new_answer ne 'problem getting file') {
+            push(@{$versioned_portfiles}, $directory.$new_answer);
+            &mark_as_readonly($domain,$stu_name,[$directory.$new_answer],
+                              [$symb,$env{'request.course.id'},'graded']);
+        }
+    }
+}
+
+sub get_next_version {
+    my ($answer_name, $answer_ext, $dir_list) = @_;
+    my $version;
+    if (ref($dir_list) eq 'ARRAY') {
+        foreach my $row (@{$dir_list}) {
+            my ($file) = split(/\&/,$row,2);
+            my ($file_name,$file_version,$file_ext) =
+                &file_name_version_ext($file);
+            if (($file_name eq $answer_name) &&
+                ($file_ext eq $answer_ext)) {
+                     # gets here if filename and extension match,
+                     # regardless of version
+                if ($file_version ne '') {
+                    # a versioned file is found  so save it for later
+                    if ($file_version > $version) {
+                        $version = $file_version;
+                    }
+                }
+            }
+        }
+    }
+    $version ++;
+    return($version);
+}
+
+sub version_selected_portfile {
+    my ($domain,$stu_name,$directory,$file_name,$version) = @_;
+    my ($answer_name,$answer_ver,$answer_ext) =
+        &file_name_version_ext($file_name);
+    my $new_answer;
+    $env{'form.copy'} =
+        &getfile("/uploaded/$domain/$stu_name/portfolio$directory$file_name");
+    if($env{'form.copy'} eq '-1') {
+        $new_answer = 'problem getting file';
+    } else {
+        $new_answer = $answer_name.'.'.$version.'.'.$answer_ext;
+        my $copy_result = 
+            &finishuserfileupload($stu_name,$domain,'copy',
+                                  '/portfolio'.$directory.$new_answer);
+    }
+    undef($env{'form.copy'});
+    return ($new_answer);
+}
+
+sub file_name_version_ext {
+    my ($file)=@_;
+    my @file_parts = split(/\./, $file);
+    my ($name,$version,$ext);
+    if (@file_parts > 1) {
+        $ext=pop(@file_parts);
+        if (@file_parts > 1 && $file_parts[-1] =~ /^\d+$/) {
+            $version=pop(@file_parts);
+        }
+        $name=join('.',@file_parts);
+    } else {
+        $name=join('.',@file_parts);
+    }
+    return($name,$version,$ext);
+}
+
 #----------------------------------------------Get portfolio file permissions
 
 sub get_portfile_permissions {
@@ -10003,9 +9446,9 @@ sub modify_access_controls {
     my $tries = 0;
     my $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
    
-    while (($gotlock ne 'ok') && $tries < 10) {
+    while (($gotlock ne 'ok') && $tries <3) {
         $tries ++;
-        sleep(0.1);
+        sleep 1;
         $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
     }
     if ($gotlock eq 'ok') {
@@ -10051,49 +9494,132 @@ sub modify_access_controls {
 }
 
 sub make_public_indefinitely {
-    my ($requrl) = @_;
+    my (@requrl) = @_;
+    return &automated_portfile_access('public',\@requrl);
+}
+
+sub automated_portfile_access {
+    my ($accesstype,$addsref,$delsref,$info) = @_;
+    unless (($accesstype eq 'public') || ($accesstype eq 'ip')) {
+        return 'invalid';
+    }
+    my %urls;
+    if (ref($addsref) eq 'ARRAY') {
+        foreach my $requrl (@{$addsref}) {
+            if (&is_portfolio_url($requrl)) {
+                unless (exists($urls{$requrl})) {
+                    $urls{$requrl} = 'add';
+                }
+            }
+        }
+    }
+    if (ref($delsref) eq 'ARRAY') {
+        foreach my $requrl (@{$delsref}) { 
+            if (&is_portfolio_url($requrl)) {
+                unless (exists($urls{$requrl})) {
+                    $urls{$requrl} = 'delete'; 
+                }
+            }
+        }
+    }
+    unless (keys(%urls)) {
+        return 'invalid';
+    }
+    my $ip;
+    if ($accesstype eq 'ip') {
+        if (ref($info) eq 'HASH') {
+            if ($info->{'ip'} ne '') {
+                $ip = $info->{'ip'};
+            }
+        }
+        if ($ip eq '') {
+            return 'invalid';
+        }
+    }
+    my $errors;
     my $now = time;
-    my $action = 'activate';
-    my $aclnum = 0;
-    if (&is_portfolio_url($requrl)) {
+    my %current_perms;
+    foreach my $requrl (sort(keys(%urls))) {
+        my $action;
+        if ($urls{$requrl} eq 'add') {
+            $action = 'activate';
+        } else {
+            $action = 'none';
+        }
+        my $aclnum = 0;
         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,
+        unless (exists($current_perms{$unum.':'.$udom})) {
+            $current_perms{$unum.':'.$udom} = &get_portfile_permissions($udom,$unum);
+        }
+        my %access_controls = &get_access_controls($current_perms{$unum.':'.$udom},
                                                    $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 {
+            if ($scope eq $accesstype) {
+                if (($start <= $now) && ($end == 0)) {
+                    if ($accesstype eq 'ip') {
+                        if (ref($access_controls{$file_name}{$key}) eq 'HASH') {
+                            if (ref($access_controls{$file_name}{$key}{'ip'}) eq 'ARRAY') {
+                                if (grep(/^\Q$ip\E$/,@{$access_controls{$file_name}{$key}{'ip'}})) {
+                                    if ($urls{$requrl} eq 'add') {
+                                        $action = 'none';
+                                        last;
+                                    } else {
+                                        $action = 'delete';
+                                        $aclnum = $num;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    } elsif ($accesstype eq 'public') {
+                        if ($urls{$requrl} eq 'add') {
+                            $action = 'none';
+                            last;
+                        } else {
+                            $action = 'delete';
+                            $aclnum = $num;
+                            last;
+                        }
+                    }
+                } elsif ($accesstype eq 'public') {
                     $action = 'update';
                     $aclnum = $num;
+                    last;
                 }
-                last;
             }
         }
         if ($action eq 'none') {
-             return 'ok';
+            next;
         } else {
             my %changes;
             my $newend = 0;
             my $newstart = $now;
-            my $newkey = $aclnum.':public_'.$newend.'_'.$newstart;
+            my $newkey = $aclnum.':'.$accesstype.'_'.$newend.'_'.$newstart;
             $changes{$action}{$newkey} = {
-                type => 'public',
+                type => $accesstype,
                 time => {
                     start => $newstart,
                     end   => $newend,
                 },
             };
+            if ($accesstype eq 'ip') {
+                $changes{$action}{$newkey}{'ip'} = [$ip];
+            }
             my ($outcome,$deloutcome,$new_values,$translation) =
                 &modify_access_controls($file_name,\%changes,$udom,$unum);
-            return $outcome;
+            unless ($outcome eq 'ok') {
+                $errors .= $outcome.' ';
+            }
         }
+    }
+    if ($errors) {
+        $errors =~ s/\s$//;
+        return $errors;
     } else {
-        return 'invalid';
+        return 'ok';
     }
 }
 
@@ -10298,23 +9824,7 @@ sub dirlist {
             foreach my $user (sort(keys(%allusers))) {
                 push(@alluserslist,$user.'&user');
             }
-            if (!%listerror) {
-                # no errors
-                return (\@alluserslist);
-            } elsif (scalar(keys(%servers)) == 1) {
-                # one library server, one error
-                my ($key) = keys(%listerror);
-                return (\@alluserslist, $listerror{$key});
-            } elsif ( grep { $_ eq 'con_lost' } values(%listerror) ) {
-                # con_lost indicates that we might miss data from at least one
-                # library server
-                return (\@alluserslist, 'con_lost');
-            } else {
-                # multiple library servers and no con_lost -> data should be
-                # complete.
-                return (\@alluserslist);
-            }
-
+            return (\@alluserslist);
         } else {
             return ([],'missing username');
         }
@@ -10531,12 +10041,10 @@ sub get_userresdata {
     }
     #error 2 occurs when the .db doesn't exist
     if ($tmp!~/error: 2 /) {
-        if ((!defined($cached)) || ($tmp ne 'con_lost')) {
-	    &logthis("<font color=\"blue\">WARNING:".
-		     " Trying to get resource data for ".
-		     $uname." at ".$udom.": ".
-		     $tmp."</font>");
-        }
+	&logthis("<font color=\"blue\">WARNING:".
+		 " Trying to get resource data for ".
+		 $uname." at ".$udom.": ".
+		 $tmp."</font>");
     } elsif ($tmp=~/error: 2 /) {
 	#&EXT_cache_set($udom,$uname);
 	&do_cache_new('userres',$hashid,undef,600);
@@ -10550,7 +10058,7 @@ sub get_userresdata {
 #  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')
+#     $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
@@ -10569,44 +10077,13 @@ sub resdata {
     }
     if (!ref($result)) { return $result; }    
     foreach my $item (@which) {
-        if (ref($item) eq 'ARRAY') {
-	    if (defined($result->{$item->[0]})) {
-	        return [$result->{$item->[0]},$item->[1]];
-	    }
-        }
+	if (defined($result->{$item->[0]})) {
+	    return [$result->{$item->[0]},$item->[1]];
+	}
     }
     return undef;
 }
 
-sub get_domain_ltitools {
-    my ($cdom) = @_;
-    my %ltitools;
-    my ($result,$cached)=&is_cached_new('ltitools',$cdom);
-    if (defined($cached)) {
-        if (ref($result) eq 'HASH') {
-            %ltitools = %{$result};
-        }
-    } else {
-        my %domconfig = &get_dom('configuration',['ltitools'],$cdom);
-        if (ref($domconfig{'ltitools'}) eq 'HASH') {
-            %ltitools = %{$domconfig{'ltitools'}};
-            my %encdomconfig = &get_dom('encconfig',['ltitools'],$cdom);
-            if (ref($encdomconfig{'ltitools'}) eq 'HASH') {
-                foreach my $id (keys(%ltitools)) {
-                    if (ref($encdomconfig{'ltitools'}{$id}) eq 'HASH') {
-                        foreach my $item ('key','secret') {
-                            $ltitools{$id}{$item} = $encdomconfig{'ltitools'}{$id}{$item};
-                        }
-                    }
-                }
-            }
-        }
-        my $cachetime = 24*60*60;
-        &do_cache_new('ltitools',$cdom,\%ltitools,$cachetime);
-    }
-    return %ltitools;
-}
-
 sub get_numsuppfiles {
     my ($cnum,$cdom,$ignorecache)=@_;
     my $hashid=$cnum.':'.$cdom;
@@ -10619,7 +10096,7 @@ sub get_numsuppfiles {
         unless ($chome eq 'no_host') {
             ($suppcount,my $errors) = (0,0);
             my $suppmap = 'supplemental.sequence';
-            ($suppcount,$errors) =
+            ($suppcount,$errors) = 
                 &Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,$errors);
         }
         &do_cache_new('suppcount',$hashid,$suppcount,600);
@@ -10814,7 +10291,7 @@ sub EXT {
             $courseid = $cid;
         }
 	if (($symbparm && $courseid) && 
-	    (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
+	    (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid)))  {
 
 	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
 
@@ -11061,7 +10538,7 @@ sub metadata {
     # if it is a non metadata possible uri return quickly
     if (($uri eq '') || 
 	(($uri =~ m|^/*adm/|) && 
-	     ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard|ext\.tool)$})) ||
+	     ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) ||
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
 	return undef;
     }
@@ -11602,7 +11079,7 @@ sub symbverify {
             $ids=$bighash{'ids_'.&clutter($thisurl)};
         }
         unless ($ids) {
-            my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
+            my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;  
             $ids=$bighash{$idkey};
         }
         if ($ids) {
@@ -11618,14 +11095,14 @@ sub symbverify {
                    if (ref($encstate)) {
                        $$encstate = $bighash{'encrypted_'.$id};
                    }
-                   if (($env{'request.role.adv'}) ||
-                       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+		   if (($env{'request.role.adv'}) ||
+		       ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
                        ($thisurl eq '/adm/navmaps')) {
-                       $okay=1;
+		       $okay=1;
                        last;
-                   }
-               }
-           }
+		   }
+	       }
+	   }
         }
 	untie(%bighash);
     }
@@ -11709,9 +11186,9 @@ sub symbread {
 # no filename provided? try from environment
     unless ($thisfn) {
         if ($env{'request.symb'}) {
-            return $env{$cache_str}=&symbclean($env{'request.symb'});
-        }
-        $thisfn=$env{'request.filename'};
+	    return $env{$cache_str}=&symbclean($env{'request.symb'});
+	}
+	$thisfn=$env{'request.filename'};
     }
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
 # is that filename actually a symb? Verify, clean, and return
@@ -11768,7 +11245,7 @@ sub symbread {
 		     $syval=&encode_symb($bighash{'map_id_'.$mapid},
 						    $resid,$thisfn);
                      if (ref($possibles) eq 'HASH') {
-                         $possibles->{$syval} = 1;
+                         $possibles->{$syval} = 1;    
                      }
                      if ($checkforblock) {
                          my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids});
@@ -11777,7 +11254,7 @@ sub symbread {
                              return;
                          }
                      }
-                 } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
+                 } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { 
 # ------------------------------------------ There is more than one possibility
                      my $realpossible=0;
                      foreach my $id (@possibilities) {
@@ -11785,14 +11262,14 @@ sub symbread {
                          my $canaccess;
                          if (($donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
                              $canaccess = 1;
-                         } else {
+                         } else { 
                              $canaccess = &allowed('bre',$file);
                          }
                          if ($canaccess) {
          		     my ($mapid,$resid)=split(/\./,$id);
                              if ($bighash{'map_type_'.$mapid} ne 'page') {
                                  my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid},
-                                                             $resid,$thisfn);
+						             $resid,$thisfn);
                                  if (ref($possibles) eq 'HASH') {
                                      $possibles->{$syval} = 1;
                                  }
@@ -11967,6 +11444,7 @@ sub rndseed {
 	$which =&get_rand_alg($courseid);
     }
     if (defined(&getCODE())) {
+
 	if ($which eq '64bit5') {
 	    return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
 	} elsif ($which eq '64bit4') {
@@ -12152,7 +11630,7 @@ sub rndseed_CODE_64bit5 {
 sub setup_random_from_rndseed {
     my ($rndseed)=@_;
     if ($rndseed =~/([,:])/) {
-	my ($num1,$num2) = map { abs($_); } (split(/[,:]/,$rndseed));
+        my ($num1,$num2) = map { abs($_); } (split(/[,:]/,$rndseed));
         if ((!$num1) || (!$num2) || ($num1 > 2147483562) || ($num2 > 2147483398)) {
             &Math::Random::random_set_seed_from_phrase($rndseed);
         } else {
@@ -12593,8 +12071,6 @@ sub clutter {
 #		&logthis("Got a blank emb style");
 	    }
 	}
-    } elsif ($thisfn =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) {
-        $thisfn='/adm/wrapper'.$thisfn;
     }
     return $thisfn;
 }
@@ -12687,9 +12163,9 @@ sub get_dns {
         delete($alldns{$dns});
 	next if ($response->is_error());
 	my @content = split("\n",$response->content);
-        unless ($nocache) {
+	unless ($nocache) {
 	    &do_cache_new('dns',$url,\@content,30*24*60*60);
-        }
+	}
 	&$func(\@content,$hashref);
 	return;
     }
@@ -12726,7 +12202,7 @@ sub parse_dns_checksums_tab {
     if (ref($lines) eq 'ARRAY') {
         chomp(@{$lines});
         my $version = shift(@{$lines});
-        if ($version eq $release) {
+        if ($version eq $release) {  
             foreach my $line (@{$lines}) {
                 my ($file,$version,$shasum) = split(/,/,$line);
                 if ($file =~ m{^/etc/httpd/conf}) {
@@ -12786,8 +12262,8 @@ sub fetch_dns_checksums {
     }
 
     sub load_domain_tab {
-	my ($ignore_cache,$nocache) = @_;
-	&get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache);
+	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>;
@@ -12841,23 +12317,8 @@ sub fetch_dns_checksums {
 	    my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline);
 	    $name=~s/\s//g;
 	    if ($id && $domain && $role && $name) {
-                if ((exists($hostname{$id})) && ($hostname{$id} ne '')) {
-                    my $curr = $hostname{$id};
-                    my $skip;
-                    if (ref($name_to_host{$curr}) eq 'ARRAY') {
-                        if (($curr eq $name) && (@{$name_to_host{$curr}} == 1)) {
-                            $skip = 1;
-                        } else {
-                            @{$name_to_host{$curr}} = grep { $_ ne $id } @{$name_to_host{$curr}};
-                        }
-                    }
-                    unless ($skip) {
-                        push(@{$name_to_host{$name}},$id);
-                    }
-                } else {
-                    push(@{$name_to_host{$name}},$id);
-                }
 		$hostname{$id}=$name;
+		push(@{$name_to_host{$name}}, $id);
 		$hostdom{$id}=$domain;
 		if ($role eq 'library') { $libserv{$id}=$name; }
                 if (defined($protocol)) {
@@ -12888,8 +12349,8 @@ sub fetch_dns_checksums {
     }
 
     sub load_hosts_tab {
-	my ($ignore_cache,$nocache) = @_;
-	&get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache);
+	my ($ignore_cache) = @_;
+	&get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache);
 	open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
 	my @config = <$config>;
 	&parse_hosts_tab(\@config);
@@ -12911,8 +12372,7 @@ sub fetch_dns_checksums {
     }
 
     sub all_names {
-        my ($ignore_cache,$nocache) = @_;
-	&load_hosts_tab($ignore_cache,$nocache) if (!$loaded);
+	&load_hosts_tab() if (!$loaded);
 
 	return %name_to_host;
     }
@@ -13034,7 +12494,7 @@ sub fetch_dns_checksums {
     }
     
     sub get_iphost {
-	my ($ignore_cache,$nocache) = @_;
+	my ($ignore_cache) = @_;
 
 	if (!$ignore_cache) {
 	    if (%iphost) {
@@ -13058,7 +12518,7 @@ sub fetch_dns_checksums {
 	    %old_name_to_ip = %{$ip_info->[1]};
 	}
 
-	my %name_to_host = &all_names($ignore_cache,$nocache);
+	my %name_to_host = &all_names();
 	foreach my $name (keys(%name_to_host)) {
 	    my $ip;
 	    if (!exists($name_to_ip{$name})) {
@@ -13083,11 +12543,9 @@ sub fetch_dns_checksums {
 	    }
 	    push(@{$iphost{$ip}},@{$name_to_host{$name}});
 	}
-        unless ($nocache) {
-	    &do_cache_new('iphost','iphost',
-		          [\%iphost,\%name_to_ip,\%lonid_to_ip],
-		          48*60*60);
-        }
+	&do_cache_new('iphost','iphost',
+		      [\%iphost,\%name_to_ip,\%lonid_to_ip],
+		      48*60*60);
 
 	return %iphost;
     }
@@ -13152,9 +12610,9 @@ sub all_loncaparevs {
     return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11);
 }
 
-# ------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
 {
-    sub load_loncaparevs {
+    sub load_loncaparevs { 
         if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
             if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
                 while (my $configline=<$config>) {
@@ -13168,7 +12626,7 @@ sub all_loncaparevs {
     }
 }
 
-# ----------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
 {
     sub load_serverhomeIDs {
         if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
@@ -13260,11 +12718,11 @@ BEGIN {
     close($config);
 }
 
-# --------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
 
 &load_loncaparevs();
 
-# ------------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
 
 &load_serverhomeIDs();
 
@@ -13278,10 +12736,11 @@ BEGIN {
                 my $item = $token->[1];
                 my $name = $token->[2]{'name'};
                 my $value = $token->[2]{'value'};
-                if ($item ne '' && $name ne '' && $value ne '') {
+                my $valuematch = $token->[2]{'valuematch'};
+                if ($item ne '' && $name ne '' && ($value ne '' || $valuematch ne '')) {
                     my $release = $parser->get_text();
                     $release =~ s/(^\s*|\s*$ )//gx;
-                    $needsrelease{$item.':'.$name.':'.$value} = $release;
+                    $needsrelease{$item.':'.$name.':'.$value.':'.$valuematch} = $release;
                 }
             }
         }
@@ -13611,13 +13070,13 @@ The first argument is required, all othe
 
 $priv is the privilege being checked.
 $uri contains additional information about what is being checked for access (e.g.,
-URL, course ID etc.).
+URL, course ID etc.). 
 $symb is the unique resource instance identifier in a course; if needed,
-but not provided, it will be retrieved via a call to &symbread().
-$role is the role for which a priv is being checked (only used if priv is evb).
-$clientip is the user's IP address (only used when checking for access to portfolio
+but not provided, it will be retrieved via a call to &symbread(). 
+$role is the role for which a priv is being checked (only used if priv is evb). 
+$clientip is the user's IP address (only used when checking for access to portfolio 
 files).
-$noblockcheck, if true, skips calls to &has_comm_blocking() for the bre priv. This
+$noblockcheck, if true, skips calls to &has_comm_blocking() for the bre priv. This 
 prevents recursive calls to &allowed.
 
  F: full access
@@ -13645,10 +13104,9 @@ in which case the null string is returne
 
 =item *
 
-definerole($rolename,$sysrole,$domrole,$courole,$uname,$udom) : define role;
-define a custom role rolename set privileges in format of lonTabs/roles.tab
-for system, domain, and course level. $uname and $udom are optional (current
-user's username and domain will be used when either of $uname or $udom are absent.
+definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
+role rolename set privileges in format of lonTabs/roles.tab for system, domain,
+and course level
 
 =item *
 
@@ -13679,9 +13137,9 @@ provided for types, will default to retu
 =item *
 
 in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if
-user: $uname:$udom has a role in the course: $cdom_$cnum.
+user: $uname:$udom has a role in the course: $cdom_$cnum. 
 
-Additional optional arguments are: $type (if role checking is to be restricted
+Additional optional arguments are: $type (if role checking is to be restricted 
 to certain user status types -- previous (expired roles), active (currently
 available roles) or future (roles available in the future), and
 $hideprivileged -- if true will not report course roles for users who
@@ -13852,8 +13310,6 @@ Inputs:
 
 =item $credits, number of credits student will earn from this class
 
-=item $instsec, institutional course section code for student
-
 =back
 
 
@@ -13920,7 +13376,7 @@ values that are the resource value.  I b
 versions are also returned.
 
 get_numsuppfiles($cnum,$cdom) : retrieve number of files in a course's
-supplemental content area. This routine caches the number of files for
+supplemental content area. This routine caches the number of files for 
 10 minutes.
 
 =back
@@ -14023,20 +13479,20 @@ will be stored for query
 
 =item *
 
-symbread($filename,$donotrecurse,$ignorecachednull,$checkforblock,$possibles) :
-return symbolic list entry (all arguments optional).
+symbread($filename,$donotrecurse,$ignorecachednull,$checkforblock,$possibles) : 
+return symbolic list entry (all arguments optional). 
 
-Args: filename is the filename (including path) for the file for which a symb
-is required; donotrecurse, if true will prevent calls to allowed() being made
-to check access status if more than one resource was found in the bighash
-(see rev. 1.249) to avoid an infinite loop if an ambiguous resource is part of
-a randompick); ignorecachednull, if true will prevent a symb of '' being
+Args: filename is the filename (including path) for the file for which a symb 
+is required; donotrecurse, if true will prevent calls to allowed() being made 
+to check access status if more than one resource was found in the bighash 
+(see rev. 1.249) to avoid an infinite loop if an ambiguous resource is part of 
+a randompick); ignorecachednull, if true will prevent a symb of '' being 
 returned if $env{$cache_str} is defined as ''; checkforblock if true will
 cause possible symbs to be checked to determine if they are subject to content
 blocking, if so they will not be included as possible symbs; possibles is a
-ref to a hash, which, as a side effect, will be populated with all possible
+ref to a hash, which, as a side effect, will be populated with all possible 
 symbs (content blocking not tested).
-
+ 
 returns the data handle
 
 =item *
@@ -14046,9 +13502,9 @@ and is a possible symb for the URL in $t
 resource that the user accessed using /enc/ returns a 1 on success, 0
 on failure, user must be in a course, as it assumes the existence of
 the course initial hash, and uses $env('request.course.id'}.  The third
-arg is an optional reference to a scalar.  If this arg is passed in the
+arg is an optional reference to a scalar.  If this arg is passed in the 
 call to symbverify, it will be set to 1 if the symb has been set to be 
-encrypted; otherwise it will be null.
+encrypted; otherwise it will be null.  
 
 =item *
 
@@ -14101,13 +13557,13 @@ expirespread($uname,$udom,$stype,$usymb)
 devalidate($symb) : devalidate temporary spreadsheet calculations,
 forcing spreadsheet to reevaluate the resource scores next time.
 
-=item *
+=item * 
 
 can_edit_resource($file,$cnum,$cdom,$resurl,$symb,$group) : determine if current user can edit a particular resource,
 when viewing in course context.
 
  input: six args -- filename (decluttered), course number, course domain,
-                    url, symb (if registered) and group (if this is a
+                    url, symb (if registered) and group (if this is a 
                     group item -- e.g., bulletin board, group page etc.).
 
  output: array of five scalars --
@@ -14115,15 +13571,15 @@ when viewing in course context.
          $home -- homeserver of resource (i.e., for author if published,
                                           or course if uploaded.).
          $switchserver --  1 if server switch will be needed.
-         $forceedit -- 1 if icon/link should be to go to edit mode
+         $forceedit -- 1 if icon/link should be to go to edit mode 
          $forceview -- 1 if icon/link should be to go to view mode
 
 =item *
 
 is_course_upload($file,$cnum,$cdom)
 
-Used in course context to determine if current file was uploaded to
-the course (i.e., would be found in /userfiles/docs on the course's
+Used in course context to determine if current file was uploaded to 
+the course (i.e., would be found in /userfiles/docs on the course's 
 homeserver.
 
   input: 3 args -- filename (decluttered), course number and course domain.
@@ -14137,20 +13593,20 @@ homeserver.
 
 =item *
 
-store($storehash,$symb,$namespace,$udom,$uname,$laststore) : stores hash 
+store($storehash,$symb,$namespace,$udom,$uname,$laststore) : stores hash
 permanently for this url; hashref needs to be given and should be a \%hashname;
 the remaining args aren't required and if they aren't passed or are '' they will
-be derived from the env (with the exception of $laststore, which is an
+be derived from the env (with the exception of $laststore, which is an 
 optional arg used when a user's submission is stored in grading).
 $laststore is $version=$timestamp, where $version is the most recent version
 number retrieved for the corresponding $symb in the $namespace db file, and
 $timestamp is the timestamp for that transaction (UNIX time).
-$laststore is currently only passed when cstore() is called by
+$laststore is currently only passed when cstore() is called by 
 structuretags::finalize_storage().
 
 =item *
 
-cstore($storehash,$symb,$namespace,$udom,$uname,$laststore) : same as store 
+cstore($storehash,$symb,$namespace,$udom,$uname,$laststore) : same as store
 but uses critical subroutine
 
 =item *
@@ -14288,7 +13744,7 @@ server ($udom and $uhome are optional)
 
 =item * 
 
-get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
+get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults 
 for: authentication, language, quotas, timezone, date locale, and portal URL in
 the target domain.
 
@@ -14343,7 +13799,7 @@ for course's uploaded content.
 =over
 
 =item
-canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota,
+canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota, 
 communityquota, textbookquota
 
 =back
@@ -14354,7 +13810,7 @@ on your servers.
 
 =over
 
-=item
+=item 
 remotesessions, hostedsessions
 
 =back
@@ -14362,10 +13818,10 @@ remotesessions, hostedsessions
 =back
 
 In cases where a domain coordinator has never used the "Set Domain Configuration"
-utility to create a configuration.db file on a domain's primary library server
+utility to create a configuration.db file on a domain's primary library server 
 only the following domain defaults: auth_def, auth_arg_def, lang_def
 -- corresponding values are authentication type (internal, krb4, krb5,
-or localauth), initial password or a kerberos realm, language (e.g., en-us) --
+or localauth), initial password or a kerberos realm, language (e.g., en-us) -- 
 will be available. Values are retrieved from cache (if current), unless the
 optional $ignore_cache arg is true, or from domain's configuration.db (if available),
 or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
@@ -14793,8 +14249,8 @@ Returns:
 
 get_timebased_id():
 
-Attempts to get a unique timestamp-based suffix for use with items added to a
-course via the Course Editor (e.g., folders, composite pages,
+Attempts to get a unique timestamp-based suffix for use with items added to a 
+course via the Course Editor (e.g., folders, composite pages, 
 group bulletin boards).
 
 Args: (first three required; six others optional)
@@ -14805,24 +14261,24 @@ Args: (first three required; six others
 2. keyid (alphanumeric): name of temporary locking key in hash,
    e.g., num, boardids
 
-3. namespace: name of gdbm file used to store suffixes already assigned;
+3. namespace: name of gdbm file used to store suffixes already assigned;  
    file will be named nohist_namespace.db
 
 4. cdom: domain of course; default is current course domain from %env
 
 5. cnum: course number; default is current course number from %env
 
-6. idtype: set to concat if an additional digit is to be appended to the
+6. idtype: set to concat if an additional digit is to be appended to the 
    unix timestamp to form the suffix, if the plain timestamp is already
-   in use.  Default is to not do this, but simply increment the unix
+   in use.  Default is to not do this, but simply increment the unix 
    timestamp by 1 until a unique key is obtained.
 
 7. who: holder of locking key; defaults to user:domain for user.
 
-8. locktries: number of attempts to obtain a lock (sleep of 1s before
+8. locktries: number of attempts to obtain a lock (sleep of 1s before 
    retrying); default is 3.
 
-9. maxtries: number of attempts to obtain a unique suffix; default is 20.
+9. maxtries: number of attempts to obtain a unique suffix; default is 20.  
 
 Returns: