--- rat/lonsequence.pm	2017/08/21 21:30:05	1.46
+++ rat/lonsequence.pm	2023/01/20 23:49:50	1.48.2.4.2.1
@@ -2,7 +2,7 @@
 #
 # Sequence Handler
 #
-# $Id: lonsequence.pm,v 1.46 2017/08/21 21:30:05 raeburn Exp $
+# $Id: lonsequence.pm,v 1.48.2.4.2.1 2023/01/20 23:49:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,9 +233,13 @@ sub handler {
                $r->send_http_header;
                $r->print(&Apache::loncommon::check_release_result(@reinit));
                return OK;
-           } elsif ($result eq 'update') {
-               my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-               my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+           }
+           my ($cnum,$cdom);
+           if ($result) {
+               $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+               $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+           }
+           if (($result eq 'main') || ($result eq 'both')) {
                my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
                if ($ferr) {
                    my $requrl = $r->uri;
@@ -244,6 +248,24 @@ sub handler {
                    return HTTP_NOT_ACCEPTABLE;
                }
            }
+           if (($result eq 'both') || ($result eq 'supp')) {
+               my $possdel;
+               if ($result eq 'supp') {
+                   $possdel = 1;
+               }
+               my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+               unless ($refs_updated) {
+                   &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+               }
+           }
+           &Apache::loncommon::content_type($r,'text/html');
+           $r->send_http_header;
+
+           my $mapurl = &Apache::lonnet::declutter($requrl);
+           my $maptitle = &Apache::lonnet::gettitle($mapurl);
+           my @crumbs = ({text => $maptitle, no_mt => 1});
+           my $args = {'bread_crumbs' => \@crumbs,
+                       'bread_crumbs_nomenu' => 1};
 
            # Create the nav map
            my $navmap = Apache::lonnavmaps::navmap->new();
@@ -251,29 +273,26 @@ sub handler {
            if (ref($navmap)) {
                # renderer call
                if (&Apache::lonnet::is_on_map($requrl)) {
-                   my $mapurl = &Apache::lonnet::declutter($requrl);
-                   my @crumbs = ({text  => $crstype.' Contents',
-                                  href  => "javascript:gopost('/adm/navmaps','')"});
+                   @crumbs = ({text  => $crstype.' Contents',
+                               href  => "javascript:gopost('/adm/navmaps','')"});
                    my $res = $navmap->getResourceByUrl($mapurl);
                    if (ref($res)) {
-                       my ($parent) = &Apache::lonnet::decode_symb($res->symb());
-                       if ($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
-                           my @mapcrumbs = $navmap->recursed_crumbs($parent);
-                           if (@mapcrumbs) {
-                               push(@crumbs,@mapcrumbs);
-                           } else {
-                               push(@crumbs,{text  => '...',
-                                             no_mt => 1});
+                       my $symb = $res->symb();
+                       if ($symb) {
+                           my ($parent) = &Apache::lonnet::decode_symb($res->symb());
+                           if ($parent ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
+                               my @mapcrumbs = $navmap->recursed_crumbs($parent);
+                               if (@mapcrumbs) {
+                                   push(@crumbs,@mapcrumbs);
+                               }
                            }
+                           $env{'request.symb'} = $symb;
                        }
                    }
-                   my $maptitle = &Apache::lonnet::gettitle($mapurl);
                    push(@crumbs,{text => $maptitle, no_mt => 1});
-                   my $args = {'bread_crumbs' => \@crumbs,
-                               'bread_crumbs_nomenu' => 1};
-                   &Apache::loncommon::content_type($r,'text/html');
-                   $r->send_http_header;
-
+                   $args = {'bread_crumbs' => \@crumbs,
+                            'bread_crumbs_nomenu' => 1,
+                            'no_auto_mt_title' => 1};
                    $r->print(&Apache::loncommon::start_page($maptitle,undef,$args));
 
                    my $renderArgs = { 'cols'                    => [0,1,2,3],
@@ -293,14 +312,27 @@ sub handler {
 
                    # If no resources were found let the user know.
                    if ($renderArgs->{'counter'} == 0) {
-                       $r->print("<p><span class=\"LC_info\">".
-                                 &mt("This folder is empty.")."</span></p>");
+                       $r->print('<p class="LC_info">'.
+                                 &mt('No items found in folder').
+                                 '</p>');
                    }
                    $r->print(&Apache::loncommon::end_page());
-                   $r->rflush();
-                   return OK;
+               } else {
+                   $r->print(&Apache::loncommon::start_page($maptitle,undef,$args).
+                             '<p class="LC_info">'.
+                             &mt('Folder no longer appears to be a part of the course').
+                             '</p>'.
+                             &Apache::loncommon::end_page());
                }
+           } else {
+               $r->print(&Apache::loncommon::start_page($maptitle,undef,$args).
+                         '<p class="LC_warning">'.
+                         &mt('Error: could not determine contents of folder').
+                         '</p>'.
+                         &Apache::loncommon::end_page());
            }
+           $r->rflush();
+           return OK;
        }
    }
 
@@ -343,8 +375,6 @@ sub handler {
                $dismapid=(split(/\./,$disid))[1];
 	       if (!$env{'request.role.adv'}) {
 		   $randomout = $bighash{'randomout_'.$disid};
-	       }
-               if (!$env{'request.role.adv'}) {
                    $is_encrypted = $bighash{'encrypted_'.$disid};
                }
            } elsif (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
@@ -365,8 +395,6 @@ sub handler {
                    $dismapid=(split(/\./,$disid))[1];
 		   if (!$env{'request.role.adv'}) {
 		       $randomout = $bighash{'randomout_'.$disid};
-		   }
-                   if (!$env{'request.role.adv'}) {
                        $is_encrypted = $bighash{'encrypted_'.$disid};
                    }
                }
@@ -386,10 +414,14 @@ sub handler {
       if ($is_encrypted) {
           $showdisurl = &Apache::lonenc::encrypted($disurl);
       }
-      &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
-				'last_known' => [$disurl,$dismapid]); 
+      if ($disurl =~ m{^/adm/navmaps(\?|$)}) {
+          &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid]);
+      } else {
+          &Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
+                                    'last_known' => [$disurl,$dismapid]);
+      }
       &Apache::loncommon::content_type($r,'text/html');
-      $r->header_out(Location => &Apache::lonnet::absolute_url($ENV{'SERVER_NAME'}).
+      $r->header_out(Location => &Apache::lonnet::absolute_url().
                                  $showdisurl);
       return REDIRECT;
    } else {