--- loncom/interface/lonnavdisplay.pm	2023/01/20 23:15:35	1.22.4.10.2.3
+++ loncom/interface/lonnavdisplay.pm	2024/07/02 02:17:56	1.22.4.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.10.2.3 2023/01/20 23:15:35 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.22.4.11 2024/07/02 02:17:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,7 +55,7 @@ sub real_handler {
     }
 
     # Check for critical messages and redirect if present.
-    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
+    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
     if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->header_out(Location => $url);
@@ -77,14 +77,10 @@ sub real_handler {
         $r->send_http_header;
         $r->print(&Apache::loncommon::check_release_result(@reinit));
         return OK;
-    }
-    my ($cid,$cnum,$cdom);
-    if ($result) {
-        $cid = $env{'request.course.id'};
-        $cnum = $env{'course.'.$cid.'.num'};
-        $cdom = $env{'course.'.$cid.'.domain'};
-    }
-    if (($result eq 'main') || ($result eq 'both')) {    
+    } elsif ($result eq 'update') {
+        my $cid = $env{'request.course.id'};
+        my $cnum = $env{'course.'.$cid.'.num'};
+        my $cdom = $env{'course.'.$cid.'.domain'};
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         &startpage($r);
@@ -114,16 +110,6 @@ ENDCLOSE
             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);
-        }
-    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -340,8 +326,7 @@ sub startpage {
                    no_mt => 1},
                  ];
     my $args = {'bread_crumbs' => $brcrum};
-    my $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    $r->print($start_page.
+    $r->print(&Apache::loncommon::start_page($title,undef,$args).
               '<script type="text/javascript">'."\n".
               '// <![CDATA['."\n".
               'window.focus();'."\n".
@@ -355,15 +340,14 @@ sub startContentScreen {
 
     $r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
     $r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
-    my $supptab;
-    if ($env{'request.role.adv'}) {
-        $supptab = 1;
-    } else {
+    my $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+    my ($suppcount,$errors);
+    unless ($allowed) {
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
+        ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
     }
-    if ($supptab) {
+    if ($allowed || $suppcount) {
         $r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
     }
     $r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");