--- loncom/interface/lonnavdisplay.pm	2025/02/07 20:58:59	1.22.4.10.2.5
+++ loncom/interface/lonnavdisplay.pm	2022/10/19 00:03:10	1.40
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.10.2.5 2025/02/07 20:58:59 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.40 2022/10/19 00:03:10 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');
@@ -84,7 +85,7 @@ sub real_handler {
         $cnum = $env{'course.'.$cid.'.num'};
         $cdom = $env{'course.'.$cid.'.domain'};
     }
-    if (($result eq 'main') || ($result eq 'both')) {    
+    if (($result eq 'main') || ($result eq 'both')) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         &startpage($r);
@@ -119,17 +120,45 @@ ENDCLOSE
         if ($result eq 'supp') {
             $possdel = 1;
         }
-        my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+        my ($supplemental,$refs_updated) = &Apache::lonnet::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 {
+            &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();
 
     if (!defined($navmap)) {
-        if (($result eq 'main') || ($result eq 'both')) {
+        if ($result eq 'update') {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
         }
@@ -139,7 +168,7 @@ ENDCLOSE
         return HTTP_NOT_ACCEPTABLE;
     }
 
-    if (($result eq 'main') || ($result eq 'both')) {
+    if ($result eq 'update') {
         $r->rflush();
         &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
         $r->print($closure);
@@ -152,7 +181,7 @@ ENDCLOSE
     }
 
     &startContentScreen($r,'navmaps');
-    unless (($result eq 'main') || ($result eq 'both')) {
+    unless ($result eq 'update') {
         $r->rflush();
     }
 
@@ -340,7 +369,8 @@ sub startpage {
                    no_mt => 1},
                  ];
     my $args = {'bread_crumbs' => $brcrum};
-    $r->print(&Apache::loncommon::start_page($title,undef,$args).
+    my $start_page = &Apache::loncommon::start_page($title,undef,$args);
+    $r->print($start_page.
               '<script type="text/javascript">'."\n".
               '// <![CDATA['."\n".
               'window.focus();'."\n".
@@ -366,6 +396,7 @@ sub startContentScreen {
         $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");
+    $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;">');
 }