--- loncom/interface/lonnavmaps.pm	2019/02/07 00:49:53	1.509.2.10
+++ loncom/interface/lonnavmaps.pm	2023/07/06 20:32:17	1.509.2.14.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.10 2019/02/07 00:49:53 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.14.2.9 2023/07/06 20:32:17 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -342,7 +342,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. 
 
@@ -534,6 +534,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             => '',
@@ -577,7 +581,11 @@ sub getLinkForResource {
 	    my $anchor;
 	    if ($res->is_page()) {
 		foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; }  }
-		$anchor=&escape($anchor->shown_symb());
+		if ($anchor->encrypted() && !&advancedUser()) {
+		    $anchor='LC_'.$anchor->id();
+		} else {
+		    $anchor=&escape($anchor->shown_symb());
+		}
 		return ($res->link(),$res->shown_symb(),$anchor);
 	    }
             # in case folder was skipped over as "only sequence"
@@ -675,10 +683,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 {
@@ -687,7 +695,17 @@ sub getDescription {
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
 	&& $res->handgrade($part) ne 'yes') {
-        return &Apache::lonhtmlcommon::direct_parm_link(&mt("Answer available"),$res->symb(),'answerdate,duedate',$part);
+        my $msg = &mt('Answer available');
+        my $parmlist = 'answerdate,duedate';
+        if (($res->is_tool) && ($res->is_gradable())) {
+            if (($status == $res->PARTIALLY_CORRECT) && ($res->parmval('retrypartial',$part))) {
+                $msg = &mt('Grade received');
+                $parmlist = 'retrypartial';
+            } else {
+                $msg = &mt('Grade available');
+            }
+        }
+        return &Apache::lonhtmlcommon::direct_parm_link($msg,$res->symb(),$parmlist,$part);
     }
     if ($status == $res->EXCUSED) {
         return &mt("Excused by instructor");
@@ -941,29 +959,31 @@ sub render_resource {
     # links to open and close the folder
 
     my $whitespace = $location.'/whitespace_21.gif';
-    my $linkopen = "<img src='$whitespace' alt='' />";
-    my $nomodal;
-    if (($params->{'modalLink'}) && (!$resource->is_sequence())) {
-        if ($link =~m{^(?:|/adm/wrapper)/ext/([^#]+)}) {
-            my $exturl = $1;
-            if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+    my ($nomodal,$linkopen,$linkclose);
+    unless ($resource->is_map() || $params->{'resource_nolink'}) {
+        $linkopen = "<img src='$whitespace' alt='' />";
+        $linkclose = "</a>";
+        if (($params->{'modalLink'}) && (!$resource->is_sequence())) {
+            if ($link =~m{^(?:|/adm/wrapper)/ext/([^#]+)}) {
+                my $exturl = $1;
+                if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) {
+                    $nomodal = 1;
+                }
+            } elsif (($link eq "/public/$LONCAPA::match_domain/$LONCAPA::match_courseid/syllabus") &&
+                     ($env{'request.course.id'}) && ($ENV{'SERVER_PORT'} == 443) &&
+                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
                 $nomodal = 1;
             }
-        } elsif (($link eq "/public/$LONCAPA::match_domain/$LONCAPA::match_courseid/syllabus") &&
-                 ($env{'request.course.id'}) && ($ENV{'SERVER_PORT'} == 443) &&
-                 ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-             $nomodal = 1;
-        }
-        my $esclink = &js_escape($link);
-        if ($nomodal) {
-            $linkopen .= "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+            my $esclink = &js_escape($link);
+            if ($nomodal) {
+                $linkopen .= "<a href=\"#\" onclick=\"javascript:window.open('$esclink','resourcepreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1'); return false;\" />";
+            } else {
+                $linkopen .= "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+            }
         } else {
-            $linkopen .= "<a href=\"$link\" onclick=\"javascript:openMyModal('$esclink',600,500,'yes','true'); return false;\">";
+            $linkopen .= "<a href=\"$link\">";
         }
-    } else {
-        $linkopen .= "<a href=\"$link\">";
     }
-    my $linkclose = "</a>";
 
     # Default icon: unknown page
     my $icon = "<img class=\"LC_contentImage\" src='$location/unknown.gif' alt='' />";
@@ -991,8 +1011,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'}) {
@@ -1011,13 +1035,14 @@ sub render_resource {
                 '&amp;jump=' .
                 &escape($resource->symb()) . 
                 "&amp;folderManip=1\">";
-
+            $linkclose = '</a>';
         } else {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
             $icon = "<img class=\"LC_space\" src='$whitespace' alt='' />"."<img class=\"LC_contentImage\" src='$location/$icon' alt=\"".($nowOpen ? &mt('Open Folder') : &mt('Close Folder')).' '.$title."\" />";
             if ($params->{'caller'} eq 'sequence') {
                 $linkopen = "<a href=\"$link\">";
+                $linkclose = '</a>';
             } else {
                 $linkopen = "";
                 $linkclose = "";
@@ -1036,10 +1061,30 @@ sub render_resource {
         }
         if ($params->{'mapHidden'} || $resource->randomout()) {
             $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->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()) {
@@ -1164,7 +1209,7 @@ sub render_quick_status {
     my $linkclose = "</a>";
 	
 	$result .= '<td class="LC_middle">';
-    if ($resource->is_problem() &&
+    if ($resource->is_gradable() &&
         !$firstDisplayed) {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
@@ -1189,7 +1234,7 @@ sub render_long_status {
                 
     my $color;
     my $info = '';
-    if ($resource->is_problem() || $resource->is_practice()) {
+    if ($resource->is_gradable() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
 
         if (dueInLessThan24Hours($resource, $part)) {
@@ -1204,8 +1249,8 @@ sub render_long_status {
          }
     }
     
-    if ($resource->kind() eq "res" &&
-        $resource->is_raw_problem() &&
+    if (($resource->kind() eq "res") &&
+        ($resource->is_raw_problem() || $resource->is_gradable()) &&
         !$firstDisplayed) {
         if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
         $result .= getDescription($resource, $part);
@@ -1252,7 +1297,7 @@ my @statuses = ($resObj->CORRECT, $resOb
 
 sub render_parts_summary_status {
     my ($resource, $part, $params) = @_;
-    if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
+    if (!$resource->is_gradable() && !$resource->contains_problem) { return '<td></td>'; }
     if ($params->{showParts}) { 
 	return '<td></td>';
     }
@@ -1364,15 +1409,49 @@ sub render {
         # an infinite loop
         my $oldFilterFunc = $filterFunc;
         $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();
@@ -1411,11 +1490,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();
                 
@@ -1532,9 +1615,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',
@@ -1558,9 +1638,6 @@ sub render {
 	<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') { 
 	    my $totdisc = 0;
 	    my $haveDisc = '';
@@ -1581,16 +1658,22 @@ END
 	}
 	$result.='</form>';
     }
-    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');
+            }
         }
     }
 
@@ -1636,12 +1719,32 @@ 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();
@@ -1660,8 +1763,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;
                     }
                 }
@@ -1726,6 +1830,23 @@ END
 	undef($args->{'sort'});
     }
 
+    # Determine if page will be served with https in case
+    # it contains a syllabus which uses an external URL
+    # which points at an http site.
+
+    my ($is_ssl,$cdom,$cnum,$hostname);
+    if ($ENV{'SERVER_PORT'} == 443) {
+        $is_ssl = 1;
+        if ($r) {
+            $hostname = $r->hostname();
+        } else {
+            $hostname = $ENV{'SERVER_NAME'};
+        }
+    }
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    }
 
     my $inhibitmenu;
     if ($args->{'modalLink'}) {
@@ -1767,6 +1888,8 @@ 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;
@@ -1779,6 +1902,22 @@ END
                     } else {
                         next;
                     }
+                } elsif ($curRes->deeplinkout) {
+                    if ($userCanSeeHidden) {
+                        $args->{'mapHiddenDeepLink'} = 1;
+                    } else {
+                        next;
+                    }
+                } else {
+                    my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
+                    my ($state,$others,$listed) = split(/,/,$deeplink);
+                    if (($listed eq 'absent') || ($listed eq 'grades')) {
+                        if ($userCanSeeHidden) {
+                            $args->{'mapUnlisted'} = 1;
+                        } else {
+                            next;
+                        }
+                    }
                 }
             }
         }
@@ -1841,7 +1980,16 @@ END
 		    $args->{'condensed'} = 1;
 		}
             }
-        } 
+        }
+        # If deep-link parameter is set (and is not set to full) suppress link
+        # 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'}) eq 'full') || &advancedUser()) {
+            $args->{'resource_nolink'} = 0;
+        } else {
+            $args->{'resource_nolink'} = 1;
+        }
             
         # If the multipart problem was condensed, "forget" it was multipart
         if (scalar(@parts) == 1) {
@@ -1864,7 +2012,27 @@ END
 		$stack=$it->getStack();
 	    }
 	    ($src,$symb,$anchor)=getLinkForResource($stack);
-	    my $srcHasQuestion = $src =~ /\?/;
+            my $srcHasQuestion = $src =~ /\?/;
+            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()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                        if ($hostname ne '') {
+                            $src = 'http://'.$hostname.$src;
+                        }
+                        $src .= ($srcHasQuestion? '&amp;' : '?') . 'usehttp=1';
+                        $srcHasQuestion = 1;
+                    }
+                } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                        if ($hostname ne '') {
+                            $src = 'http://'.$hostname.$src;
+                        }
+                        $src .= ($srcHasQuestion? '&amp;' : '?') . 'usehttp=1';
+                        $srcHasQuestion = 1;
+                    }
+                }
+            }
 	    if (defined($anchor)) { $anchor='#'.$anchor; }
             if (($args->{'caller'} eq 'sequence') && ($curRes->is_map())) {
                 $args->{"resourceLink"} = $src.($srcHasQuestion?'&amp;':'?') .'navmap=1';
@@ -1900,7 +2068,7 @@ END
                     $currentJumpDelta) {
                     # Jam the anchor after the <td> tag;
                     # necessary for valid HTML (which Mozilla requires)
-                    $colHTML =~ s/\>/\>\<a name="curloc" \/\>/;
+                    $colHTML =~ s/\>/\>\<a name="curloc" \>\<\/a\>/;
                     $displayedJumpMarker = 1;
                 }
                 $result .= $colHTML . "\n";
@@ -1974,7 +2142,7 @@ sub show_linkitems_toolbar {
             $result .= '<td align="left">'."\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 '') {
@@ -2387,7 +2555,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;
 }
 
@@ -2691,6 +2859,10 @@ sub parmval_real {
 
     my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
     $mapname = &Apache::lonnet::deversion($mapname);
+    my $toolsymb = '';
+    if ($fn =~ /ext\.tool$/) {
+        $toolsymb = $symb;
+    }
 # ----------------------------------------------------- Cascading lookup scheme
     my $rwhat=$what;
     $what=~s/^parameter\_//;
@@ -2754,9 +2926,9 @@ sub parmval_real {
 
     my $meta_rwhat=$rwhat;
     $meta_rwhat=~s/\./_/g;
-    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
+    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat,$toolsymb);
     if (defined($default)) { return [$default,'resource']}
-    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
+    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat,$toolsymb);
     if (defined($default)) { return [$default,'resource']}
 # --------------------------------------------------- fifth, check more course
     if (defined($courseopt)) {
@@ -2779,7 +2951,7 @@ sub parmval_real {
        if (defined($partgeneral[0])) { return \@partgeneral; }
     }
     if ($recurse) { return []; }
-    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat);
+    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat,$toolsymb);
     if (defined($pack_def)) { return [$pack_def,'resource']; }
     return [''];
 }
@@ -2825,8 +2997,12 @@ sub recursed_crumbs {
         my $pc = $map->map_pc();
         next if ((!$pc) || ($pc == 1));
         push(@links,$map);
-        push(@revmapinfo,{'href' => $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) {
@@ -2838,9 +3014,13 @@ 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' => $map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});
+                    push(@revmapinfo,{'href' => $env{'request.use_absolute'}.$map->link().'?navmap=1','text' => $showntitle,'no_mt' => 1,});
                 }
             }
         }
@@ -3323,6 +3503,71 @@ sub usedVersion {
     return $self->navhash("version_$linkurl");
 }
 
+sub isFirstResource {
+    my $self = shift;
+    my $map = shift;
+    my $symb = shift;
+    return unless (ref($map));
+    my $isfirst;
+    my $firstResource = $map->map_start();
+    if (ref($firstResource)) {
+        if ((!$firstResource->is_map()) && ($firstResource->src() ne ''))  {
+            if ($firstResource->symb() eq $symb) {
+                $isfirst = 1;
+            } else {
+                $isfirst = 0;
+            }
+        } else {
+            my $it = $self->getIterator($firstResource,undef,undef,1);
+            while ( my $res=$it->next()) {
+                if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
+                    if ($res->symb() eq $symb) {
+                        $isfirst = 1;
+                    } else {
+                        $isfirst = 0;
+                    }
+                    last;
+                }
+            }
+        }
+    }
+    return $isfirst;
+}
+
+sub isLastResource {
+    my $self = shift;
+    my $map = shift;
+    my $symb = shift;
+    return unless (ref($map));
+    my $islast;
+    my $lastResource = $map->map_finish();
+    if (ref($lastResource)) {
+        if ((!$lastResource->is_map()) && ($lastResource->src() ne ''))  {
+            if ($lastResource->symb() eq $symb) {
+                $islast = 1;
+            } else {
+                $islast = 0;
+            }
+        } else {
+            my $currRes = $self->getBySymb($symb);
+            if (ref($currRes)) {
+                my $it = $self->getIterator($currRes,undef,undef,1);
+                while ( my $res=$it->next()) {
+                    if ((ref($res)) && ($res->src() ne '') && (!$res->is_map())) {
+                        if ($res->symb() eq $symb) {
+                            $islast = 1;
+                        } else {
+                            $islast = 0;
+                        }
+                        last;
+                    }
+                }
+            }
+        }
+    }
+    return $islast;
+}
+
 1;
 
 package Apache::lonnavmaps::iterator;
@@ -3353,7 +3598,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
@@ -3370,7 +3615,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
@@ -3507,6 +3755,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.
 
@@ -3598,7 +3850,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.
@@ -3758,7 +4011,8 @@ sub next {
     # That ends the main iterator logic. Now, do we want to recurse
     # down this map (if this resource is a map)?
     if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
-        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
+        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION}) &&
+        ($env{'request.role.adv'} || !$self->{HERE}->randomout())) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
         my $finishResource = $self->{HERE}->map_finish();
@@ -3767,13 +4021,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);
@@ -4201,6 +4456,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');
@@ -4369,6 +4625,19 @@ sub is_problem {
     }
     return 0;
 }
+sub is_tool {
+    my $self=shift;
+    my $src = $self->src();
+    return ($src =~ /ext\.tool$/);
+}
+sub is_gradable {
+    my $self=shift;
+    my $src = $self->src();
+    if (($src =~ /$LONCAPA::assess_re/) ||
+        (($self->is_tool()) && ($self->parmval('gradable',0) =~ /^yes$/i))) {
+        return !($self->is_practice());
+    }
+}
 #
 #  The has below is the set of status that are considered 'incomplete'
 #
@@ -4427,6 +4696,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();
@@ -4456,7 +4730,6 @@ sub is_task {
 
 sub is_empty_sequence {
     my $self=shift;
-    my $src = $self->src();
     return !$self->is_page() && $self->navHash("is_map_", 1) && !$self->navHash("map_type_" . $self->map_pc());
 }
 
@@ -4777,11 +5050,12 @@ sub duedate {
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if ($interval[0] =~ /\d+/) {
-       my $first_access=&Apache::lonnet::get_first_access($interval[1],
+    if ($interval[0] =~ /(\d+)/) {
+        my $timelimit = $1;
+        my $first_access=&Apache::lonnet::get_first_access($interval[1],
                                                           $self->{SYMB});
 	if (defined($first_access)) {
-           my $interval = $first_access+$interval[0];
+            my $interval = $first_access+$timelimit;
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
                                                           : $due_date;
 	} else {
@@ -4875,6 +5149,46 @@ sub slot_control {
     my $available = $self->parmval("available", $part); 
     return ($useslots,$availablestudent,$available);
 }
+sub deeplink {
+    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));
+                }
+            }
+        }
+        unless (($caller eq 'sequence') || ($state eq 'both')) {
+            return $listed;
+        }
+    }
+    return;
+}
 
 # Multiple things need this
 sub getReturnHash {
@@ -5023,6 +5337,8 @@ sub parts {
     my $self = shift;
 
     if ($self->ext) { return []; }
+    if (($self->is_tool()) &&
+        ($self->is_gradable())) { return ['0']; }
 
     $self->extractParts();
     return $self->{PARTS};
@@ -5113,7 +5429,7 @@ sub extractParts {
     my %parts;
 
     # Retrieve part count, if this is a problem
-    if ($self->is_problem()) {
+    if ($self->is_raw_problem()) {
 	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
 
@@ -5280,7 +5596,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.
@@ -5293,6 +5608,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.
@@ -5308,6 +5643,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. 
@@ -5397,6 +5736,14 @@ Attempted, and not yet graded.
 
 Attempted, and credit received for attempt (survey and anonymous survey only).
 
+=item * B<INCORRECT_BY_PASSBACK>:
+
+Attempted, but wrong for LTI Tool Provider by passback of grade
+
+=item * B<CORRECT_BY_PASSBACK>:
+
+Correct for LTI Tool Provider by passback of grade
+
 =back
 
 =cut
@@ -5409,6 +5756,8 @@ sub CORRECT_BY_OVERRIDE   { return 14; }
 sub EXCUSED               { return 15; }
 sub ATTEMPTED             { return 16; }
 sub CREDIT_ATTEMPTED      { return 17; }
+sub INCORRECT_BY_PASSBACK { return 18; }
+sub CORRECT_BY_PASSBACK   { return 19; }
 
 sub getCompletionStatus {
     my $self = shift;
@@ -5423,8 +5772,12 @@ sub getCompletionStatus {
     if ($status eq 'correct_by_override') {
 	return $self->CORRECT_BY_OVERRIDE;
     }
+    if ($status eq 'correct_by_passback') {
+        return $self->CORRECT_BY_PASSBACK;
+    }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
+    if ($status eq 'incorrect_by_passback') {return $self->INCORRECT_BY_PASSBACK; }
     if ($status eq 'excused') {return $self->EXCUSED; }
     if ($status eq 'ungraded_attempted') {return $self->ATTEMPTED; }
     if ($status eq 'credit_attempted') {
@@ -5497,6 +5850,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.
@@ -5578,8 +5951,20 @@ sub status {
 
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||
-        $completionStatus == CORRECT_BY_OVERRIDE ) {
-	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+        $completionStatus == CORRECT_BY_OVERRIDE ||
+        $completionStatus == CORRECT_BY_PASSBACK ) {
+	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;
@@ -5591,7 +5976,8 @@ sub status {
 
     # If it's WRONG... and not open
     if ( ($completionStatus == INCORRECT || 
-	  $completionStatus == INCORRECT_BY_OVERRIDE)
+	  $completionStatus == INCORRECT_BY_OVERRIDE ||
+          $completionStatus == INCORRECT_BY_PASSBACK)
 	 && (!$self->opendate($part) ||  $self->opendate($part) > time()) ) {
 	return INCORRECT;
     }
@@ -5618,7 +6004,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) {
@@ -5633,7 +6035,8 @@ sub status {
     }
 
     # If it's WRONG...
-    if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
+    if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE ||
+        $completionStatus == INCORRECT_BY_PASSBACK) {
         # and there are TRIES LEFT:
         if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
             return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
@@ -5828,6 +6231,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,
@@ -6006,13 +6413,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