--- loncom/interface/lonnavmaps.pm	2020/04/22 14:53:03	1.550
+++ loncom/interface/lonnavmaps.pm	2025/02/03 19:07:54	1.571
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.550 2020/04/22 14:53:03 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.571 2025/02/03 19:07:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,7 +48,8 @@ described at http://www.lon-capa.org.
 
 =head1 OVERVIEW
 
-X<lonnavmaps, overview> When a user enters a course, LON-CAPA examines the
+X<lonnavmaps, overview>
+When a user enters a course, LON-CAPA examines the
 course structure and caches it in what is often referred to as the
 "big hash" X<big hash>. You can see it if you are logged into
 LON-CAPA, in a course, by going to /adm/test. The content of 
@@ -357,7 +358,7 @@ user into thinking that if the sequence
 under it; for example, see the "Show Uncompleted Homework" view on the
 B<NAV> screen.
 
-=item * B<suppressNavmaps>: default: false
+=item * B<suppressNavmap>: default: false
 
 If true, will not display Navigate Content resources. 
 
@@ -549,6 +550,10 @@ my %colormap =
       $resObj->EXCUSED                => '#3333FF',
       $resObj->PAST_DUE_ANSWER_LATER  => '',
       $resObj->PAST_DUE_NO_ANSWER     => '',
+      $resObj->PAST_DUE_ATMPT_ANS     => '',
+      $resObj->PAST_DUE_ATMPT_NOANS   => '',
+      $resObj->PAST_DUE_NO_ATMT_ANS   => '',
+      $resObj->PAST_DUE_NO_ATMT_NOANS => '',
       $resObj->ANSWER_OPEN            => '#006600',
       $resObj->OPEN_LATER             => '',
       $resObj->TRIES_LEFT             => '',
@@ -694,10 +699,10 @@ sub getDescription {
             return &Apache::lonhtmlcommon::direct_parm_link(&mt("Open, no due date"),$res->symb(),'duedate',$part).$slotinfo;
         }
     }
-    if ($status == $res->PAST_DUE_ANSWER_LATER) {
+    if (($status == $res->PAST_DUE_ANSWER_LATER) || ($status == $res->PAST_DUE_ATMPT_ANS) || ($status == $res->PAST_DUE_NO_ATMT_ANS)) {
         return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
     }
-    if ($status == $res->PAST_DUE_NO_ANSWER) {
+    if (($status == $res->PAST_DUE_NO_ANSWER) || ($status == $res->PAST_DUE_ATMPT_NOANS) || ($status == $res->PAST_DUE_NO_ATMT_NOANS)) {
 	if ($res->is_practice()) {
 	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
 	} else {
@@ -1020,8 +1025,12 @@ sub render_resource {
         if ($it->{CONDITION}) {
             $nowOpen = !$nowOpen;
         }
-	
-	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
+	my $folderType;
+	if (&advancedUser() && $resource->is_missing_map()) {
+	    $folderType = 'none';
+	} else {
+	    $folderType = $resource->is_sequence() ? 'folder' : 'page';
+	}
         my $title=$resource->title;
 		$title=~s/\"/\&qout;/g;
         if (!$params->{'resource_no_folder_link'}) {
@@ -1068,13 +1077,28 @@ sub render_resource {
             $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
         } elsif ($params->{'mapUnlisted'}) {
             $nonLinkedText .= ' <span class="LC_warning">('.&mt('unlisted').')</span> ';
+        } elsif ($params->{'mapHiddenDeepLink'} || $resource->deeplinkout()) {
+            $nonLinkedText .= ' <span class="LC_warning">('.&mt('not shown').')</span> ';
         }
     } else {
         if ($resource->randomout()) {
             $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
-        } elsif (($resource->deeplink($params->{caller}) eq 'absent') ||
-                 ($resource->deeplink($params->{caller}) eq 'grades')) {
-            $nonLinkedText .= ' <span class="LC_warning">('.&mt('unlisted').')</span> ';
+        } elsif ($resource->deeplinkout()) {
+            $nonLinkedText .= ' <span class="LC_warning">('.&mt('not shown').')</span> ';
+        } else {
+            my $deeplink = $resource->deeplink($params->{caller});
+            if ((($deeplink eq 'absent') || ($deeplink eq 'grades')) &&
+                  &advancedUser()) {
+                $nonLinkedText .= ' <span class="LC_warning">('.&mt('unlisted').')</span> ';
+            } elsif (($deeplink) && ($deeplink) ne 'full') {
+                if (&advancedUser()) {
+                    $nonLinkedText .= ' <span class="LC_warning">('.&mt('deep-link access').
+                                      ')</span> ';
+                } else {
+                    $nonLinkedText .= ' <span class="LC_warning">('.&mt('access via external site').
+                                      ')</span> ';
+                }
+            }
         }
     }
     if (!$resource->condval()) {
@@ -1097,7 +1121,7 @@ sub render_resource {
     }
 
     # Decide what to display
-    $result .= "$newBranchText$linkopen$icon$linkclose";
+    $result .= "$newBranchText$linkopen$icon";
     
     my $curMarkerBegin = '';
     my $curMarkerEnd = '';
@@ -1137,7 +1161,7 @@ sub render_resource {
             $linkopen = "<a href=\"$link\">";
         }
     }
-    $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
+    $result .= "$curMarkerBegin$title$partLabel$curMarkerEnd$linkclose$editmapLink$nonLinkedText</td>";
 
     return $result;
 }
@@ -1401,15 +1425,47 @@ sub render {
         $filterFunc = sub { my $res = shift; return !$res->randomout() &&
                                 ($res->deeplink($args->{'caller'}) ne 'absent') &&
                                 ($res->deeplink($args->{'caller'}) ne 'grades') &&
+                                !$res->deeplinkout() &&
                                 &$oldFilterFunc($res);};
     }
 
     my $condition = 0;
     if ($env{'form.condition'}) {
         $condition = 1;
+    } elsif (($env{'request.deeplink.login'}) && ($env{'request.course.id'}) && (!$userCanSeeHidden)) {
+        if (!defined($navmap)) {
+            $navmap = Apache::lonnavmaps::navmap->new();
+        }
+        if (defined($navmap)) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $symb = &Apache::loncommon::symb_from_tinyurl($env{'request.deeplink.login'},$cnum,$cdom);
+            if ($symb) {
+                my $deeplink;
+                my $res = $navmap->getBySymb($symb);
+                if ($res->is_map()) {
+                    my $mapname = &Apache::lonnet::declutter($res->src());
+                    $mapname = &Apache::lonnet::deversion($mapname);
+                    $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
+                } else {
+                    $deeplink = $res->deeplink();
+                }
+                if ($deeplink ne '') {
+                    if ((split(/,/,$deeplink))[1] eq 'hide') {
+                        if ($res->is_map()) {
+                            map { $filterHash->{$_} = 1 if $_ } split(/,/,$res->map_hierarchy());
+                        } else {
+                            my $mapurl = (&Apache::lonnet::decode_symb($symb))[0];
+                            my $map = $navmap->getResourceByUrl($mapurl);
+                            map { $filterHash->{$_} = 1 if $_ } split(/,/,$map->map_hierarchy());
+                        }
+                    }
+                }
+            }
+        }
     }
 
-    if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) {
+    if (!$env{'form.folderManip'} && !defined($args->{'iterator'}) && !$args->{'nocurrloc'}) {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
@@ -1448,11 +1504,15 @@ sub render {
         my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
         my $curRes;
         my $found = 0;
+        my $here_is_navmaps = 0; 
+        if ($here =~ m{___\d+___adm/navmaps$}) {
+            $here_is_navmaps = 1;
+        }
         
         # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count
         # for the jump marker with this loop.
-        while ($here && ($curRes = $mapIterator->next()) && !$found) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found && !$here_is_navmaps) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -1513,10 +1573,15 @@ sub render {
     my $curRes;
     my $foundJump = 0;
     my $counter = 0;
-    
+
     while (($curRes = $mapIterator->next()) && !$foundJump) {
         if (ref($curRes)) { $counter++; }
-        
+        # Speed up display after course initialization
+        # when $jump is empty. Note: we still need
+        # $counter to be 1 in that case if there is at
+        # least one resource.
+        last if (($jump eq '') && ($counter));
+
         if (ref($curRes) && $jump eq $curRes->symb()) {
             
             # This is why we have to use the main iterator instead of the
@@ -1535,27 +1600,19 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-   
+
     # Print key?
     if ($printKey) {
-        $result .= '<table border="0" cellpadding="2" cellspacing="0">';
-        $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
-	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
-        if ($navmap->{LAST_CHECK}) {
-            $result .= 
-                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('New discussion since').' '.
-                strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
-                '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').'<p>'.
-                '</td>'; 
-        } else {
-            $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif" alt="" /> '.&mt('New message (click to open)').
-                '</td>'; 
-        }
-
-        $result .= '</tr></table>';
+        my $location = &Apache::loncommon::lonhttpdurl("/adm/lonMisc");
+        $result .= '<div class="LC_navtools">'."\n".
+                   '<span class="LC_middle LC_right">'.&mt('Key').':</span>'.
+                   '<span class="LC_middle LC_center">&nbsp;&nbsp;'.
+                   '<img src="'.$location.'/chat.gif" alt="" /> '.&mt('Unread Discussion').
+                   '&nbsp;&nbsp;'.
+                   '<img src="'.$location.'/feedback.gif" alt="" /> '.
+                   &mt('New message (click to open)').
+                   '</span></div>'.
+                   '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
     }
 
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
@@ -1569,9 +1626,6 @@ sub render {
 		'&amp;here='.&escape($here);
 	    $text='Open all folders';
         }
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
 	if ($args->{'caller'} eq 'navmapsdisplay') {
             unless ($args->{'notools'}) {
                 &add_linkitem($args->{'linkitems'},'changefolder',
@@ -1585,20 +1639,19 @@ sub render {
 
     # Check for any unread discussions in all resources.
     if (($args->{'caller'} eq 'navmapsdisplay') && (!$args->{'notools'})) {
+        my $markread = 'Mark all posts read';
 	&add_linkitem($args->{'linkitems'},'clearbubbles',
 		      'document.clearbubbles.submit()',
-		      'Mark all posts read');
+		      $markread);
 	my $time=time;
+        my $submit = &mt($markread);
         my $querystr = &HTML::Entities::encode($ENV{'QUERY_STRING'},'<>&"');
 	$result .= (<<END);
-    <form name="clearbubbles" method="post" action="/adm/feedback">
+    <form name="clearbubbles" method="post" action="/adm/feedback" aria-hidden="true">
 	<input type="hidden" name="navurl" value="$querystr" />
 	<input type="hidden" name="navtime" value="$time" />
 END
-        if ($env{'form.register'}) {
-            $result .= '<input type="hidden" name="register" value="'.$env{'form.register'}.'" />';
-        }
-        if ($args->{'sort'} eq 'discussion') { 
+        if ($args->{'sort'} eq 'discussion') {
 	    my $totdisc = 0;
 	    my $haveDisc = '';
 	    my @allres=$navmap->retrieveResources();
@@ -1612,22 +1665,30 @@ END
 		$haveDisc =~ s/:$//;
 		$result .= (<<END);
 	<input type="hidden" name="navmaps" value="$haveDisc" />
-    </form>
 END
             }
 	}
-	$result.='</form>';
+	$result .= <<END;
+        <input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
+    </form>
+END
     }
-    if (($args->{'caller'} eq 'navmapsdisplay') &&
-        ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
-         (&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) {
+    if (($args->{'caller'} eq 'navmapsdisplay') && ($env{'request.course.id'})) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
+        if ($env{'course.'.$env{'request.course.id'}.'.url'} eq
             "uploaded/$cdom/$cnum/default.sequence") {
-            &add_linkitem($args->{'linkitems'},'edittoplevel',
-                          "javascript:gocmd('/adm/coursedocs','editdocs');",
-                          'Content Editor');
+            if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+                (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) {
+                &add_linkitem($args->{'linkitems'},'edittoplevel',
+                              "javascript:gocmd('/adm/coursedocs','editdocs');",
+                              'Content Editor');
+            }
+            if ($counter) {
+                &add_linkitem($args->{'linkitems'},'printout',
+                              "javascript:gopost('/adm/printout','/adm/navmaps');",
+                              'Prepare a printable document');
+            }
         }
     }
 
@@ -1648,7 +1709,9 @@ END
     $result .= "<br />\n";
 
     # Data
-    $result.=&Apache::loncommon::start_data_table("LC_tableOfContent");    
+    if ($counter) {
+        $result.=&Apache::loncommon::start_data_table("LC_tableOfContent");
+    }
 
     my $res = "Apache::lonnavmaps::resource";
     my %condenseStatuses =
@@ -1673,11 +1736,31 @@ END
     # mark as hidden for users who have $userCanSeeHidden.  
     # Use DFS for speed, since structure actually doesn't matter,
     # except what map has what resources.
+    #
+    # To ensure the "Selected Resources from selected folder in course"
+    # printout generation option will work in sessions launched via a
+    # deep link, the value of $args->{'filterFunc'} included in the 
+    # call to lonnavmaps::render() is omitted from the filter function
+    # used with the DFS Iterator when $args->{'caller'} is 'printout'.
+    #
+    # As a result $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} can be
+    # set to 1 for folder(s) which include resources only accessible
+    # for sessions launched via a deep link, when the current session 
+    # is of that type.
 
     my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
                                                      $it->{FIRST_RESOURCE},
                                                      $it->{FINISH_RESOURCE},
                                                      {}, undef, 1);
+    my $dfsFilterFunc;
+    if ($args->{'caller'} eq 'printout') {
+        $dfsFilterFunc = sub { my $res = shift; return !$res->randomout() &&
+                              ($res->deeplink($args->{'caller'}) ne 'absent') &&
+                              ($res->deeplink($args->{'caller'}) ne 'grades') &&
+                              !$res->deeplinkout();};
+    } else {
+        $dfsFilterFunc = $filterFunc;
+    }
     my $depth = 0;
     $dfsit->next();
     my $curRes = $dfsit->next();
@@ -1696,8 +1779,9 @@ END
             } elsif ($curRes->src()) {
                 # Not a sequence: if it's filtered, ignore it, otherwise
                 # rise up the stack and mark the sequences as having children
-                if (&$filterFunc($curRes)) {
+                if (&$dfsFilterFunc($curRes)) {
                     for my $sequence (@{$dfsit->getStack()}) {
+                        next unless ($sequence->is_map());
                         $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
                     }
                 }
@@ -1821,6 +1905,7 @@ END
         # If this is an empty sequence and we're filtering them, continue on
         $args->{'mapHidden'} = 0;
         $args->{'mapUnlisted'} = 0;
+        $args->{'mapHiddenDeepLink'} = 0;
         if (($curRes->is_map()) && (!$curRes->{DATA}->{HAS_VISIBLE_CHILDREN})) {
             if ($args->{'suppressEmptySequences'}) {
                 next;
@@ -1833,9 +1918,16 @@ END
                     } else {
                         next;
                     }
+                } elsif ($curRes->deeplinkout) {
+                    if ($userCanSeeHidden) {
+                        $args->{'mapHiddenDeepLink'} = 1;
+                    } else {
+                        next;
+                    }
                 } else {
                     my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
-                    if ($deeplink =~ /^(absent|grades),/) {
+                    my ($state,$others,$listed) = split(/,/,$deeplink);
+                    if (($listed eq 'absent') || ($listed eq 'grades')) {
                         if ($userCanSeeHidden) {
                             $args->{'mapUnlisted'} = 1;
                         } else {
@@ -1906,10 +1998,10 @@ END
             }
         }
         # If deep-link parameter is set (and is not set to full) suppress link
-        # unless privileged user, or calling context is sequence, and parameter
-        # set at map level
+        # unless privileged user, tinyurl used for login resolved to a map, and
+        # the resource is within the map.
         if ((!$curRes->deeplink($args->{'caller'})) ||
-            ($curRes->deeplink($args->{'caller'}) =~ /^full,/) || &advancedUser()) {
+            ($curRes->deeplink($args->{'caller'}) eq 'full') || &advancedUser()) {
             $args->{'resource_nolink'} = 0;
         } else {
             $args->{'resource_nolink'} = 1;
@@ -1940,7 +2032,7 @@ END
             if ($env{'request.course.id'}) {
                 if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }
@@ -1948,7 +2040,7 @@ END
                         $srcHasQuestion = 1;
                     }
                 } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }
@@ -2017,7 +2109,9 @@ END
 	}
     }
 
-    $result.=&Apache::loncommon::end_data_table();
+    if ($counter) {
+        $result.=&Apache::loncommon::end_data_table();
+    }
     
     # Print out the part that jumps to #curloc if it exists
     # delay needed because the browser is processing the jump before
@@ -2056,17 +2150,15 @@ sub show_linkitems_toolbar {
         if (ref($args->{'linkitems'}) eq 'HASH') {
             my $numlinks = scalar(keys(%{$args->{'linkitems'}}));
             if ($numlinks > 1) {
-                $result = '<td>'.
+                $result = '<div class="LC_navtools">'.
                           &Apache::loncommon::help_open_menu('Navigation Screen','Navigation_Screen',
                                                              undef,'RAT').
-                          '</td>'.
-                          '<td>&nbsp;</td>'.
-                          '<td class="LC_middle">'.&mt('Tools:').'</td>';
+                          '</div><div class="LC_navtools">&nbsp;'.&mt('Tools:').'</div>';
             }
-            $result .= '<td align="left">'."\n".
+            $result .= '<div class="LC_navtools">'."\n".
                        '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
-                             'changefolder','clearbubbles','edittoplevel');
+                             'changefolder','clearbubbles','printout','edittoplevel');
             foreach my $link (@linkorder) {
                 if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
                     if ($args->{'linkitems'}{$link}{'text'} ne '') {
@@ -2091,19 +2183,21 @@ sub show_linkitems_toolbar {
                 }
             }
             $result .= '</ul>'.
-                       '</td>';
+                       '</div>';
             if (($numlinks==1) && (exists($args->{'linkitems'}{'edittoplevel'}))) {
-                $result .= '<td><a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
-                           &mt('Content Editor').'</a></td>';
+                $result .= '<div class="LC_navtools">'.
+                           '&nbsp;<a href="'.$args->{'linkitems'}{'edittoplevel'}{'cmd'}.'">'.
+                           &mt('Content Editor').'</a></div>';
             }
         }
         if ($args->{'sort_html'}) {
-            $result .= '<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
-                       '<td align="right">'.$args->{'sort_html'}.'</td>';
+            $result .= '<div class="LC_navtools">&nbsp;&nbsp;&nbsp;'.
+                       $args->{'sort_html'}.'</div>';
         }
     }
     if ($result) {
-        $result = "<table><tr>$result</tr></table>";
+        $result = '<div class="LC_navtools">'.$result.'</div>'."\n".
+                  '<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n";
     }
     return $result;
 }
@@ -2198,10 +2292,17 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{SECTION}  = shift;
     $self->{CODE}     = shift;
-    $self->{NOHIDE} = shift;
+    $self->{NOHIDE}   = shift;
 
 
+    if (($self->{SECTION} eq '') && ($env{'request.course.sec'} ne '')) {
+        if (($self->{USERNAME} eq $env{'user.name'}) &&
+            ($self->{USERNAME} eq $env{'user.domain'})) {
+            $self->{SECTION} = $env{'request.course.sec'};
+        }
+    }
 
     # Resource cache stores navmap resources as we reference them. We generate
     # them on-demand so we don't pay for creating resources unless we use them.
@@ -2243,7 +2344,7 @@ sub new {
 	$self->{PARM_HASH} = \%parmhash;
 	$self->{PARM_CACHE} = {};
     } else {
-	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE}, $self->{NOHIDE});
+	$self->change_user($self->{USERNAME}, $self->{DOMAIN}, $self->{SECTION}, $self->{CODE}, $self->{NOHIDE});
     }
 
     return $self;
@@ -2254,15 +2355,17 @@ sub new {
 # username/domain associated with a navmap (e.g. to navigate for someone
 # else besides the current user...if sufficiently privileged.
 # Parameters:
-#    user  - New user.
-#    domain- Domain the user belongs to.
-#    code  - Anonymous CODE in use.
+#    user    - New user.
+#    domain  - Domain to which the user belongs.
+#    section - Section to which the user belongs.
+#    code    - Anonymous CODE in use.
 # Implicit inputs:
 #   
 sub change_user {
     my $self = shift;
     $self->{USERNAME} = shift;
     $self->{DOMAIN}   = shift;
+    $self->{SECTION}  = shift;
     $self->{CODE}     = shift;
     $self->{NOHIDE}   = shift;
 
@@ -2479,7 +2582,7 @@ sub getIterator {
     my $self = shift;
     my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,
                                                      shift, undef, shift,
-						     shift, shift);
+						     shift, shift, shift);
     return $iterator;
 }
 
@@ -2769,7 +2872,7 @@ sub parmval_real {
     $self->generate_course_user_opt();
 
     my $cid=$env{'request.course.id'};
-    my $csec=$env{'request.course.sec'};
+    my $csec=$self->{SECTION};
     my $cgroup='';
     my @cgrps=split(/:/,$env{'request.course.groups'});
     if (@cgrps > 0) {
@@ -2958,7 +3061,7 @@ sub parmval_real {
 }
 
 sub recurseup_maps {
-    my ($self,$mapname) = @_;
+    my ($self,$mapname,$getsymb) = @_;
     my @recurseup;
     if ($mapname) {
         my $res = $self->getResourceByUrl($mapname);
@@ -2966,7 +3069,11 @@ sub recurseup_maps {
             my @pcs = split(/,/,$res->map_hierarchy());
             shift(@pcs);
             if (@pcs) {
-                @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
+                if ($getsymb) {
+                    @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->symb()); } reverse(@pcs);
+                } else {
+                    @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
+                }
             }
         }
     }
@@ -2998,8 +3105,12 @@ sub recursed_crumbs {
         my $pc = $map->map_pc();
         next if ((!$pc) || ($pc == 1));
         push(@links,$map);
-        push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $map->title(),'no_mt' => 1,});
-        $totallength += length($map->title());
+        my $text = $map->title();
+        if ($text eq '') {
+            $text = '...';
+        }
+        push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $text,'no_mt' => 1,});
+        $totallength += length($text);
     }
     my $numlinks = scalar(@links);
     if ($numlinks) {
@@ -3011,7 +3122,11 @@ sub recursed_crumbs {
             }
             @revmapinfo = ();
             foreach my $map (@links) {
-                my $showntitle = &truncate_crumb_text($map->title(),$avg);
+                my $title = $map->title();
+                if ($title eq '') {
+                    $title = '...';
+                }
+                my $showntitle = &truncate_crumb_text($title,$avg);
                 if ($showntitle ne '') {
                     push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});
                 }
@@ -3086,7 +3201,7 @@ sub get_mapparam {
     # Get the course id and section if there is one.
 
     my $cid=$env{'request.course.id'};
-    my $csec=$env{'request.course.sec'};
+    my $csec=$self->{SECTION};
     my $cgroup='';
     my @cgrps=split(/:/,$env{'request.course.groups'});
     if (@cgrps > 0) {
@@ -3243,6 +3358,9 @@ sub get_mapparam {
 	if (defined($$courseopt{$courselevelm})) {
 	    return $$courseopt{$courselevelm};
 	}
+        if (defined($$courseopt{$courseleveli})) {
+            return $$courseopt{$courseleveli};
+        }
         unless ($recursed) {
             @recurseup = $self->recurseup_maps($mapname);
             $recursed = 1;
@@ -3284,11 +3402,11 @@ sub getcourseparam {
 
     my $uname = $self->{USERNAME};
     my $udom  = $self->{DOMAIN};
+    my $csec  = $self->{SECTION};
     
-    # Course, section, group ids come from the env:
+    # Course and group ids come from the env:
 
     my $cid   = $env{'request.course.id'};
-    my $csec  = $env{'request.course.sec'};
     my $cgroup = '';		# Assume no group
 
     my @cgroups = split(/:/, $env{'request.course.groups'});
@@ -3616,7 +3734,7 @@ getIterator behaves as follows:
 
 =over 4
 
-=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap):
+=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap, $deeplinklisted):
 
 All parameters are optional. firstResource is a resource reference
 corresponding to where the iterator should start. It defaults to
@@ -3633,7 +3751,10 @@ that is not just a single, 'redirecting'
 will return all information, starting with the top-level map,
 regardless of content. returnTopMap, if true (default false), will
 cause the iterator to return the top-level map object (resource 0.0)
-before anything else.
+before anything else. deeplinklisted if true (default false), will
+check "listed" status of a resource with a deeplink, and unless "absent"
+will exclude deeplink checking when retrieving the browsePriv from
+lonnet::allowed().
 
 Thus, by default, only top-level resources will be shown. Change the
 condition to a 1 without changing the hash, and all resources will be
@@ -3770,6 +3891,10 @@ sub new {
     # have we done that yet?
     $self->{HAVE_RETURNED_0} = 0;
 
+    # Do we want to check the "listed" status for a resource for which
+    # deeplinking applies.
+    $self->{DEEPLINKLISTED} = shift;
+
     # Now, we need to pre-process the map, by walking forward and backward
     # over the parts of the map we're going to look at.
 
@@ -3861,7 +3986,8 @@ sub new {
 						 $finishResource, $self->{FILTER},
 						 $self->{ALREADY_SEEN}, 
 						 $self->{CONDITION},
-						 $self->{FORCE_TOP});
+						 $self->{FORCE_TOP},
+                                                 undef,$self->{DEEPLINKLISTED});
     }
 
     # Set up some bookkeeping information.
@@ -4031,13 +4157,14 @@ sub next {
                                               $finishResource, $self->{FILTER},
                                               $self->{ALREADY_SEEN},
 					      $self->{CONDITION},
-					      $self->{FORCE_TOP});
+					      $self->{FORCE_TOP},
+                                              undef,$self->{DEEPLINKLISTED});
     }
 
     # If this is a blank resource, don't actually return it.
     # Should you ever find you need it, make sure to add an option to the code
     #  that you can use; other things depend on this behavior.
-    my $browsePriv = $self->{HERE}->browsePriv($noblockcheck);
+    my $browsePriv = $self->{HERE}->browsePriv($noblockcheck,$self->{DEEPLINKLISTED});
     if (!$self->{HERE}->src() || 
         (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
         return $self->next($closeAllPages);
@@ -4465,6 +4592,7 @@ sub from { my $self=shift; return $self-
 sub goesto { my $self=shift; return $self->navHash("goesto_", 1); }
 sub kind { my $self=shift; return $self->navHash("kind_", 1); }
 sub randomout { my $self=shift; return $self->navHash("randomout_", 1); }
+sub deeplinkout { my $self=shift; return $self->navHash("deeplinkout_", 1); }
 sub randompick { 
     my $self = shift;
     my $randompick = $self->parmval('randompick');
@@ -4704,6 +4832,11 @@ sub is_sequence {
     return $self->navHash("is_map_", 1) && 
     $self->navHash("map_type_" . $self->map_pc()) eq 'sequence';
 }
+sub is_missing_map {
+    my $self=shift;
+    return $self->navHash("is_map_", 1) &&
+    $self->navHash("map_type_" . $self->map_pc()) eq 'none';
+}
 sub is_survey {
     my $self = shift();
     my $part = shift();
@@ -5131,7 +5264,7 @@ sub weight {
     my $weight = &Apache::lonnet::EXT('resource.'.$part.'.weight',
                                 $self->{SYMB}, $self->{DOMAIN},
                                 $self->{USERNAME},
-                                $env{'request.course.sec'});
+                                $self->{SECTION});  
     return $weight;
 }
 sub part_display {
@@ -5153,16 +5286,42 @@ sub slot_control {
     return ($useslots,$availablestudent,$available);
 }
 sub deeplink {
-    my ($self,$caller) = @_;
-    my $value = $self->parmval("deeplink");
-    if ($value) {
-        my @deeplink = split(/,/,$value);
-        if ($caller eq 'sequence') {
-            if ($deeplink[1] ne 'res') {
-                return;
+    my ($self,$caller,$action) = @_;
+    my $deeplink = $self->parmval("deeplink");
+    if ($deeplink) {
+        my ($state,$others,$listed,$scope) = split(/,/,$deeplink);
+        if ($action eq 'getlisted') {
+            return $listed;
+        }
+        if ($env{'request.deeplink.login'}) {
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
+            if ($deeplink_symb) {
+                my ($loginmap,$mapname);
+                if ($deeplink_symb =~ /\.(page|sequence)$/) {
+                    $mapname = $self->enclosing_map_src();
+                    $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
+                    return if ($mapname eq $loginmap);
+                } else {
+                    return if ($deeplink_symb eq $self->symb());
+                    if (($scope eq 'map') || ($scope eq 'rec')) {
+                        $mapname = $self->enclosing_map_src();
+                        $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
+                        return if ($mapname eq $loginmap);
+                    }
+                }
+                if ($scope eq 'rec') {
+                    my $map_pc = $self->navHash('map_pc_'.$mapname);
+                    my @recurseup = split(/,/,$self->navHash('map_hierarchy_'.$map_pc));
+                    my $login_pc = $self->navHash('map_pc_'.$loginmap);
+                    return if (grep(/^\Q$login_pc\E$/,@recurseup));
+                }
             }
         }
-        return $deeplink[0];
+        unless (($caller eq 'sequence') || ($state eq 'both')) {
+            return $listed;
+        }
     }
     return;
 }
@@ -5579,7 +5738,6 @@ The problem will be opened later.
 
 Open and not yet due.
 
-
 =item * B<PAST_DUE_ANSWER_LATER>:
 
 The due date has passed, but the answer date has not yet arrived.
@@ -5592,6 +5750,26 @@ The due date has passed and there is no
 
 The answer date is here.
 
+=item * B<NOTHING_SET>:
+
+No dates have been set for this problem at all.
+
+=item * B<PAST_DUE_ATMPT_ANS>:
+
+The due date has passed, feedback is suppressed, the problem was attempted, and the answer date has not yet arrived.
+
+=item * B<PAST_DUE_ATMPT_NOANS>:
+
+The due date has passed, feedback is suppressed, the problem was attempted, and there is no answer opening date set.
+
+=item * B<PAST_DUE_NO_ATMT_ANS>:
+
+The due date has passed, feedback is suppressed, the problem was not attempted, and the answer date has not yet arrived.
+
+=item * B<PAST_DUE_NO_ATMT_NOANS>:
+
+The due date has passed, feedback is suppressed, the problem was not attempted, and there is no answer opening date set.
+
 =item * B<NETWORK_FAILURE>:
 
 The information is unknown due to network failure.
@@ -5607,6 +5785,10 @@ sub PAST_DUE_NO_ANSWER     { return 2; }
 sub PAST_DUE_ANSWER_LATER  { return 3; }
 sub ANSWER_OPEN            { return 4; }
 sub NOTHING_SET            { return 5; }
+sub PAST_DUE_ATMPT_ANS     { return 6; }
+sub PAST_DUE_ATMPT_NOANS   { return 7; }
+sub PAST_DUE_NO_ATMT_ANS   { return 8; }
+sub PAST_DUE_NO_ATMT_NOANS { return 9; }
 sub NETWORK_FAILURE        { return 100; }
 
 # getDateStatus gets the date status for a given problem part. 
@@ -5810,6 +5992,26 @@ set.
 The problem is past due, not considered correct, and an answer date in
 the future is set.
 
+=item * B<PAST_DUE_ATMPT_ANS>:
+
+The problem is past due, feedback is suppressed, the problem was
+attempted and an answer date in the future is set.
+
+=item * B<PAST_DUE_ATMPT_NOANS>:
+
+The problem is past due, feedback is suppressed, the problem was
+attempted and no answer date is set.
+
+=item * B<PAST_DUE_NO_ATMT_ANS>:
+
+The problem is past due, feedback is suppressed, the problem was
+not attempted and an answer date in the future is set.
+
+=item * B<PAST_DUE_NO_ATMT_NOANS>:
+
+The problem is past due, feedback is suppressed, the problem was
+not attempted and no answer date is set.
+
 =item * B<ANSWER_OPEN>:
 
 The problem is past due, not correct, and the answer is now available.
@@ -5893,7 +6095,18 @@ sub status {
     if ($completionStatus == CORRECT ||
         $completionStatus == CORRECT_BY_OVERRIDE ||
         $completionStatus == CORRECT_BY_PASSBACK ) {
-	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+	if ( $suppressFeedback ) {
+            if ($dateStatus == PAST_DUE_ANSWER_LATER ||
+                $dateStatus == PAST_DUE_NO_ANSWER ) {
+                if ($dateStatus == PAST_DUE_ANSWER_LATER) {
+                    return PAST_DUE_ATMPT_ANS;
+                } else {
+                    return PAST_DUE_ATMPT_NOANS;
+                }
+            } else {
+                return ANSWER_SUBMITTED;
+            }
+        }
 	my $awarded=$self->awarded($part);
 	if ($awarded < 1 && $awarded > 0) {
             return PARTIALLY_CORRECT;
@@ -5933,7 +6146,23 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
+        if ($suppressFeedback) {
+            if ($completionStatus == NOT_ATTEMPTED) {
+                if ($dateStatus == PAST_DUE_ANSWER_LATER) {
+                    return PAST_DUE_NO_ATMT_ANS;
+                } else {
+                    return PAST_DUE_NO_ATMT_NOANS;
+                }
+            } else {
+                if ($dateStatus == PAST_DUE_ANSWER_LATER) {
+                    return PAST_DUE_ATMPT_ANS;
+                } else {
+                    return PAST_DUE_ATMPT_NOANS;
+                }
+            }
+        } else {
+            return $dateStatus;
+        }
     }
 
     if ($dateStatus == ANSWER_OPEN) {
@@ -6179,6 +6408,10 @@ my %compositeToSimple =
       EXCUSED()               => CORRECT,
       PAST_DUE_NO_ANSWER()    => INCORRECT,
       PAST_DUE_ANSWER_LATER() => INCORRECT,
+      PAST_DUE_ATMPT_ANS()    => ATTEMPTED,
+      PAST_DUE_ATMPT_NOANS()  => ATTEMPTED,
+      PAST_DUE_NO_ATMT_ANS()  => CLOSED,
+      PAST_DUE_NO_ATMT_NOANS() => CLOSED,
       ANSWER_OPEN()           => INCORRECT,
       OPEN_LATER()            => CLOSED,
       TRIES_LEFT()            => OPEN,
@@ -6357,13 +6590,23 @@ sub getPrevious {
 sub browsePriv {
     my $self = shift;
     my $noblockcheck = shift;
+    my $deeplinklisted = shift;
     if (defined($self->{BROWSE_PRIV})) {
         return $self->{BROWSE_PRIV};
     }
-
+    my ($nodeeplinkcheck,$nodeeplinkout);
+    if ($deeplinklisted) {
+        my $deeplink = $self->deeplink(undef,'getlisted');
+        if (($deeplink) && ($deeplink ne 'absent')) {
+            $nodeeplinkcheck = 1;
+        }
+        $nodeeplinkout = 1;
+    }
     $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
 						    $self->{SYMB},undef,
-                                                    undef,$noblockcheck);
+                                                    undef,$noblockcheck,
+                                                    undef,$nodeeplinkcheck,
+                                                    $nodeeplinkout);
 }
 
 =pod