--- loncom/interface/lonnavdisplay.pm	2020/09/08 04:26:22	1.22.4.9.4.1
+++ loncom/interface/lonnavdisplay.pm	2024/07/02 02:13:19	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.9.4.1 2020/09/08 04:26:22 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.43 2024/07/02 02:13:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::londocs();
 use Apache::lonuserstate;
+use LONCAPA::ltiutils;
 
 sub handler {
     my $r = shift;
@@ -54,7 +55,7 @@ sub real_handler {
         return OK;
     }
 
-    # Check for critical messages and redirect if present.
+    # Check for critical messages and redirect if present.  
     my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
     if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');
@@ -65,7 +66,7 @@ sub real_handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
                                                                   'showOnlyHomework',
-                                                                  'postsymb','register']);
+                                                                  'postsymb']);
     # Check if course needs to be re-initialized
     my $loncaparev = $r->dir_config('lonVersion');
     my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
@@ -77,17 +78,21 @@ sub real_handler {
         $r->send_http_header;
         $r->print(&Apache::loncommon::check_release_result(@reinit));
         return OK;
-    } elsif ($result eq 'update') {
-        my $cid = $env{'request.course.id'};
-        my $cnum = $env{'course.'.$cid.'.num'};
-        my $cdom = $env{'course.'.$cid.'.domain'};
+    }
+    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')) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         &startpage($r);
         my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                        '<br />'.
                        &mt('Your course session is being updated because of recent changes by course personnel.').
-                       ' '.&mt('Please be patient.').'<br /></div>'.
+                       ' '.&mt('Please be patient').'.<br /></div>'.
                        '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $closure = <<ENDCLOSE;
 <script type="text/javascript">
@@ -100,7 +105,7 @@ ENDCLOSE
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
         $r->rflush();
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
-        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
+        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
         if ($ferr) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
@@ -110,6 +115,46 @@ 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);
+        }
+    }
+
+    my $course_type = &Apache::loncommon::course_type();
+    if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
+        my $furl = &Apache::lonpageflip::first_accessible_resource();
+        if ($result eq 'update') {
+            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+            $r->print($closure.&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            unless ($furl eq '/adm/navmaps') {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->header_out(Location => $furl);
+                return REDIRECT;
+            }
+        }
+    }
+
+    if ($env{'request.lti.login'}) {
+        if ($env{'request.lti.uri'} ne '') {
+            my $cid = $env{'request.course.id'};
+            my $cnum = $env{'course.'.$cid.'.num'};
+            my $cdom = $env{'course.'.$cid.'.domain'};
+            my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
+            if (($scope eq 'map') || ($scope eq 'resource')) {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->header_out(Location => $url);
+                return REDIRECT;
+            }
+        }
+    }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -137,7 +182,7 @@ ENDCLOSE
         &startpage($r);
     }
 
-    &startContentScreen($r,'navmaps');
+    &startContentScreen($r,'navmaps',$course_type);
     unless ($result eq 'update') {
         $r->rflush();
     }
@@ -229,9 +274,6 @@ ENDCLOSE
         }
     } else {
         my $link = '/adm/navmaps?jumpToFirstHomework';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'}; 
-        }
         unless ($notools) {
 	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
 					      'location.href="'.$link.'"',
@@ -252,9 +294,6 @@ ENDCLOSE
                             return $res->completable() || $res->is_map();
                         };
         my $link = '/adm/navmaps?sort='.$env{'form.sort'};
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
 					  'location.href="'.$link.'"',
 					  'Show everything');
@@ -264,9 +303,6 @@ ENDCLOSE
 	$resource_no_folder_link = 1;
     } else {
         my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
         unless ($notools) {
 	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
 					      'location.href="'.$link.'"',
@@ -288,7 +324,6 @@ ENDCLOSE
                        <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>
                        <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
                     </select>
-                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
                  </span>
                </form>');
     }
@@ -331,19 +366,12 @@ sub startpage {
     # Header
     my $course_type = &Apache::loncommon::course_type();
     my $title = $course_type . ' Contents';
-    my ($start_page,$args);
-    if ($env{'form.register'}) {
-        $args = {'force_register' => $env{'form.register'}};
-        $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    } else {
-        my $brcrum = [{href => '/adm/navmaps',
-                       text => &mt($course_type . ' Contents'),
-                       no_mt => 1},
-                     ];
-        $args = {'bread_crumbs' => $brcrum};
-        $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    }
-    $r->print($start_page.
+    my $brcrum = [{href => '/adm/navmaps',
+                   text => &mt($course_type . ' Contents'),
+                   no_mt => 1},
+                 ];
+    my $args = {'bread_crumbs' => $brcrum};
+    $r->print(&Apache::loncommon::start_page($title,undef,$args).
               '<script type="text/javascript">'."\n".
               '// <![CDATA['."\n".
               'window.focus();'."\n".
@@ -353,21 +381,25 @@ sub startpage {
 }
 
 sub startContentScreen {
-    my ($r,$mode)=@_;
+    my ($r,$mode,$course_type)=@_;
 
     $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 $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
-    my ($suppcount,$errors);
-    unless ($allowed) {
+    my $supptab;
+    if ($env{'request.role.adv'}) {
+        $supptab = 1;
+    } else {
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
+        $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
     }
-    if ($allowed || $suppcount) {
+    if ($supptab) {
         $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");
+    unless ($course_type eq 'Placement') {
+        $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");
+        $r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    }
     $r->print("\n".'</ul>'."\n");
     $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
 }