--- loncom/interface/lonnavmaps.pm	2023/07/06 20:32:17	1.509.2.14.2.9
+++ loncom/interface/lonnavmaps.pm	2015/10/05 01:52:10	1.510
@@ -1,8 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.14.2.9 2023/07/06 20:32:17 raeburn Exp $
-
+# $Id: lonnavmaps.pm,v 1.510 2015/10/05 01:52:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -342,7 +341,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<suppressNavmap>: default: false
+=item * B<suppressNavmaps>: default: false
 
 If true, will not display Navigate Content resources. 
 
@@ -486,7 +485,7 @@ use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::lonmap;
 
-use POSIX qw (ceil floor strftime);
+use POSIX qw (floor strftime);
 use Time::HiRes qw( gettimeofday tv_interval );
 use LONCAPA;
 use DateTime();
@@ -534,10 +533,6 @@ 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             => '',
@@ -581,11 +576,7 @@ sub getLinkForResource {
 	    my $anchor;
 	    if ($res->is_page()) {
 		foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; }  }
-		if ($anchor->encrypted() && !&advancedUser()) {
-		    $anchor='LC_'.$anchor->id();
-		} else {
-		    $anchor=&escape($anchor->shown_symb());
-		}
+		$anchor=&escape($anchor->shown_symb());
 		return ($res->link(),$res->shown_symb(),$anchor);
 	    }
             # in case folder was skipped over as "only sequence"
@@ -651,9 +642,6 @@ sub getDescription {
             } elsif ($slot_status == $res->RESERVABLE) {
                 $slotmsg = &mt('Reservable, reservations close [_1]',
                            timeToHumanString($slot_time,'end'));
-            } elsif ($slot_status == $res->NEEDS_CHECKIN) {
-                $slotmsg = &mt('Reserved, check-in needed - ends [_1]',
-                           timeToHumanString($slot_time,'end'));
             } elsif ($slot_status == $res->RESERVABLE_LATER) {
                 $slotmsg = &mt('Reservable, reservations open [_1]',
                            timeToHumanString($slot_time,'start'));
@@ -683,10 +671,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) || ($status == $res->PAST_DUE_ATMPT_ANS) || ($status == $res->PAST_DUE_NO_ATMT_ANS)) {
+    if ($status == $res->PAST_DUE_ANSWER_LATER) {
         return &mt("Answer open [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($answer,'start'),$res->symb(),'answerdate',$part));
     }
-    if (($status == $res->PAST_DUE_NO_ANSWER) || ($status == $res->PAST_DUE_ATMPT_NOANS) || ($status == $res->PAST_DUE_NO_ATMT_NOANS)) {
+    if ($status == $res->PAST_DUE_NO_ANSWER) {
 	if ($res->is_practice()) {
 	    return &mt("Closed [_1]",&Apache::lonhtmlcommon::direct_parm_link(&timeToHumanString($due,'start'),$res->symb(),'answerdate,duedate',$part));
 	} else {
@@ -695,17 +683,7 @@ sub getDescription {
     }
     if (($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT)
 	&& $res->handgrade($part) ne 'yes') {
-        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);
+        return &Apache::lonhtmlcommon::direct_parm_link(&mt("Answer available"),$res->symb(),'answerdate,duedate',$part);
     }
     if ($status == $res->EXCUSED) {
         return &mt("Excused by instructor");
@@ -936,9 +914,6 @@ sub render_resource {
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
-    if ($resource->ext()) {
-        $link =~ s/\#.+(\?)/$1/g;
-    }
 
     #  The URL part is not escaped at this point, but the symb is... 
 
@@ -959,31 +934,8 @@ sub render_resource {
     # links to open and close the folder
 
     my $whitespace = $location.'/whitespace_21.gif';
-    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;
-            }
-            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\">";
-        }
-    }
+    my $linkopen = "<img src='$whitespace' alt='' />"."<a href=\"$link\">";
+    my $linkclose = "</a>";
 
     # Default icon: unknown page
     my $icon = "<img class=\"LC_contentImage\" src='$location/unknown.gif' alt='' />";
@@ -1011,12 +963,8 @@ sub render_resource {
         if ($it->{CONDITION}) {
             $nowOpen = !$nowOpen;
         }
-	my $folderType;
-	if (&advancedUser() && $resource->is_missing_map()) {
-	    $folderType = 'none';
-	} else {
-	    $folderType = $resource->is_sequence() ? 'folder' : 'page';
-	}
+	
+	my $folderType = $resource->is_sequence() ? 'folder' : 'page';
         my $title=$resource->title;
 		$title=~s/\"/\&qout;/g;
         if (!$params->{'resource_no_folder_link'}) {
@@ -1035,21 +983,16 @@ 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 = "";
-            }
+
+            $linkopen = "";
+            $linkclose = "";
         }
-        if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
-             (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&
+        if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
             if (!$params->{'map_no_edit_link'}) {
                 my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
@@ -1059,33 +1002,10 @@ sub render_resource {
                          '</a>';
             }
         }
-        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->randomout()) {
+        $nonLinkedText .= ' <span class="LC_warning">('.&mt('hidden').')</span> ';
     }
     if (!$resource->condval()) {
         $nonLinkedText .= ' <span class="LC_info">('.&mt('conditionally hidden').')</span> ';
@@ -1135,19 +1055,10 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $linkclose = '</a>';
-        if ($params->{'modalLink'}) {
-            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\">";
-        }
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
+    } else {
+        $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
-    $result .= "$curMarkerBegin$linkopen$title$partLabel$linkclose$curMarkerEnd$editmapLink$nonLinkedText</td>";
 
     return $result;
 }
@@ -1209,7 +1120,7 @@ sub render_quick_status {
     my $linkclose = "</a>";
 	
 	$result .= '<td class="LC_middle">';
-    if ($resource->is_gradable() &&
+    if ($resource->is_problem() &&
         !$firstDisplayed) {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
@@ -1234,7 +1145,7 @@ sub render_long_status {
                 
     my $color;
     my $info = '';
-    if ($resource->is_gradable() || $resource->is_practice()) {
+    if ($resource->is_problem() || $resource->is_practice()) {
         $color = $colormap{$resource->status};
 
         if (dueInLessThan24Hours($resource, $part)) {
@@ -1249,8 +1160,8 @@ sub render_long_status {
          }
     }
     
-    if (($resource->kind() eq "res") &&
-        ($resource->is_raw_problem() || $resource->is_gradable()) &&
+    if ($resource->kind() eq "res" &&
+        $resource->is_raw_problem() &&
         !$firstDisplayed) {
         if ($color) {$result .= '<span style="color:'.$color.'"'.$info.'><b>'; }
         $result .= getDescription($resource, $part);
@@ -1297,7 +1208,7 @@ my @statuses = ($resObj->CORRECT, $resOb
 
 sub render_parts_summary_status {
     my ($resource, $part, $params) = @_;
-    if (!$resource->is_gradable() && !$resource->contains_problem) { return '<td></td>'; }
+    if (!$resource->is_problem() && !$resource->contains_problem) { return '<td></td>'; }
     if ($params->{showParts}) { 
 	return '<td></td>';
     }
@@ -1409,49 +1320,15 @@ 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'}) && !$args->{'nocurrloc'}) {
+    if (!$env{'form.folderManip'} && !defined($args->{'iterator'})) {
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
             $navmap = Apache::lonnavmaps::navmap->new();
@@ -1472,11 +1349,10 @@ sub render {
             my $currenturl = $env{'form.postdata'};
             #$currenturl=~s/^http\:\/\///;
             #$currenturl=~s/^[^\/]+//;
-            unless ($args->{'caller'} eq 'sequence') { 
-                $here = $jump = &Apache::lonnet::symbread($currenturl);
-            }
+            
+            $here = $jump = &Apache::lonnet::symbread($currenturl);
 	}
-	if (($here eq '') && ($args->{'caller'} ne 'sequence')) { 
+	if ($here eq '') {
 	    my $last;
 	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                     &GDBM_READER(),0640)) {
@@ -1490,15 +1366,11 @@ 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 && !$here_is_navmaps) {
+        while ($here && ($curRes = $mapIterator->next()) && !$found) {
             if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();
                 
@@ -1540,13 +1412,10 @@ sub render {
         if ($args->{'iterator_map'}) {
             my $map = $args->{'iterator_map'};
             $map = $navmap->getResourceByUrl($map);
-            if (ref($map)) {
-                my $firstResource = $map->map_start();
-                my $finishResource = $map->map_finish();
-                $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
-            } else {
-                return;
-            }
+            my $firstResource = $map->map_start();
+            my $finishResource = $map->map_finish();
+
+            $args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition);
         } else {
             $args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'});
         }
@@ -1615,6 +1484,9 @@ 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',
@@ -1638,6 +1510,9 @@ 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 = '';
@@ -1658,22 +1533,15 @@ END
 	}
 	$result.='</form>';
     }
-    if (($args->{'caller'} eq 'navmapsdisplay') && ($env{'request.course.id'})) {
+    if (($args->{'caller'} eq 'navmapsdisplay') &&
+        (&Apache::lonnet::allowed('mdc',$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") {
-            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');
-            }
+            &add_linkitem($args->{'linkitems'},'edittoplevel',
+                          "javascript:gocmd('/adm/coursedocs','editdocs');",
+                          'Content Editor');
         }
     }
 
@@ -1712,67 +1580,41 @@ END
     $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' alt='' />");
     $args->{'displayedHereMarker'} = 0;
 
-    # If we're suppressing empty sequences, look for them here.
-    # We also do this even if $args->{'suppressEmptySequences'}
-    # is not true, so we can hide empty sequences for which the
-    # hiddenresource parameter is set to yes (at map level), or
-    # 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();
-    while ($depth > -1) {
-        if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
-        if ($curRes == $dfsit->END_MAP()) { $depth--; }
-
-        if (ref($curRes)) {
-            # Parallel pre-processing: Do sequences have non-filtered-out children?
-            if ($curRes->is_map()) {
-                $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
-                # Sequences themselves do not count as visible children,
-                # unless those sequences also have visible children.
-                # This means if a sequence appears, there's a "promise"
-                # that there's something under it if you open it, somewhere.
-            } 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 (&$dfsFilterFunc($curRes)) {
-                    for my $sequence (@{$dfsit->getStack()}) {
-                        next unless ($sequence->is_map());
-                        $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
+    # If we're suppressing empty sequences, look for them here. Use DFS for speed,
+    # since structure actually doesn't matter, except what map has what resources.
+    if ($args->{'suppressEmptySequences'}) {
+        my $dfsit = Apache::lonnavmaps::DFSiterator->new($navmap,
+                                                         $it->{FIRST_RESOURCE},
+                                                         $it->{FINISH_RESOURCE},
+                                                         {}, undef, 1);
+        my $depth = 0;
+        $dfsit->next();
+        my $curRes = $dfsit->next();
+        while ($depth > -1) {
+            if ($curRes == $dfsit->BEGIN_MAP()) { $depth++; }
+            if ($curRes == $dfsit->END_MAP()) { $depth--; }
+
+            if (ref($curRes)) { 
+                # Parallel pre-processing: Do sequences have non-filtered-out children?
+                if ($curRes->is_map()) {
+                    $curRes->{DATA}->{HAS_VISIBLE_CHILDREN} = 0;
+                    # Sequences themselves do not count as visible children,
+                    # unless those sequences also have visible children.
+                    # This means if a sequence appears, there's a "promise"
+                    # that there's something under it if you open it, somewhere.
+                } else {
+                    # Not a sequence: if it's filtered, ignore it, otherwise
+                    # rise up the stack and mark the sequences as having children
+                    if (&$filterFunc($curRes)) {
+                        for my $sequence (@{$dfsit->getStack()}) {
+                            $sequence->{DATA}->{HAS_VISIBLE_CHILDREN} = 1;
+                        }
                     }
                 }
             }
+        } continue {
+            $curRes = $dfsit->next();
         }
-    } continue {
-        $curRes = $dfsit->next();
     }
 
     my $displayedJumpMarker = 0;
@@ -1830,28 +1672,6 @@ 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'}) {
-        $inhibitmenu = '&amp;inhibitmenu=yes';
-    }
 
     while (1) {
 	if ($args->{'sort'}) {
@@ -1887,39 +1707,9 @@ 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;
-            } else {
-                my $mapname = &Apache::lonnet::declutter($curRes->src());
-                $mapname = &Apache::lonnet::deversion($mapname);
-                if (lc($navmap->get_mapparam(undef,$mapname,"0.hiddenresource")) eq 'yes') {
-                    if ($userCanSeeHidden) {
-                        $args->{'mapHidden'} = 1;
-                    } 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;
-                        }
-                    }
-                }
-            }
+        if ($curRes->is_map() && $args->{'suppressEmptySequences'} &&
+            !$curRes->{DATA}->{HAS_VISIBLE_CHILDREN}) {
+            next;
         }
 
         # If we're suppressing navmaps and this is a navmap, continue on
@@ -1980,16 +1770,7 @@ 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) {
@@ -2012,35 +1793,11 @@ END
 		$stack=$it->getStack();
 	    }
 	    ($src,$symb,$anchor)=getLinkForResource($stack);
-            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';
-            } else {
-	        $args->{"resourceLink"} = $src.
-		    ($srcHasQuestion?'&amp;':'?') .
-		    'symb=' . &escape($symb).$inhibitmenu.$anchor;
-            }
+	    my $srcHasQuestion = $src =~ /\?/;
+	    $args->{"resourceLink"} = $src.
+		($srcHasQuestion?'&amp;':'?') .
+		'symb=' . &escape($symb).$anchor;
 	}
         # Now, we've decided what parts to show. Loop through them and
         # show them.
@@ -2068,7 +1825,7 @@ END
                     $currentJumpDelta) {
                     # Jam the anchor after the <td> tag;
                     # necessary for valid HTML (which Mozilla requires)
-                    $colHTML =~ s/\>/\>\<a name="curloc" \>\<\/a\>/;
+                    $colHTML =~ s/\>/\>\<a name="curloc" \/\>/;
                     $displayedJumpMarker = 1;
                 }
                 $result .= $colHTML . "\n";
@@ -2142,7 +1899,7 @@ sub show_linkitems_toolbar {
             $result .= '<td align="left">'."\n".
                        '<ul id="LC_toolbar">';
             my @linkorder = ('firsthomework','everything','uncompleted',
-                             'changefolder','clearbubbles','printout','edittoplevel');
+                             'changefolder','clearbubbles','edittoplevel');
             foreach my $link (@linkorder) {
                 if (ref($args->{'linkitems'}{$link}) eq 'HASH') {
                     if ($args->{'linkitems'}{$link}{'text'} ne '') {
@@ -2454,7 +2211,7 @@ sub generate_email_discuss_status {
     foreach my $msgid (@keys) {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
-                $symb,$error) = &Apache::lonmsg::unpackmsgid(&LONCAPA::escape($msgid));
+                $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
             &Apache::lonenc::check_decrypt(\$symb); 
             if (($fromcid ne '') && ($fromcid ne $cid)) {
                 next;
@@ -2555,7 +2312,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;
 }
 
@@ -2859,10 +2616,6 @@ 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\_//;
@@ -2926,9 +2679,9 @@ sub parmval_real {
 
     my $meta_rwhat=$rwhat;
     $meta_rwhat=~s/\./_/g;
-    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat,$toolsymb);
+    my $default=&Apache::lonnet::metadata($fn,$meta_rwhat);
     if (defined($default)) { return [$default,'resource']}
-    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat,$toolsymb);
+    $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
     if (defined($default)) { return [$default,'resource']}
 # --------------------------------------------------- fifth, check more course
     if (defined($courseopt)) {
@@ -2951,120 +2704,10 @@ sub parmval_real {
        if (defined($partgeneral[0])) { return \@partgeneral; }
     }
     if ($recurse) { return []; }
-    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat,$toolsymb);
+    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$rwhat);
     if (defined($pack_def)) { return [$pack_def,'resource']; }
     return [''];
 }
-
-sub recurseup_maps {
-    my ($self,$mapname) = @_;
-    my @recurseup;
-    if ($mapname) {
-        my $res = $self->getResourceByUrl($mapname);
-        if (ref($res)) {
-            my @pcs = split(/,/,$res->map_hierarchy());
-            shift(@pcs);
-            if (@pcs) {
-                @recurseup = map { &Apache::lonnet::declutter($self->getByMapPc($_)->src()); } reverse(@pcs);
-            }
-        }
-    }
-    return @recurseup;
-}
-
-sub recursed_crumbs {
-    my ($self,$mapurl,$restitle) = @_;
-    my (@revmapinfo,@revmapres);
-    my $mapres = $self->getResourceByUrl($mapurl);
-    if (ref($mapres)) {
-        @revmapres = map { $self->getByMapPc($_); } split(/,/,$mapres->map_breadcrumbs());
-        shift(@revmapres);
-    }
-    my $allowedlength = 60;
-    my $minlength = 5;
-    my $allowedtitle = 30;
-    if (($env{'environment.icons'} eq 'iconsonly') && (!$env{'browser.mobile'})) {
-        $allowedlength = 100;
-        $allowedtitle = 70;
-    }
-    if (length($restitle) > $allowedtitle) {
-        $restitle = &truncate_crumb_text($restitle,$allowedtitle);
-    }
-    my $totallength = length($restitle);
-    my @links;
-
-    foreach my $map (@revmapres) {
-        my $pc = $map->map_pc();
-        next if ((!$pc) || ($pc == 1));
-        push(@links,$map);
-        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) {
-        if ($totallength - $allowedlength > 0) {
-            my $available = $allowedlength - length($restitle);
-            my $avg = POSIX::ceil($available/$numlinks);
-            if ($avg < $minlength) {
-                $avg = $minlength;
-            }
-            @revmapinfo = ();
-            foreach my $map (@links) {
-                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,});
-                }
-            }
-        }
-    }
-    if ($restitle ne '') {
-        push(@revmapinfo,{'text' => $restitle, 'no_mt' => 1});
-    }
-    return @revmapinfo;
-}
-
-sub truncate_crumb_text {
-    my ($title,$limit) = @_;
-    my $showntitle = '';
-    if (length($title) > $limit) {
-        my @words = split(/\b\s*/,$title);
-        if (@words == 1) {
-            $showntitle = substr($title,0,$limit).' ...';
-        } else {
-            my $linklength = 0;
-            my $num = 0;
-            foreach my $word (@words) {
-                $linklength += 1+length($word);
-                if ($word eq '-') {
-                    $showntitle =~ s/ $//;
-                    $showntitle .= $word;
-                } elsif ($linklength > $limit) {
-                    if ($num < @words) {
-                        $showntitle .= $word.' ...';
-                        last;
-                    } else {
-                        $showntitle .= $word;
-                    }
-                } else {
-                    $showntitle .= $word.' ';
-                }
-            }
-            $showntitle =~ s/ $//;
-        }
-        return $showntitle;
-    } else {
-        return $title;
-    }
-}
-
 #
 #  Determines the open/close dates for printing a map that
 #  encloses a resource.
@@ -3076,15 +2719,15 @@ sub map_printdates {
 
 
 
-    my $opendate = $self->get_mapparam($res->symb(),'',"$part.printstartdate");
-    my $closedate= $self->get_mapparam($res->symb(),'', "$part.printenddate");
+    my $opendate = $self->get_mapparam($res->symb(), "$part.printstartdate");
+    my $closedate= $self->get_mapparam($res->symb(), "$part.printenddate");
 
 
     return ($opendate, $closedate);
 }
 
 sub get_mapparam {
-    my ($self, $symb, $mapname, $what) = @_;
+    my ($self, $symb, $what) = @_;
 
     # Ensure the course option hash is populated:
 
@@ -3103,17 +2746,15 @@ sub get_mapparam {
     my $uname=$self->{USERNAME};
     my $udom=$self->{DOMAIN};
 
-    unless ($symb || $mapname) { return; }
+    unless ($symb) { return ['']; }
     my $result='';
-    my ($recursed,@recurseup);
+
 
     # Figure out which map we are in.
 
-    if ($symb && !$mapname) {
-        my ($id,$fn);
-        ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
-        $mapname = &Apache::lonnet::deversion($mapname);
-    }
+    my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
+    $mapname = &Apache::lonnet::deversion($mapname);
+
 
     my $rwhat=$what;
     $what=~s/^parameter\_//;
@@ -3145,20 +2786,6 @@ sub get_mapparam {
 	if (defined($$useropt{$courselevel})) {
 	    return $$useropt{$courselevel};
 	}
-        if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-            unless ($recursed) {
-                @recurseup = $self->recurseup_maps($mapname);
-                $recursed = 1;
-            }
-            foreach my $item (@recurseup) {
-                my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-                if (defined($$useropt{$norecursechk})) {
-                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-                        return $$useropt{$norecursechk};
-                    }
-                }
-            }
-        }
     }
 
     # Check course -- group
@@ -3169,20 +2796,6 @@ sub get_mapparam {
 	if (defined($$courseopt{$grplevel})) {
 	    return $$courseopt{$grplevel};
 	}
-        if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-            unless ($recursed) {
-                @recurseup = $self->recurseup_maps($mapname);
-                $recursed = 1;
-            }
-            foreach my $item (@recurseup) {
-                my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what;
-                if (defined($$courseopt{$norecursechk})) {
-                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-                        return $$courseopt{$norecursechk};
-                    }
-                }
-            }
-        }
     }
 
     # Check course -- section
@@ -3195,29 +2808,12 @@ sub get_mapparam {
 	if (defined($$courseopt{$seclevel})) {
 	    return $$courseopt{$seclevel};
 	}
-        if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-            unless ($recursed) {
-                @recurseup = $self->recurseup_maps($mapname);
-                $recursed = 1;
-            }
-            foreach my $item (@recurseup) {
-                my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what;
-                if (defined($$courseopt{$norecursechk})) {
-                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-                        return $$courseopt{$norecursechk};
-                    }
-                }
-            }
-        }
     }
     # Check the map parameters themselves:
 
-    if ($symb) {
-        my $symbparm=$symb.'.'.$what;
-        my $thisparm = $$parmhash{$symbparm};
-        if (defined($thisparm)) {
-            return $thisparm;
-        }
+    my $thisparm = $$parmhash{$symbparm};
+    if (defined($thisparm)) {
+	return $thisparm;
     }
 
 
@@ -3227,20 +2823,6 @@ sub get_mapparam {
 	if (defined($$courseopt{$courselevel})) {
 	    return $$courseopt{$courselevel};
 	}
-        if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-            unless ($recursed) {
-                @recurseup = $self->recurseup_maps($mapname);
-                $recursed = 1;
-            }
-            foreach my $item (@recurseup) {
-                my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what;
-                if (defined($$courseopt{$norecursechk})) {
-                    if ($what =~ /\.(encrypturl|hiddenresource)$/) {
-                        return $$courseopt{$norecursechk};
-                    }
-                }
-            }
-        }
     }
     return undef;		# Unefined if we got here.
 }
@@ -3296,7 +2878,7 @@ sub getcourseparam {
     # 
     # We want the course level stuff from the way
     # parmval_real operates 
-    # TODO: Factor some of this stuff out of
+    # TODO: Fator some of this stuff out of
     # both parmval_real and here
     #
     my $courselevel = $cid . '.' .  $what;
@@ -3313,7 +2895,7 @@ sub getcourseparam {
     }
     # Try for the group's course level option:
 
-    if ($cgroup ne '' and defined($courseopt)) {
+    if ($uname ne '' and defined($courseopt)) {
 	if (defined($$courseopt{$grplevel})) {
 	    return $$courseopt{$grplevel};
 	}
@@ -3321,12 +2903,12 @@ sub getcourseparam {
 
     #  Try for section level parameters:
 
-    if ($csec ne '' and defined($courseopt)) {
+    if ($csec and defined($courseopt)) {
 	if (defined($$courseopt{$seclevel})) {
 	    return $$courseopt{$seclevel};
 	}
     }
-    # Try for 'additional' course parameters:
+    # Try for 'additional' course parameterse:
 
     if (defined($courseopt)) {
 	if (defined($$courseopt{$courselevel})) {
@@ -3503,71 +3085,6 @@ 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;
@@ -3598,7 +3115,7 @@ getIterator behaves as follows:
 
 =over 4
 
-=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap, $deeplinklisted):
+=item * B<getIterator>(firstResource, finishResource, filterHash, condition, forceTop, returnTopMap):
 
 All parameters are optional. firstResource is a resource reference
 corresponding to where the iterator should start. It defaults to
@@ -3615,10 +3132,7 @@ 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. 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().
+before anything else.
 
 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
@@ -3755,10 +3269,6 @@ 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.
 
@@ -3850,8 +3360,7 @@ sub new {
 						 $finishResource, $self->{FILTER},
 						 $self->{ALREADY_SEEN}, 
 						 $self->{CONDITION},
-						 $self->{FORCE_TOP},
-                                                 undef,$self->{DEEPLINKLISTED});
+						 $self->{FORCE_TOP});
     }
 
     # Set up some bookkeeping information.
@@ -4011,8 +3520,7 @@ 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}) &&
-        ($env{'request.role.adv'} || !$self->{HERE}->randomout())) {
+        (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
         $self->{RECURSIVE_ITERATOR_FLAG} = 1;
         my $firstResource = $self->{HERE}->map_start();
         my $finishResource = $self->{HERE}->map_finish();
@@ -4021,14 +3529,13 @@ sub next {
                                               $finishResource, $self->{FILTER},
                                               $self->{ALREADY_SEEN},
 					      $self->{CONDITION},
-					      $self->{FORCE_TOP},
-                                              undef,$self->{DEEPLINKLISTED});
+					      $self->{FORCE_TOP});
     }
 
     # 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,$self->{DEEPLINKLISTED});
+    my $browsePriv = $self->{HERE}->browsePriv($noblockcheck);
     if (!$self->{HERE}->src() || 
         (!($browsePriv eq 'F') && !($browsePriv eq '2')) ) {
         return $self->next($closeAllPages);
@@ -4456,7 +3963,6 @@ 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');
@@ -4492,7 +3998,6 @@ sub enclosing_map_src {
 }
 sub symb {
     my $self=shift;
-    if (defined($self->{SYMB})) { return $self->{SYMB}; }
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
     my $symbSrc = &Apache::lonnet::declutter($self->src());
     my $symb = &Apache::lonnet::declutter($self->navHash('map_id_'.$first)) 
@@ -4625,19 +4130,6 @@ 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'
 #
@@ -4696,11 +4188,6 @@ 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();
@@ -4730,6 +4217,7 @@ 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());
 }
 
@@ -4780,12 +4268,6 @@ Returns a string with a comma-separated
 for the hierarchy of maps containing a map, with the top level
 map first, then descending to deeper levels, with the enclosing map last.
 
-=item * B<map_breadcrumbs>:
-
-Same as map_hierarchy, except maps containing only a single itemm if
-it's a map, or containing no items are omitted, unless it's the top
-level map (map_pc = 1), which is always included.
-
 =back
 
 =cut
@@ -4821,11 +4303,6 @@ sub map_hierarchy {
     my $pc = $self->map_pc();
     return $self->navHash("map_hierarchy_$pc", 0);
 }
-sub map_breadcrumbs {
-    my $self = shift;
-    my $pc = $self->map_pc();
-    return $self->navHash("map_breadcrumbs_$pc", 0);
-}
 
 #####
 # Property queries
@@ -5050,12 +4527,11 @@ sub duedate {
     my $date;
     my @interval=$self->parmval("interval", $part);
     my $due_date=$self->parmval("duedate", $part);
-    if ($interval[0] =~ /(\d+)/) {
-        my $timelimit = $1;
-        my $first_access=&Apache::lonnet::get_first_access($interval[1],
-                                                          $self->{SYMB});
+    if ($interval[0] =~ /\d+/) {
+       my $first_access=&Apache::lonnet::get_first_access($interval[1],
+                                                          $self->symb);
 	if (defined($first_access)) {
-            my $interval = $first_access+$timelimit;
+           my $interval = $first_access+$interval[0];
 	    $date = (!$due_date || $interval < $due_date) ? $interval 
                                                           : $due_date;
 	} else {
@@ -5135,7 +4611,7 @@ sub part_display {
     my $self= shift(); my $partID = shift();
     if (! defined($partID)) { $partID = '0'; }
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
-                                     $self->{SYMB});
+                                     $self->symb);
     if (! defined($display) || $display eq '') {
         $display = $partID;
     }
@@ -5149,46 +4625,6 @@ 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 {
@@ -5337,8 +4773,6 @@ sub parts {
     my $self = shift;
 
     if ($self->ext) { return []; }
-    if (($self->is_tool()) &&
-        ($self->is_gradable())) { return ['0']; }
 
     $self->extractParts();
     return $self->{PARTS};
@@ -5429,7 +4863,7 @@ sub extractParts {
     my %parts;
 
     # Retrieve part count, if this is a problem
-    if ($self->is_raw_problem()) {
+    if ($self->is_problem()) {
 	my $partorder = &Apache::lonnet::metadata($self->src(), 'partorder');
         my $metadata = &Apache::lonnet::metadata($self->src(), 'packages');
 
@@ -5596,6 +5030,7 @@ 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.
@@ -5608,26 +5043,6 @@ 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.
@@ -5643,10 +5058,6 @@ 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. 
@@ -5736,14 +5147,6 @@ 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
@@ -5756,8 +5159,6 @@ 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;
@@ -5772,12 +5173,8 @@ 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') {
@@ -5850,26 +5247,6 @@ 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.
@@ -5951,20 +5328,8 @@ sub status {
 
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||
-        $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;
-            }
-        }
+        $completionStatus == CORRECT_BY_OVERRIDE ) {
+	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
 	my $awarded=$self->awarded($part);
 	if ($awarded < 1 && $awarded > 0) {
             return PARTIALLY_CORRECT;
@@ -5976,8 +5341,7 @@ sub status {
 
     # If it's WRONG... and not open
     if ( ($completionStatus == INCORRECT || 
-	  $completionStatus == INCORRECT_BY_OVERRIDE ||
-          $completionStatus == INCORRECT_BY_PASSBACK)
+	  $completionStatus == INCORRECT_BY_OVERRIDE)
 	 && (!$self->opendate($part) ||  $self->opendate($part) > time()) ) {
 	return INCORRECT;
     }
@@ -6004,23 +5368,7 @@ sub status {
 
     if ($dateStatus == PAST_DUE_ANSWER_LATER ||
         $dateStatus == PAST_DUE_NO_ANSWER ) {
-        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;
-        }
+        return $suppressFeedback ? ANSWER_SUBMITTED : $dateStatus; 
     }
 
     if ($dateStatus == ANSWER_OPEN) {
@@ -6035,8 +5383,7 @@ sub status {
     }
 
     # If it's WRONG...
-    if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE ||
-        $completionStatus == INCORRECT_BY_PASSBACK) {
+    if ($completionStatus == INCORRECT || $completionStatus == INCORRECT_BY_OVERRIDE) {
         # and there are TRIES LEFT:
         if ($self->tries($part) < $self->maxtries($part) || !$self->maxtries($part)) {
             return $suppressFeedback ? ANSWER_SUBMITTED : TRIES_LEFT;
@@ -6060,13 +5407,14 @@ sub check_for_slot {
         my $cnum=$env{'course.'.$cid.'.num'};
         my $now = time;
         my $num_usable_slots = 0;
-        my ($checkedin,$checkedinslot,%consumed_uniq,%slots);
         if (@slots > 0) {
-            %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
+            my %slots=&Apache::lonnet::get('slots',[@slots],$cdom,$cnum);
             if (&Apache::lonnet::error(%slots)) {
                 return (UNKNOWN);
             }
             my @sorted_slots = &Apache::loncommon::sorted_slots(\@slots,\%slots,'starttime');
+            my ($checkedin,$checkedinslot);
+            my ($map) = &Apache::lonnet::decode_symb($symb);
             foreach my $slot_name (@sorted_slots) {
                 next if (!defined($slots{$slot_name}) || !ref($slots{$slot_name}));
                 my $end = $slots{$slot_name}->{'endtime'};
@@ -6090,7 +5438,7 @@ sub check_for_slot {
                                 ($checkedin,$checkedinslot) = $self->checkedin();
                                 unless ((grep(/^\Q$checkedin\E/,@proctors)) &&
                                         ($checkedinslot eq $slot_name)) {
-                                    return (NEEDS_CHECKIN,$end,$slot_name); 
+                                    return (NEEDS_CHECKIN,undef,$slot_name); 
                                 }
                             }
                             return (RESERVED,$end,$slot_name);
@@ -6100,30 +5448,19 @@ sub check_for_slot {
                     $num_usable_slots ++;
                 }
             }
-            my ($is_correct,$wait_for_grade);
+            my ($is_correct,$got_grade);
             if ($self->is_task()) {
                 my $taskstatus = $self->taskstatus();
                 $is_correct = (($taskstatus eq 'pass') || 
                                ($self->solved() =~ /^correct_/));
-                unless ($taskstatus =~ /^(?:pass|fail)$/) {
-                    $wait_for_grade = 1;
-                }
+                $got_grade = ($taskstatus =~ /^(?:pass|fail)$/);
             } else {
-                unless ($self->completable()) {
-                    $wait_for_grade = 1;
-                }
-                unless (($self->problemstatus($part) eq 'no') ||
-                        ($self->problemstatus($part) eq 'no_feedback_ever')) {
-                    $is_correct = ($self->solved($part) =~ /^correct_/);
-                    $wait_for_grade = 0;
-                }
+                $got_grade = 1;
+                $is_correct = ($self->solved() =~ /^correct_/);   
             }
             ($checkedin,$checkedinslot) = $self->checkedin();
             if ($checkedin) {
-                if (ref($slots{$checkedinslot}) eq 'HASH') {
-                    $consumed_uniq{$checkedinslot} = $slots{$checkedinslot}{'uniqueperiod'};
-                }
-                if ($wait_for_grade) {
+                if (!$got_grade) {
                     return (WAITING_FOR_GRADE);
                 } elsif ($is_correct) {
                     return (CORRECT); 
@@ -6139,22 +5476,27 @@ sub check_for_slot {
             if ((ref($reservable->{'now_order'}) eq 'ARRAY') && (ref($reservable->{'now'}) eq 'HASH')) {
                 foreach my $slot (reverse (@{$reservable->{'now_order'}})) {
                     my $canuse;
-                    if (($reservable->{'now'}{$slot}{'symb'} eq '') ||
-                        ($reservable->{'now'}{$slot}{'symb'} eq $symb)) {
+                    if ($reservable->{'now'}{$slot}{'symb'} eq '') {
                         $canuse = 1;
-                    }
-                    if ($canuse) {
-                        if ($checkedin) {
-                            if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
-                                my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
-                                if ($reservable->{'now'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
-                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
-                                    next if (!
-                                        ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
-                                        ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                    } else {
+                        my %oksymbs;
+                        my @slotsymbs = split(/\s*,\s*/,$reservable->{'now'}{$slot}{'symb'});
+                        map { $oksymbs{$_} = 1; } @slotsymbs;
+                        if ($oksymbs{$symb}) {
+                            $canuse = 1;
+                        } else {
+                            foreach my $item (@slotsymbs) {
+                                if ($item =~ /\.(page|sequence)$/) {
+                                    (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                    if (($map ne '') && ($map eq $sloturl)) {
+                                        $canuse = 1;
+                                        last;
+                                    }
                                 }
                             }
                         }
+                    }
+                    if ($canuse) {
                         return(RESERVABLE,$reservable->{'now'}{$slot}{'endreserve'});
                     }
                 }
@@ -6162,22 +5504,29 @@ sub check_for_slot {
             if ((ref($reservable->{'future_order'}) eq 'ARRAY') && (ref($reservable->{'future'}) eq 'HASH')) {
                 foreach my $slot (@{$reservable->{'future_order'}}) {
                     my $canuse;
-                    if (($reservable->{'future'}{$slot}{'symb'} eq '') ||
-                        ($reservable->{'future'}{$slot}{'symb'} eq $symb)) {
+                    if ($reservable->{'future'}{$slot}{'symb'} eq '') {
                         $canuse = 1;
-                    }
-                    if ($canuse) {
-                        if ($checkedin) {
-                            if (ref($consumed_uniq{$checkedinslot}) eq 'ARRAY') {
-                                my ($uniqstart,$uniqend)=@{$consumed_uniq{$checkedinslot}};
-                                if ($reservable->{'future'}{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
-                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
-                                    next if (!
-                                        ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
-                                        ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                    } elsif ($reservable->{'future'}{$slot}{'symb'} =~ /,/) {
+                        my %oksymbs;
+                        my @slotsymbs = split(/\s*,\s*/,$reservable->{'future'}{$slot}{'symb'});
+                        map { $oksymbs{$_} = 1; } @slotsymbs;
+                        if ($oksymbs{$symb}) {
+                            $canuse = 1;
+                        } else {
+                            foreach my $item (@slotsymbs) {
+                                if ($item =~ /\.(page|sequence)$/) {
+                                    (undef,undef, my $sloturl) = &Apache::lonnet::decode_symb($item);
+                                    if (($map ne '') && ($map eq $sloturl)) {
+                                        $canuse = 1;
+                                        last;
+                                    }
                                 }
                             }
                         }
+                    } elsif ($reservable->{'future'}{$slot}{'symb'} eq $symb) {
+                        $canuse = 1;
+                    }
+                    if ($canuse) {
                         return(RESERVABLE_LATER,$reservable->{'future'}{$slot}{'startreserve'});
                     }
                 }
@@ -6231,10 +5580,6 @@ 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,
@@ -6413,23 +5758,13 @@ 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,$nodeeplinkcheck,
-                                                    $nodeeplinkout);
+                                                    undef,$noblockcheck);
 }
 
 =pod