--- loncom/interface/lonnavdisplay.pm	2023/01/20 23:15:35	1.22.4.10.2.3
+++ loncom/interface/lonnavdisplay.pm	2017/11/16 13:41:56	1.35
@@ -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.35 2017/11/16 13:41:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,7 +54,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 +65,7 @@ sub real_handler {
 # ------------------------------------------------------------ Get query string
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
                                                                   'showOnlyHomework',
-                                                                  'postsymb']);
+                                                                  'postsymb','register']);
     # Check if course needs to be re-initialized
     my $loncaparev = $r->dir_config('lonVersion');
     my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
@@ -77,21 +77,17 @@ 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);
         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">
@@ -104,7 +100,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());
@@ -114,14 +110,18 @@ 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 {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->header_out(Location => $furl);
+            return REDIRECT;
         }
     }
 
@@ -242,7 +242,10 @@ ENDCLOSE
                      ."</span>");
         }
     } else {
-        my $link = '/adm/navmaps?jumpToFirstHomework';
+        my $link = 'navmaps?jumpToFirstHomework';
+        if ($env{'form.register'}) {
+            $link .= '&amp;register='.$env{'form.register'}; 
+        }
         unless ($notools) {
 	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
 					      'location.href="'.$link.'"',
@@ -262,7 +265,10 @@ ENDCLOSE
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        my $link = '/adm/navmaps?sort='.$env{'form.sort'};
+        my $link = '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');
@@ -271,7 +277,10 @@ ENDCLOSE
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        my $link = '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.'"',
@@ -293,6 +302,7 @@ 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>');
     }
@@ -335,12 +345,18 @@ sub startpage {
     # Header
     my $course_type = &Apache::loncommon::course_type();
     my $title = $course_type . ' Contents';
-    my $brcrum = [{href => '/adm/navmaps',
-                   text => &mt($course_type . ' Contents'),
-                   no_mt => 1},
-                 ];
-    my $args = {'bread_crumbs' => $brcrum};
-    my $start_page = &Apache::loncommon::start_page($title,undef,$args);
+    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.
               '<script type="text/javascript">'."\n".
               '// <![CDATA['."\n".
@@ -355,18 +371,18 @@ 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");
+    $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;">');
 }