--- loncom/lonnet/perl/lonnet.pm	2024/02/28 05:40:11	1.1172.2.146.2.19
+++ loncom/lonnet/perl/lonnet.pm	2022/10/07 14:31:28	1.1494
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.146.2.19 2024/02/28 05:40:11 raeburn Exp $
+# $Id: lonnet.pm,v 1.1494 2022/10/07 14:31:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,11 +71,12 @@ delayed.
 package Apache::lonnet;
 
 use strict;
-use LWP::UserAgent();
 use HTTP::Date;
 use Image::Magick;
 use CGI::Cookie;
 
+use Encode;
+
 use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $deftex
             $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
             %managerstab $passwdmin);
@@ -101,6 +102,7 @@ use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Configuration;
 use LONCAPA::lonmetadata;
 use LONCAPA::Lond;
+use LONCAPA::LWPReq;
 use LONCAPA::transliterate;
 
 use File::Copy;
@@ -113,6 +115,7 @@ require Exporter;
 our @ISA = qw (Exporter);
 our @EXPORT = qw(%env);
 
+
 # ------------------------------------ Logging (parameters, docs, slots, roles)
 {
     my $logid;
@@ -128,19 +131,19 @@ our @EXPORT = qw(%env);
         my $now = time();
 	my $id=$now.'00000'.$$.'00000'.$logid;
         my $ip = &get_requestor_ip();
-        my $logentry = {
-                         $id => {
-                                  'exe_uname' => $env{'user.name'},
-                                  'exe_udom'  => $env{'user.domain'},
-                                  'exe_time'  => $now,
-                                  'exe_ip'    => $ip,
-                                  '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'    => $ip,
+                                   'delflag'   => $delflag,
+                                   'logentry'  => $storehash,
+                                   'uname'     => $uname,
+                                   'udom'      => $udom,
+                                  }
                        };
-        return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
+	return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
     }
 }
 
@@ -185,7 +188,7 @@ sub create_connection {
 				     Type    => SOCK_STREAM,
 				     Timeout => 10);
     return 0 if (!$client);
-    print $client (join(':',$hostname,$lonid,&machine_ids($hostname))."\n");
+    print $client (join(':',$hostname,$lonid,&machine_ids($hostname),$loncaparevs{$lonid})."\n");
     my $result = <$client>;
     chomp($result);
     return 1 if ($result eq 'done');
@@ -230,6 +233,54 @@ sub get_server_distarch {
     return;
 }
 
+sub get_servercerts_info {
+    my ($lonhost,$hostname,$context) = @_;
+    return if ($lonhost eq '');
+    if ($hostname eq '') {
+        $hostname = &hostname($lonhost);
+    }
+    return if ($hostname eq '');
+    my ($rep,$uselocal);
+    if ($context eq 'install') {
+        $uselocal = 1;
+    } elsif (grep { $_ eq $lonhost } &current_machine_ids()) {
+        $uselocal = 1;
+    }
+    if (($context ne 'cgi') && ($context ne 'install') && ($uselocal)) {
+        my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0];
+        if ($distro eq '') {
+            $uselocal = 0;
+        } elsif ($distro =~ /^(?:centos|redhat|scientific)(\d+)$/) {
+            if ($1 < 6) {
+                $uselocal = 0;
+            }
+        }  elsif ($distro =~ /^(?:sles)(\d+)$/) {
+            if ($1 < 12) {
+                $uselocal = 0;
+            }
+        }
+    }
+    if ($uselocal) {
+        $rep = LONCAPA::Lond::server_certs(\%perlvar,$lonhost,$hostname);
+    } else {
+        $rep=&reply('servercerts',$lonhost);
+    }
+    my ($result,%returnhash);
+    if (($rep=~/^(refused|rejected|error)/) || ($rep eq 'con_lost') ||
+        ($rep eq 'unknown_cmd')) {
+        $result = $rep;
+    } else {
+        $result = 'ok';
+        my @pairs=split(/\&/,$rep);
+        foreach my $item (@pairs) {
+            my ($key,$value)=split(/=/,$item,2);
+            my $what = &unescape($key);
+            $returnhash{$what}=&thaw_unescape($value);
+        }
+    }
+    return ($result,\%returnhash);
+}
+
 sub get_server_loncaparev {
     my ($dom,$lonhost,$ignore_cache,$caller) = @_;
     if (defined($lonhost)) {
@@ -264,14 +315,12 @@ sub get_server_loncaparev {
             $answer = &reply('serverloncaparev',$lonhost);
             if (($answer eq 'unknown_cmd') || ($answer eq 'con_lost')) {
                 if ($caller eq 'loncron') {
-                    my $ua=new LWP::UserAgent;
-                    $ua->timeout(4);
                     my $hostname = &hostname($lonhost);
                     my $protocol = $protocol{$lonhost};
                     $protocol = 'http' if ($protocol ne 'https');
                     my $url = $protocol.'://'.$hostname.'/adm/about.html';
                     my $request=new HTTP::Request('GET',$url);
-                    my $response=$ua->request($request);
+                    my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,'',\%perlvar,4,1);
                     unless ($response->is_error()) {
                         my $content = $response->content;
                         if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) {
@@ -362,64 +411,8 @@ sub remote_devalidate_cache {
     my $items;
     return unless (ref($cachekeys) eq 'ARRAY');
     my $cachestr = join('&',@{$cachekeys});
-    return &reply('devalidatecache:'.&escape($cachestr),$lonhost);
-}
-
-sub sign_lti {
-    my ($cdom,$cnum,$crsdef,$type,$context,$url,$ltinum,$keynum,$paramsref,$inforef) = @_;
-    my $chome;
-    if (&domain($cdom) ne '') {
-        if ($crsdef) {
-            $chome = &homeserver($cnum,$cdom);
-        } else {
-            $chome = &domain($cdom,'primary');
-        }
-    }
-    if ($cdom && $chome && ($chome ne 'no_host')) {
-        if ((ref($paramsref) eq 'HASH') &&
-            (ref($inforef) eq 'HASH')) {
-            my $rep;
-            if (grep { $_ eq $chome } &current_machine_ids()) {
-                # domain information is hosted on this machine
-                $rep =
-                    &LONCAPA::Lond::sign_lti_payload($cdom,$cnum,$crsdef,$type,
-                                                     $context,$url,$ltinum,$keynum,
-                                                     $perlvar{'lonVersion'},
-                                                     $paramsref,$inforef);
-                if (ref($rep) eq 'HASH') {
-                    return ('ok',$rep);
-                }
-            } else {
-                my ($escurl,$params,$info);
-                $escurl = &escape($url);
-                if (ref($paramsref) eq 'HASH') {
-                    $params = &freeze_escape($paramsref);
-                }
-                if (ref($inforef) eq 'HASH') {
-                    $info = &freeze_escape($inforef);
-                }
-                $rep=&reply("encrypt:signlti:$cdom:$cnum:$crsdef:$type:$context:$escurl:$ltinum:$keynum:$params:$info",$chome);
-            }
-            if (($rep eq '') || ($rep =~ /^con_lost|error|no_such_host|unknown_cmd/i)) {
-                return ();
-            } elsif (($inforef->{'respfmt'} eq 'to_post_body') ||
-                     ($inforef->{'respfmt'} eq 'to_authorization_header')) {
-                return ('ok',$rep);
-            } else {
-                my %returnhash;
-                foreach my $item (split(/\&/,$rep)) {
-                    my ($name,$value)=split(/\=/,$item);
-                    $returnhash{&unescape($name)}=&thaw_unescape($value);
-                }
-                return('ok',\%returnhash);
-            }
-        } else {
-            return ();
-        }
-    } else {
-        return ();
-        &logthis("sign_lti failed - no homeserver and/or domain ($cdom) ($chome)");
-    }
+    my $response = &reply('devalidatecache:'.&escape($cachestr),$lonhost);
+    return $response;
 }
 
 # -------------------------------------------------- Non-critical communication
@@ -451,7 +444,7 @@ sub subreply {
 	} else {
 	    &create_connection(&hostname($server),$server);
 	}
-        sleep(0.1);		# Try again later if failed connection.
+        sleep(0.1);	# Try again later if failed connection.
     }
     my $answer;
     if ($client) {
@@ -525,7 +518,7 @@ sub reconlonc {
 	    &logthis("lonc at pid $loncpid responding, sending USR1");
             kill USR1 => $loncpid;
             sleep 1;
-         } else {
+        } else {
 	    &logthis(
                "<font color=\"blue\">WARNING:".
                " lonc at pid $loncpid not responding, giving up</font>");
@@ -720,7 +713,7 @@ sub check_for_valid_session {
         }
     }
     if (!-e "$lonidsdir/$handle.id") {
-        if ((ref($domref)) && ($name eq 'lonID') &&
+        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)) {
@@ -992,9 +985,9 @@ sub spareserver {
                                                      :  $userloadpercent;
     my ($uint_dom,$remotesessions);
     if (($udom ne '') && (&domain($udom) ne '')) {
-        my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
-        $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-        my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom);
+        my $uprimary_id = &domain($udom,'primary');
+        $uint_dom = &internet_dom($uprimary_id);
+        my %udomdefaults = &get_domain_defaults($udom);
         $remotesessions = $udomdefaults{'remotesessions'};
     }
     my $spareshash = &this_host_spares($udom);
@@ -1030,7 +1023,7 @@ sub spareserver {
                 if ($protocol{$spare_server} eq 'https') {
                     $protocol = $protocol{$spare_server};
                 }
-                my $alias = &Apache::lonnet::use_proxy_alias($r,$spare_server);
+                my $alias = &use_proxy_alias($r,$spare_server);
                 $hostname = $alias if ($alias ne '');
 	        $spare_server = $protocol.'://'.$hostname;
             }
@@ -1111,7 +1104,6 @@ sub delusersession {
     return;
 }
 
-
 # check if user's browser sent load balancer cookie and server still has session
 # and is not overloaded.
 sub check_for_balancer_cookie {
@@ -1219,7 +1211,7 @@ sub choose_server {
         unless (defined($cached)) {
             my $cachetime = 60*60*24;
             my %domconfig =
-                &Apache::lonnet::get_dom('configuration',['loadbalancing'],$udom);
+                &get_dom('configuration',['loadbalancing'],$udom);
             if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
                 $balancers = &do_cache_new('loadbalancing',$udom,$domconfig{'loadbalancing'},
                                            $cachetime);
@@ -1227,12 +1219,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) {
@@ -1412,7 +1404,7 @@ sub can_switchserver {
 sub can_host_session {
     my ($udom,$lonhost,$remoterev,$remotesessions,$hostedsessions) = @_;
     my $canhost = 1;
-    my $host_idn = &Apache::lonnet::internet_dom($lonhost);
+    my $host_idn = &internet_dom($lonhost);
     if (ref($remotesessions) eq 'HASH') {
         if (ref($remotesessions->{'excludedomain'}) eq 'ARRAY') {
             if (grep(/^\Q$host_idn\E$/,@{$remotesessions->{'excludedomain'}})) {
@@ -1448,8 +1440,8 @@ sub can_host_session {
     }
     if ($canhost) {
         if (ref($hostedsessions) eq 'HASH') {
-            my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
-            my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
+            my $uprimary_id = &domain($udom,'primary');
+            my $uint_dom = &internet_dom($uprimary_id);
             if (ref($hostedsessions->{'excludedomain'}) eq 'ARRAY') {
                 if (($uint_dom ne '') && 
                     (grep(/^\Q$uint_dom\E$/,@{$hostedsessions->{'excludedomain'}}))) {
@@ -1541,7 +1533,7 @@ sub spares_for_offload  {
     } else {
         my $cachetime = 60*60*24;
         my %domconfig =
-            &Apache::lonnet::get_dom('configuration',['usersessions'],$dom_in_use);
+            &get_dom('configuration',['usersessions'],$dom_in_use);
         if (ref($domconfig{'usersessions'}) eq 'HASH') {
             if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') {
                 if (ref($domconfig{'usersessions'}{'spares'}{$lonhost_in_use}) eq 'HASH') {
@@ -1590,14 +1582,14 @@ sub get_lonbalancer_config {
 sub check_loadbalancing {
     my ($uname,$udom,$caller) = @_;
     my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom,
-        $rule_in_effect,$offloadto,$otherserver,$setcookie);
+        $rule_in_effect,$offloadto,$otherserver,$setcookie,$dom_balancers);
     my $lonhost = $perlvar{'lonHostID'};
     my @hosts = &current_machine_ids();
-    my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
-    my $uintdom = &Apache::lonnet::internet_dom($uprimary_id);
-    my $intdom = &Apache::lonnet::internet_dom($lonhost);
+    my $uprimary_id = &domain($udom,'primary');
+    my $uintdom = &internet_dom($uprimary_id);
+    my $intdom = &internet_dom($lonhost);
     my $serverhomedom = &host_domain($lonhost);
-    my $domneedscache; 
+    my $domneedscache;
     my $cachetime = 60*60*24;
 
     if (($uintdom ne '') && ($uintdom eq $intdom)) {
@@ -1609,7 +1601,7 @@ sub check_loadbalancing {
     my ($result,$cached)=&is_cached_new('loadbalancing',$dom_in_use);
     unless (defined($cached)) {
         my %domconfig =
-            &Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use);
+            &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 {
@@ -1617,7 +1609,7 @@ sub check_loadbalancing {
         }
     }
     if (ref($result) eq 'HASH') {
-        ($is_balancer,$currtargets,$currrules,$setcookie) =
+        ($is_balancer,$currtargets,$currrules,$setcookie,$dom_balancers) =
             &check_balancer_result($result,@hosts);
         if ($is_balancer) {
             if (ref($currrules) eq 'HASH') {
@@ -1670,7 +1662,7 @@ sub check_loadbalancing {
         ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
         unless (defined($cached)) {
             my %domconfig =
-                &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
+                &get_dom('configuration',['loadbalancing'],$serverhomedom);
             if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
                 $result = &do_cache_new('loadbalancing',$serverhomedom,$domconfig{'loadbalancing'},$cachetime);
             } else {
@@ -1678,7 +1670,7 @@ sub check_loadbalancing {
             }
         }
         if (ref($result) eq 'HASH') {
-            ($is_balancer,$currtargets,$currrules,$setcookie) =
+            ($is_balancer,$currtargets,$currrules,$setcookie,$dom_balancers) =
                 &check_balancer_result($result,@hosts);
             if ($is_balancer) {
                 if (ref($currrules) eq 'HASH') {
@@ -1754,12 +1746,12 @@ sub check_loadbalancing {
     if (($is_balancer) && (!$homeintdom)) {
         undef($setcookie);
     }
-    return ($is_balancer,$otherserver,$setcookie);
+    return ($is_balancer,$otherserver,$setcookie,$offloadto,$dom_balancers);
 }
 
 sub check_balancer_result {
     my ($result,@hosts) = @_;
-    my ($is_balancer,$currtargets,$currrules,$setcookie);
+    my ($is_balancer,$currtargets,$currrules,$setcookie,$dom_balancers);
     if (ref($result) eq 'HASH') {
         if ($result->{'lonhost'} ne '') {
             my $currbalancer = $result->{'lonhost'};
@@ -1768,20 +1760,24 @@ sub check_balancer_result {
                 $currtargets = $result->{'targets'};
                 $currrules = $result->{'rules'};
             }
+            $dom_balancers = $currbalancer;
         } else {
-            foreach my $key (keys(%{$result})) {
-                if (($key ne '') && (grep(/^\Q$key\E$/,@hosts)) &&
-                    (ref($result->{$key}) eq 'HASH')) {
-                    $is_balancer = 1;
-                    $currrules = $result->{$key}{'rules'};
-                    $currtargets = $result->{$key}{'targets'};
-                    $setcookie = $result->{$key}{'cookie'};
-                    last;
+            if (keys(%{$result})) {
+                foreach my $key (keys(%{$result})) {
+                    if (($key ne '') && (grep(/^\Q$key\E$/,@hosts)) &&
+                        (ref($result->{$key}) eq 'HASH')) {
+                        $is_balancer = 1;
+                        $currrules = $result->{$key}{'rules'};
+                        $currtargets = $result->{$key}{'targets'};
+                        $setcookie = $result->{$key}{'cookie'};
+                        last;
+                    }
                 }
+                $dom_balancers = join(',',sort(keys(%{$result})));
             }
         }
     }
-    return ($is_balancer,$currtargets,$currrules,$setcookie);
+    return ($is_balancer,$currtargets,$currrules,$setcookie,$dom_balancers);
 }
 
 sub get_loadbalancer_targets {
@@ -1799,7 +1795,7 @@ sub get_loadbalancer_targets {
             }
         } elsif ($rule_in_effect eq 'externalbalancer') {
             my %domconfig =
-                &Apache::lonnet::get_dom('configuration',['loadbalancing'],$udom);
+                &get_dom('configuration',['loadbalancing'],$udom);
             if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
                 if ($domconfig{'loadbalancing'}{'lonhost'} ne '') {
                     if (&hostname($domconfig{'loadbalancing'}{'lonhost'}) ne '') {
@@ -1853,6 +1849,101 @@ sub internet_dom_servers {
     return %uniqservers;
 }
 
+sub trusted_domains {
+    my ($cmdtype,$calldom) = @_;
+    my ($trusted,$untrusted);
+    if (&domain($calldom) eq '') {
+        return ($trusted,$untrusted);
+    }
+    unless ($cmdtype =~ /^(content|shared|enroll|coaurem|othcoau|domroles|catalog|reqcrs|msg)$/) {
+        return ($trusted,$untrusted);
+    }
+    my $callprimary = &domain($calldom,'primary');
+    my $intcalldom = &internet_dom($callprimary);
+    if ($intcalldom eq '') {
+        return ($trusted,$untrusted);
+    }
+
+    my ($trustconfig,$cached)=&is_cached_new('trust',$calldom);
+    unless (defined($cached)) {
+        my %domconfig = &get_dom('configuration',['trust'],$calldom);
+        &do_cache_new('trust',$calldom,$domconfig{'trust'},3600);
+        $trustconfig = $domconfig{'trust'};
+    }
+    if (ref($trustconfig)) {
+        my (%possexc,%possinc,@allexc,@allinc); 
+        if (ref($trustconfig->{$cmdtype}) eq 'HASH') {
+            if (ref($trustconfig->{$cmdtype}->{'exc'}) eq 'ARRAY') {
+                map { $possexc{$_} = 1; } @{$trustconfig->{$cmdtype}->{'exc'}}; 
+            }
+            if (ref($trustconfig->{$cmdtype}->{'inc'}) eq 'ARRAY') {
+                $possinc{$intcalldom} = 1;
+                map { $possinc{$_} = 1; } @{$trustconfig->{$cmdtype}->{'inc'}};
+            }
+        }
+        if (keys(%possexc)) {
+            if (keys(%possinc)) {
+                foreach my $key (sort(keys(%possexc))) {
+                    next if ($key eq $intcalldom);
+                    unless ($possinc{$key}) {
+                        push(@allexc,$key);
+                    }
+                }
+            } else {
+                @allexc = sort(keys(%possexc));
+            }
+        }
+        if (keys(%possinc)) {
+            $possinc{$intcalldom} = 1;
+            @allinc = sort(keys(%possinc));
+        }
+        if ((@allexc > 0) || (@allinc > 0)) {
+            my %doms_by_intdom;
+            my %allintdoms = &all_host_intdom();
+            my %alldoms = &all_host_domain();
+            foreach my $key (%allintdoms) {
+                if (ref($doms_by_intdom{$allintdoms{$key}}) eq 'ARRAY') {
+                    unless (grep(/^\Q$alldoms{$key}\E$/,@{$doms_by_intdom{$allintdoms{$key}}})) {
+                        push(@{$doms_by_intdom{$allintdoms{$key}}},$alldoms{$key});
+                    }
+                } else {
+                    $doms_by_intdom{$allintdoms{$key}} = [$alldoms{$key}]; 
+                }
+            }
+            foreach my $exc (@allexc) {
+                if (ref($doms_by_intdom{$exc}) eq 'ARRAY') {
+                    push(@{$untrusted},@{$doms_by_intdom{$exc}});
+                }
+            }
+            foreach my $inc (@allinc) {
+                if (ref($doms_by_intdom{$inc}) eq 'ARRAY') {
+                    push(@{$trusted},@{$doms_by_intdom{$inc}});
+                }
+            }
+        }
+    }
+    return ($trusted,$untrusted);
+}
+
+sub will_trust {
+    my ($cmdtype,$domain,$possdom) = @_;
+    return 1 if ($domain eq $possdom);
+    my ($trustedref,$untrustedref) = &trusted_domains($cmdtype,$possdom);
+    my $willtrust; 
+    if ((ref($trustedref) eq 'ARRAY') && (@{$trustedref} > 0)) {
+        if (grep(/^\Q$domain\E$/,@{$trustedref})) {
+            $willtrust = 1;
+        }
+    } elsif ((ref($untrustedref) eq 'ARRAY') && (@{$untrustedref} > 0)) {
+        unless (grep(/^\Q$domain\E$/,@{$untrustedref})) {
+            $willtrust = 1;
+        }
+    } else {
+        $willtrust = 1;
+    }
+    return $willtrust;
+}
+
 # ---------------------- Find the homebase for a user from domain's lib servers
 
 my %homecache;
@@ -1878,17 +1969,33 @@ sub homeserver {
     return 'no_host';
 }
 
-# ------------------------------------- Find the usernames behind a list of IDs
+# ----- Find the usernames behind a list of student/employee IDs or clicker IDs
 
 sub idget {
-    my ($udom,@ids)=@_;
+    my ($udom,$idsref,$namespace)=@_;
     my %returnhash=();
+    my @ids=(); 
+    if (ref($idsref) eq 'ARRAY') {
+        @ids = @{$idsref};
+    } else {
+        return %returnhash; 
+    }
+    if ($namespace eq '') {
+        $namespace = 'ids';
+    }
     
     my %servers = &get_servers($udom,'library');
     foreach my $tryserver (keys(%servers)) {
 	my $idlist=join('&', map { &escape($_); } @ids);
-	$idlist=~tr/A-Z/a-z/; 
-	my $reply=&reply("idget:$udom:".$idlist,$tryserver);
+	if ($namespace eq 'ids') {
+	    $idlist=~tr/A-Z/a-z/;
+	}
+	my $reply;
+	if ($namespace eq 'ids') {
+	    $reply=&reply("idget:$udom:".$idlist,$tryserver);
+	} else {
+	    $reply=&reply("getdom:$udom:$namespace:$idlist",$tryserver);
+	}
 	my @answer=();
 	if (($reply ne 'con_lost') && ($reply!~/^error\:/)) {
 	    @answer=split(/\&/,$reply);
@@ -1897,9 +2004,9 @@ sub idget {
 	for ($i=0;$i<=$#ids;$i++) {
 	    if ($answer[$i]) {
 		$returnhash{$ids[$i]}=&unescape($answer[$i]);
-	    } 
+	    }
 	}
-    } 
+    }
     return %returnhash;
 }
 
@@ -1914,60 +2021,141 @@ sub idrget {
     return %returnhash;
 }
 
-# ------------------------------- Store away a list of names and associated IDs
+# Store away a list of names and associated student/employee IDs or clicker IDs
 
 sub idput {
-    my ($udom,%ids)=@_;
+    my ($udom,$idsref,$uhom,$namespace)=@_;
     my %servers=();
+    my %ids=();
+    my %byid = ();
+    if (ref($idsref) eq 'HASH') {
+        %ids=%{$idsref};
+    }
+    if ($namespace eq '') {
+        $namespace = 'ids'; 
+    }
     foreach my $uname (keys(%ids)) {
 	&cput('environment',{'id'=>$ids{$uname}},$udom,$uname);
-        my $uhom=&homeserver($uname,$udom);
+        if ($uhom eq '') {
+            $uhom=&homeserver($uname,$udom);
+        }
         if ($uhom ne 'no_host') {
-            my $id=&escape($ids{$uname});
-            $id=~tr/A-Z/a-z/;
             my $esc_unam=&escape($uname);
-	    if ($servers{$uhom}) {
-		$servers{$uhom}.='&'.$id.'='.$esc_unam;
+            if ($namespace eq 'ids') {
+                my $id=&escape($ids{$uname});
+                $id=~tr/A-Z/a-z/;
+                my $esc_unam=&escape($uname);
+                $servers{$uhom}.=$id.'='.$esc_unam.'&';
             } else {
-                $servers{$uhom}=$id.'='.$esc_unam;
+                my @currids = split(/,/,$ids{$uname});
+                foreach my $id (@currids) {
+                    $byid{$uhom}{$id} .= $uname.',';
+                }
+            }
+        }
+    }
+    if ($namespace eq 'clickers') {
+        foreach my $server (keys(%byid)) {
+            if (ref($byid{$server}) eq 'HASH') {
+                foreach my $id (keys(%{$byid{$server}})) {
+                    $byid{$server} =~ s/,$//;
+                    $servers{$uhom}.=&escape($id).'='.&escape($byid{$server}).'&'; 
+                }
             }
         }
     }
     foreach my $server (keys(%servers)) {
-        &critical('idput:'.$udom.':'.$servers{$server},$server);
+        $servers{$server} =~ s/\&$//;
+        if ($namespace eq 'ids') {     
+            &critical('idput:'.$udom.':'.$servers{$server},$server);
+        } else {
+            &critical('updateclickers:'.$udom.':add:'.$servers{$server},$server);
+        }
     }
 }
 
-# ---------------------------------------- Delete unwanted IDs from ids.db file
+# ------------- Delete unwanted student/employee IDs or clicker IDs from domain
 
 sub iddel {
-    my ($udom,$idshashref,$uhome)=@_;
+    my ($udom,$idshashref,$uhome,$namespace)=@_;
     my %result=();
-    unless (ref($idshashref) eq 'HASH') {
+    my %ids=();
+    my %byid = ();
+    if (ref($idshashref) eq 'HASH') {
+        %ids=%{$idshashref};
+    } else {
         return %result;
     }
+    if ($namespace eq '') {
+        $namespace = 'ids';
+    }
     my %servers=();
-    while (my ($id,$uname) = each(%{$idshashref})) {
-        my $uhom;
-        if ($uhome) {
-            $uhom = $uhome;
-        } else {
-            $uhom=&homeserver($uname,$udom);
-        }
-        if ($uhom ne 'no_host') {
-            if ($servers{$uhom}) {
+    while (my ($id,$unamestr) = each(%ids)) {
+        if ($namespace eq 'ids') {
+            my $uhom = $uhome;
+            if ($uhom eq '') { 
+                $uhom=&homeserver($unamestr,$udom);
+            }
+            if ($uhom ne 'no_host') {
                 $servers{$uhom}.='&'.&escape($id);
-            } else {
-                $servers{$uhom}=&escape($id);
+            }
+         } else {
+            my @curritems = split(/,/,$ids{$id});
+            foreach my $uname (@curritems) {
+                my $uhom = $uhome;
+                if ($uhom eq '') {
+                    $uhom=&homeserver($uname,$udom);
+                }
+                if ($uhom ne 'no_host') { 
+                    $byid{$uhom}{$id} .= $uname.',';
+                }
+            }
+        }
+    }
+    if ($namespace eq 'clickers') {
+        foreach my $server (keys(%byid)) {
+            if (ref($byid{$server}) eq 'HASH') {
+                foreach my $id (keys(%{$byid{$server}})) {
+                    $byid{$server}{$id} =~ s/,$//;
+                    $servers{$server}.=&escape($id).'='.&escape($byid{$server}{$id}).'&';
+                }
             }
         }
     }
     foreach my $server (keys(%servers)) {
-        $result{$server} = &critical('iddel:'.$udom.':'.$servers{$server},$uhome);
+        $servers{$server} =~ s/\&$//;
+        if ($namespace eq 'ids') {
+            $result{$server} = &critical('iddel:'.$udom.':'.$servers{$server},$uhome);
+        } elsif ($namespace eq 'clickers') {
+            $result{$server} = &critical('updateclickers:'.$udom.':del:'.$servers{$server},$server);
+        }
     }
     return %result;
 }
 
+# ----- Update clicker ID-to-username look-ups in clickers.db on library server 
+
+sub updateclickers {
+    my ($udom,$action,$idshashref,$uhome,$critical) = @_;
+    my %clickers;
+    if (ref($idshashref) eq 'HASH') {
+        %clickers=%{$idshashref};
+    } else {
+        return;
+    }
+    my $items='';
+    foreach my $item (keys(%clickers)) {
+        $items.=&escape($item).'='.&escape($clickers{$item}).'&';
+    }
+    $items=~s/\&$//;
+    my $request = "updateclickers:$udom:$action:$items";
+    if ($critical) {
+        return &critical($request,$uhome);
+    } else {
+        return &reply($request,$uhome);
+    }
+}
+
 # ------------------------------dump from db file owned by domainconfig user
 sub dump_dom {
     my ($namespace, $udom, $regexp) = @_;
@@ -2132,7 +2320,7 @@ sub restore_dom {
         }
     }
     my %returnhash=();
-    unless (($answer eq '') || ($answer eq 'con_lost') || ($answer eq 'refused') ||
+    unless (($answer eq '') || ($answer eq 'con_lost') || ($answer eq 'refused') || 
             ($answer eq 'unknown_cmd') || ($answer eq 'rejected')) {
         foreach my $line (split(/\&/,$answer)) {
             my ($name,$value)=split(/\=/,$line);
@@ -2157,7 +2345,7 @@ sub get_domainconfiguser {
 sub retrieve_inst_usertypes {
     my ($udom) = @_;
     my (%returnhash,@order);
-    my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
+    my %domdefs = &get_domain_defaults($udom);
     if ((ref($domdefs{'inststatustypes'}) eq 'HASH') && 
         (ref($domdefs{'inststatusorder'}) eq 'ARRAY')) {
         return ($domdefs{'inststatustypes'},$domdefs{'inststatusorder'});
@@ -2208,10 +2396,9 @@ sub inst_directory_query {
         unless ($homeserver eq $perlvar{'lonHostID'}) {
             if ($srch->{'srchby'} eq 'email') {
                 my $lcrev = &get_server_loncaparev($udom,$homeserver);
-                my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.(\d+)[\w.\-]+\'?$/);
+                my ($major,$minor) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
                 if (($major eq '' && $minor eq '') || ($major < 2) ||
-                    (($major == 2) && ($minor < 11)) ||
-                    (($major == 2) && ($minor == 11) && ($subver < 3))) {
+                    (($major == 2) && ($minor < 12))) {
                     return;
                 }
             }
@@ -2260,10 +2447,9 @@ sub usersearch {
             unless ($tryserver eq $perlvar{'lonHostID'}) {
                 if ($srch->{'srchby'} eq 'email') {
                     my $lcrev = &get_server_loncaparev($dom,$tryserver);
-                    my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.(\d+)[\w.\-]+\'?$/);
+                    my ($major,$minor) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
                     next if (($major eq '' && $minor eq '') || ($major < 2) ||
-                             (($major == 2) && ($minor < 11)) ||
-                             (($major == 2) && ($minor == 11) && ($subver < 3)));
+                             (($major == 2) && ($minor < 12)));
                 }
             }
             my $host=&hostname($tryserver);
@@ -2355,7 +2541,7 @@ sub get_multiple_instusers {
     my ($udom,$users,$caller) = @_;
     my ($outcome,$results);
     if (ref($users) eq 'HASH') {
-        my $count = keys(%{$users});
+        my $count = keys(%{$users}); 
         my $requested = &freeze_escape($users);
         my $homeserver = &domain($udom,'primary');
         if ($homeserver ne '') {
@@ -2399,7 +2585,7 @@ sub get_multiple_instusers {
                 } else {
                     ($outcome,my $userdata) = split(/=/,$response,2);
                     if ($outcome eq 'ok') {
-                        $results = &thaw_unescape($userdata);
+                        $results = &thaw_unescape($userdata); 
                     }
                 }
             }
@@ -2426,14 +2612,14 @@ sub inst_rulecheck {
                     $response=&unescape(&reply('instidrulecheck:'.&escape($udom).
                                               ':'.&escape($id).':'.$rulestr,
                                               $homeserver));
-                } elsif ($item eq 'unamemap') {
-                    $response=&unescape(&reply('instunamemapcheck:'.
-                                               &escape($udom).':'.&escape($uname).
-                                              ':'.$rulestr,$homeserver));
                 } elsif ($item eq 'selfcreate') {
                     $response=&unescape(&reply('instselfcreatecheck:'.
                                                &escape($udom).':'.&escape($uname).
                                               ':'.$rulestr,$homeserver));
+                } elsif ($item eq 'unamemap') {
+                    $response=&unescape(&reply('instunamemapcheck:'.
+                                               &escape($udom).':'.&escape($uname).
+                                              ':'.$rulestr,$homeserver));
                 }
                 if ($response ne 'refused') {
                     my @pairs=split(/\&/,$response);
@@ -2465,7 +2651,7 @@ sub inst_userrules {
                                  $homeserver);
             } elsif ($check eq 'unamemap') {
                 $response=&reply('unamemaprules:'.&escape($udom),
-                                 $homeserver);
+                                 $homeserver); 
             } else {
                 $response=&reply('instuserrules:'.&escape($udom),
                                  $homeserver);
@@ -2507,15 +2693,13 @@ sub get_domain_defaults {
     }
     my %domdefaults;
     my %domconfig =
-         &Apache::lonnet::get_dom('configuration',['defaults','quotas',
+         &get_dom('configuration',['defaults','quotas',
                                   'requestcourses','inststatus',
                                   'coursedefaults','usersessions',
-                                  'requestauthor','authordefaults',
-                                  'selfenrollment','coursecategories',
-                                  'autoenroll','helpsettings',
-                                  'wafproxy','ltisec','toolsec',
-                                  'domexttool','exttool'],$domain);
-    my @coursetypes = ('official','unofficial','community','textbook');
+                                  'requestauthor','selfenrollment',
+                                  'coursecategories','ssl','autoenroll',
+                                  'trust','helpsettings','wafproxy','ltisec'],$domain);
+    my @coursetypes = ('official','unofficial','community','textbook','placement');
     if (ref($domconfig{'defaults'}) eq 'HASH') {
         $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; 
         $domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
@@ -2551,21 +2735,10 @@ sub get_domain_defaults {
         }
     }
     if (ref($domconfig{'requestcourses'}) eq 'HASH') {
-        foreach my $item ('official','unofficial','community','textbook') {
+        foreach my $item ('official','unofficial','community','textbook','placement') {
             $domdefaults{$item} = $domconfig{'requestcourses'}{$item};
         }
     }
-    if (ref($domconfig{'authordefaults'}) eq 'HASH') {
-        foreach my $item ('nocodemirror','copyright','sourceavail','domcoordacc','editors') {
-            if ($item eq 'editors') {
-                if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') {
-                    $domdefaults{$item} = join(',',@{$domconfig{'authordefaults'}{'editors'}});
-                }
-            } else {
-                $domdefaults{$item} = $domconfig{'authordefaults'}{$item};
-            }
-        }
-    }
     if (ref($domconfig{'requestauthor'}) eq 'HASH') {
         $domdefaults{'requestauthor'} = $domconfig{'requestauthor'};
     }
@@ -2575,6 +2748,7 @@ sub get_domain_defaults {
         }
     }
     if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
+        $domdefaults{'canuse_pdfforms'} = $domconfig{'coursedefaults'}{'canuse_pdfforms'};
         $domdefaults{'usejsme'} = $domconfig{'coursedefaults'}{'usejsme'};
         $domdefaults{'inline_chem'} = $domconfig{'coursedefaults'}{'inline_chem'};
         $domdefaults{'uselcmath'} = $domconfig{'coursedefaults'}{'uselcmath'};
@@ -2590,25 +2764,12 @@ sub get_domain_defaults {
             if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
                 $domdefaults{$type.'quota'} = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
             }
-            if (ref($domconfig{'coursedefaults'}{'coursequota'}) eq 'HASH') {
-                $domdefaults{$type.'coursequota'} = $domconfig{'coursedefaults'}{'coursequota'}{$type};
-            }
             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}; 
                 }
             }
-            if (ref($domconfig{'coursedefaults'}{'domexttool'}) eq 'HASH') {
-                $domdefaults{$type.'domexttool'} = $domconfig{'coursedefaults'}{'domexttool'}{$type};
-            } else {
-                $domdefaults{$type.'domexttool'} = 1;
-            }
-            if (ref($domconfig{'coursedefaults'}{'exttool'}) eq 'HASH') {
-                $domdefaults{$type.'exttool'} = $domconfig{'coursedefaults'}{'exttool'}{$type};
-            } else {
-                $domdefaults{$type.'exttool'} = 0;
-            }
         }
         if (ref($domconfig{'coursedefaults'}{'canclone'}) eq 'HASH') {
             if (ref($domconfig{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
@@ -2679,6 +2840,25 @@ sub get_domain_defaults {
             $domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'};
         }
     }
+    if (ref($domconfig{'ssl'}) eq 'HASH') {
+        if (ref($domconfig{'ssl'}{'replication'}) eq 'HASH') {
+            $domdefaults{'replication'} = $domconfig{'ssl'}{'replication'};
+        }
+        if (ref($domconfig{'ssl'}{'connto'}) eq 'HASH') {
+            $domdefaults{'connect'} = $domconfig{'ssl'}{'connto'};
+        }
+        if (ref($domconfig{'ssl'}{'connfrom'}) eq 'HASH') {
+            $domdefaults{'connect'} = $domconfig{'ssl'}{'connfrom'};
+        }
+    }
+    if (ref($domconfig{'trust'}) eq 'HASH') {
+        my @prefixes = qw(content shared enroll othcoau coaurem domroles catalog reqcrs msg);
+        foreach my $prefix (@prefixes) {
+            if (ref($domconfig{'trust'}{$prefix}) eq 'HASH') {
+                $domdefaults{'trust'.$prefix} = $domconfig{'trust'}{$prefix};
+            }
+        }
+    }
     if (ref($domconfig{'autoenroll'}) eq 'HASH') {
         $domdefaults{'autofailsafe'} = $domconfig{'autoenroll'}{'autofailsafe'};
         $domdefaults{'failsafe'} = $domconfig{'autoenroll'}{'failsafe'};
@@ -2704,29 +2884,7 @@ sub get_domain_defaults {
         }
         if (ref($domconfig{'ltisec'}{'private'}) eq 'HASH') {
             if (ref($domconfig{'ltisec'}{'private'}{'keys'}) eq 'ARRAY') {
-                $domdefaults{'ltiprivhosts'} = $domconfig{'ltisec'}{'private'}{'keys'};
-            }
-        }
-        if (ref($domconfig{'ltisec'}{'suggested'}) eq 'HASH') {
-            my %suggestions = %{$domconfig{'ltisec'}{'suggested'}};
-            foreach my $item (keys(%{$domconfig{'ltisec'}{'suggested'}})) {
-                unless (ref($domconfig{'ltisec'}{'suggested'}{$item}) eq 'HASH') {
-                    delete($suggestions{$item});
-                }
-            }
-            if (keys(%suggestions)) {
-                $domdefaults{'linkprotsuggested'} = \%suggestions;
-            }
-        }
-    }
-    if (ref($domconfig{'toolsec'}) eq 'HASH') {
-        if (ref($domconfig{'toolsec'}{'encrypt'}) eq 'HASH') {
-            $domdefaults{'toolenc_crs'} = $domconfig{'toolsec'}{'encrypt'}{'crs'};
-            $domdefaults{'toolenc_dom'} = $domconfig{'toolsec'}{'encrypt'}{'dom'};
-        }
-        if (ref($domconfig{'toolsec'}{'private'}) eq 'HASH') {
-            if (ref($domconfig{'toolsec'}{'private'}{'keys'}) eq 'ARRAY') {
-                $domdefaults{'toolprivhosts'} = $domconfig{'toolsec'}{'private'}{'keys'};
+                $domdefaults{'privhosts'} = $domconfig{'ltisec'}{'private'}{'keys'};
             }
         }
     }
@@ -2749,7 +2907,7 @@ sub get_dom_cats {
         } else {
             $cats = {};
         }
-        &Apache::lonnet::do_cache_new('cats',$dom,$cats,3600);
+        &do_cache_new('cats',$dom,$cats,3600);
     }
     return $cats;
 }
@@ -2766,7 +2924,6 @@ sub get_dom_instcats {
             if (&auto_instcode_format($caller,$dom,\%coursecodes,\%codes,
                                       \@codetitles,\%cat_titles,\%cat_order) eq 'ok') {
                 $instcats = {
-                                totcodes => $totcodes,
                                 codes => \%codes,
                                 codetitles => \@codetitles,
                                 cat_titles => \%cat_titles,
@@ -2794,29 +2951,6 @@ sub retrieve_instcodes {
     return $totcodes;
 }
 
-# --------------------------------------------- Get domain config for passwords
-
-sub get_passwdconf {
-    my ($dom) = @_;
-    my (%passwdconf,$gotconf,$lookup);
-    my ($result,$cached)=&is_cached_new('passwdconf',$dom);
-    if (defined($cached)) {
-        if (ref($result) eq 'HASH') {
-            %passwdconf = %{$result};
-            $gotconf = 1;
-        }
-    }
-    unless ($gotconf) {
-        my %domconfig = &get_dom('configuration',['passwords'],$dom);
-        if (ref($domconfig{'passwords'}) eq 'HASH') {
-            %passwdconf = %{$domconfig{'passwords'}};
-        }
-        my $cachetime = 24*60*60;
-        &do_cache_new('passwdconf',$dom,\%passwdconf,$cachetime);
-    }
-    return %passwdconf;
-}
-
 sub course_portal_url {
     my ($cnum,$cdom,$r) = @_;
     my $chome = &homeserver($cnum,$cdom);
@@ -2828,7 +2962,7 @@ sub course_portal_url {
     if ($domdefaults{'portal_def'}) {
         $firsturl = $domdefaults{'portal_def'};
     } else {
-        my $alias = &Apache::lonnet::use_proxy_alias($r,$chome);
+        my $alias = &use_proxy_alias($r,$chome);
         $hostname = $alias if ($alias ne '');
         $firsturl = $protocol.'://'.$hostname;
     }
@@ -2855,6 +2989,29 @@ sub url_prefix {
     return $prefix;
 }
 
+# --------------------------------------------- Get domain config for passwords
+
+sub get_passwdconf {
+    my ($dom) = @_;
+    my (%passwdconf,$gotconf,$lookup);
+    my ($result,$cached)=&is_cached_new('passwdconf',$dom);
+    if (defined($cached)) {
+        if (ref($result) eq 'HASH') {
+            %passwdconf = %{$result};
+            $gotconf = 1;
+        }
+    }
+    unless ($gotconf) {
+        my %domconfig = &get_dom('configuration',['passwords'],$dom);
+        if (ref($domconfig{'passwords'}) eq 'HASH') {
+            %passwdconf = %{$domconfig{'passwords'}};
+        }
+        my $cachetime = 24*60*60;
+        &do_cache_new('passwdconf',$dom,\%passwdconf,$cachetime);
+    }
+    return %passwdconf;
+}
+
 # --------------------------------------------------- Assign a key to a student
 
 sub assign_access_key {
@@ -3003,7 +3160,7 @@ sub courseid_to_courseurl {
 	return "/$cdom/$cnum";
     }
 
-    my %courseinfo=&Apache::lonnet::coursedescription($courseid);
+    my %courseinfo=&coursedescription($courseid);
     if (exists($courseinfo{'num'})) {
 	return "/$courseinfo{'domain'}/$courseinfo{'num'}";
     }
@@ -3100,9 +3257,7 @@ sub devalidate_cache_new {
 
 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).
+    my $remembered_id=$name.':'.$id; # this is to avoid make_key (which is slow) whenever possible
     if (exists($remembered{$remembered_id})) {
 	if ($debug) { &Apache::lonnet::logthis("Early return $remembered_id of $remembered{$remembered_id} "); }
 	$accessed{$remembered_id}=[&gettimeofday()];
@@ -3203,14 +3358,14 @@ sub userenvironment {
 # ---------------------------------------------------------- Get a studentphoto
 sub studentphoto {
     my ($udom,$unam,$ext) = @_;
-    my $home=&Apache::lonnet::homeserver($unam,$udom);
+    my $home=&homeserver($unam,$udom);
     if (defined($env{'request.course.id'})) {
         if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
             if ($udom eq $env{'course.'.$env{'request.course.id'}.'.domain'}) {
                 return(&retrievestudentphoto($udom,$unam,$ext)); 
             } else {
                 my ($result,$perm_reqd)=
-		    &Apache::lonnet::auto_photo_permission($unam,$udom);
+		    &auto_photo_permission($unam,$udom);
                 if ($result eq 'ok') {
                     if (!($perm_reqd eq 'yes')) {
                         return(&retrievestudentphoto($udom,$unam,$ext));
@@ -3220,7 +3375,7 @@ sub studentphoto {
         }
     } else {
         my ($result,$perm_reqd) = 
-	    &Apache::lonnet::auto_photo_permission($unam,$udom);
+	    &auto_photo_permission($unam,$udom);
         if ($result eq 'ok') {
             if (!($perm_reqd eq 'yes')) {
                 return(&retrievestudentphoto($udom,$unam,$ext));
@@ -3232,14 +3387,14 @@ sub studentphoto {
 
 sub retrievestudentphoto {
     my ($udom,$unam,$ext,$type) = @_;
-    my $home=&Apache::lonnet::homeserver($unam,$udom);
-    my $ret=&Apache::lonnet::reply("studentphoto:$udom:$unam:$ext:$type",$home);
+    my $home=&homeserver($unam,$udom);
+    my $ret=&reply("studentphoto:$udom:$unam:$ext:$type",$home);
     if ($ret eq 'ok') {
         my $url="/uploaded/$udom/$unam/internal/studentphoto.$ext";
         if ($type eq 'thumbnail') {
             $url="/uploaded/$udom/$unam/internal/studentphoto_tn.$ext"; 
         }
-        my $tokenurl=&Apache::lonnet::tokenwrapper($url);
+        my $tokenurl=&tokenwrapper($url);
         return $tokenurl;
     } else {
         if ($type eq 'thumbnail') {
@@ -3364,9 +3519,13 @@ sub repcopy {
 		   mkdir($path,0777);
                }
            }
-           my $ua=new LWP::UserAgent;
            my $request=new HTTP::Request('GET',"$remoteurl");
-           my $response=$ua->request($request,$transname);
+           my $response;
+           if ($remoteurl =~ m{/raw/}) {
+               $response=&LONCAPA::LWPReq::makerequest($home,$request,$transname,\%perlvar,'',0,1);
+           } else {
+               $response=&LONCAPA::LWPReq::makerequest($home,$request,$transname,\%perlvar,'',1);
+           }
            if ($response->is_error()) {
 	       unlink($transname);
                my $message=$response->status_line;
@@ -3376,7 +3535,12 @@ sub repcopy {
            } else {
 	       if ($remoteurl!~/\.meta$/) {
                   my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
-                  my $mresponse=$ua->request($mrequest,$filename.'.meta');
+                  my $mresponse;
+                  if ($remoteurl =~ m{/raw/}) {
+                      $mresponse = &LONCAPA::LWPReq::makerequest($home,$mrequest,$filename.'.meta',\%perlvar,'',0,1);
+                  } else {
+                      $mresponse = &LONCAPA::LWPReq::makerequest($home,$mrequest,$filename.'.meta',\%perlvar,'',1);
+                  }
                   if ($mresponse->is_error()) {
 		      unlink($filename.'.meta');
                       &logthis(
@@ -3406,7 +3570,12 @@ sub unsubscribe {
     } elsif (grep { $_ eq $home } &current_machine_ids()) {
         $answer = 'home';
     } else {
-        $answer = reply("unsub:$fname",$home);
+        my $defdom = $perlvar{'lonDefDomain'};
+        if (&will_trust('content',$defdom,$udom)) {
+            $answer = reply("unsub:$fname",$home);
+        } else {
+            $answer = 'untrusted';
+        }
     }
     return $answer;
 }
@@ -3449,7 +3618,7 @@ sub absolute_url {
         if ($alias eq $host_name) {
             my $lonhost = $perlvar{'lonHostID'};
             my $hostname = &hostname($lonhost);
-            my $lcproto;
+            my $lcproto; 
             if (($keep_proto) || ($hostname eq '')) {
                 $lcproto = $protocol;
             } else {
@@ -3461,7 +3630,7 @@ sub absolute_url {
                 return $lcproto.$hostname;
             }
         }
-    } 
+    }
     return $protocol.$host_name;
 }
 
@@ -3485,41 +3654,30 @@ sub ssi {
     &Apache::lonenc::check_encrypt(\$fn);
     if (%form) {
       $request=new HTTP::Request('POST',$host.$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',$host.$fn);
     }
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
-
+    my $lonhost = $perlvar{'lonHostID'};
+    my $islocal;
     if (($env{'request.course.id'}) &&
         ($form{'grade_courseid'} eq $env{'request.course.id'}) &&
         ($form{'grade_username'} ne '') && ($form{'grade_domain'} ne '') &&
         ($form{'grade_symb'} ne '') &&
-        (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}.
-                                 ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
-        if (LWP::UserAgent->VERSION >= 5.834) {
-            my $ua=new LWP::UserAgent;
-            $ua->local_address('127.0.0.1');
-            $response = $ua->request($request);
-        } else {
-            {
-                require LWP::Protocol::http;
-                local @LWP::Protocol::http::EXTRA_SOCK_OPTS = (LocalAddr => '127.0.0.1');
-                my $ua=new LWP::UserAgent;
-                $response = $ua->request($request);
-                @LWP::Protocol::http::EXTRA_SOCK_OPTS = ();
-            }
-        }
-    } else {
-        my $ua=new LWP::UserAgent;
-        $response = $ua->request($request);
+        (&allowed('mgr',$env{'request.course.id'}.
+                        ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) {
+        $islocal = 1;
     }
+    $response= &LONCAPA::LWPReq::makerequest($lonhost,$request,'',\%perlvar,
+                                             '','','',$islocal);
+
     if (wantarray) {
 	return ($response->content, $response);
     } else {
@@ -3529,9 +3687,8 @@ sub ssi {
 
 sub externalssi {
     my ($url)=@_;
-    my $ua=new LWP::UserAgent;
     my $request=new HTTP::Request('GET',$url);
-    my $response=$ua->request($request);
+    my $response = &LONCAPA::LWPReq::makerequest('',$request,'',\%perlvar);
     if (wantarray) {
         return ($response->content, $response);
     } else {
@@ -3539,8 +3696,9 @@ sub externalssi {
     }
 }
 
-# If the local copy of a replicated resource is outdated, trigger a
-# connection from the homeserver to flush the delayed queue. If no update
+
+# If the local copy of a replicated resource is outdated, trigger a  
+# connection from the homeserver to flush the delayed queue. If no update 
 # happens, remove local copies of outdated resource (and corresponding
 # metadata file).
 
@@ -3560,11 +3718,9 @@ sub remove_stale_resfile {
                     if ($hostname) {
                         my $protocol = $protocol{$homeserver};
                         $protocol = 'http' if ($protocol ne 'https');
-                        my $uri = $protocol.'://'.$hostname.'/raw/'.&declutter($url);
-                        my $ua=new LWP::UserAgent;
-                        $ua->timeout(5);
-                        my $request=new HTTP::Request('HEAD',$uri);
-                        my $response=$ua->request($request);
+                        my $uri = &declutter($url);
+                        my $request=new HTTP::Request('HEAD',$protocol.'://'.$hostname.'/raw/'.$uri);
+                        my $response = &LONCAPA::LWPReq::makerequest($homeserver,$request,'',\%perlvar,5,0,1);
                         if ($response->is_success()) {
                             my $remmodtime = &HTTP::Date::str2time( $response->header('Last-modified') );
                             my $locmodtime = (stat($fname))[9];
@@ -3627,7 +3783,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.
@@ -3635,12 +3791,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
 #
 
@@ -3667,7 +3823,7 @@ sub can_edit_resource {
     }
 
     if ($env{'request.course.id'}) {
-        my $crsedit = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+        my $crsedit = &allowed('mdc',$env{'request.course.id'});
         if ($group ne '') {
 # if this is a group homepage or group bulletin board, check group privs
             my $allowed = 0;
@@ -3696,7 +3852,7 @@ sub can_edit_resource {
             }
         } else {
             if ($resurl =~ m{^/?adm/viewclasslist$}) {
-                unless (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
+                unless (&allowed('opa',$env{'request.course.id'})) {
                     return;
                 }
             } elsif (!$crsedit) {
@@ -3729,7 +3885,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'}) {
@@ -3780,7 +3936,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;
@@ -3840,7 +3996,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)) {
@@ -3867,9 +4023,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;
@@ -4063,7 +4219,7 @@ sub clean_filename {
 # Replace all .\d. sequences with _\d. so they no longer look like version
 # numbers
     $fname=~s/\.(\d+)(?=\.)/_$1/g;
-# Replace three or more adjacent underscores with one for consistency
+# Replace three or more adjacent underscores with one for consistency 
 # with loncfile::filename_check() so complete url can be extracted by
 # lonnet::decode_symb()
     $fname=~s/_{3,}/_/g;
@@ -4112,7 +4268,7 @@ sub resizeImage {
 # input: $formname - the contents of the file are in $env{"form.$formname"}
 #                    the desired filename is in $env{"form.$formname.filename"}
 #        $context - possible values: coursedoc, existingfile, overwrite, 
-#                                    canceloverwrite, scantron, toollogo or ''. 
+#                                    canceloverwrite, scantron or ''.
 #                   if 'coursedoc': upload to the current course
 #                   if 'existingfile': write file to tmp/overwrites directory 
 #                   if 'canceloverwrite': delete file written to tmp/overwrites directory
@@ -4120,12 +4276,12 @@ sub resizeImage {
 #        $subdir - directory in userfile to store the file into
 #        $parser - instruction to parse file for objects ($parser = parse) or
 #                  if context is 'scantron', $parser is hashref of csv column mapping
-#                  (e.g.,{ PaperID => 0, LastName => 1, FirstName => 2, ID => 3,
+#                  (e.g.,{ PaperID => 0, LastName => 1, FirstName => 2, ID => 3, 
 #                          Section => 4, CODE => 5, FirstQuestion => 9 }).
 #        $allfiles - reference to hash for embedded objects
 #        $codebase - reference to hash for codebase of java objects
-#        $destuname - username for permanent storage of uploaded file
-#        $destudom - domain for permanaent storage of uploaded file
+#        $desuname - username for permanent storage of uploaded file
+#        $dsetudom - domain for permanaent storage of uploaded file
 #        $thumbwidth - width (pixels) of thumbnail to make for uploaded image 
 #        $thumbheight - height (pixels) of thumbnail to make for uploaded image
 #        $resizewidth - width (pixels) to which to resize uploaded image
@@ -4170,7 +4326,7 @@ sub userfileupload {
             } else {
                 $docudom = $env{'user.domain'};
             }
-            if ($destuname =~ /^$match_username$/) { 
+            if ($destuname =~ /^$match_username$/) {
                 $docuname = $destuname;
             } else {
                 $docuname = $env{'user.name'};
@@ -4335,24 +4491,11 @@ sub finishuserfileupload {
     if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) {
         my $input = $filepath.'/'.$file;
         my $output = $filepath.'/'.'tn-'.$file;
-        my $makethumb;
         my $thumbsize = $thumbwidth.'x'.$thumbheight;
-        if ($context eq 'toollogo') {
-            my ($fullwidth,$fullheight) = &check_dimensions($input);
-            if ($fullwidth ne '' && $fullheight ne '') {
-                if ($fullwidth > $thumbwidth && $fullheight > $thumbheight) {
-                    $makethumb = 1;
-                }
-            }
-        } else {
-            $makethumb = 1;
-        }
-        if ($makethumb) {
-            my @args = ('convert','-sample',$thumbsize,$input,$output);
-            system({$args[0]} @args);
-            if (-e $filepath.'/'.'tn-'.$file) {
-                $fetchthumb  = 1;
-            }
+        my @args = ('convert','-sample',$thumbsize,$input,$output);
+        system({$args[0]} @args);
+        if (-e $filepath.'/'.'tn-'.$file) {
+            $fetchthumb  = 1; 
         }
     }
  
@@ -4409,7 +4552,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') {
@@ -4584,37 +4727,13 @@ sub embedded_dependency {
     return;
 }
 
-sub check_dimensions {
-    my ($inputfile) = @_;
-    my ($fullwidth,$fullheight);
-    if (($inputfile =~ m|^[/\w.\-]+$|) && (-e $inputfile)) {
-        my $mm = new File::MMagic;
-        my $mime_type = $mm->checktype_filename($inputfile);
-        if ($mime_type =~ m{^image/}) {
-            if (open(PIPE,"identify $inputfile 2>&1 |")) {
-                my $imageinfo = <PIPE>;
-                if (!close(PIPE)) {
-                    &Apache::lonnet::logthis("Failed to close PIPE opened to retrieve image information for $inputfile");
-                }
-                chomp($imageinfo);
-                my ($fullsize) =
-                    ($imageinfo =~ /^\Q$inputfile\E\s+\w+\s+(\d+x\d+)/);
-                if ($fullsize) {
-                    ($fullwidth,$fullheight) = split(/x/,$fullsize);
-                }
-            }
-        }
-    }
-    return ($fullwidth,$fullheight);
-}
-
 sub bubblesheet_converter {
     my ($cdom,$fullpath,$config,$format) = @_;
     if ((&domain($cdom) ne '') &&
         ($fullpath =~ m{^\Q$perlvar{'lonDocRoot'}/userfiles/$cdom/\E$match_courseid/scantron_orig}) &&
         (-e $fullpath) && (ref($config) eq 'HASH') && ($format ne '')) {
         my (%csvcols,%csvoptions);
-        if (ref($config->{'fields'}) eq 'HASH') {
+        if (ref($config->{'fields'}) eq 'HASH') {  
             %csvcols = %{$config->{'fields'}};
         }
         if (ref($config->{'options'}) eq 'HASH') {
@@ -4971,17 +5090,17 @@ sub flushcourselogs {
 # Typo in rev. 1.458 (2003/12/09)??
 # These should likely by $env{'course.'.$cid.'.domain'} and $env{'course.'.$cid.'.num'}
 #
-# While these remain as $env{'request.'.$cid.'.domain'} and $env{'request.'.$cid.'.num'}
+# While these ramain as  $env{'request.'.$cid.'.domain'} and $env{'request.'.$cid.'.num'}
 # $dom and $name will always be null, so the &inc() call will default to storing this data
 # in a nohist_accesscount.db file for the user rather than the course.
 #
 # That said there is a lot of noise in the data being stored.
 # So counts for prtspool/  and adm/ etc. are recorded.
 #
-# A review of which items ending '___count' are written to %accesshash should likely be
+# A review of which items ending '___count' are written to %accesshash should likely be 
 # made before deciding whether to set these to 'course.' instead of 'request.'
 #
-# Under the current scheme each user receives a nohist_accesscount.db file listing
+# Under the current scheme each user receives a nohist_accesscount.db file listing 
 # accesses for things which are not published resources, regardless of course, and
 # there is not a nohist_accesscount.db file in a course, which might log accesses from
 # anyone in the course for things which are not published resources.
@@ -5015,7 +5134,7 @@ sub flushcourselogs {
     foreach my $entry (keys(%userrolehash)) {
         my ($role,$uname,$udom,$runame,$rudom,$rsec)=
 	    split(/\:/,$entry);
-        if (&Apache::lonnet::put('nohist_userroles',
+        if (&put('nohist_userroles',
              { $role.':'.$uname.':'.$udom.':'.$rsec => $userrolehash{$entry} },
                 $rudom,$runame) eq 'ok') {
 	    delete $userrolehash{$entry};
@@ -5037,19 +5156,19 @@ 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;
+	if (defined(&domain($dom,'primary'))) {
+	    my $primary=&domain($dom,'primary');
+	    my $hostname=&hostname($primary);
+	    $servers{$primary} = $hostname;
+	} else { 
+	    %servers = &get_servers($dom,'library');
+	}
 	foreach my $tryserver (keys(%servers)) {
 	    if (&reply('domroleput:'.$dom.':'.
-	               $domrolebuffer{$dom},$tryserver) eq 'ok') {
-	        last;
-	    } else {
+		       $domrolebuffer{$dom},$tryserver) eq 'ok') {
+		last;
+	    } else {  
 		&logthis('Put of domain roles failed for '.$dom.' and  '.$tryserver);
 	    }
         }
@@ -5200,36 +5319,6 @@ sub courserolelog {
             $storehash{'group'} = $sec;
         } else {
             $storehash{'section'} = $sec;
-            my ($curruserdomstr,$newuserdomstr);
-            if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.userdomains'})) {
-                $curruserdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'};
-            } else {
-                my %courseinfo = &coursedescription($cdom.'/'.$cnum);
-                $curruserdomstr = $courseinfo{'internal.userdomains'};
-            }
-            if ($curruserdomstr ne '') {
-                my @udoms = split(/,/,$curruserdomstr);
-                unless (grep(/^\Q$domain\E/,@udoms)) {
-                    push(@udoms,$domain);
-                    $newuserdomstr = join(',',sort(@udoms));
-                }
-            } else {
-                $newuserdomstr = $domain;
-            }
-            if ($newuserdomstr ne '') {
-                my $putresult = &put('environment',{ 'internal.userdomains' => $newuserdomstr },
-                                     $cdom,$cnum);
-                if ($putresult eq 'ok') {
-                    unless (($selfenroll) || ($context eq 'selfenroll')) {
-                        if (($context eq 'createcourse') || ($context eq 'requestcourses') ||
-                            ($context eq 'automated') || ($context eq 'domain')) {
-                            $env{'course.'.$cdom.'_'.$cnum.'.internal.userdomains'} = $newuserdomstr;
-                        } elsif ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-                            &appenv({'course.'.$cdom.'_'.$cnum.'.internal.userdomains' => $newuserdomstr});
-                        }
-                    }
-                }
-            }
         }
         &write_log('course',$namespace,\%storehash,$delflag,$username,
                    $domain,$cnum,$cdom);
@@ -5244,7 +5333,7 @@ sub domainrolelog {
     my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_;
     if ($area =~ m{^/($match_domain)/$}) {
         my $cdom = $1;
-        my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
+        my $domconfiguser = &get_domainconfiguser($cdom);
         my $namespace = 'rolelog';
         my %storehash = (
                            role    => $trole,
@@ -5411,7 +5500,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}) {
@@ -5475,8 +5564,8 @@ sub get_my_adhocroles {
     } elsif ($cid =~ /^($match_domain)_($match_courseid)$/) {
         $cdom = $1;
         $cnum = $2;
-        %info = &Apache::lonnet::get('environment',['internal.coursecode'],
-                                     $cdom,$cnum);
+        %info = &get('environment',['internal.coursecode'],
+                     $cdom,$cnum);
     }
     if (($info{'internal.coursecode'} ne '') && ($checkreg)) {
         my $user = $env{'user.name'}.':'.$env{'user.domain'};
@@ -5708,16 +5797,16 @@ 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($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))));
                 } else {
@@ -5733,7 +5822,7 @@ sub courseiddump {
                              &escape($creationcontext).':'.$domcloner.':'.$hasuniquecode.
                              ':'.$reqcrsdom.':'.&escape($reqinstcode),$tryserver);
                 }
-
+                     
                 my @pairs=split(/\&/,$rep);
                 foreach my $item (@pairs) {
                     my ($key,$value)=split(/\=/,$item,2);
@@ -5803,7 +5892,7 @@ sub extract_lastaccess {
 
 sub dcmailput {
     my ($domain,$msgid,$message,$server)=@_;
-    my $status = &Apache::lonnet::critical(
+    my $status = &critical(
        'dcmailput:'.$domain.':'.&escape($msgid).'='.
        &escape($message),$server);
     return $status;
@@ -5960,93 +6049,6 @@ sub set_first_access {
 }
 }
 
-sub checkout {
-    my ($symb,$tuname,$tudom,$tcrsid)=@_;
-    my $now=time;
-    my $lonhost=$perlvar{'lonHostID'};
-    my $ip = &get_requestor_ip();
-    my $infostr=&escape(
-                 'CHECKOUTTOKEN&'.
-                 $tuname.'&'.
-                 $tudom.'&'.
-                 $tcrsid.'&'.
-                 $symb.'&'.
-                 $now.'&'.$ip);
-    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' => $ip);
-
-    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 $ip = &get_requestor_ip();
-    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' => $ip);
-
-    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 {
@@ -6640,7 +6642,7 @@ sub privileged {
     my $now = time;
     my $roles;
     if (ref($possroles) eq 'ARRAY') {
-        $roles = $possroles;
+        $roles = $possroles; 
     } else {
         $roles = ['dc','su'];
     }
@@ -6667,7 +6669,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);
             }
         }
@@ -6705,7 +6707,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};
                     }
                 }
@@ -6738,7 +6740,7 @@ sub rolesinit {
     my %firstaccess = &dump('firstaccesstimes', $domain, $username);
     my %timerinterval = &dump('timerinterval', $domain, $username);
     my (%coursetimerstarts, %firstaccchk, %firstaccenv, %coursetimerintervals,
-        %timerintchk, %timerintenv,%coauthorenv);
+        %timerintchk, %timerintenv);
 
     foreach my $key (keys(%firstaccess)) {
         my ($cid, $rest) = split(/\0/, $key);
@@ -6752,7 +6754,6 @@ sub rolesinit {
 
     my %allroles=();
     my %allgroups=();
-    my %gotcoauconfig=();
 
     for my $area (grep { ! /^rolesdef_/ } keys(%rolesdump)) {
         my $role = $rolesdump{$area};
@@ -6804,23 +6805,6 @@ sub rolesinit {
         } else {
         # Normal role, defined in roles.tab
             &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area);
-            if (($trole eq 'ca') || ($trole eq 'aa')) {
-                (undef,my ($audom,$auname)) = split(/\//,$area);
-                unless ($gotcoauconfig{$area}) {
-                    my @ca_settings = ('authoreditors');
-                    my %info = &userenvironment($audom,$auname,@ca_settings);
-                    $gotcoauconfig{$area} = 1;
-                    foreach my $item (@ca_settings) {
-                        if (exists($info{$item})) {
-                            my $name = $item;
-                            if ($item eq 'authoreditors') {
-                                $name = 'editors';
-                            }
-                            $coauthorenv{"environment.internal.$name.$area"} = $info{$item};
-                        }
-                    }
-                }
-            }
         }
 
         my $cid = $tdomain.'_'.$trest;
@@ -6849,7 +6833,7 @@ sub rolesinit {
     $env{'user.adv'} = $userroles{'user.adv'};
     $env{'user.rar'} = $userroles{'user.rar'};
 
-    return (\%userroles,\%firstaccenv,\%timerintenv,\%coauthorenv);
+    return (\%userroles,\%firstaccenv,\%timerintenv);
 }
 
 sub set_arearole {
@@ -7156,7 +7140,7 @@ sub check_adhoc_privs {
     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);
@@ -7202,7 +7186,7 @@ sub set_adhoc_privileges {
             ($caller eq 'tiny')) {
         &appenv( {'request.role'        => $spec,
                   'request.role.domain' => $dcdom,
-                  'request.course.sec'  => $sec, 
+                  'request.course.sec'  => $sec,
                  }
                );
         my $tadv=0;
@@ -7262,14 +7246,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.
@@ -7284,11 +7269,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;
     if ($encrypt) {
@@ -7301,7 +7286,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);
 	}
@@ -7345,7 +7331,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);
@@ -7355,7 +7341,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,'.');
@@ -7499,7 +7485,7 @@ sub putstore {
                      '&host='.&escape($perlvar{'lonHostID'}).
                      '&version='.$esc_v.
                      '&by='.&escape($env{'user.name'}.':'.$env{'user.domain'});
-       &Apache::lonnet::courselog($symb.':'.$uname.':'.$udomain.':PUTSTORE:'.$namevalue);
+       &courselog($symb.':'.$uname.':'.$udomain.':PUTSTORE:'.$namevalue);
    }
    if ($reply eq 'unknown_cmd') {
        # gfall back to way things use to be done
@@ -7611,13 +7597,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');
     }
 
@@ -7631,7 +7617,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'};
@@ -7649,16 +7635,16 @@ sub get_timebased_id {
     my $tries = 0;
 
 # attempt to get lock on nohist_$namespace file
-    my $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
+    my $gotlock = &newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
     while (($gotlock ne 'ok') && $tries <$locktries) {
         $tries ++;
         sleep 1;
-        $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
+        $gotlock = &newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
     }
 
 # attempt to get unique identifier, based on current timestamp
     if ($gotlock eq 'ok') {
-        my %inuse = &Apache::lonnet::dump('nohist_'.$namespace,$cdom,$cnum,$prefix);
+        my %inuse = &dump('nohist_'.$namespace,$cdom,$cnum,$prefix);
         my $id = time;
         $newid = $id;
         if ($idtype eq 'addcode') {
@@ -7679,7 +7665,7 @@ sub get_timebased_id {
             my %new_item =  (
                               $prefix."\0".$newid => $who,
                             );
-            my $putresult = &Apache::lonnet::put('nohist_'.$namespace,\%new_item,
+            my $putresult = &put('nohist_'.$namespace,\%new_item,
                                                  $cdom,$cnum);
             if ($putresult ne 'ok') {
                 undef($newid);
@@ -7721,11 +7707,11 @@ sub portfolio_access {
         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
             my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
                 &Apache::loncommon::blockcheck(\%setters,'port',$clientip,$unum,$udom);
-            if (($startblock && $endblock) || ($by_ip))  {
+            if (($startblock && $endblock) || ($by_ip)) {
                 return 'B';
             }
         } else {
-            my ($startblock,$endblock,$triggerblock,$by_ip,$blockdo) =
+            my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
                 &Apache::loncommon::blockcheck(\%setters,'port',$clientip);
             if (($startblock && $endblock) || ($by_ip)) {
                 return 'B';
@@ -7786,7 +7772,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; 
                     }
                 }
             }
@@ -7968,17 +7954,6 @@ sub is_portfolio_file {
     return;
 }
 
-sub is_coursetool_logo {
-    my ($uri) = @_;
-    if ($env{'request.course.id'}) {
-        my $courseurl = &courseid_to_courseurl($env{'request.course.id'});
-        if ($uri =~ m{^/*uploaded\Q$courseurl\E/toollogo/\d+/[^/]+$}) {
-            return 1;
-        }
-    }
-    return;
-}
-
 sub usertools_access {
     my ($uname,$udom,$tool,$action,$context,$userenvref,$domdefref,$is_advref)=@_;
     my ($access,%tools);
@@ -7991,20 +7966,18 @@ sub usertools_access {
                       unofficial => 1,
                       community  => 1,
                       textbook   => 1,
+                      placement  => 1,
                       lti        => 1,
                  );
     } elsif ($context eq 'requestauthor') {
         %tools = (
                       requestauthor => 1,
                  );
-    } elsif ($context eq 'authordefaults') {
-        %tools = (
-                      webdav    => 1,
-                 );
     } else {
         %tools = (
                       aboutme   => 1,
                       blog      => 1,
+                      webdav    => 1,
                       portfolio => 1,
                       timezone  => 1,
                  );
@@ -8022,10 +7995,6 @@ sub usertools_access {
                 return $env{'environment.canrequest.'.$tool};
             } elsif ($context eq 'requestauthor') {
                 return $env{'environment.canrequest.author'};
-            } elsif ($context eq 'authordefaults') {
-                if ($tool eq 'webdav') {
-                    return $env{'environment.availabletools.'.$tool};
-                }
             } else {
                 return $env{'environment.availabletools.'.$tool};
             }
@@ -8034,11 +8003,7 @@ sub usertools_access {
 
     my ($toolstatus,$inststatus,$envkey);
     if ($context eq 'requestauthor') {
-        $envkey = $context;
-    } elsif ($context eq 'authordefaults') {
-        if ($tool eq 'webdav') {
-            $envkey = 'tools.'.$tool;
-        }
+        $envkey = $context; 
     } else {
         $envkey = $context.'.'.$tool;
     }
@@ -8139,7 +8104,7 @@ sub is_course_owner {
             if ($env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'} eq $uname.':'.$udom) {
                 return 1;
             } else {
-                my %courseinfo = &Apache::lonnet::coursedescription($cdom.'/'.$cnum);
+                my %courseinfo = &coursedescription($cdom.'/'.$cnum);
                 if ($courseinfo{'internal.courseowner'} eq $uname.':'.$udom) {
                     return 1;
                 }
@@ -8210,6 +8175,7 @@ sub check_can_request {
     my @options = ('approval','validate','autolimit');
     my $optregex = join('|',@options);
     if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) {
+        my %willtrust;
         foreach my $type (@{$types}) {
             if (&usertools_access($uname,$udom,$type,undef,
                                   'requestcourses')) {
@@ -8229,12 +8195,17 @@ sub check_can_request {
                         if (ref($request_domains) eq 'HASH') {
                             my ($otherdom) = ($item =~ /^($match_domain):($optregex)(=?\d*)$/);
                             if ($otherdom ne '') {
-                                if (ref($request_domains->{$type}) eq 'ARRAY') {
-                                    unless (grep(/^\Q$otherdom\E$/,@{$request_domains->{$type}})) {
+                                unless (exists($willtrust{$otherdom})) {
+                                    $willtrust{$otherdom} = &will_trust('reqcrs',$env{'user.domain'},$otherdom);
+                                }
+                                if ($willtrust{$otherdom}) {
+                                    if (ref($request_domains->{$type}) eq 'ARRAY') {
+                                        unless (grep(/^\Q$otherdom\E$/,@{$request_domains->{$type}})) {
+                                            push(@{$request_domains->{$type}},$otherdom);
+                                        }
+                                    } else {
                                         push(@{$request_domains->{$type}},$otherdom);
                                     }
-                                } else {
-                                    push(@{$request_domains->{$type}},$otherdom);
                                 }
                             }
                         }
@@ -8583,7 +8554,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';
@@ -8611,12 +8582,6 @@ sub allowed {
 
     if ($env{'request.course.id'}) {
 
-        if ($priv eq 'bre') {
-            if (&is_coursetool_logo($uri)) {
-                return 'F';
-            }
-        }
-
 # If this is modifying password (internal auth) domains must match for user and user's role.
 
         if ($priv eq 'mip') {
@@ -8842,7 +8807,7 @@ sub allowed {
        my $unamedom=$env{'user.name'}.':'.$env{'user.domain'};
        if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.roles.denied'}
 	   =~/\Q$rolecode\E/) {
-	   if (($priv ne 'pch') && ($priv ne 'plc')) { 
+	   if (($priv ne 'pch') && ($priv ne 'plc') && ($priv ne 'pac')) {
 	       &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'.
 			'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '.
 			$env{'request.course.id'});
@@ -8852,7 +8817,7 @@ sub allowed {
 
        if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.users.denied'}
 	   =~/\Q$unamedom\E/) {
-	   if (($priv ne 'pch') && ($priv ne 'plc')) { 
+	   if (($priv ne 'pch') && ($priv ne 'plc') && ($priv ne 'pac')) {
 	       &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.
 			'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '.
 			$env{'request.course.id'});
@@ -8944,6 +8909,15 @@ sub constructaccess {
             $ownerhome = &homeserver($ownername,$ownerdomain);
             return ($ownername,$ownerdomain,$ownerhome);
         }
+        if ($env{'request.course.id'}) {
+            if (($ownername eq $env{'course.'.$env{'request.course.id'}.'.num'}) &&
+                ($ownerdomain eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
+                if (&allowed('mdc',$env{'request.course.id'})) {
+                    $ownerhome = $env{'course.'.$env{'request.course.id'}.'.home'};
+                    return ($ownername,$ownerdomain,$ownerhome);
+                }
+            }
+        }
     }
 
 # We don't have any access right now. If we are not possibly going to do anything about this,
@@ -8988,14 +8962,14 @@ sub constructaccess {
 my $cacheduser='';
 # Course for which data are being temporarily cached.
 my $cachedcid='';
-# 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)=@_;
-    if (($uname ne '') && ($udom ne '')) {
+    if (($uname ne '') && ($udom ne '')) { 
         if (($cacheduser eq $uname.':'.$udom) &&
             ($cachedcid eq $env{'request.course.id'}) &&
             (abs($cachedlast-time)<5)) {
@@ -9022,7 +8996,7 @@ sub get_comm_blocks {
     if ((defined($cached)) && (ref($blocksref) eq 'HASH')) {
         %commblocks = %{$blocksref};
     } else {
-        %commblocks = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
+        %commblocks = &dump('comm_block',$cdom,$cnum);
         my $cachetime = 600;
         &do_cache_new('comm_block',$hashid,\%commblocks,$cachetime);
     }
@@ -9044,7 +9018,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;
@@ -9056,7 +9030,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') {
@@ -9089,7 +9063,7 @@ sub get_commblock_resources {
                         }
                     }
                     if ($interval[0] =~ /^(\d+)/) {
-                        my $timelimit = $1;
+                        my $timelimit = $1; 
                         my $first_access;
                         if ($type eq 'resource') {
                             $first_access=&get_first_access($interval[1],$item);
@@ -9182,7 +9156,7 @@ sub has_comm_blocking {
     }
     if ($symb) {
         @symbs = ($symb);
-    } elsif (keys(%possibles)) {
+    } elsif (keys(%possibles)) { 
         @symbs = keys(%possibles);
     }
     my $noblock;
@@ -9217,7 +9191,7 @@ sub has_comm_blocking {
             }
         }
     }
-    unless ($noblock) {
+    unless ($noblock) { 
         return @blockers;
     }
     return;
@@ -9305,7 +9279,7 @@ sub deeplink_check {
     return 1;
 }
 
-# -------------------------------- Deversion and split uri into path an filename
+# -------------------------------- Deversion and split uri into path an filename   
 
 #
 #   Removes the version from a URI and
@@ -9431,9 +9405,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);
@@ -10064,7 +10038,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) {
@@ -10324,6 +10299,7 @@ sub plaintext {
     my %rolenames = (
                       Course    => 'std',
                       Community => 'alt1',
+                      Placement => 'std',
                     );
     if ($cid ne '') {
         if ($env{'course.'.$cid.'.'.$short.'.plaintext'} ne '') {
@@ -10405,7 +10381,7 @@ sub assignrole {
             }
             if ($refused) {
                 my ($cdom,$cnum) = ($cwosec =~ m{^/?($match_domain)/($match_courseid)$});
-                if (!$selfenroll && $context eq 'course') {
+                if (!$selfenroll && (($context eq 'course') || ($context eq 'ltienroll' && $env{'request.lti.login'}))) {
                     my %crsenv;
                     if ($role eq 'cc' || $role eq 'co') {
                         %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner'));
@@ -10449,7 +10425,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 = '';
@@ -10457,13 +10433,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;
                                 }
@@ -10551,7 +10527,7 @@ sub assignrole {
                            $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);
@@ -10646,10 +10622,10 @@ sub store_coowners {
     }
     if (($putresult eq 'ok') || ($delresult eq 'ok')) {
         my %crsinfo =
-            &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
+            &courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.');
         if (ref($crsinfo{$cid}) eq 'HASH') {
             $crsinfo{$cid}{'co-owners'} = \@newcoowners;
-            my $cidput = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime');
+            my $cidput = &courseidput($cdom,\%crsinfo,$chome,'notime');
         }
     }
 }
@@ -10771,7 +10747,7 @@ sub modifyuser {
                   'current user id "'.$uidhash{$uname}.'".';
           }
        } else {
-	  &idput($udom,($uname => $uid));
+	  &idput($udom,{$uname => $uid},$uhome,'ids');
        }
     }
 # -------------------------------------------------------------- Add names, etc
@@ -10867,7 +10843,7 @@ sub modifyuser {
         return 'error: '.$reply;
     }
     if ($names{'permanentemail'} ne $oldnames{'permanentemail'}) {
-        &Apache::lonnet::devalidate_cache_new('emailscache',$uname.':'.$udom);
+        &devalidate_cache_new('emailscache',$uname.':'.$udom);
     }
     my $sqlresult = &update_allusers_table($uname,$udom,\%names);
     &devalidate_cache_new('namescache',$uname.':'.$udom);
@@ -10896,7 +10872,7 @@ 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,
+                                        $gene,$usec,$end,$start,$type,$locktype,
                                         $cid,$selfenroll,$context,$credits,$instsec);
     return $reply;
 }
@@ -10947,7 +10923,7 @@ sub modify_student_enrollment {
     }
     my $fullname = &format_name($first,$middle,$last,$gene,'lastname');
     my $user = "$uname:$udom";
-    my %old_entry = &Apache::lonnet::get('classlist',[$user],$cdom,$cnum);
+    my %old_entry = &get('classlist',[$user],$cdom,$cnum);
     my $reply=cput('classlist',
 		   {$user => 
 			join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits,$instsec) },
@@ -11081,7 +11057,7 @@ sub createcourse {
         }
     }
     my %host_servers =
-        &Apache::lonnet::get_servers($udom,'library');
+        &get_servers($udom,'library');
     unless ($host_servers{$course_server}) {
         return 'error: invalid home server for course: '.$course_server;
     }
@@ -11178,6 +11154,7 @@ sub generate_coursenum {
 sub is_course {
     my ($cdom, $cnum) = scalar(@_) == 1 ? 
          ($_[0] =~ /^($match_domain)_($match_courseid)$/)  :  @_;
+
     return unless (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/));
     my $uhome=&homeserver($cnum,$cdom);
     my $iscourse;
@@ -11196,7 +11173,7 @@ sub is_course {
             &do_cache_new('iscourse',$hashid,$iscourse,3600);
         }
     }
-    return unless($iscourse);
+    return unless ($iscourse);
     return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum;
 }
 
@@ -11395,6 +11372,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 {
@@ -11539,49 +11600,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';
     }
 }
 
@@ -11786,11 +11930,12 @@ 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
+                # one library server, one error 
                 my ($key) = keys(%listerror);
                 return (\@alluserslist, $listerror{$key});
             } elsif ( grep { $_ eq 'con_lost' } values(%listerror) ) {
@@ -11799,7 +11944,7 @@ sub dirlist {
                 return (\@alluserslist, 'con_lost');
             } else {
                 # multiple library servers and no con_lost -> data should be
-                # complete.
+                # complete. 
                 return (\@alluserslist);
             }
 
@@ -11875,6 +12020,115 @@ sub stat_file {
     return ();
 }
 
+# --------------------------------------------------------- recursedirs
+# Recursive function to traverse either a specific user's Authoring Space
+# or corresponding Published Resource Space, and populate the hash ref:
+# $dirhashref with URLs of all directories, and if $filehashref hash
+# ref arg is provided, the URLs of any files, excluding versioned, .meta,
+# or .rights files in resource space, and .meta, .save, .log, and .bak
+# files in Authoring Space.
+#
+# Inputs:
+#
+# $is_home - true if current server is home server for user's space
+# $context - either: priv, or res respectively for Authoring or Resource Space.
+# $docroot - Document root (i.e., /home/httpd/html
+# $toppath - Top level directory (i.e., /res/$dom/$uname or /priv/$dom/$uname
+# $relpath - Current path (relative to top level).
+# $dirhashref - reference to hash to populate with URLs of directories (Required)
+# $filehashref - reference to hash to populate with URLs of files (Optional)
+#
+# Returns: nothing
+#
+# Side Effects: populates $dirhashref, and $filehashref (if provided).
+#
+# Currently used by interface/londocs.pm to create linked select boxes for
+# directory and filename to import a Course "Author" resource into a course, and
+# also to create linked select boxes for Authoring Space and Directory to choose
+# save location for creation of a new "standard" problem from the Course Editor.
+#
+
+sub recursedirs {
+    my ($is_home,$context,$docroot,$toppath,$relpath,$dirhashref,$filehashref) = @_;
+    return unless (ref($dirhashref) eq 'HASH');
+    my $currpath = $docroot.$toppath;
+    if ($relpath) {
+        $currpath .= "/$relpath";
+    }
+    my $savefile;
+    if (ref($filehashref)) {
+        $savefile = 1;
+    }
+    if ($is_home) {
+        if (opendir(my $dirh,$currpath)) {
+            foreach my $item (sort { lc($a) cmp lc($b) } grep(!/^\.+$/,readdir($dirh))) {
+                next if ($item eq '');
+                if (-d "$currpath/$item") {
+                    my $newpath;
+                    if ($relpath) {
+                        $newpath = "$relpath/$item";
+                    } else {
+                        $newpath = $item;
+                    }
+                    $dirhashref->{&Apache::lonlocal::js_escape($newpath)} = 1;
+                    &recursedirs($is_home,$context,$docroot,$toppath,$newpath,$dirhashref,$filehashref);
+                } elsif ($savefile) {
+                    if ($context eq 'priv') {
+                        unless ($item =~ /\.(meta|save|log|bak|DS_Store)$/) {
+                            $filehashref->{&Apache::lonlocal::js_escape($relpath)}{$item} = 1;
+                        }
+                    } else {
+                        unless (($item =~ /\.meta$/) || ($item =~ /\.\d+\.\w+$/) || ($item =~ /\.rights$/)) {
+                            $filehashref->{&Apache::lonlocal::js_escape($relpath)}{$item} = 1;
+                        }
+                    }
+                }
+            }
+            closedir($dirh);
+        }
+    } else {
+        my ($dirlistref,$listerror) =
+            &dirlist($toppath.$relpath);
+        my @dir_lines;
+        my $dirptr=16384;
+        if (ref($dirlistref) eq 'ARRAY') {
+            foreach my $dir_line (sort
+                              {
+                                  my ($afile)=split('&',$a,2);
+                                  my ($bfile)=split('&',$b,2);
+                                  return (lc($afile) cmp lc($bfile));
+                              } (@{$dirlistref})) {
+                my ($item,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef) =
+                    split(/\&/,$dir_line,16);
+                $item =~ s/\s+$//;
+                next if (($item =~ /^\.\.?$/) || ($obs));
+                if ($dirptr&$testdir) {
+                    my $newpath;
+                    if ($relpath) {
+                        $newpath = "$relpath/$item";
+                    } else {
+                        $relpath = '/';
+                        $newpath = $item;
+                    }
+                    $dirhashref->{&Apache::lonlocal::js_escape($newpath)} = 1;
+                    &recursedirs($is_home,$context,$docroot,$toppath,$newpath,$dirhashref,$filehashref);
+                } elsif ($savefile) {
+                    if ($context eq 'priv') {
+                        unless ($item =~ /\.(meta|save|log|bak|DS_Store)$/) {
+                            $filehashref->{$relpath}{$item} = 1;
+                        }
+                    } else {
+                        unless (($item =~ /\.meta$/) || ($item =~ /\.\d+\.\w+$/)) {
+                            $filehashref->{$relpath}{$item} = 1;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 # -------------------------------------------------------- Value of a Condition
 
 # gets the value of a specific preevaluated condition
@@ -12038,7 +12292,14 @@ 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')
+#     $mapp      - decluttered URL of enclosing map  
+#     $recursed  - Ref to scalar -- set to 1, if nested maps have been recursed.
+#     $recurseup - Ref to array of map URLs, starting with map containing
+#                  $mapp up through hierarchy of nested maps to top level map.  
+#     $courseid  - CourseID (first part of param identifier).
+#     $modifier  - Middle part of param identifier.
+#     $what      - Last part of param identifier.
 #     @which     - Array of names of resources desired.
 #  Returns:
 #     The value of the first reasource in @which that is found in the
@@ -12048,7 +12309,8 @@ sub get_userresdata {
 #     'user', an undefined  reference is returned.
 #     If none of the resources are found, an undef is returned
 sub resdata {
-    my ($name,$domain,$type,@which)=@_;
+    my ($name,$domain,$type,$mapp,$recursed,$recurseup,$courseid,
+        $modifier,$what,@which)=@_;
     my $result;
     if ($type eq 'course') {
 	$result=&get_courseresdata($name,$domain);
@@ -12057,7 +12319,21 @@ sub resdata {
     }
     if (!ref($result)) { return $result; }    
     foreach my $item (@which) {
-	if (defined($result->{$item->[0]})) {
+        if ($item->[1] eq 'course') {
+            if ((ref($recurseup) eq 'ARRAY') && (ref($recursed) eq 'SCALAR')) {
+                unless ($$recursed) {
+                    @{$recurseup} = &get_map_hierarchy($mapp,$courseid);
+                    $$recursed = 1;
+                }
+                foreach my $item (@${recurseup}) {
+                    my $norecursechk=$courseid.$modifier.$item.'___(all).'.$what;
+                    last if (defined($result->{$norecursechk}));
+                    my $recursechk=$courseid.$modifier.$item.'___(rec).'.$what;
+                    if (defined($result->{$recursechk})) { return [$result->{$recursechk},'map']; }
+                }
+            }
+        }
+        if (defined($result->{$item->[0]})) {
 	    return [$result->{$item->[0]},$item->[1]];
 	}
     }
@@ -12076,11 +12352,13 @@ sub get_domain_lti {
     } else {
         return %lti;
     }
+
     if ($context eq 'linkprot') {
         $cachename = $context;
     } else {
         $cachename = $name;
     }
+    
     my ($result,$cached)=&is_cached_new($cachename,$cdom);
     if (defined($cached)) {
         if (ref($result) eq 'HASH') {
@@ -12096,6 +12374,18 @@ sub get_domain_lti {
             } else {
                 %lti = %{$domconfig{$name}};
             }
+            if (($context eq 'consumer') && (keys(%lti))) {
+                my %encdomconfig = &get_dom('encconfig',[$name],$cdom,undef,1);
+                if (ref($encdomconfig{$name}) eq 'HASH') {
+                    foreach my $id (keys(%lti)) {
+                        if (ref($encdomconfig{$name}{$id}) eq 'HASH') {
+                            foreach my $item ('key','secret') {
+                                $lti{$id}{$item} = $encdomconfig{$name}{$id}{$item};
+                            }
+                        }
+                    }
+                }
+            }
         }
         my $cachetime = 24*60*60;
         &do_cache_new($cachename,$cdom,\%lti,$cachetime);
@@ -12104,29 +12394,20 @@ sub get_domain_lti {
 }
 
 sub get_course_lti {
-    my ($cnum,$cdom,$context) = @_;
-    my ($name,$cachename,%lti);
-    if ($context eq 'consumer') {
-        $name = 'ltitools';
-        $cachename = 'courseltitools';
-    } elsif ($context eq 'provider') {
-        $name = 'lti';
-        $cachename = 'courselti';
-    } else {
-        return %lti;
-    }
+    my ($cnum,$cdom) = @_;
     my $hashid=$cdom.'_'.$cnum;
-    my ($result,$cached)=&is_cached_new($cachename,$hashid);
+    my %courselti;
+    my ($result,$cached)=&is_cached_new('courselti',$hashid);
     if (defined($cached)) {
         if (ref($result) eq 'HASH') {
-            %lti = %{$result};
+            %courselti = %{$result};
         }
     } else {
-        %lti = &dump($name,$cdom,$cnum,undef,undef,undef,1);
+        %courselti = &dump('lti',$cdom,$cnum,undef,undef,undef,1);
         my $cachetime = 24*60*60;
-        &do_cache_new($cachename,$hashid,\%lti,$cachetime);
+        &do_cache_new('courselti',$hashid,\%courselti,$cachetime);
     }
-    return %lti;
+    return %courselti;
 }
 
 sub courselti_itemid {
@@ -12176,131 +12457,25 @@ sub domainlti_itemid {
     return $itemid;
 }
 
-sub get_ltitools_id {
-    my ($context,$cdom,$cnum,$title) = @_;
-    my ($lockhash,$tries,$gotlock,$id,$error);
-
-    # get lock on ltitools db
-    $lockhash = {
-                   lock => $env{'user.name'}.
-                           ':'.$env{'user.domain'},
-                };
-    $tries = 0;
-    if ($context eq 'domain') {
-        $gotlock = &newput_dom('ltitools',$lockhash,$cdom);
-    } else {
-        $gotlock = &newput('ltitools',$lockhash,$cdom,$cnum);
-    }
-    while (($gotlock ne 'ok') && ($tries<10)) {
-        $tries ++;
-        sleep (0.1);
-        if ($context eq 'domain') {
-            $gotlock = &newput_dom('ltitools',$lockhash,$cdom);
-        } else {
-            $gotlock = &newput('ltitools',$lockhash,$cdom,$cnum);
-        }
-    }
-    if ($gotlock eq 'ok') {
-        my %currids;
-        if ($context eq 'domain') {
-            %currids = &dump_dom('ltitools',$cdom);
-        } else {
-            %currids = &dump('ltitools',$cdom,$cnum);
-        }
-        if ($currids{'lock'}) {
-            delete($currids{'lock'});
-            if (keys(%currids)) {
-                my @curr = sort { $a <=> $b } keys(%currids);
-                if ($curr[-1] =~ /^\d+$/) {
-                    $id = 1 + $curr[-1];
-                }
-            } else {
-                $id = 1;
-            }
-            if ($id) {
-                if ($context eq 'domain') {
-                    unless (&newput_dom('ltitools',{ $id => $title },$cdom) eq 'ok') {
-                        $error = 'nostore';
-                    }
-                } else {
-                    unless (&newput('ltitools',{ $id => $title },$cdom,$cnum) eq 'ok') {
-                        $error = 'nostore';
-                    }
-                }
-            } else {
-                $error = 'nonumber';
-            }
-        }
-        my $dellockoutcome;
-        if ($context eq 'domain') {
-            $dellockoutcome = &del_dom('ltitools',['lock'],$cdom);
-        } else {
-            $dellockoutcome = &del('ltitools',['lock'],$cdom,$cnum);
-        }
-    } else {
-        $error = 'nolock';
-    }
-    return ($id,$error);
-}
-
-sub count_supptools {
-    my ($cnum,$cdom,$ignorecache,$reload)=@_;
-    my $hashid=$cnum.':'.$cdom;
-    my ($numexttools,$cached);
-    unless ($ignorecache) {
-        ($numexttools,$cached) = &is_cached_new('supptools',$hashid);
-    }
-    unless (defined($cached)) {
-        my $chome=&homeserver($cnum,$cdom);
-        $numexttools = 0;
-        unless ($chome eq 'no_host') {
-            my ($supplemental) = &Apache::loncommon::get_supplemental($cnum,$cdom,$reload);
-            if (ref($supplemental) eq 'HASH') {
-                if ((ref($supplemental->{'ids'}) eq 'HASH') && (ref($supplemental->{'hidden'}) eq 'HASH')) {
-                    foreach my $key (keys(%{$supplemental->{'ids'}})) {
-                        if ($key =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
-                            $numexttools ++;
-                        }
-                    }
-                }
-            }
-        }
-        &do_cache_new('supptools',$hashid,$numexttools,600);
-    }
-    return $numexttools;
-}
-
-sub has_unhidden_suppfiles {
-    my ($cnum,$cdom,$ignorecache,$possdel)=@_;
+sub get_numsuppfiles {
+    my ($cnum,$cdom,$ignorecache)=@_;
     my $hashid=$cnum.':'.$cdom;
-    my ($showsupp,$cached);
+    my ($suppcount,$cached);
     unless ($ignorecache) {
-        ($showsupp,$cached) = &is_cached_new('showsupp',$hashid);
+        ($suppcount,$cached) = &is_cached_new('suppcount',$hashid);
     }
     unless (defined($cached)) {
         my $chome=&homeserver($cnum,$cdom);
         unless ($chome eq 'no_host') {
-            my ($supplemental) = &Apache::loncommon::get_supplemental($cnum,$cdom,$ignorecache,$possdel);
-            if (ref($supplemental) eq 'HASH') {
-                if ((ref($supplemental->{'ids'}) eq 'HASH') && (ref($supplemental->{'hidden'}) eq 'HASH')) {
-                    foreach my $key (keys(%{$supplemental->{'ids'}})) {
-                        next if ($key =~ /\.sequence$/);
-                        if (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') {
-                            foreach my $id (@{$supplemental->{'ids'}->{$key}}) {
-                                unless ($supplemental->{'hidden'}->{$id}) {
-                                    $showsupp = 1;
-                                    last;
-                                }
-                            }
-                        }
-                        last if ($showsupp);
-                    }
-                }
-            }
+            ($suppcount,my $supptools,my $errors) = (0,0,0);
+            my $suppmap = 'supplemental.sequence';
+            ($suppcount,$supptools,$errors) =
+                &Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,
+                                                         $supptools,$errors);
         }
-        &do_cache_new('showsupp',$hashid,$showsupp,600);
+        &do_cache_new('suppcount',$hashid,$suppcount,600);
     }
-    return $showsupp;
+    return $suppcount;
 }
 
 #
@@ -12341,7 +12516,7 @@ sub EXT_cache_set {
 # --------------------------------------------------------- Value of a Variable
 sub EXT {
 
-    my ($varname,$symbparm,$udom,$uname,$usection,$recurse,$cid)=@_;
+    my ($varname,$symbparm,$udom,$uname,$usection,$recurse,$cid,$recurseupref)=@_;
     unless ($varname) { return ''; }
     #get real user name/domain, courseid and symb
     my $courseid;
@@ -12494,23 +12669,26 @@ sub EXT {
             }
         }
 
-	my ($section, $group, @groups);
-	my ($courselevelm,$courselevel);
+	my ($section, $group, @groups, @recurseup, $recursed);
+        if (ref($recurseupref) eq 'ARRAY') {
+            @recurseup = @{$recurseupref};
+            $recursed = 1;
+        }
+	my ($courselevelm,$courseleveli,$courselevel,$mapp);
         if (($courseid eq '') && ($cid)) {
             $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;
 
 # ----------------------------------------------------- Cascading lookup scheme
 	    my $symbp=$symbparm;
-	    my $mapp=&deversion((&decode_symb($symbp))[0]);
-
+	    $mapp=&deversion((&decode_symb($symbp))[0]);
 	    my $symbparm=$symbp.'.'.$spacequalifierrest;
+            my $recurseparm=$mapp.'___(rec).'.$spacequalifierrest;
 	    my $mapparm=$mapp.'___(all).'.$spacequalifierrest;
-
 	    if (($env{'user.name'} eq $uname) &&
 		($env{'user.domain'} eq $udom)) {
 		$section=$env{'request.course.sec'};
@@ -12527,17 +12705,21 @@ sub EXT {
 
 	    my $seclevel=$courseid.'.['.$section.'].'.$spacequalifierrest;
 	    my $seclevelr=$courseid.'.['.$section.'].'.$symbparm;
+            my $secleveli=$courseid.'.['.$section.'].'.$recurseparm;
 	    my $seclevelm=$courseid.'.['.$section.'].'.$mapparm;
 
 	    $courselevel=$courseid.'.'.$spacequalifierrest;
 	    my $courselevelr=$courseid.'.'.$symbparm;
+            $courseleveli=$courseid.'.'.$recurseparm;
 	    $courselevelm=$courseid.'.'.$mapparm;
 
 # ----------------------------------------------------------- first, check user
 
-	    my $userreply=&resdata($uname,$udom,'user',
+	    my $userreply=&resdata($uname,$udom,'user',$mapp,\$recursed,
+                                   \@recurseup,$courseid,'.',$spacequalifierrest, 
 				       ([$courselevelr,'resource'],
 					[$courselevelm,'map'     ],
+                                        [$courseleveli,'map'     ],
 					[$courselevel, 'course'  ]));
 	    if (defined($userreply)) { return &get_reply($userreply); }
 
@@ -12545,15 +12727,18 @@ sub EXT {
             my $coursereply;
             if (@groups > 0) {
                 $coursereply = &check_group_parms($courseid,\@groups,$symbparm,
-                                       $mapparm,$spacequalifierrest);
-                if (defined($coursereply)) { return &get_reply($coursereply); }
+                                       $recurseparm,$mapparm,$spacequalifierrest,
+                                       $mapp,\$recursed,\@recurseup);
+                if (defined($coursereply)) { return &get_reply($coursereply); } 
             }
 
 	    $coursereply=&resdata($env{'course.'.$courseid.'.num'},
 				  $env{'course.'.$courseid.'.domain'},
-				  'course',
+				  'course',$mapp,\$recursed,\@recurseup,
+                                  $courseid,'.['.$section.'].',$spacequalifierrest,
 				  ([$seclevelr,   'resource'],
 				   [$seclevelm,   'map'     ],
+                                   [$secleveli,   'map'     ],
 				   [$seclevel,    'course'  ],
 				   [$courselevelr,'resource']));
 	    if (defined($coursereply)) { return &get_reply($coursereply); }
@@ -12570,10 +12755,10 @@ sub EXT {
 	    if ($thisparm) { return &get_reply([$thisparm,'resource']); }
 	}
 # ------------------------------------------ fourth, look in resource metadata
-
+ 
         my $what = $spacequalifierrest;
-        $what=~s/\./\_/;
-        my $filename;
+	$what=~s/\./\_/;
+	my $filename;
 	if (!$symbparm) { $symbparm=&symbread(); }
 	if ($symbparm) {
 	    $filename=(&decode_symb($symbparm))[2];
@@ -12594,8 +12779,10 @@ sub EXT {
 	    $courseid eq $env{'request.course.id'}) {
 	    my $coursereply=&resdata($env{'course.'.$courseid.'.num'},
 				     $env{'course.'.$courseid.'.domain'},
-				     'course',
+				     'course',$mapp,\$recursed,\@recurseup,
+                                     $courseid,'.',$spacequalifierrest,
 				     ([$courselevelm,'map'   ],
+                                      [$courseleveli,'map'   ],
 				      [$courselevel, 'course']));
 	    if (defined($coursereply)) { return &get_reply($coursereply); }
 	}
@@ -12656,19 +12843,24 @@ sub get_reply {
 }
 
 sub check_group_parms {
-    my ($courseid,$groups,$symbparm,$mapparm,$what) = @_;
-    my @groupitems = ();
-    my $resultitem;
-    my @levels = ([$symbparm,'resource'],[$mapparm,'map'],[$what,'course']);
+    my ($courseid,$groups,$symbparm,$recurseparm,$mapparm,$what,$mapp,
+        $recursed,$recurseupref) = @_;
+    my @levels = ([$symbparm,'resource'],[$mapparm,'map'],[$recurseparm,'map'],
+                  [$what,'course']);
+    my $coursereply;
     foreach my $group (@{$groups}) {
+        my @groupitems = ();
         foreach my $level (@levels) {
              my $item = $courseid.'.['.$group.'].'.$level->[0];
              push(@groupitems,[$item,$level->[1]]);
         }
+        my $coursereply = &resdata($env{'course.'.$courseid.'.num'},
+                                   $env{'course.'.$courseid.'.domain'},
+                                   'course',$mapp,$recursed,$recurseupref,
+                                   $courseid,'.['.$group.'].',$what,
+                                   @groupitems);
+        last if (defined($coursereply));
     }
-    my $coursereply = &resdata($env{'course.'.$courseid.'.num'},
-                            $env{'course.'.$courseid.'.domain'},
-                                     'course',@groupitems);
     return $coursereply;
 }
 
@@ -12815,11 +13007,11 @@ sub metadata {
 # gradable in the exttool_$marker.db file for the tool instance
 # is retrieved via &get().
 #
-# When lonuserstate::traceroute() calls lonnet::EXT() for
+# When lonuserstate::traceroute() calls lonnet::EXT() for 
 # hiddenresource and encrypturl (during course initialization)
-# the map-level parameter for resource.0.gradable included in the
+# the map-level parameter for resource.0.gradable included in the 
 # uploaded map containing the tool will not yet have been stored
-# in the user_course_parms.db file for the user's session, so in
+# in the user_course_parms.db file for the user's session, so in 
 # this case fall back to retrieving gradable status from the
 # exttool_$marker.db file.
 #
@@ -12967,23 +13159,31 @@ sub metadata {
 # Check metadata for imported file to
 # see if it contained response items
 #
+                        my ($origfile,@libfilekeys);
                         my %currmetaentry = %metaentry;
-                        my $libresponseorder = &metadata($location,'responseorder');
-                        my $origfile;
-                        if ($libresponseorder ne '') {
-                            if ($#origfiletagids<0) {
-                                undef(%importedrespids);
-                                undef(%importedpartids);
-                            }
-                            @{$importedrespids{$importid}} = split(/\s*,\s*/,$libresponseorder);
-                            if (@{$importedrespids{$importid}} > 0) {
-                                $importedresponses = 1;
+                        @libfilekeys = split(/,/,&metadata($location,'keys',undef,undef,undef,
+                                                           $depthcount+1));
+                        if (grep(/^responseorder$/,@libfilekeys)) {
+                            my $libresponseorder = &metadata($location,'responseorder',undef,undef,
+                                                             undef,$depthcount+1);
+                            if ($libresponseorder ne '') {
+                                if ($#origfiletagids<0) {
+                                    undef(%importedrespids);
+                                    undef(%importedpartids);
+                                }
+                                my @respids = split(/\s*,\s*/,$libresponseorder);
+                                if (@respids) {
+                                    $importedrespids{$importid} = join(',',map { $importid.'_'.$_ } @respids);
+                                }
+                                if ($importedrespids{$importid} ne '') {
+                                    $importedresponses = 1;
 # We need to get the original file and the imported file to get the response order correct
 # Load and inspect original file
-                                if ($#origfiletagids<0) {
-                                    my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
-                                    $origfile=&getfile($origfilelocation);
-                                    @origfiletagids=($origfile=~/<((?:\w+)response|import|part)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                                    if ($#origfiletagids<0) {
+                                        my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri);
+                                        $origfile=&getfile($origfilelocation);
+                                        @origfiletagids=($origfile=~/<((?:\w+)response|import|part)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                                    }
                                 }
                             }
                         }
@@ -12991,10 +13191,7 @@ sub metadata {
 # hash populated for imported library file
                         %metaentry = %currmetaentry;
                         undef(%currmetaentry);
-                        if ($importmode eq 'problem') {
-# Import as problem/response
-                           $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
-                        } elsif ($importmode eq 'part') {
+                        if ($importmode eq 'part') {
 # Import as part(s)
                            $importedparts=1;
 # We need to get the original file and the imported file to get the part order correct
@@ -13009,10 +13206,23 @@ sub metadata {
                                    @origfiletagids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
                                }
                            }
-
-# Load and inspect imported file
-                           my $impfile=&getfile($location);
-                           my @impfilepartids=($impfile=~/<part[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                           my @impfilepartids;
+# If <partorder> tag is included in metadata for the imported file
+# get the parts in the imported file from that.
+                           if (grep(/^partorder$/,@libfilekeys)) {
+                               %currmetaentry = %metaentry;
+                               my $libpartorder = &metadata($location,'partorder',undef,undef,undef,
+                                                            $depthcount+1);
+                               %metaentry = %currmetaentry;
+                               undef(%currmetaentry);
+                               if ($libpartorder ne '') {
+                                   @impfilepartids=split(/\s*,\s*/,$libpartorder);
+                               }
+                           } else {
+# If no <partorder> tag available, load and inspect imported file
+                               my $impfile=&getfile($location);
+                               @impfilepartids=($impfile=~/<part[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs);
+                           }
                            if ($#impfilepartids>=0) {
 # This problem had parts
                                $importedpartids{$token->[2]->{'id'}}=join(',',@impfilepartids);
@@ -13023,13 +13233,28 @@ sub metadata {
                                $importedpartids{$token->[2]->{'id'}}=$token->[2]->{'id'};
                            }
                         } else {
+# Import as problem or as normal import
+                            $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
+                            unless ($importmode eq 'problem') {
 # Normal import
-                           $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'});
-                           if (defined($token->[2]->{'id'})) {
-                              $unikey.='_'.$token->[2]->{'id'};
-                           }
+                                if (defined($token->[2]->{'id'})) {
+                                    $unikey.='_'.$token->[2]->{'id'};
+                                }
+                            }
+# Check metadata for imported file to
+# see if it contained parts
+                            if (grep(/^partorder$/,@libfilekeys)) {
+                                %currmetaentry = %metaentry;
+                                my $libpartorder = &metadata($location,'partorder',undef,undef,undef,
+                                                             $depthcount+1);
+                                %metaentry = %currmetaentry;
+                                undef(%currmetaentry);
+                                if ($libpartorder ne '') {
+                                    $importedparts = 1;
+                                    $importedpartids{$token->[2]->{'id'}}=$libpartorder;
+                                }
+                            }
                         }
-
 			if ($depthcount<20) {
 			    my $metadata = 
 				&metadata($uri,'keys',$toolsymb,$location,$unikey,
@@ -13038,7 +13263,6 @@ sub metadata {
 				$metaentry{':'.$meta}=$metaentry{':'.$meta};
 				$metathesekeys{$meta}=1;
 			    }
-			
                         }
 		    } else {
 #
@@ -13128,7 +13352,7 @@ sub metadata {
                 $metathesekeys{'partorder'}=1;
             }
             if ($importedresponses) {
-# We had imported responses and need to rebuild responseorder
+# We had imported responses and need to rebuil responseorder
                 $metaentry{':responseorder'}='';
                 $metathesekeys{'responseorder'}=1;
             }
@@ -13142,12 +13366,14 @@ sub metadata {
                 } elsif ($origfiletagids[$index] eq 'import') {
                     if ($importedparts) {
 # We have imported parts at this position
-                        $metaentry{':partorder'}.=','.$importedpartids{$origid};
+                        if ($importedpartids{$origid} ne '') {
+                            $metaentry{':partorder'}.=','.$importedpartids{$origid};
+                        }
                     }
                     if ($importedresponses) {
 # We have imported responses at this position
-                        if (ref($importedrespids{$origid}) eq 'ARRAY') {
-                            $metaentry{':responseorder'}.=','.join(',',map { $origid.'_'.$_ } @{$importedrespids{$origid}});
+                        if ($importedrespids{$origid} ne '') {
+                            $metaentry{':responseorder'}.=','.$importedrespids{$origid};
                         }
                     }
                 } else {
@@ -13164,11 +13390,12 @@ sub metadata {
                 $metaentry{':responseorder'}=~s/^\,//;
             }
         }
-
 	$metaentry{':keys'} = join(',',keys(%metathesekeys));
 	&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
 	$metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));
-	&do_cache_new('meta',$uri,\%metaentry,$cachetime);
+        unless ($liburi) {
+	    &do_cache_new('meta',$uri,\%metaentry,$cachetime);
+        }
 # this is the end of "was not already recently cached
     }
     return $metaentry{':'.$what};
@@ -13324,13 +13551,13 @@ sub get_reservable_slots {
 sub get_course_slots {
     my ($cnum,$cdom) = @_;
     my $hashid=$cnum.':'.$cdom;
-    my ($result,$cached) = &Apache::lonnet::is_cached_new('allslots',$hashid);
+    my ($result,$cached) = &is_cached_new('allslots',$hashid);
     if (defined($cached)) {
         if (ref($result) eq 'HASH') {
             return %{$result};
         }
     } else {
-        my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+        my %slots=&dump('slots',$cdom,$cnum);
         my ($tmp) = keys(%slots);
         if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
             &do_cache_new('allslots',$hashid,\%slots,600);
@@ -13376,68 +13603,11 @@ sub get_coursechange {
 }
 
 sub devalidate_coursechange_cache {
-    my ($cdom,$cnum)=@_;
-    my $hashid=$cdom.'_'.$cnum;
+    my ($cnum,$cdom)=@_;
+    my $hashid=$cnum.':'.$cdom;
     &devalidate_cache_new('crschange',$hashid);
 }
 
-sub get_suppchange {
-    my ($cdom,$cnum) = @_;
-    if ($cdom eq '' || $cnum eq '') {
-        return unless ($env{'request.course.id'});
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    }
-    my $hashid=$cdom.'_'.$cnum;
-    my ($change,$cached)=&is_cached_new('suppchange',$hashid);
-    if ((defined($cached)) && ($change ne '')) {
-        return $change;
-    } else {
-        my %crshash = &get('environment',['internal.supplementalchange'],$cdom,$cnum);
-        if ($crshash{'internal.supplementalchange'} eq '') {
-            $change = $env{'course.'.$cdom.'_'.$cnum.'.internal.created'};
-            if ($change eq '') {
-                %crshash = &get('environment',['internal.created'],$cdom,$cnum);
-                $change = $crshash{'internal.created'};
-            }
-        } else {
-            $change = $crshash{'internal.supplementalchange'};
-        }
-        my $cachetime = 600;
-        &do_cache_new('suppchange',$hashid,$change,$cachetime);
-    }
-    return $change;
-}
-
-sub devalidate_suppchange_cache {
-    my ($cdom,$cnum)=@_;
-    my $hashid=$cdom.'_'.$cnum;
-    &devalidate_cache_new('suppchange',$hashid);
-}
-
-sub update_supp_caches {
-    my ($cdom,$cnum) = @_;
-    my %servers = &internet_dom_servers($cdom);
-    my @ids=&current_machine_ids();
-    foreach my $server (keys(%servers)) {
-        next if (grep(/^\Q$server\E$/,@ids));
-        my $hashid=$cnum.':'.$cdom;
-        my $cachekey = &escape('showsupp').':'.&escape($hashid);
-        &remote_devalidate_cache($server,[$cachekey]);
-    }
-    &has_unhidden_suppfiles($cnum,$cdom,1,1);
-    &count_supptools($cnum,$cdom,1);
-    my $now = time;
-    if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
-        &Apache::lonnet::appenv({'request.course.suppupdated' => $now});
-    }
-    &put('environment',{'internal.supplementalchange' => $now},
-         $cdom,$cnum);
-    &Apache::lonnet::appenv(
-        {'course.'.$cdom.'_'.$cnum.'.internal.supplementalchange' => $now});
-    &do_cache_new('suppchange',$cdom.'_'.$cnum,$now,600);
-}
-
 # ------------------------------------------------- Update symbolic store links
 
 sub symblist {
@@ -13498,7 +13668,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) {
@@ -13514,14 +13684,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);
     }
@@ -13609,8 +13779,8 @@ sub symbread {
     unless ($thisfn) {
         if ($env{'request.symb'}) {
             return $env{$cache_str}=&symbclean($env{'request.symb'});
-        }
-        $thisfn=$env{'request.filename'};
+	}
+	$thisfn=$env{'request.filename'};
     }
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
 # is that filename actually a symb? Verify, clean, and return
@@ -13682,7 +13852,7 @@ sub symbread {
                              }
                          }
                      }
-                 } 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) {
@@ -13690,14 +13860,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);
                                  next if ($bighash{'randomout_'.$id} && !$env{'request.role.adv'});
                                  next unless (($noenccheck) || ($bighash{'encrypted_'.$id} eq $env{'request.enc'}));
                                  if ($checkforblock) {
@@ -13878,6 +14048,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') {
@@ -14063,7 +14234,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 {
@@ -14247,7 +14418,6 @@ sub repcopy_userfile {
     }
 # now the path exists for sure
 # get a user agent
-    my $ua=new LWP::UserAgent;
     my $transferfile=$file.'.in.transfer';
 # FIXME: this should flock
     if (-e $transferfile) { return 'ok'; }
@@ -14258,7 +14428,7 @@ sub repcopy_userfile {
     my $protocol = $protocol{$homeserver};
     $protocol = 'http' if ($protocol ne 'https');
     $request=new HTTP::Request('GET',$protocol.'://'.$hostname.'/raw/'.$uri);
-    my $response=$ua->request($request,$transferfile);
+    my $response = &LONCAPA::LWPReq::makerequest($homeserver,$request,$transferfile,\%perlvar,'',0,1);
 # did it work?
     if ($response->is_error()) {
 	unlink($transferfile);
@@ -14304,9 +14474,8 @@ sub getuploaded {
     my $protocol = $protocol{$homeserver};
     $protocol = 'http' if ($protocol ne 'https');
     $uri = $protocol.'://'.$hostname.'/raw/'.$uri;
-    my $ua=new LWP::UserAgent;
     my $request=new HTTP::Request($reqtype,$uri);
-    my $response=$ua->request($request);
+    my $response=&LONCAPA::LWPReq::makerequest($homeserver,$request,'',\%perlvar,'',0,1);
     $$rtncode = $response->code;
     if (! $response->is_success()) {
 	return 'failed';
@@ -14438,8 +14607,8 @@ sub additional_machine_domains {
     my @domains;
     if (-e "$perlvar{'lonTabDir'}/expected_domains.tab") {
         if (open(my $fh,"<","$perlvar{'lonTabDir'}/expected_domains.tab")) {
-            while( my $line = <$fh>) {
-                chomp($line);
+            while (my $line = <$fh>) {
+                chomp($line);           
                 $line =~ s/\s//g;
                 push(@domains,$line);
             }
@@ -14499,10 +14668,9 @@ sub uses_sts {
                 return $sts_on;
             }
         }
-        my $ua=new LWP::UserAgent;
         my $url = $protocol{$lonhost}.'://'.$hostname.'/index.html';
         my $request=new HTTP::Request('HEAD',$url);
-        my $response=$ua->request($request);
+        my $response=&LONCAPA::LWPReq::makerequest($lonhost,$request,'',\%perlvar,'','','',1);
         if ($response->is_success) {
             my $has_sts = $response->header('Strict-Transport-Security');
             if ($has_sts eq '') {
@@ -14559,8 +14727,8 @@ sub get_requestor_ip {
     } else {
         $from_ip = $ENV{'REMOTE_ADDR'};
     }
-    return $from_ip if ($noproxy);
-   # Who controls proxy settings for server
+    return $from_ip if ($noproxy); 
+    # Who controls proxy settings for server
     my $dom_in_use = $Apache::lonnet::perlvar{'lonDefDomain'};
     my $proxyinfo = &get_proxy_settings($dom_in_use);
     if ((ref($proxyinfo) eq 'HASH') && ($from_ip)) {
@@ -14603,7 +14771,7 @@ sub get_requestor_ip {
 
 sub get_proxy_settings {
     my ($dom_in_use) = @_;
-    my %domdefaults = &Apache::lonnet::get_domain_defaults($dom_in_use);
+    my %domdefaults = &get_domain_defaults($dom_in_use);
     my $proxyinfo = {
                        ipheader => $domdefaults{'waf_ipheader'},
                        trusted  => $domdefaults{'waf_trusted'},
@@ -14636,11 +14804,11 @@ sub get_proxy_alias {
         if ($cached) {
             return $alias;
         }
-        my $dom = &Apache::lonnet::host_domain($lonid);
+        my $dom = &host_domain($lonid);
         if ($dom ne '') {
             my $cachetime = 60*60*24;
             my %domconfig =
-                &Apache::lonnet::get_dom('configuration',['wafproxy'],$dom);
+                &get_dom('configuration',['wafproxy'],$dom);
             if (ref($domconfig{'wafproxy'}) eq 'HASH') {
                 if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') {
                     $alias = $domconfig{'wafproxy'}{'alias'}{$lonid};
@@ -14687,11 +14855,11 @@ sub alias_sso {
         if ($cached) {
             return $use_alias;
         }
-        my $dom = &Apache::lonnet::host_domain($lonid);
+        my $dom = &host_domain($lonid);
         if ($dom ne '') {
             my $cachetime = 60*60*24;
             my %domconfig =
-                &Apache::lonnet::get_dom('configuration',['wafproxy'],$dom);
+                &get_dom('configuration',['wafproxy'],$dom);
             if (ref($domconfig{'wafproxy'}) eq 'HASH') {
                 if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') {
                     $use_alias = $domconfig{'wafproxy'}{'saml'}{$lonid};
@@ -14719,7 +14887,7 @@ sub get_saml_landing {
             $lonid = $perlvar{'lonHostID'};
         }
         if ($lonid) {
-            unless (&Apache::lonnet::host_domain($lonid) eq $defdom) {
+            unless (&host_domain($lonid) eq $defdom) {
                 return;
             }
         } else {
@@ -14732,11 +14900,11 @@ sub get_saml_landing {
     if ($cached) {
         return $landing;
     }
-    my $dom = &Apache::lonnet::host_domain($lonid);
+    my $dom = &host_domain($lonid);
     if ($dom ne '') {
         my $cachetime = 60*60*24;
         my %domconfig =
-            &Apache::lonnet::get_dom('configuration',['login'],$dom);
+            &get_dom('configuration',['login'],$dom);
         if (ref($domconfig{'login'}) eq 'HASH') {
             if (ref($domconfig{'login'}{'saml'}) eq 'HASH') {
                 if (ref($domconfig{'login'}{'saml'}{$lonid}) eq 'HASH') {
@@ -14866,7 +15034,7 @@ sub get_dns {
     my ($url,$func,$ignore_cache,$nocache,$hashref) = @_;
     if (!$ignore_cache) {
 	my ($content,$cached)=
-	    &Apache::lonnet::is_cached_new('dns',$url);
+	    &is_cached_new('dns',$url);
 	if ($cached) {
 	    &$func($content,$hashref);
 	    return;
@@ -14888,7 +15056,7 @@ sub get_dns {
     }
     while (%alldns) {
 	my ($dns) = sort { $b cmp $a } keys(%alldns);
-        my @content;
+        my ($contents,@content);
         if ($dns eq Sys::Hostname::FQDN::fqdn()) {
             my $command = (split('/',$url))[3];
             my ($dir,$file) = &parse_getdns_url($command,$url);
@@ -14898,26 +15066,45 @@ sub get_dns {
                 @content = <$config>;
                 close($config);
             }
+            if ($url eq '/adm/dns/loncapaCRL') {
+                $contents = join('',@content);
+            }
         } else {
-	    my $ua=new LWP::UserAgent;
-            $ua->timeout(30);
 	    my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url");
-	    my $response=$ua->request($request);
+            my $response = &LONCAPA::LWPReq::makerequest('',$request,'',\%perlvar,30,0);
             delete($alldns{$dns});
 	    next if ($response->is_error());
-	    @content = split("\n",$response->content);
+            if ($url eq '/adm/dns/loncapaCRL') {
+                $contents = $response->content;
+            } else {
+                @content = split("\n",$response->content);
+            }
         }
-        unless ($nocache) {
-	    &do_cache_new('dns',$url,\@content,30*24*60*60);
+        if ($url eq '/adm/dns/loncapaCRL') {
+            return &$func($contents);
+        } else {
+	    unless ($nocache) {
+	        &do_cache_new('dns',$url,\@content,30*24*60*60);
+	    }
+	    &$func(\@content,$hashref);
+            return;
         }
-	&$func(\@content,$hashref);
-	return;
     }
-    my $which = (split('/',$url))[3];
-    &logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
-    if (open(my $config,"<","$perlvar{'lonTabDir'}/dns_$which.tab")) {
-        my @content = <$config>;
-        &$func(\@content,$hashref);
+    my $which = (split('/',$url,4))[3];
+    if ($which eq 'loncapaCRL') {
+        my $diskfile = "$perlvar{'lonCertificateDirectory'}/$perlvar{'lonnetCertRevocationList'}";
+        if (-e $diskfile) {
+            &logthis("unable to contact DNS, on disk file $diskfile not updated");
+        } else {
+            &logthis("unable to contact DNS, no on disk file $diskfile available");
+        }
+    } else {
+        &logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
+        if (open(my $config,"<","$perlvar{'lonTabDir'}/dns_$which.tab")) {
+            my @content = <$config>;
+            close($config);
+            &$func(\@content,$hashref);
+        }
     }
     return;
 }
@@ -14926,7 +15113,7 @@ sub get_dns {
 sub parse_dns_checksums_tab {
     my ($lines,$hashref) = @_;
     my $lonhost = $perlvar{'lonHostID'};
-    my $machine_dom = &Apache::lonnet::host_domain($lonhost);
+    my $machine_dom = &host_domain($lonhost);
     my $loncaparev = &get_server_loncaparev($machine_dom);
     my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0];
     my $webconfdir = '/etc/httpd/conf';
@@ -14946,7 +15133,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}) {
@@ -14970,7 +15157,7 @@ sub parse_dns_checksums_tab {
 
 sub fetch_dns_checksums {
     my %checksums;
-    my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
+    my $machine_dom = &host_domain($perlvar{'lonHostID'});
     my $loncaparev = &get_server_loncaparev($machine_dom,$perlvar{'lonHostID'});
     my ($release,$timestamp) = split(/\-/,$loncaparev);
     &get_dns("/adm/dns/checksums/$release",\&parse_dns_checksums_tab,1,1,
@@ -14978,6 +15165,79 @@ sub fetch_dns_checksums {
     return \%checksums;
 }
 
+sub fetch_crl_pemfile {
+    return &get_dns("/adm/dns/loncapaCRL",\&save_crl_pem,1,1);
+}
+
+sub save_crl_pem {
+    my ($content) = @_;
+    my ($msg,$hadchanges);
+    if ($content ne '') {
+        my $now = time;
+        my $lonca = $perlvar{'lonCertificateDirectory'}.'/'.$perlvar{'lonnetCertificateAuthority'};
+        my $tmpcrl = $tmpdir.'/'.$perlvar{'lonnetCertRevocationList'}.'_'.$now.'.'.$$.'.tmp';
+        if (open(my $fh,'>',"$tmpcrl")) {
+            print $fh $content;
+            close($fh);
+            if (-e $lonca) {
+                if (open(PIPE,"openssl crl -in $tmpcrl -inform pem -CAfile $lonca -noout 2>&1 |")) {
+                    my $check = <PIPE>;
+                    close(PIPE);
+                    chomp($check);
+                    if ($check eq 'verify OK') {
+                        my $dest = "$perlvar{'lonCertificateDirectory'}/$perlvar{'lonnetCertRevocationList'}";
+                        my $backup;
+                        if (-e $dest) {
+                            if (&File::Copy::move($dest,"$dest.bak")) {
+                                $backup = 'ok';
+                            }
+                        }
+                        if (&File::Copy::move($tmpcrl,$dest)) {
+                            $msg = 'ok';
+                            if ($backup) {
+                                my (%oldnums,%newnums);
+                                if (open(PIPE, "openssl crl -inform PEM -text -noout -in $dest.bak |grep 'Serial Number' |")) {
+                                    while (<PIPE>) {
+                                        $oldnums{(split(/:/))[1]} = 1;
+                                    }
+                                    close(PIPE);
+                                }
+                                if (open(PIPE, "openssl crl -inform PEM -text -noout -in $dest |grep 'Serial Number' |")) {
+                                    while(<PIPE>) {
+                                        $newnums{(split(/:/))[1]} = 1;
+                                    }
+                                    close(PIPE);
+                                }
+                                foreach my $key (sort {$b <=> $a } (keys(%newnums))) {
+                                    unless (exists($oldnums{$key})) {
+                                        $hadchanges = 1;
+                                        last;
+                                    }
+                                }
+                                unless ($hadchanges) {
+                                    foreach my $key (sort {$b <=> $a } (keys(%oldnums))) {
+                                        unless (exists($newnums{$key})) {
+                                            $hadchanges = 1;
+                                            last;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        unlink($tmpcrl);
+                    }
+                } else {
+                    unlink($tmpcrl);
+                }
+            } else {
+                unlink($tmpcrl);
+            }
+        }
+    }
+    return ($msg,$hadchanges);
+}
+
 sub parse_getdns_url {
     my ($command,$url) = @_;
     my $dir = $perlvar{'lonTabDir'};
@@ -14989,6 +15249,9 @@ sub parse_getdns_url {
     } elsif ($command eq 'checksums') {
         my $version = (split('/',$url))[4];
         $file = "dns_checksums/$version.tab",
+    } elsif ($command eq 'loncapaCRL') {
+        $dir = $perlvar{'lonCertificateDirectory'};
+        $file = $perlvar{'lonnetCertRevocationList'};
     }
     return ($dir,$file);
 }
@@ -15115,6 +15378,7 @@ sub parse_getdns_url {
 	&purge_remembered();
 	&reset_domain_info();
 	&reset_hosts_ip_info();
+        undef(%internetdom);
 	undef(%name_to_host);
 	undef(%hostname);
 	undef(%hostdom);
@@ -15157,6 +15421,11 @@ sub parse_getdns_url {
         return %hostdom;
     }
 
+    sub all_host_intdom {
+        &load_hosts_tab() if (!$loaded);
+        return %internetdom;
+    }
+
     sub is_library {
 	&load_hosts_tab() if (!$loaded);
 
@@ -15276,7 +15545,7 @@ sub parse_getdns_url {
 		return %iphost;
 	    }
 	    my ($ip_info,$cached)=
-		&Apache::lonnet::is_cached_new('iphost','iphost');
+		&is_cached_new('iphost','iphost');
 	    if ($cached) {
 		%iphost      = %{$ip_info->[0]};
 		%name_to_ip  = %{$ip_info->[1]};
@@ -15288,7 +15557,7 @@ sub parse_getdns_url {
 	# get yesterday's info for fallback
 	my %old_name_to_ip;
 	my ($ip_info,$cached)=
-	    &Apache::lonnet::is_cached_new('iphost','iphost');
+	    &s_cached_new('iphost','iphost');
 	if ($cached) {
 	    %old_name_to_ip = %{$ip_info->[1]};
 	}
@@ -15355,7 +15624,7 @@ sub parse_getdns_url {
         my ($lonid) = @_;
         return if ($lonid eq '');
         my ($idnref,$cached)=
-            &Apache::lonnet::is_cached_new('internetnames',$lonid);
+            &is_cached_new('internetnames',$lonid);
         if ($cached) {
             return $idnref;
         }
@@ -15387,9 +15656,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>) {
@@ -15403,7 +15672,7 @@ sub all_loncaparevs {
     }
 }
 
-# ----------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
 {
     sub load_serverhomeIDs {
         if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
@@ -15495,11 +15764,11 @@ BEGIN {
     close($config);
 }
 
-# --------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
 
 &load_loncaparevs();
 
-# ------------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
 
 &load_serverhomeIDs();
 
@@ -15513,7 +15782,15 @@ 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'};
+                my $namematch = $token->[2]{'namematch'};
+                if ($item eq 'parameter') {
+                    if (($namematch ne '') || (($name ne '') && ($value ne '' || $valuematch ne ''))) {
+                        my $release = $parser->get_text();
+                        $release =~ s/(^\s*|\s*$ )//gx;
+                        $needsrelease{$item.':'.$name.':'.$value.':'.$valuematch.':'.$namematch} = $release;
+                    }
+                } elsif ($item ne '' && $name ne '') {
                     my $release = $parser->get_text();
                     $release =~ s/(^\s*|\s*$ )//gx;
                     $needsrelease{$item.':'.$name.':'.$value} = $release;
@@ -15796,10 +16073,12 @@ the answer, and also caches if there is
 
 =item *
 X<idget()>
-B<idget($udom,@ids)>: find the usernames behind a list of IDs
-(IDs are a unique resource in a domain, there must be only 1 ID per
-username, and only 1 username per ID in a specific domain) (returns
-hash: id=>name,id=>name)
+B<idget($udom,$idsref,$namespace)>: find the usernames behind either 
+a list of student/employee IDs or clicker IDs
+(student/employee IDs are a unique resource in a domain, there must be 
+only 1 ID per username, and only 1 username per ID in a specific domain).
+clickerIDs are not necessarily unique, as students might share clickers.
+(returns hash: id=>name,id=>name)
 
 =item *
 X<idrget()>
@@ -15808,7 +16087,27 @@ usernames (returns hash: name=>id,name=>
 
 =item *
 X<idput()>
-B<idput($udom,%ids)>: store away a list of names and associated IDs
+B<idput($udom,$idsref,$uhome,$namespace)>: store away a list of 
+names and associated student/employee IDs or clicker IDs.
+
+=item *
+X<iddel()>
+B<iddel($udom,$idshashref,$uhome,$namespace)>: delete unwanted 
+student/employee ID or clicker ID username look-ups from domain.
+The homeserver ($uhome) and namespace ($namespace) are optional.
+If no $uhome is provided, it will be determined usig &homeserver()
+for each user.  If no $namespace is provided, the default is ids.
+
+=item *
+X<updateclickers()>
+B<updateclickers($udom,$action,$idshashref,$uhome,$critical)>: update 
+clicker ID-to-username look-ups in clickers.db on library server.
+Permitted actions are add or del (i.e., add or delete). The 
+clickers.db contains clickerID as keys (escaped), and each corresponding
+value is an escaped comma-separated list of usernames (for whom the
+library server is the homeserver), who registered that particular ID.
+If $critical is true, the update will be sent via &critical, otherwise
+&reply() will be used.
 
 =item *
 X<rolesinit()>
@@ -15856,13 +16155,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
@@ -15872,7 +16171,7 @@ prevents recursive calls to &allowed.
  2: browse allowed
  A: passphrase authentication needed
  B: access temporarily blocked because of a blocking event in a course.
- D: access blocked because access is required via session initiated via deep-link
+ D: access blocked because access is required via session initiated via deep-link 
 
 =item *
 
@@ -15925,9 +16224,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
@@ -16165,6 +16464,10 @@ data base, returning a hash that is keye
 values that are the resource value.  I believe that the timestamps and
 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 
+10 minutes.
+
 =back
 
 =head2 Course Modification
@@ -16335,13 +16638,15 @@ condval($condidx) : value of condition i
 metadata($uri,$what,$toolsymb,$liburi,$prefix,$depthcount) : request a
 resource's metadata, $what should be either a specific key, or either
 'keys' (to get a list of possible keys) or 'packages' to get a list of
-packages that this resource currently uses, the last 3 arguments are
+packages that this resource currently uses, the last 3 arguments are 
 only used internally for recursive metadata.
 
 the toolsymb is only used where the uri is for an external tool (for which
 the uri as well as the symb are guaranteed to be unique).
 
-this function automatically caches all requests
+this function automatically caches all requests except any made recursively
+to retrieve a list of metadata keys for an imported library file ($liburi is 
+defined).
 
 =item *
 
@@ -16351,20 +16656,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 *
@@ -16374,9 +16679,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 *
 
@@ -16429,13 +16734,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 --
@@ -16443,15 +16748,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.
@@ -16465,20 +16770,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 *
@@ -16616,7 +16921,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.
 
@@ -16650,7 +16955,7 @@ requestcourses: ability to request cours
 =over
 
 =item
-official, unofficial, community, textbook
+official, unofficial, community, textbook, placement
 
 =back
 
@@ -16671,8 +16976,8 @@ for course's uploaded content.
 =over
 
 =item
-canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota,
-communityquota, textbookquota
+canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota, 
+communityquota, textbookquota, placementquota
 
 =back
 
@@ -16682,7 +16987,7 @@ on your servers.
 
 =over
 
-=item
+=item 
 remotesessions, hostedsessions
 
 =back
@@ -16690,10 +16995,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.
@@ -17122,8 +17427,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)
@@ -17134,24 +17439,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: