--- loncom/lonnet/perl/lonnet.pm	2025/01/05 21:53:43	1.1533
+++ loncom/lonnet/perl/lonnet.pm	2025/04/02 23:44:03	1.1538
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1533 2025/01/05 21:53:43 raeburn Exp $
+# $Id: lonnet.pm,v 1.1538 2025/04/02 23:44:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3019,6 +3019,9 @@ sub get_domain_defaults {
                 last if ($domdefaults{'userapprovals'});
             }
         }
+        if (ref($domconfig{'privacy'}{'othdom'}) eq 'HASH') {
+            $domdefaults{'privacyothdom'} = $domconfig{'privacy'}{'othdom'};
+        }
     }
     &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
     return %domdefaults;
@@ -3731,6 +3734,7 @@ sub ssi_body {
     $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs;
     $output=~s/^.*?\<body[^\>]*\>//si;
     $output=~s/\<\/body\s*\>.*?$//si;
+    $output=~s{\Q<div class="LC_landmark" role="main">\E}{<div>}gs;
     if (wantarray) {
         return ($output, $response);
     } else {
@@ -7524,6 +7528,27 @@ sub set_adhoc_privileges {
         if (&allowed('adv') eq 'F') { $tadv=1; }
         &appenv({'request.role.adv'    => $tadv});
     }
+    if ($role eq 'ca') {
+        my @ca_settings = ('authoreditors','coauthorlist');
+        my %info = &userenvironment($dcdom,$pickedcourse,@ca_settings);
+        foreach my $item (@ca_settings) {
+            if (exists($info{$item})) {
+                my $name = $item;
+                if ($item eq 'authoreditors') {
+                    $name = 'editors';
+                    unless ($info{'authoreditors'}) {
+                        my %domdefs = &get_domain_defaults($dcdom);
+                        if ($domdefs{$name} ne '') {
+                            $info{'authoreditors'} = $domdefs{$name};
+                        } else {
+                            $info{'authoreditors'} = 'edit,xml';
+                        }
+                    }
+                }
+                &appenv({"environment.internal.$name./$dcdom/$pickedcourse" => $info{$item}});
+            }
+        }
+    }
 }
 
 # --------------------------------------------------------------- get interface
@@ -13191,6 +13216,15 @@ my %cachedmaps=();
 # When this was last done
 my $cachedmaptime='';
 
+# Cache (5 seconds) of mapsymb hierarchy for speedup of reservations display
+#
+# The course for which we cache
+my $cachedmapsymbkey='';
+# The cached recursive map symbs for this course
+my %cachedmapsymbs=();
+# When this was last done
+my $cachedmapsymbtime='';
+
 sub clear_EXT_cache_status {
     &delenv('cache.EXT.');
 }
@@ -13382,6 +13416,43 @@ sub EXT {
 
 	    #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
 
+# --------------------------------------------- Special handling for encrypturl
+
+            if ($spacequalifierrest eq '0.encrypturl') {
+                unless ($recursed) {
+                    my ($map_from_symb,@mapsymbs);
+                    if ($symbparm =~ /\.(page|sequence)$/) {
+                        push(@mapsymbs,$symbparm);
+                        $map_from_symb = &deversion((&decode_symb($symbparm))[2]);
+                    } else {
+                        $map_from_symb = &deversion((&decode_symb($symbparm))[0]);
+                    }
+                    if (($map_from_symb ne '') && ($map_from_symb !~ /default\.sequence$/)) {
+                        my @parents = &get_mapsymb_hierarchy($map_from_symb,$courseid);
+                        if (@parents) {
+                            push(@mapsymbs,@parents);
+                        }
+                    }
+                    if (@mapsymbs) {
+                        my $earlyout;
+                        my %parmhash=();
+                        if (tie(%parmhash,'GDBM_File',
+                                $env{'request.course.fn'}.'_parms.db',
+                                &GDBM_READER(),0640)) {
+                            foreach my $mapsymb (@mapsymbs) {
+                                if ((exists($parmhash{$mapsymb.'.'.$spacequalifierrest})) &&
+                                    (lc($parmhash{$mapsymb.'.'.$spacequalifierrest}) eq 'yes')) {
+                                    $earlyout = $parmhash{$mapsymb.'.'.$spacequalifierrest};
+                                    last;
+                                }
+                            }
+                            untie(%parmhash);
+                        }
+                        if ($earlyout) { return &get_reply([$earlyout,'map']); }
+                    }
+                }
+            }
+
 # ----------------------------------------------------- Cascading lookup scheme
 	    my $symbp=$symbparm;
 	    $mapp=&deversion((&decode_symb($symbp))[0]);
@@ -13585,6 +13656,30 @@ sub get_map_hierarchy {
     return @recurseup;
 }
 
+sub get_mapsymb_hierarchy {
+    my ($mapname,$courseid) = @_;
+    my @recurseup;
+    if ($mapname) {
+        if (($cachedmapsymbkey eq $courseid) &&
+            (abs($cachedmapsymbtime-time)<5)) {
+            if (ref($cachedmapsymbs{$mapname}) eq 'ARRAY') {
+                return @{$cachedmapsymbs{$mapname}};
+            }
+        }
+        my $navmap = Apache::lonnavmaps::navmap->new();
+        if (ref($navmap)) {
+            my $getsymb = 1;
+            my $inclusive = 1;
+            @recurseup = $navmap->recurseup_maps($mapname,$getsymb,$inclusive);
+            undef($navmap);
+            $cachedmapsymbs{$mapname} = \@recurseup;
+            $cachedmapsymbtime=time;
+            $cachedmapsymbkey=$courseid;
+        }
+    }
+    return @recurseup;
+}
+
 }
 
 sub sort_course_groups { # Sort groups based on defined rankings. Default is sort().
@@ -15092,6 +15187,9 @@ sub whichuser {
 	    $courseid=$tmp_courseid;
 	    ($domain)=&get_env_multiple('form.grade_domain');
 	    ($name)=&get_env_multiple('form.grade_username');
+            if ($name eq 'public' && $domain eq 'public') {
+                $publicuser = 1;
+            }
 	    return ($symb,$courseid,$domain,$name,$publicuser);
 	}
     }
@@ -15108,6 +15206,7 @@ sub whichuser {
 	    $env{'form.username'}.=time.rand(10000000);
 	}
 	$name.=$env{'form.username'};
+        $publicuser = 1;
     }
     return ($symb,$courseid,$domain,$name,$publicuser);