--- loncom/interface/slotrequest.pm	2025/03/20 15:46:05	1.149
+++ loncom/interface/slotrequest.pm	2025/04/02 23:44:01	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.149 2025/03/20 15:46:05 raeburn Exp $
+# $Id: slotrequest.pm,v 1.152 2025/04/02 23:44:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -63,6 +63,10 @@ sub start_page {
         if ($bread_crumbs_component) {
             $args->{bread_crumbs_component} = $bread_crumbs_component;
         }
+        if ((($env{'form.requestattempt'}) || ($env{'form.context'} eq 'user')) && 
+             ($env{'form.symb'})) {
+            $args->{'bread_crumbs_nomenu'} = 1;
+        }
     }
     if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
         my %loaditems = (
@@ -79,6 +83,9 @@ sub start_page {
              ($env{'form.command'} eq 'remove_registration')))) {
         if ($env{'form.symb'}) {
             my $symb=&unescape($env{'form.symb'});
+            if ($symb =~ m{^/enc/}) {
+                $symb = &Apache::lonenc::unencrypted($symb);
+            }
             my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($symb);
             if ($resurl =~ /ext\.tool$/) {
                 my $target;
@@ -710,7 +717,11 @@ sub remove_registration_user {
     my $name = &Apache::loncommon::plainname($env{'form.uname'},
 					     $env{'form.udom'});
 
-    my $title = &Apache::lonnet::gettitle($env{'form.symb'});
+    my $symb = &unescape($env{'form.symb'});
+    if ($symb =~ m{^/enc/}) {
+        $symb = &Apache::lonenc::unencrypted($symb);
+    }
+    my $title = &Apache::lonnet::gettitle($symb);
 
     my $msg = &mt('Remove [_1] from slot [_2] for [_3]',
 		  $name,$slot_name,$title);
@@ -769,7 +780,7 @@ sub release_all_slot {
         if (!$result) {
             $r->print('<p class="LC_error">'.&mt($msg).'</p>');
         } else {
-	    $r->print("<p>$msg</p>");
+	    $r->print($msg);
         }
 	$r->rflush();
     }
@@ -792,6 +803,9 @@ sub release_slot {
     if ($mgr eq 'F' 
 	&& defined($env{'form.symb'})) {
 	$symb = &unescape($env{'form.symb'});
+	if ($symb =~ m{^/enc/}) {
+	    $symb = &Apache::lonenc::unencrypted($symb);
+	}
     }
 
     my ($result,$msg) =
@@ -1061,7 +1075,8 @@ sub release_reservation {
             if ($mgr eq 'F') {
                 $msg = &mt('Released Reservation for user: [_1]',"$uname:$udom");
             } else {
-                $msg = '<span style="font-weight: bold;">'.&mt('Released reservation: [_1]',$description).'</span><br /><br />';
+                $msg = '<p style="font-weight: bold;">'.
+                       &mt('Released reservation: [_1]',$description).'</p>';
                 my $person = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
                 my $subject = &mt('Reservation change: [_1]',$description);
                 my $msgbody = &mt('Reservation released by [_1] for [_2].',$person,$description);
@@ -1446,7 +1461,7 @@ sub show_choices {
         return;
     }
     if (!@{$available}) {
-        $output = '<span class="LC_info">'.&mt('No available times.').'</span>';
+        $output = '<p class="LC_info">'.&mt('No available times.').'</p>';
         if ($env{'form.command'} ne 'manageresv') {
             my $target = &return_target();
             $output .= ' <a href="/adm/flip?postdata=return:" target="'.$target.'">'.
@@ -1457,6 +1472,10 @@ sub show_choices {
         } else {
             return $output;
         }
+    } elsif ($env{'form.command'} ne 'manageresv') {
+        my $title = &Apache::lonnet::gettitle($symb);
+        my $headertext = &mt('Manage Reservation(s) for [_1]',$title);
+        $output .= '<h2 class="LC_heading_3">'.$headertext.'</h2>';
     }
     if (@{$available} > 1) {
         my $numavailable = scalar(@{$available});
@@ -1522,19 +1541,32 @@ ENDSCRIPT
         $output .=
             '<div id="LC_slotfilter_'.$num.'" style="display:'.$showfilter.'">'.
             '<form method="post" name="'.$chooserform.'" action="">'.
-            '<table><tr><td>'.&mt('Open after').'</td><td>'.
+            '<table class="LC_manage_reservations"><tr><th>'.&mt('Open after').'</th><td>'.
             &Apache::lonhtmlcommon::date_setter($chooserform,'start',$starttime,'','','','','','','',1,1).
-            '</td></tr><tr><td>'.&mt('Closed before').'</td><td>'.
+            '</td></tr><tr><th>'.&mt('Closed before').'</th><td>'.
             &Apache::lonhtmlcommon::date_setter($chooserform,'end',$endtime,'','','','','','','',1,1).
             '</td></tr></table><br />'.
             '<input type="button" name="slotfilter" value="Search for reservable slots" onclick="updateSlotDisplay(this.form,'."'$num'".');" />'.
             '</form></div><div id="LC_slotsearch_'.$num.'" style="display:none"><hr />';
     }
     if ($env{'form.command'} eq 'manageresv') {
-        $output .= '<table border="0">';
+        $output .= '<table border="0" class="LC_manage_reservations">'.
+                   '<tr><th>'.&mt('Action').'</th><th>'.&mt('Name').'</th></tr>';
     } else {
-        $output .= &Apache::loncommon::start_data_table();
+        $output .= &Apache::loncommon::start_data_table().
+                   &Apache::loncommon::start_data_table_header_row().
+                   '<th>'.&mt('Action').'</th><th>'.&mt('Name').'</th>'.
+                   &Apache::loncommon::end_data_table_header_row();
+    }
+    my $shownsymb;
+    if ($env{'request.role.adv'}) {
+        $shownsymb = $symb;
+    } elsif (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
+        $shownsymb = &Apache::lonenc::encrypted($symb);
+    } else {
+        $shownsymb = $symb;
     }
+    $shownsymb = &escape($shownsymb);
     foreach my $slot (@{$available}) {
 	my $description=&get_description($slot,$slots->{$slot});
 	my $form;
@@ -1559,7 +1591,6 @@ ENDSCRIPT
 		    }
                 }
 	    }
-	    my $escsymb=&escape($symb);
             if (!$form) {
                 my $name;
                 if ($formname) {
@@ -1572,7 +1603,7 @@ ENDSCRIPT
 	        $form=<<STUFF;
    <form method="post" action="/adm/slotrequest" $name>
      <input type="submit" name="Select" value="$text" />
-     <input type="hidden" name="symb" value="$escsymb" />
+     <input type="hidden" name="symb" value="$shownsymb" />
      <input type="hidden" name="slotname" value="$slot" />
      <input type="hidden" name="command" value="$command" />
      <input type="hidden" name="context" value="$context" />
@@ -1685,11 +1716,20 @@ sub remove_link {
 	undef($udom);
     }
 
+    my $shownsymb;
+    if ($env{'request.role.adv'}) {
+        $shownsymb = $symb;
+    } elsif (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) {
+        $shownsymb = &Apache::lonenc::encrypted($symb);
+    } else {
+        $shownsymb = $symb;
+    }
+
     $slotname  = &escape($slotname);
     $entry     = &escape($entry);
     $uname     = &escape($uname);
     $udom      = &escape($udom);
-    $symb      = &escape($symb);
+    $symb      = &escape($shownsymb);
 
     return <<"END_LINK";
  <a href="/adm/slotrequest?command=remove_registration&amp;slotname=$slotname&amp;entry=$entry&amp;uname=$uname&amp;udom=$udom&amp;symb=$symb&amp;context=manage"
@@ -2331,8 +2371,8 @@ sub manage_reservations {
                             $arrowstate = 'closed';
                         }
                         $row .= '<td>'.$spacers.'<img src="/adm/lonIcons/arrow.'.$arrowstate.'.gif" '.
-                                'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" '.
-                                'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
+                                'id="arrow'.$mapnum.'" '.'alt="arrow" onmouseover="this.style.cursor=\'pointer\'" tabindex="0" '.
+                                'onclick="'."toggleSlotMap('$mapnum','$rownum');".'" onkeydown="'."toggleSlotMap('$mapnum','$rownum');".'" />'.
                                 $icon.('&nbsp;' x6).'</td>'."\n";
                         if (ref($output{$currmap}) eq 'HASH') {
                             my $formnum = $mapnum.'_'.$reservable+1;
@@ -2365,6 +2405,14 @@ sub manage_reservations {
             $currcontainer = $parent{$depth};
         } elsif (ref($resource)) {
             my $symb = $resource->symb();
+            my $src = $resource->src();
+            my ($shownsymb,$shownsrc);
+            $shownsymb = $resource->shown_symb();
+            if ($resource->encrypted()) {
+                $shownsrc = &Apache::lonenc::encrypted($src);
+            } else {
+                $shownsrc = $src;
+            }
             next if (!$resource->is_problem() && !$resource->is_tool() &&
                      !$resource->is_sequence() && !$resource->is_page());
             $count ++;
@@ -2396,7 +2444,7 @@ sub manage_reservations {
                 for (my $i=0; $i<$depth; $i++) {
                     $r->print('<img src="'.$location.'" alt="" />');
                 }
-                $r->print('<a href="'.$resource->src().'?symb='.$symb.'">'.
+                $r->print('<a href="'.$shownsrc.'?symb='.$shownsymb.'">'.
                           '<img class="LC_contentImage" src="/adm/lonIcons/');
                 if ($resource->is_task()) {
                     $r->print('task.gif" alt="'.&mt('Task'));
@@ -3445,6 +3493,61 @@ sub slot_reservationmsg_options {
     return %options;
 }
 
+sub get_user_breadcrumbs {
+    my ($symb) = @_;
+    my ($mapurl, $rid, $resurl) = &Apache::lonnet::decode_symb($symb);
+    return [] unless (&Apache::lonnet::symbverify($symb,$resurl));
+    my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
+    my $maptitle = &Apache::lonnet::gettitle($mapurl);
+    my $restitle = &Apache::lonnet::gettitle($symb);
+    my $crstype = &Apache::loncommon::course_type();
+    my ($ltiscope,$ltiuri);
+    my (@crumbs,@mapcrumbs);
+    if (($env{'request.course.id'}) && ($env{'request.lti.login'})) {
+        ($ltiscope,$ltiuri) =
+            &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},
+                       $env{'course.'.$env{'request.course.id'}.'.domain'},
+                       $env{'course.'.$env{'request.course.id'}.'.num'});
+    }
+    if (($resurl ne '/adm/navmaps') && ($mapurl ne '') &&
+        (!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) {
+        unless ($ltiscope eq 'resource') {
+            if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) &&
+                !(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) {
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
+                }
+            }
+        }
+    }
+    unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) ||
+             ($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
+             @crumbs = ({text  => $crstype.' Contents',
+                         href  => "javascript:gopost('/adm/navmaps','')"});
+    }
+    if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
+        if (@mapcrumbs) {
+            push(@crumbs,@mapcrumbs);
+        } elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'})) &&
+                 ($ltiscope ne 'map') && ($ltiscope ne 'resource')) {
+            push(@crumbs, {text  => '...',
+                           no_mt => 1});
+        }
+    }
+    unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) || (@mapcrumbs) ||
+            (!$maptitle) || ($maptitle eq 'default.sequence') ||
+            ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) ||
+            ($ltiscope eq 'resource')) {
+        push(@crumbs, {text => $maptitle, no_mt => 1,
+                       href => &Apache::lonnet::clutter($mapurl).'?navmap=1'});
+    }
+    if ($restitle && !@mapcrumbs) {
+        push(@crumbs,{text => $restitle, no_mt => 1});
+    }
+    return \@crumbs;
+}
+
 sub handler {
     my $r=shift;
 
@@ -3458,7 +3561,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
 
     my %crumb_titles = &slot_command_titles();
-    my ($brcrum,$bread_crumbs_component);
+    my ($symb,$brcrum,$bread_crumbs_component);
 
     my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
@@ -3488,6 +3591,15 @@ sub handler {
             $title = 'Manage Reservations';
             $brcrum =[{href=>"/adm/slotrequest?command=manageresv",text=>$title}];
         }
+        if ($env{'form.requestattempt'}) {
+            $symb=&unescape($env{'form.symb'});
+            if ($symb =~ m{^/enc/}) {
+                $symb = &Apache::lonenc::unencrypted($symb);
+            }
+            if ($symb) {
+                $brcrum = &get_user_breadcrumbs($symb);
+            }
+        }
         my ($cnum,$cdom)=&get_course();
         %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
         $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots);
@@ -3507,19 +3619,38 @@ sub handler {
     } elsif ($env{'form.command'} eq 'release') {
         if ($env{'form.context'} eq 'usermanage') {
             $brcrum =[{href=>"/adm/slotrequest?command=manageresv",
-                       text=>$crumb_titles{'showslots'}}];
+                       text=>$crumb_titles{'manageresv'}}];
             $title = 'Manage Reservations';
             if (ref($brcrum) eq 'ARRAY') {
                 push(@{$brcrum},{href=>"/adm/slotrequest?command=$env{'form.command'}",text=>$crumb_titles{$env{'form.command'}}});
             }
+        } elsif ($env{'form.context'} eq 'user') {
+            if ($env{'form.symb'}) {
+                $symb = &unescape($env{'form.symb'});
+                if ($symb =~ m{^/enc/}) {
+                    $symb = &Apache::lonenc::unencrypted($symb);
+                }
+                $brcrum = &get_user_breadcrumbs($symb);
+            } else {
+                $brcrum =[];
+            }
+        }
+    } elsif (($env{'form.command'} eq 'get') && ($env{'form.context'} eq 'user')) {
+        if ($env{'form.symb'}) {
+            $symb=&unescape($env{'form.symb'});
+            if ($symb =~ m{^/enc/}) {
+                $symb = &Apache::lonenc::unencrypted($symb);
+            }
+            $brcrum = &get_user_breadcrumbs($symb);
+        } else {
+            $brcrum =[];
         }
     } else {
         $brcrum =[];
     }
-    my ($symb,$js,$available,$allavailable,$got_slots);
+    my ($js,$available,$allavailable,$got_slots);
     $available = [];
     if ($env{'form.requestattempt'}) {
-        $symb=&unescape($env{'form.symb'});
         @{$got_slots}=&check_for_reservation($symb,'allslots');
     }
     if (($env{'form.requestattempt'}) || ($env{'form.command'} eq 'manageresv')) {
@@ -3566,7 +3697,10 @@ sub handler {
     } elsif (($env{'form.command'} eq 'slotlog') && ($vgr eq 'F')) {
         &show_reservations_log($r);
     } else {
-	my $symb=&unescape($env{'form.symb'});
+	$symb = &unescape($env{'form.symb'});
+	if ($symb =~ m{^/enc/}) {
+	    $symb = &Apache::lonenc::unencrypted($symb);
+	}
 	if (!defined($symb)) {
 	    &fail($r,'not_valid');
 	    return OK;
@@ -3591,9 +3725,9 @@ sub handler {
 	    return OK;
 	}
 	if ($env{'form.requestattempt'}) {
-            $r->print('<div class="LC_left_float">'); 
-	    $r->print(&show_choices($symb,undef,undef,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots));
-            $r->print('</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
+            $r->print('<div class="LC_left_float">'.
+	              &show_choices($symb,undef,0,undef,\%slots,$consumed_uniqueperiods,$available,$got_slots).
+                      '</div><div style="padding:0;clear:both;margin:0;border:0"></div>');
 	} elsif ($env{'form.command'} eq 'release') {
 	    &release_slot($r,$symb);
 	} elsif ($env{'form.command'} eq 'get') {