--- loncom/interface/lonnavmaps.pm	2004/09/20 15:28:10	1.267.2.6
+++ loncom/interface/lonnavmaps.pm	2005/07/15 05:20:37	1.334
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.267.2.6 2004/09/20 15:28:10 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.334 2005/07/15 05:20:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,12 +30,16 @@
 package Apache::lonnavmaps;
 
 use strict;
+use GDBM_File;
 use Apache::Constants qw(:common :http);
 use Apache::loncommon();
 use Apache::lonmenu();
+use Apache::lonenc();
 use Apache::lonlocal;
+use Apache::lonnet;
 use POSIX qw (floor strftime);
-use Data::Dumper; # for debugging, not always used
+use Data::Dumper; # for debugging, not always 
+use Time::HiRes qw( gettimeofday tv_interval );
 
 # symbolic constants
 sub SYMB { return 1; }
@@ -53,6 +57,7 @@ my %statusIconMap =
      $resObj->CLOSED       => '',
      $resObj->OPEN         => 'navmap.open.gif',
      $resObj->CORRECT      => 'navmap.correct.gif',
+     $resObj->PARTIALLY_CORRECT      => 'navmap.ellipsis.gif',
      $resObj->INCORRECT    => 'navmap.wrong.gif',
      $resObj->ATTEMPTED    => 'navmap.ellipsis.gif',
      $resObj->ERROR        => ''
@@ -77,12 +82,63 @@ my %colormap =
       $resObj->OPEN                   => '',
       $resObj->NOTHING_SET            => '',
       $resObj->ATTEMPTED              => '',
-      $resObj->ANSWER_SUBMITTED       => ''
+      $resObj->ANSWER_SUBMITTED       => '',
+      $resObj->PARTIALLY_CORRECT      => '#006600'
       );
 # And a special case in the nav map; what to do when the assignment
 # is not yet done and due in less then 24 hours
 my $hurryUpColor = "#FF0000";
 
+sub launch_win {
+    my ($mode,$script,$toplinkitems)=@_;
+    my $result;
+    if ($script ne 'no') {
+	$result.='<script type="text/javascript">';
+    }
+    $result.='function launch_navmapwin() {
+                 newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
+               }';
+    if ($mode eq 'now') {
+	$result.="\nlaunch_navmapwin();\n";
+    }
+    if ($script ne 'no') {
+	$result.='</script>';
+    }
+    if ($mode eq 'link') {
+	&add_linkitem($toplinkitems,'launchnav','launch_navmapwin()',
+		      "Launch navigation window");
+    }
+    return $result;
+}
+
+sub close {
+    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
+    return(<<ENDCLOSE);
+<script type="text/javascript">
+window.status='Accessing Nav Control';
+menu=window.open("/adm/rat/empty.html","loncapanav",
+                 "height=600,width=400,scrollbars=1");
+window.status='Closing Nav Control';
+menu.close();
+window.status='Done.';
+</script>
+ENDCLOSE
+}
+
+sub update {
+    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
+    if (!$env{'request.course.id'}) { return ''; }
+    if ($ENV{'REQUEST_URI'}=~m|^/adm/navmaps|) { return ''; }
+    return(<<ENDUPDATE);
+<form name="navform"></form>
+<script type="text/javascript">
+this.document.navform.action='/adm/navmaps#curloc';
+this.document.navform.target='loncapanav';
+this.document.navform.submit();
+</script>
+ENDUPDATE
+}
+
 sub handler {
     my $r = shift;
     real_handler($r);
@@ -90,10 +146,10 @@ sub handler {
 
 sub real_handler {
     my $r = shift;
-
+    #my $t0=[&gettimeofday()];
     # Handle header-only request
     if ($r->header_only) {
-        if ($ENV{'browser.mathml'}) {
+        if ($env{'browser.mathml'}) {
             &Apache::loncommon::content_type($r,'text/xml');
         } else {
             &Apache::loncommon::content_type($r,'text/html');
@@ -103,7 +159,7 @@ sub real_handler {
     }
 
     # Send header, don't cache this page
-    if ($ENV{'browser.mathml'}) {
+    if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($r,'text/xml');
     } else {
         &Apache::loncommon::content_type($r,'text/html');
@@ -111,39 +167,98 @@ sub real_handler {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
 
+    my %toplinkitems=();
+    &add_linkitem(\%toplinkitems,'blank','',"Select Action");
+    if ($ENV{QUERY_STRING} eq 'collapseExternal') {
+	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
+	&Apache::lonnet::appenv('environment.remotenavmap' => 'off');
+	my $menu=&Apache::lonmenu::reopenmenu();
+	my $navstatus=&Apache::lonmenu::get_nav_status();
+	if ($menu) {
+	    $menu=(<<MENU)
+             swmenu=$menu
+             swmenu.clearTimeout(swmenu.menucltim);
+	     $navstatus
+MENU
+        } else {
+	    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+	    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
+	    $menu=(<<MENU)
+             swmenu=$mainwindow
+	     $navstatus
+MENU
+	}
+	my $html=&Apache::lonxml::xmlbegin();
+	$r->print(<<"ENDSUBM");
+	$html
+        <head>
+	  <script type="text/javascript">
+ 	    function submitthis() {
+		    $menu
+		    self.close();
+	    }
+	
+  	  </script>
+        </head>
+	<body bgcolor="#FFFFFF" onLoad="submitthis()"></body>
+        </html>
+ENDSUBM
+        return;
+    }
+    if ($ENV{QUERY_STRING} eq 'launchExternal') {
+	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
+	&Apache::lonnet::appenv('environment.remotenavmap' => 'on');
+    }
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
         my $requrl = $r->uri;
-        $ENV{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
+        $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
         return HTTP_NOT_ACCEPTABLE;
     }
-
-    $r->print("<html><head>\n");
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print("$html<head>\n");
     $r->print("<title>".&mt('Navigate Course Contents')."</title>");
 # ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['register','sort','showOnlyHomework','postsymb']);
     
 # ----------------------------------------------------- Force menu registration
     my $addentries='';
-    if ($ENV{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-	   '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-       $r->print(&Apache::lonmenu::registerurl(1));
+    my $more_unload;
+    my $body_only='';
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$r->print('<script type="text/javascript">
+                      function collapse() {
+                         this.document.location="/adm/navmaps?collapseExternal";
+                      }
+                   </script>');
+# FIXME need to be smarter to only catch window close events
+#	$more_unload="collapse()"
+	$body_only=1;
+    }
+    if ($env{'form.register'}) {
+	$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
+	    '" onUnload="'.&Apache::lonmenu::unloadevents().';'.
+	    $more_unload.'"';
+	$r->print(&Apache::lonmenu::registerurl(1));
+    } else {
+	$addentries=' onUnload="'.$more_unload.'"';
     }
 
     # Header
     $r->print('</head>'.
               &Apache::loncommon::bodytag('Navigate Course Contents','',
-                                    $addentries,'','',$ENV{'form.register'}));
-    $r->print('<script>window.focus();</script>'.
-	      &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
+					  $addentries,$body_only,'',
+					  $env{'form.register'}));
+    $r->print('<script>window.focus();</script>');
      
     $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
+	$r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .
                   '</body></html>');
         return OK;
@@ -167,15 +282,34 @@ sub real_handler {
         if ($sequenceCount == 1) {
             # The automatic iterator creation in the render call 
             # will pick this up. We know the condition because
-            # the defined($ENV{'form.filter'}) also ensures this
+            # the defined($env{'form.filter'}) also ensures this
             # is a fresh call.
-            $ENV{'form.filter'} = "$sequenceId";
+            $env{'form.filter'} = "$sequenceId";
         }
     }
 
+    if ($ENV{QUERY_STRING} eq 'launchExternal') {
+	$r->print('
+          <form name="returnwin" action="/adm/flip?postdata=return%3a" 
+                method="post" target="loncapaclient">
+          </form>');
+	$r->print('
+          <script type="text/javascript">
+              this.document.returnwin.submit();
+          </script>');
+    }
+
+    if ($env{'environment.remotenavmap'} ne 'on') {
+	$r->print(&launch_win('link','yes',\%toplinkitems));
+    } 
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	&add_linkitem(\%toplinkitems,'closenav','collapse()',
+		      "Close navigation window");
+    } 
+
     my $jumpToFirstHomework = 0;
     # Check to see if the student is jumping to next open, do-able problem
-    if ($ENV{QUERY_STRING} eq 'jumpToFirstHomework') {
+    if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
         $jumpToFirstHomework = 1;
         # Find the next homework problem that they can do.
         my $iterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -195,10 +329,10 @@ sub real_handler {
                     pop @$stack; # last resource in the stack is the problem
                                  # itself, which we don't need in the map stack
                     my @mapPcs = map {$_->map_pc()} @$stack;
-                    $ENV{'form.filter'} = join(',', @mapPcs);
+                    $env{'form.filter'} = join(',', @mapPcs);
 
                     # Mark as both "here" and "jump"
-                    $ENV{'form.postsymb'} = $curRes->symb();
+                    $env{'form.postsymb'} = $curRes->symb();
                 }
             }
         }
@@ -208,8 +342,9 @@ sub real_handler {
             $r->print("<font size='+2'>All homework assignments have been completed.</font><br /><br />");
         }
     } else {
-        $r->print("<a href='navmaps?jumpToFirstHomework'>" .
-       &mt("Go To My First Homework Problem")."</a>&nbsp;&nbsp;&nbsp;&nbsp;");
+	&add_linkitem(\%toplinkitems,'firsthomework',
+		      'location.href="navmaps?jumpToFirstHomework"',
+		      "Show Me My First Homework Problem");
     }
 
     my $suppressEmptySequences = 0;
@@ -218,32 +353,53 @@ sub real_handler {
 
     # Display only due homework.
     my $showOnlyHomework = 0;
-    if ($ENV{QUERY_STRING} eq 'showOnlyHomework') {
+    if ($env{'form.showOnlyHomework'} eq "1") {
         $showOnlyHomework = 1;
         $suppressEmptySequences = 1;
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
+	&add_linkitem(\%toplinkitems,'everything',
+		     'location.href="navmaps?sort='.$env{'form.sort'}.'"',
+		      "Show Everything");
         $r->print("<p><font size='+2'>".&mt("Uncompleted Homework")."</font></p>");
-        $ENV{'form.filter'} = '';
-        $ENV{'form.condition'} = 1;
+        $env{'form.filter'} = '';
+        $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        $r->print("<a href='navmaps?showOnlyHomework'>" .
-       &mt("Show Only Uncompleted Homework")."</a>&nbsp;&nbsp;&nbsp;&nbsp;");
-    }
-
+	&add_linkitem(\%toplinkitems,'uncompleted',
+		      'location.href="navmaps?sort='.$env{'form.sort'}.
+		          '&showOnlyHomework=1"',
+		      "Show Only Uncompleted Homework");
+    }
+
+    my %selected=($env{'form.sort'} => 'selected=on');
+    my $sort_html=("<form>
+                 <nobr>
+                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$env{'form.showOnlyHomework'}."\" />
+                    <input type=\"submit\" value=\"".&mt('Sort by:')."\" />
+                    <select name=\"sort\">
+                       <option value=\"default\" $selected{'default'}>".&mt('Default')."</option>
+                       <option value=\"title\"   $selected{'title'}  >".&mt('Title')."</option>
+                       <option value=\"duedate\" $selected{'duedate'}>".&mt('Duedate')."</option>
+                       <option value=\"discussion\" $selected{'discussion'}>".&mt('Has New Discussion')."</option>
+                    </select>
+                 </nobr>
+               </form>");
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
+		       'sort' => $env{'form.sort'},
                        'url' => '/adm/navmaps',
                        'navmap' => $navmap,
                        'suppressNavmap' => 1,
                        'suppressEmptySequences' => $suppressEmptySequences,
                        'filterFunc' => $filterFunc,
 		       'resource_no_folder_link' => $resource_no_folder_link,
-                       'r' => $r};
+		       'sort_html'=> $sort_html,
+                       'r' => $r,
+                       'caller' => 'navmapsdisplay',
+                       'linkitems' => \%toplinkitems};
     my $render = render($renderArgs);
-    $navmap->untieHashes();
 
     # If no resources were printed, print a reassuring message so the
     # user knows there was no error.
@@ -254,6 +410,8 @@ sub real_handler {
             $r->print("<p><font size='+1'>This course is empty.</font></p>");
         }
     }
+    #my $td=&tv_interval($t0);
+    #$r->print("<br />$td");
 
     $r->print("</body></html>");
     $r->rflush();
@@ -284,7 +442,6 @@ sub removeFromFilter {
 
 # Convenience function: Given a stack returned from getStack on the iterator,
 # return the correct src() value.
-# Later, this should add an anchor when we start putting anchors in pages.
 sub getLinkForResource {
     my $stack = shift;
     my $res;
@@ -292,14 +449,18 @@ sub getLinkForResource {
     # Check to see if there are any pages in the stack
     foreach $res (@$stack) {
         if (defined($res)) {
+	    my $anchor;
 	    if ($res->is_page()) {
-		return $res->src();
+		foreach (@$stack) { if (defined($_)) { $anchor = $_; }  }
+		$anchor=&Apache::lonnet::escape($anchor->shown_symb());
+		return ($res->link(),$res->shown_symb(),$anchor);
 	    }
             # in case folder was skipped over as "only sequence"
 	    my ($map,$id,$src)=&Apache::lonnet::decode_symb($res->symb());
 	    if ($map=~/\.page$/) {
-		return &Apache::lonnet::clutter($map).'#'.
-		    &Apache::lonnet::escape(&Apache::lonnet::declutter($src));
+		my $url=&Apache::lonnet::clutter($map);
+		$anchor=&Apache::lonnet::escape($src->shown_symb());
+		return ($url,$res->shown_symb(),$anchor);
 	    }
         }
     }
@@ -312,7 +473,7 @@ sub getLinkForResource {
         if (defined($_)) { $res = $_; }
     }
 
-    return $res->src();
+    return ($res->link(),$res->shown_symb());
 }
 
 # Convenience function: This separates the logic of how to create
@@ -348,7 +509,7 @@ sub getDescription {
     if ($status == $res->PAST_DUE_NO_ANSWER) {
         return &mt("Was due")." " . timeToHumanString($res->duedate($part));
     }
-    if ($status == $res->ANSWER_OPEN) {
+    if ($status == $res->ANSWER_OPEN || $status == $res->PARTIALLY_CORRECT) {
         return &mt("Answer available");
     }
     if ($status == $res->EXCUSED) {
@@ -406,10 +567,10 @@ sub lastTry {
         $res->duedate($part) > time();
 }
 
-# This puts a human-readable name on the ENV variable.
+# This puts a human-readable name on the env variable.
 
 sub advancedUser {
-    return $ENV{'request.role.adv'};
+    return $env{'request.role.adv'};
 }
 
 
@@ -499,7 +660,7 @@ sub timeToHumanString {
             my $timeStr = strftime("%A, %b %e at %I:%M %P", localtime($time));
             $timeStr =~ s/12:00 am/00:00/;
             $timeStr =~ s/12:00 pm/noon/;
-            return ($inPast ? "last " : "next ") .
+            return ($inPast ? "last " : "this ") .
                 $timeStr;
         }
         
@@ -712,13 +873,13 @@ automatically.
 
 =over 4
 
-=item * B<iterator>: default: constructs one from %ENV
+=item * B<iterator>: default: constructs one from %env
 
 A reference to a fresh ::iterator to use from the navmaps. The
 rendering will reflect the options passed to the iterator, so you can
 use that to just render a certain part of the course, if you like. If
 one is not passed, the renderer will attempt to construct one from
-ENV{'form.filter'} and ENV{'form.condition'} information, plus the
+env{'form.filter'} and env{'form.condition'} information, plus the
 'iterator_map' parameter if any.
 
 =item * B<iterator_map>: default: not used
@@ -728,11 +889,11 @@ instruct the renderer to render only a p
 the source of the map you want to process, like
 '/res/103/jerf/navmap.course.sequence'.
 
-=item * B<navmap>: default: constructs one from %ENV
+=item * B<navmap>: default: constructs one from %env
 
 A reference to a navmap, used only if an iterator is not passed in. If
 this is necessary to make an iterator but it is not passed in, a new
-one will be constructed based on ENV info. This is useful to do basic
+one will be constructed based on env info. This is useful to do basic
 error checking before passing it off to render.
 
 =item * B<r>: default: must be passed in
@@ -758,12 +919,12 @@ then only one line will be displayed for
 all parts will always be displayed. If showParts is 0, this is
 ignored.
 
-=item * B<jumpCount>: default: determined from %ENV
+=item * B<jumpCount>: default: determined from %env
 
 A string identifying the URL to place the anchor 'curloc' at.
 It is the responsibility of the renderer user to
 ensure that the #curloc is in the URL. By default, determined through
-the use of the ENV{} 'jump' information, and should normally "just
+the use of the env{} 'jump' information, and should normally "just
 work" correctly.
 
 =item * B<here>: default: empty string
@@ -791,7 +952,7 @@ are allowing the user to open and close
 
 Describes the currently-open row number to cause the browser to jump
 to, because the user just opened that folder. By default, pulled from
-the Jump information in the ENV{'form.*'}.
+the Jump information in the env{'form.*'}.
 
 =item * B<printKey>: default: false
 
@@ -860,6 +1021,15 @@ sub render_resource {
     my $nonLinkedText = ''; # stuff after resource title not in link
 
     my $link = $params->{"resourceLink"};
+
+    #  The URL part is not escaped at this point, but the symb is... 
+    #  The stuff to the left of the ? must have ' replaced by \' since
+    #  it will be quoted with ' in the href.
+
+    my ($left,$right) = split(/\?/, $link);
+    $left =~ s/'/\\'/g;
+    $link = $left.'?'.$right;
+
     my $src = $resource->src();
     my $it = $params->{"iterator"};
     my $filter = $it->{FILTER};
@@ -868,28 +1038,31 @@ sub render_resource {
 
     my $partLabel = "";
     my $newBranchText = "";
-    
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons");
     # If this is a new branch, label it so
     if ($params->{'isNewBranch'}) {
-        $newBranchText = "<img src='/adm/lonIcons/branch.gif' border='0' />";
+        $newBranchText = "<img src='$location/branch.gif' border='0' alt='Branch' />";
     }
 
     # links to open and close the folder
+
+    
     my $linkopen = "<a href='$link'>";
+
+
     my $linkclose = "</a>";
 
     # Default icon: unknown page
-    my $icon = "<img src='/adm/lonIcons/unknown.gif' alt='' border='0' />";
+    my $icon = "<img src='$location/unknown.gif' alt='' border='0' alt='&nbsp;&nbsp;' ' />";
     
     if ($resource->is_problem()) {
         if ($part eq '0' || $params->{'condensed'}) {
-            $icon = '<img src="/adm/lonIcons/problem.gif" alt="" border="0" />';
+            $icon ='<img src="'.$location.'/problem.gif" alt="&nbsp;&nbsp;" border="0" />';
         } else {
             $icon = $params->{'indentString'};
         }
     } else {
-	$icon = "<img src='".&Apache::loncommon::icon($resource->src).
-	    "' alt='' border='0' />";
+	$icon = "<img src='".&Apache::loncommon::icon($resource->src)."' alt='&nbsp;&nbsp;' border='0' />";
     }
 
     # Display the correct map icon to open or shut map
@@ -904,7 +1077,8 @@ sub render_resource {
 
         if (!$params->{'resource_no_folder_link'}) {
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') . '.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+	    $icon = "<img src='$location/$icon' alt='".
+		($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />";
 
             $linkopen = "<a href='" . $params->{'url'} . '?' . 
                 $params->{'queryString'} . '&filter=';
@@ -917,11 +1091,13 @@ sub render_resource {
                 '&jump=' .
                 &Apache::lonnet::escape($resource->symb()) . 
                 "&folderManip=1'>";
+
         } else {
             # Don't allow users to manipulate folder
             $icon = "navmap.$folderType." . ($nowOpen ? 'closed' : 'open') .
                 '.nomanip.gif';
-            $icon = "<img src='/adm/lonIcons/$icon' alt='' border='0' />";
+            $icon = "<img src='$location/$icon' alt='".
+		($nowOpen ? 'Open Folder' : 'Close Folder')."' border='0' />";
 
             $linkopen = "";
             $linkclose = "";
@@ -944,6 +1120,7 @@ sub render_resource {
     }
 
     # Decide what to display
+
     $result .= "$newBranchText$linkopen$icon$linkclose";
     
     my $curMarkerBegin = '';
@@ -959,11 +1136,9 @@ sub render_resource {
 
     if ($resource->is_problem() && $part ne '0' && 
         !$params->{'condensed'}) {
-	my $displaypart=&Apache::lonnet::EXT('resource.'.$part.'.display',
-					     $resource->symb());
-	unless ($displaypart) { $displaypart=$part; }
+	my $displaypart=$resource->part_display($part);
         $partLabel = " (Part: $displaypart)";
-	$link.='#'.&Apache::lonnet::escape($part);
+	if ($link!~/\#/) { $link.='#'.&Apache::lonnet::escape($part); }
         $title = "";
     }
 
@@ -971,8 +1146,12 @@ sub render_resource {
         $nonLinkedText .= ' (' . $resource->countParts() . ' parts)';
     }
 
+    my $target;
+    if ($env{'environment.remotenavmap'} eq 'on') {
+	$target=' target="loncapaclient" ';
+    }
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "  $curMarkerBegin<a href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
+        $result .= "  $curMarkerBegin<a $target href='$link'>$title$partLabel</a>$curMarkerEnd $nonLinkedText</td>";
     } else {
         $result .= "  $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText</td>";
     }
@@ -987,10 +1166,10 @@ sub render_communication_status {
     my $link = $params->{"resourceLink"};
     my $linkopen = "<a href='$link'>";
     my $linkclose = "</a>";
-
+    my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
     if ($resource->hasDiscussion()) {
         $discussionHTML = $linkopen .
-            '<img border="0" src="/adm/lonMisc/chat.gif" />' .
+            '<img border="0" src="'.$location.'/chat.gif" />' .
             $linkclose;
     }
     
@@ -1000,7 +1179,7 @@ sub render_communication_status {
             if ($_) {
                 $feedbackHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/feedback.gif" '
+                    . '<img src="'.$location.'/feedback.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1015,7 +1194,7 @@ sub render_communication_status {
                 $errorcount++;
                 $errorHTML .= '&nbsp;<a href="/adm/email?display='
                     . &Apache::lonnet::escape($_) . '">'
-                    . '<img src="/adm/lonMisc/bomb.gif" '
+                    . '<img src="'.$location.'/bomb.gif" '
                     . 'border="0" /></a>';
             }
         }
@@ -1044,7 +1223,9 @@ sub render_quick_status {
         my $icon = $statusIconMap{$resource->simpleStatus($part)};
         my $alt = $iconAltTags{$icon};
         if ($icon) {
-            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='/adm/lonIcons/$icon' border='0' alt='$alt' />$linkclose</td>\n";
+	    my $location=
+		&Apache::loncommon::lonhttpdurl("/adm/lonIcons/$icon");
+            $result .= "<td width='30' valign='center' width='50' align='right'>$linkopen<img width='25' height='25' src='$location' border='0' alt='$alt' />$linkclose</td>\n";
         } else {
             $result .= "<td width='30'>&nbsp;</td>\n";
         }
@@ -1175,11 +1356,17 @@ sub setDefault {
     return $val;
 }
 
+sub cmp_title {
+    my ($atitle,$btitle) = (lc($_[0]->compTitle),lc($_[1]->compTitle));
+    $atitle=~s/^\s*//;
+    $btitle=~s/^\s*//;
+    return $atitle cmp $btitle;
+}
+
 sub render {
     my $args = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{QUERY_STRING});
     my $result = '';
-
     # Configure the renderer.
     my $cols = $args->{'cols'};
     if (!defined($cols)) {
@@ -1207,7 +1394,7 @@ sub render {
     # marker
     my $filterHash = {};
     # Figure out what we're not displaying
-    foreach (split(/\,/, $ENV{"form.filter"})) {
+    foreach (split(/\,/, $env{"form.filter"})) {
         if ($_) {
             $filterHash->{$_} = "1";
         }
@@ -1227,11 +1414,11 @@ sub render {
     }
 
     my $condition = 0;
-    if ($ENV{'form.condition'}) {
+    if ($env{'form.condition'}) {
         $condition = 1;
     }
 
-    if (!$ENV{'form.folderManip'} && !defined($args->{'iterator'})) {
+    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();
@@ -1241,16 +1428,25 @@ sub render {
         # Step two: Locate what kind of here marker is necessary
         # Determine where the "here" marker is and where the screen jumps to.
 
-        if ($ENV{'form.postsymb'}) {
-            $here = $jump = $ENV{'form.postsymb'};
-        } elsif ($ENV{'form.postdata'}) {
+        if ($env{'form.postsymb'} ne '') {
+            $here = $jump = &Apache::lonnet::symbclean($env{'form.postsymb'});
+        } elsif ($env{'form.postdata'} ne '') {
             # couldn't find a symb, is there a URL?
-            my $currenturl = $ENV{'form.postdata'};
+            my $currenturl = $env{'form.postdata'};
             #$currenturl=~s/^http\:\/\///;
             #$currenturl=~s/^[^\/]+//;
             
             $here = $jump = &Apache::lonnet::symbread($currenturl);
-        }
+	}
+	if ($here eq '') {
+	    my $last;
+	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+                    &GDBM_READER(),0640)) {
+		$last=$hash{'last_known'};
+		untie(%hash);
+	    }
+	    if ($last) { $here = $jump = $last; }
+	}
 
         # Step three: Ensure the folders are open
         my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
@@ -1277,16 +1473,16 @@ sub render {
         }            
     }        
 
-    if ( !defined($args->{'iterator'}) && $ENV{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
+    if ( !defined($args->{'iterator'}) && $env{'form.folderManip'} ) { # we came from a user's manipulation of the nav page
         # If this is a click on a folder or something, we want to preserve the "here"
         # from the querystring, and get the new "jump" marker
-        $here = $ENV{'form.here'};
-        $jump = $ENV{'form.jump'};
+        $here = $env{'form.here'};
+        $jump = $env{'form.jump'};
     } 
     
     my $it = $args->{'iterator'};
     if (!defined($it)) {
-        # Construct a default iterator based on $ENV{'form.'} information
+        # Construct a default iterator based on $env{'form.'} information
         
         # Step 1: Check to see if we have a navmap
         if (!defined($navmap)) {
@@ -1336,23 +1532,24 @@ sub render {
     my $printKey = $args->{'printKey'};
     my $printCloseAll = $args->{'printCloseAll'};
     if (!defined($printCloseAll)) { $printCloseAll = 1; }
-    
+
     # Print key?
     if ($printKey) {
         $result .= '<table border="0" cellpadding="2" cellspacing="0">';
         my $date=localtime;
         $result.='<tr><td align="right" valign="bottom">Key:&nbsp;&nbsp;</td>';
+	my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
         if ($navmap->{LAST_CHECK}) {
             $result .= 
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('New discussion since').' '.
+                '<img src="'.$location.'/chat.gif"> '.&mt('New discussion since').' '.
                 strftime("%A, %b %e at %I:%M %P", localtime($navmap->{LAST_CHECK})).
                 '</td><td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
+                '<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').'<p>'.
                 '</td>'; 
         } else {
             $result .= '<td align="center" valign="bottom">&nbsp;&nbsp;'.
-                '<img src="/adm/lonMisc/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
-                '&nbsp;&nbsp;<img src="/adm/lonMisc/feedback.gif"> '.&mt('New message (click to open)').
+                '<img src="'.$location.'/chat.gif"> '.&mt('Discussions').'</td><td align="center" valign="bottom">'.
+                '&nbsp;&nbsp;<img src="'.$location.'/feedback.gif"> '.&mt('New message (click to open)').
                 '</td>'; 
         }
 
@@ -1360,51 +1557,80 @@ sub render {
     }
 
     if ($printCloseAll && !$args->{'resource_no_folder_link'}) {
+	my ($link,$text);
         if ($condition) {
-            $result.="<a href=\"navmaps?condition=0&filter=&$queryString" .
-                "&here=" . Apache::lonnet::escape($here) .
-                "\">".&mt('Close All Folders')."</a>";
+	    $link='"navmaps?condition=0&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Close All Folders';
         } else {
-            $result.="<a href=\"navmaps?condition=1&filter=&$queryString" .
-                "&here=" . Apache::lonnet::escape($here) . 
-                "\">".&mt('Open All Folders')."</a>";
-        }
+	    $link='"navmaps?condition=1&filter=&'.$queryString.
+		'&here='.&Apache::lonnet::escape($here).'"';
+	    $text='Open All Folders';
+        }
+	if ($args->{'caller'} eq 'navmapsdisplay') {
+	    &add_linkitem($args->{'linkitems'},'changefolder',
+			  'location.href='.$link,$text);
+	} else {
+	    $result.='<a href='.$link.'>'.&mt($text).'</a>';
+	}
         $result .= "\n";
     }
 
     # Check for any unread discussions in all resources.
-    if (0 && !$args->{'resource_no_folder_link'}) {
-	my $totdisc = 0;
-	my $haveDisc = '';
-	my @allres=$navmap->retrieveResources();
-	foreach my $resource (@allres) {
-	    if ($resource->hasDiscussion()) {
-		my $ressymb;
-		if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
-		    $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
-		} else {
-		    $ressymb = $resource->symb();
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+	&add_linkitem($args->{'linkitems'},'clearbubbles',
+		      'document.clearbubbles.submit()',
+		      'Mark all posts read');
+	my $time=time;
+	$result .= (<<END);
+    <form name="clearbubbles" method="post" action="/adm/feedback">
+	<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
+	<input type="hidden" name="navtime" value="$time" />
+END
+        if ($args->{'sort'} eq 'discussion') { 
+	    my $totdisc = 0;
+	    my $haveDisc = '';
+	    my @allres=$navmap->retrieveResources();
+	    foreach my $resource (@allres) {
+		if ($resource->hasDiscussion()) {
+		    $haveDisc .= $resource->wrap_symb().':';
+		    $totdisc ++;
 		}
-		$haveDisc .= $ressymb.':';
-		$totdisc ++;
 	    }
-	}
-	if ($totdisc > 0) {
-	    $haveDisc =~ s/:$//;
-	    my %lt = &Apache::lonlocal::texthash(
-						 'mapr' => 'Mark all posts read',
-						 );
-	    $result .= (<<END);
-	        &nbsp;&nbsp;&nbsp;<a href="javascript:document.clearbubbles.submit()">$lt{'mapr'}</a>&nbsp;<a href="javascript:void(open('/adm/help/NavMaps_MarkPosts_Read.hlp', 'Help_for_NavMaps_MarkPosts', 'menubar=0,toolbar=1,scrollbars=1,width=350,height=400,resizable=yes'))" title="Online Help"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: NavMaps_MarkPostsLink)" /></a>
-		<form name="clearbubbles" method="post" action="/adm/feedback">
-		<input type="hidden" name="navurl" value="$ENV{'QUERY_STRING'}" />
-		<input type="hidden" name="navmaps" value="$haveDisc" />
-		</form>
+	    if ($totdisc > 0) {
+		$haveDisc =~ s/:$//;
+		$result .= (<<END);
+	<input type="hidden" name="navmaps" value="$haveDisc" />
+    </form>
 END
+            }
+	}
+	$result.='</form>';
+    }
+
+    if ($args->{'caller'} eq 'navmapsdisplay') {
+        $result .= '<table><tr><td>'.
+                   &Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT').'</td>';
+	if ($env{'environment.remotenavmap'} ne 'on') {
+	    $result .= '<td>&nbsp;</td>'; 
         } else {
-	    $result .= '<br />';
+	    $result .= '</tr><tr>'; 
+        }
+	$result.=&show_linkitems($args->{'linkitems'});
+        if ($args->{'sort_html'}) {
+	    if ($env{'environment.remotenavmap'} ne 'on') {
+		$result.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>'.
+		    '<td align="right">'.$args->{'sort_html'}.'</td></tr>';
+	    } else {
+		$result.='</tr><tr><td align="left"><br />'.
+		    $args->{'sort_html'}.'</td></tr>';
+	    }
 	}
+        $result .= '</table>';
+    } elsif ($args->{'sort_html'}) { 
+        $result.=$args->{'sort_html'}; 
     }
+
     $result .= "<br />\n";
     if ($r) {
         $r->print($result);
@@ -1427,7 +1653,9 @@ END
     $args->{'indentLevel'} = 0;
     $args->{'isNewBranch'} = 0;
     $args->{'condensed'} = 0;    
-    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='/adm/lonIcons/whitespace1.gif' width='25' height='1' alt='' border='0' />");
+    my $location=
+	&Apache::loncommon::lonhttpdurl("/adm/lonIcons/whitespace1.gif");
+    $args->{'indentString'} = setDefault($args->{'indentString'}, "<img src='$location' width='25' height='1' alt='&nbsp;&nbsp;' border='0' />");
     $args->{'displayedHereMarker'} = 0;
 
     # If we're suppressing empty sequences, look for them here. Use DFS for speed,
@@ -1477,7 +1705,60 @@ END
     $args->{'here'} = $here;
 
     $args->{'indentLevel'} = -1; # first BEGIN_MAP takes this to 0
-    while ($curRes = $it->next($closeAllPages)) {
+    my @resources;
+    my $code='';# sub { !(shift->is_map();) };
+    if ($args->{'sort'} eq 'title') {
+        my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if ($res->is_map()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
+    } elsif ($args->{'sort'} eq 'duedate') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->is_problem()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort {
+	    if ($a->duedate ne $b->duedate) {
+	        return $a->duedate cmp $b->duedate;
+	    }
+	    my $value=&cmp_title($a,$b);
+	    return $value;
+	} @resources;
+    } elsif ($args->{'sort'} eq 'discussion') {
+	my $oldFilterFunc = $filterFunc;
+	my $filterFunc= 
+	    sub {
+		my ($res)=@_;
+		if (!$res->hasDiscussion() &&
+		    !$res->getFeedback() &&
+		    !$res->getErrors()) { return 0;}
+		return &$oldFilterFunc($res);
+	    };
+	@resources=$navmap->retrieveResources(undef,$filterFunc);
+	@resources= sort { &cmp_title($a,$b) } @resources;
+    } else {
+	#unknow sort mechanism or default
+	undef($args->{'sort'});
+    }
+
+
+    while (1) {
+	if ($args->{'sort'}) {
+	    $curRes = shift(@resources);
+	} else {
+	    $curRes = $it->next($closeAllPages);
+	}
+	if (!$curRes) { last; }
+
         # Maintain indentation level.
         if ($curRes == $it->BEGIN_MAP() ||
             $curRes == $it->BEGIN_BRANCH() ) {
@@ -1580,7 +1861,26 @@ END
             # Add part 0 so we display it correctly.
             unshift @parts, '0';
         }
-
+	
+	{
+	    my ($src,$symb,$anchor,$stack);
+	    if ($args->{'sort'}) {
+		my $it = $navmap->getIterator(undef, undef, undef, 1);
+		while ( my $res=$it->next()) {
+		    if (ref($res) &&
+			$res->symb() eq  $curRes->symb()) { last; }
+		}
+		$stack=$it->getStack();
+	    } else {
+		$stack=$it->getStack();
+	    }
+	    ($src,$symb,$anchor)=getLinkForResource($stack);
+	    if (defined($anchor)) { $anchor='#'.$anchor; }
+	    my $srcHasQuestion = $src =~ /\?/;
+	    $args->{"resourceLink"} = $src.
+		($srcHasQuestion?'&':'?') .
+		'symb=' . &Apache::lonnet::escape($symb).$anchor;
+	}
         # Now, we've decided what parts to show. Loop through them and
         # show them.
         foreach my $part (@parts) {
@@ -1591,18 +1891,7 @@ END
 
             # Set up some data about the parts that the cols might want
             my $filter = $it->{FILTER};
-            my $stack = $it->getStack();
-            my $src = getLinkForResource($stack);
-            my $anchor='';
-            if ($src=~s/(\#.*$)//) {
-		$anchor=$1;
-	    }
-            my $srcHasQuestion = $src =~ /\?/;
-            $args->{"resourceLink"} = $src.
-                ($srcHasQuestion?'&':'?') .
-                'symb=' . &Apache::lonnet::escape($curRes->symb()).
-		$anchor;
-            
+
             # Now, display each column.
             foreach my $col (@$cols) {
                 my $colHTML = '';
@@ -1668,8 +1957,46 @@ if (location.href.indexOf('#curloc')==-1
         $r->rflush();
     }
         
-    if ($mustCloseNavMap) { $navmap->untieHashes(); } 
+    return $result;
+}
+
+sub add_linkitem {
+    my ($linkitems,$name,$cmd,$text)=@_;
+    $$linkitems{$name}{'cmd'}=$cmd;
+    $$linkitems{$name}{'text'}=&mt($text);
+}
 
+sub show_linkitems {
+    my ($linkitems)=@_;
+    my @linkorder = ("blank","launchnav","closenav","firsthomework",
+		     "everything","uncompleted","changefolder","clearbubbles");
+    
+    my $result .= (<<ENDBLOCK);
+              <td align="left">
+<script type="text/javascript">
+    function changeNavDisplay () {
+	var navchoice = document.linkitems.toplink[document.linkitems.toplink.selectedIndex].value;
+ENDBLOCK
+    foreach my $link (@linkorder) {
+	$result.= "if (navchoice == '$link') {".
+	    $linkitems->{$link}{'cmd'}."}\n";
+    }
+    $result.='}
+              </script>
+                   <form name="linkitems" method="post">
+                       <nobr><select name="toplink">'."\n";
+    foreach my $link (@linkorder) {
+	if (defined($linkitems->{$link})) {
+	    if ($linkitems->{$link}{'text'} ne '') {
+		$result .= ' <option value="'.$link.'">'.
+		    $linkitems->{$link}{'text'}."</option>\n";
+	    }
+	}
+    }
+    $result .= '</select>&nbsp;<input type="button" name="chgnav"
+                   value="Go" onClick="javascript:changeNavDisplay()" />
+                </nobr></form></td>'."\n";
+	
     return $result;
 }
 
@@ -1730,10 +2057,6 @@ successful, or B<undef> if not.
 
 =back
 
-When you are done with the $navmap object, you I<must> call 
-$navmap->untieHashes(), or you'll prevent the current user from using that 
-course until the web server is restarted. (!)
-
 =head2 Methods
 
 =over 4
@@ -1746,6 +2069,7 @@ See iterator documentation below.
 
 use strict;
 use GDBM_File;
+use Apache::lonnet;
 
 sub new {
     # magic invocation to create a class instance
@@ -1765,7 +2089,7 @@ sub new {
 
     my %navmaphash;
     my %parmhash;
-    my $courseFn = $ENV{"request.course.fn"};
+    my $courseFn = $env{"request.course.fn"};
     if (!(tie(%navmaphash, 'GDBM_File', "${courseFn}.db",
               &GDBM_READER(), 0640))) {
         return undef;
@@ -1791,56 +2115,36 @@ sub generate_course_user_opt {
     my $self = shift;
     if ($self->{COURSE_USER_OPT_GENERATED}) { return; }
 
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
-    my $uhome=$ENV{'user.home'};
-    my $cid=$ENV{'request.course.id'};
-    my $chome=$ENV{'course.'.$cid.'.home'};
-    my ($cdom,$cnum)=split(/\_/,$cid);
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
+    my $cid=$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
     
-    my $userprefix=$uname.'_'.$udom.'_';
-    
-    my %courserdatas; my %useropt; my %courseopt; my %userrdatas;
-    unless ($uhome eq 'no_host') { 
 # ------------------------------------------------- Get coursedata (if present)
-	unless ((time-$courserdatas{$cid.'.last_cache'})<240) {
-	    my $reply=&Apache::lonnet::reply('dump:'.$cdom.':'.$cnum.
-					     ':resourcedata',$chome);
-	    # Check for network failure
-	    if ( $reply =~ /no.such.host/i || $reply =~ /con_lost/i) {
-		$self->{NETWORK_FAILURE} = 1;
-	    } elsif ($reply!~/^error\:/) {
-		$courserdatas{$cid}=$reply;
-		$courserdatas{$cid.'.last_cache'}=time;
-	    }
-	}
-	foreach (split(/\&/,$courserdatas{$cid})) {
-	    my ($name,$value)=split(/\=/,$_);
-	    $courseopt{$userprefix.&Apache::lonnet::unescape($name)}=
-		&Apache::lonnet::unescape($value);
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+    # Check for network failure
+    if (!ref($courseopt)) {
+	if ( $courseopt =~ /no.such.host/i || $courseopt =~ /con_lost/i) {
+	    $self->{NETWORK_FAILURE} = 1;
 	}
+	undef($courseopt);
+    }
+
 # --------------------------------------------------- Get userdata (if present)
-	unless ((time-$userrdatas{$uname.'___'.$udom.'.last_cache'})<240) {
-	    my $reply=&Apache::lonnet::reply('dump:'.$udom.':'.$uname.':resourcedata',$uhome);
-	    if ($reply!~/^error\:/) {
-		$userrdatas{$uname.'___'.$udom}=$reply;
-		$userrdatas{$uname.'___'.$udom.'.last_cache'}=time;
-	    }
-	    # check to see if network failed
-	    elsif ( $reply=~/no.such.host/i || $reply=~/con.*lost/i )
-	    {
-		$self->{NETWORK_FAILURE} = 1;
-	    }
-	}
-	foreach (split(/\&/,$userrdatas{$uname.'___'.$udom})) {
-	    my ($name,$value)=split(/\=/,$_);
-	    $useropt{$userprefix.&Apache::lonnet::unescape($name)}=
-		&Apache::lonnet::unescape($value);
+	
+    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    # Check for network failure
+    if (!ref($useropt)) {
+	if ( $useropt =~ /no.such.host/i || $useropt =~ /con_lost/i) {
+	    $self->{NETWORK_FAILURE} = 1;
 	}
-	$self->{COURSE_OPT} = \%courseopt;
-	$self->{USER_OPT} = \%useropt;
+	undef($useropt);
     }
 
+    $self->{COURSE_OPT} = $courseopt;
+    $self->{USER_OPT} = $useropt;
+
     $self->{COURSE_USER_OPT_GENERATED} = 1;
     
     return;
@@ -1851,18 +2155,19 @@ sub generate_email_discuss_status {
     my $symb = shift;
     if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
 
-    my $cid=$ENV{'request.course.id'};
-    my ($cdom,$cnum)=split(/\_/,$cid);
+    my $cid=$env{'request.course.id'};
+    my $cdom=$env{'course.'.$cid.'.domain'};
+    my $cnum=$env{'course.'.$cid.'.num'};
     
     my %emailstatus = &Apache::lonnet::dump('email_status');
     my $logoutTime = $emailstatus{'logout'};
-    my $courseLeaveTime = $emailstatus{'logout_'.$ENV{'request.course.id'}};
+    my $courseLeaveTime = $emailstatus{'logout_'.$env{'request.course.id'}};
     $self->{LAST_CHECK} = (($courseLeaveTime > $logoutTime) ?
 			   $courseLeaveTime : $logoutTime);
     my %discussiontime = &Apache::lonnet::dump('discussiontimes', 
 					       $cdom, $cnum);
     my %lastread = &Apache::lonnet::dump('nohist_'.$cid.'_discuss',
-                                        $ENV{'user.domain'},$ENV{'user.name'},'lastread');
+                                        $env{'user.domain'},$env{'user.name'},'lastread');
     my %lastreadtime = ();
     foreach (keys %lastread) {
         my $key = $_;
@@ -1872,24 +2177,15 @@ sub generate_email_discuss_status {
 
     my %feedback=();
     my %error=();
-    my $keys = &Apache::lonnet::reply('keys:'.
-				      $ENV{'user.domain'}.':'.
-				      $ENV{'user.name'}.':nohist_email',
-				      $ENV{'user.home'});
+    my @keys = &Apache::lonnet::getkeys('nohist_email',$env{'user.domain'},
+					$env{'user.name'});
     
-    foreach my $msgid (split(/\&/, $keys)) {
-	$msgid=&Apache::lonnet::unescape($msgid);
-	my $plain=&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
-	if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
-	    my ($what,$url)=($1,$2);
-	    my %status=
-		&Apache::lonnet::get('email_status',[$msgid]);
-	    if ($status{$msgid}=~/^error\:/) { 
-		$status{$msgid}=''; 
-	    }
-	    
-	    if (($status{$msgid} eq 'new') || 
-		(!$status{$msgid})) { 
+    foreach my $msgid (@keys) {
+	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
+	    my $plain=
+		&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
+	    if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
+		my ($what,$url)=($1,$2);
 		if ($what eq 'Error') {
 		    $error{$url}.=','.$msgid; 
 		} else {
@@ -1899,8 +2195,10 @@ sub generate_email_discuss_status {
 	}
     }
     
+    #url's of resources that have feedbacks
     $self->{FEEDBACK} = \%feedback;
-    $self->{ERROR_MSG} = \%error; # what is this? JB
+    #or errors
+    $self->{ERROR_MSG} = \%error;
     $self->{DISCUSSION_TIME} = \%discussiontime;
     $self->{EMAIL_STATUS} = \%emailstatus;
     $self->{LAST_READ} = \%lastreadtime;
@@ -1913,9 +2211,9 @@ sub get_user_data {
     if ($self->{RETRIEVED_USER_DATA}) { return; }
 
     # Retrieve performance data on problems
-    my %student_data = Apache::lonnet::currentdump($ENV{'request.course.id'},
-						   $ENV{'user.domain'},
-						   $ENV{'user.name'});
+    my %student_data = Apache::lonnet::currentdump($env{'request.course.id'},
+						   $env{'user.domain'},
+						   $env{'user.name'});
     $self->{STUDENT_DATA} = \%student_data;
 
     $self->{RETRIEVED_USER_DATA} = 1;
@@ -1940,7 +2238,7 @@ sub navhash {
 # Checks to see if coursemap is defined, matching test in old lonnavmaps
 sub courseMapDefined {
     my $self = shift;
-    my $uri = &Apache::lonnet::clutter($ENV{'request.course.uri'});
+    my $uri = &Apache::lonnet::clutter($env{'request.course.uri'});
 
     my $firstres = $self->navhash("map_start_$uri");
     my $lastres = $self->navhash("map_finish_$uri");
@@ -1950,37 +2248,24 @@ sub courseMapDefined {
 sub getIterator {
     my $self = shift;
     my $iterator = Apache::lonnavmaps::iterator->new($self, shift, shift,
-                                                     shift, undef, shift);
+                                                     shift, undef, shift,
+						     shift, shift);
     return $iterator;
 }
 
-# unties the hash when done
-sub untieHashes {
-    my $self = shift;
-    untie %{$self->{NAV_HASH}};
-    untie %{$self->{PARM_HASH}};
-}
-
 # Private method: Does the given resource (as a symb string) have
 # current discussion? Returns 0 if chat/mail data not extracted.
 sub hasDiscussion {
     my $self = shift;
     my $symb = shift;
-    
     $self->generate_email_discuss_status();
 
     if (!defined($self->{DISCUSSION_TIME})) { return 0; }
 
     #return defined($self->{DISCUSSION_TIME}->{$symb});
 
-# backward compatibility (bulletin boards used to be 'wrapped')
-    my $ressymb = $symb;
-    if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
-        unless ($ressymb =~ m|adm/wrapper/adm|) {
-            $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
-        }
-    }
-
+    # backward compatibility (bulletin boards used to be 'wrapped')
+    my $ressymb = $self->wrap_symb($symb);
     if ( defined ( $self->{LAST_READ}->{$ressymb} ) ) {
         return $self->{DISCUSSION_TIME}->{$ressymb} > $self->{LAST_READ}->{$ressymb};
     } else {
@@ -1989,9 +2274,21 @@ sub hasDiscussion {
     }
 }
 
+sub wrap_symb {
+    my $self = shift;
+    my $symb = shift;
+    if ($symb =~ m-___(adm/\w+/\w+/)(\d+)(/bulletinboard)$-) {
+        unless ($symb =~ m|adm/wrapper/adm|) {
+            $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;
+        }
+    }
+    return $symb;
+}
+
 # Private method: Does the given resource (as a symb string) have
 # current feedback? Returns the string in the feedback hash, which
 # will be false if it does not exist.
+
 sub getFeedback { 
     my $self = shift;
     my $symb = shift;
@@ -2057,9 +2354,14 @@ sub getById {
 sub getBySymb {
     my $self = shift;
     my $symb = shift;
+
     my ($mapUrl, $id, $filename) = &Apache::lonnet::decode_symb($symb);
     my $map = $self->getResourceByUrl($mapUrl);
-    return $self->getById($map->map_pc() . '.' . $id);
+    my $returnvalue = undef;
+    if (ref($map)) {
+        $returnvalue = $self->getById($map->map_pc() .'.'.$id);
+    }
+    return $returnvalue;
 }
 
 sub getByMapPc {
@@ -2082,7 +2384,7 @@ resource in the navmap.
 sub firstResource {
     my $self = shift;
     my $firstResource = $self->navhash('map_start_' .
-                     &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                     &Apache::lonnet::clutter($env{'request.course.uri'}));
     return $self->getById($firstResource);
 }
 
@@ -2098,7 +2400,7 @@ in the navmap.
 sub finishResource {
     my $self = shift;
     my $firstResource = $self->navhash('map_finish_' .
-                     &Apache::lonnet::clutter($ENV{'request.course.uri'}));
+                     &Apache::lonnet::clutter($env{'request.course.uri'}));
     return $self->getById($firstResource);
 }
 
@@ -2125,10 +2427,10 @@ sub parmval_real {
     # Make sure the {USER_OPT} and {COURSE_OPT} hashes are populated
     $self->generate_course_user_opt();
 
-    my $cid=$ENV{'request.course.id'};
-    my $csec=$ENV{'request.course.sec'};
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
+    my $cid=$env{'request.course.id'};
+    my $csec=$env{'request.course.sec'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
 
     unless ($symb) { return ''; }
     my $result='';
@@ -2142,7 +2444,7 @@ sub parmval_real {
 
     my $symbparm=$symb.'.'.$what;
     my $mapparm=$mapname.'___(all).'.$what;
-    my $usercourseprefix=$uname.'_'.$udom.'_'.$cid;
+    my $usercourseprefix=$cid;
 
     my $seclevel= $usercourseprefix.'.['.$csec.'].'.$what;
     my $seclevelr=$usercourseprefix.'.['.$csec.'].'.$symbparm;
@@ -2172,8 +2474,6 @@ sub parmval_real {
 
     if (defined($courseopt)) {
         if (defined($$courseopt{$courselevelr})) { return $$courseopt{$courselevelr}; }
-        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
-        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
     }
 
 # ----------------------------------------------------- third, check map parms
@@ -2190,7 +2490,13 @@ sub parmval_real {
     $default=&Apache::lonnet::metadata($fn,'parameter_'.$meta_rwhat);
     if (defined($default)) { return $default}
 
-# --------------------------------------------------- fifth , cascade up parts
+# --------------------------------------------------- fifth, check more course
+    if (defined($courseopt)) {
+        if (defined($$courseopt{$courselevelm})) { return $$courseopt{$courselevelm}; }
+        if (defined($$courseopt{$courselevel})) { return $$courseopt{$courselevel}; }
+    }
+
+# --------------------------------------------------- sixth , cascade up parts
 
     my ($space,@qualifier)=split(/\./,$rwhat);
     my $qualifier=join('.',@qualifier);
@@ -2219,7 +2525,7 @@ you're not sure if $res is already an ob
 resource appears multiple times in the course, only the first instance
 will be returned. As a result, this is probably useful only for maps.
 
-=item * B<retrieveResources>(map, filterFunc, recursive, bailout):
+=item * B<retrieveResources>(map, filterFunc, recursive, bailout, showall):
 
 The map is a specification of a map to retreive the resources from,
 either as a url or as an object. The filterFunc is a reference to a
@@ -2227,13 +2533,14 @@ function that takes a resource object as
 true if the resource should be included, or false if it should not
 be. If recursive is true, the map will be recursively examined,
 otherwise it will not be. If bailout is true, the function will return
-as soon as it finds a resource, if false it will finish. By default,
-the map is the top-level map of the course, filterFunc is a function
-that always returns 1, recursive is true, bailout is false. The
-resources will be returned in a list containing the resource objects
-for the corresponding resources, with B<no structure information> in
-the list; regardless of branching, recursion, etc., it will be a flat
-list.
+as soon as it finds a resource, if false it will finish. If showall is
+true it will not hide maps that contain nothing but one other map. By
+default, the map is the top-level map of the course, filterFunc is a
+function that always returns 1, recursive is true, bailout is false,
+showall is false. The resources will be returned in a list containing
+the resource objects for the corresponding resources, with B<no
+structure information> in the list; regardless of branching,
+recursion, etc., it will be a flat list.
 
 Thus, this is suitable for cases where you don't want the structure,
 just a list of all resources. It is also suitable for finding out how
@@ -2242,17 +2549,18 @@ want to know is if I<any> resources matc
 parameter will allow you to avoid potentially expensive enumeration of
 all matching resources.
 
-=item * B<hasResource>(map, filterFunc, recursive):
+=item * B<hasResource>(map, filterFunc, recursive, showall):
 
 Convience method for
 
- scalar(retrieveResources($map, $filterFunc, $recursive, 1)) > 0
+ scalar(retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0
 
 which will tell whether the map has resources matching the description
 in the filter function.
 
 =cut
 
+
 sub getResourceByUrl {
     my $self = shift;
     my $resUrl = shift;
@@ -2279,7 +2587,7 @@ sub retrieveResources {
     if (!defined($recursive)) { $recursive = 1; }
     my $bailout = shift;
     if (!defined($bailout)) { $bailout = 0; }
-
+    my $showall = shift;
     # Create the necessary iterator.
     if (!ref($map)) { # assume it's a url of a map.
         $map = $self->getResourceByUrl($map);
@@ -2298,7 +2606,7 @@ sub retrieveResources {
 
     # Get an iterator.
     my $it = $self->getIterator($map->map_start(), $map->map_finish(),
-                                undef, $recursive);
+                                undef, $recursive, $showall);
 
     my @resources = ();
 
@@ -2328,13 +2636,16 @@ sub hasResource {
     my $map = shift;
     my $filterFunc = shift;
     my $recursive = shift;
+    my $showall = shift;
     
-    return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1)) > 0;
+    return scalar($self->retrieveResources($map, $filterFunc, $recursive, 1, $showall)) > 0;
 }
 
 1;
 
 package Apache::lonnavmaps::iterator;
+use WeakRef;
+use Apache::lonnet;
 
 =pod
 
@@ -2475,7 +2786,7 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     return undef unless ($self->{NAV_MAP});
 
     # Handle the parameters
@@ -2595,7 +2906,8 @@ sub new {
             Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                               $finishResource, $self->{FILTER},
                                               $self->{ALREADY_SEEN}, 
-                                              $self->{CONDITION}, 0);
+                                              $self->{CONDITION},
+					      $self->{FORCE_TOP});
         
     }
 
@@ -2758,7 +3070,9 @@ sub next {
         $self->{RECURSIVE_ITERATOR} = 
             Apache::lonnavmaps::iterator->new($self->{NAV_MAP}, $firstResource,
                                               $finishResource, $self->{FILTER},
-                                              $self->{ALREADY_SEEN}, $self->{CONDITION});
+                                              $self->{ALREADY_SEEN},
+					      $self->{CONDITION},
+					      $self->{FORCE_TOP});
     }
 
     # If this is a blank resource, don't actually return it.
@@ -2811,6 +3125,8 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::DFSiterator;
+use WeakRef;
+use Apache::lonnet;
 
 # Not documented in the perldoc: This is a simple iterator that just walks
 #  through the nav map and presents the resources in a depth-first search
@@ -2839,7 +3155,7 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     return undef unless ($self->{NAV_MAP});
 
     $self->{FIRST_RESOURCE} = shift || $self->{NAV_MAP}->firstResource();
@@ -2993,7 +3309,7 @@ sub populateStack {
 1;
 
 package Apache::lonnavmaps::resource;
-
+use WeakRef;
 use Apache::lonnet;
 
 =pod
@@ -3075,7 +3391,7 @@ sub new {
     my $class = ref($proto) || $proto;
     my $self = {};
 
-    $self->{NAV_MAP} = shift;
+    weaken($self->{NAV_MAP} = shift);
     $self->{ID} = shift;
 
     # Store this new resource in the parent nav map's cache.
@@ -3163,6 +3479,7 @@ Returns the title of the resource.
 # These info functions can be used directly, as they don't return
 # resource information.
 sub comesfrom { my $self=shift; return $self->navHash("comesfrom_", 1); }
+sub encrypted { my $self=shift; return $self->navHash("encrypted_", 1); }
 sub ext { my $self=shift; return $self->navHash("ext_", 1) eq 'true:'; }
 sub from { my $self=shift; return $self->navHash("from_", 1); }
 # considered private and undocumented
@@ -3174,10 +3491,29 @@ sub randompick {
     return $self->{NAV_MAP}->{PARM_HASH}->{$self->symb .
                                                '.0.parameter_randompick'};
 }
+sub link {
+    my $self=shift;
+    if ($self->encrypted()) { return &Apache::lonenc::encrypted($self->src); }
+    return $self->src;
+}
 sub src { 
     my $self=shift;
     return $self->navHash("src_", 1);
 }
+sub shown_symb {
+    my $self=shift;
+    if ($self->encrypted()) {return &Apache::lonenc::encrypted($self->symb());}
+    return $self->symb();
+}
+sub id {
+    my $self=shift;
+    return $self->{ID};
+}
+sub enclosing_map_src {
+    my $self=shift;
+    (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
+    return $self->navHash('map_id_'.$first);
+}
 sub symb {
     my $self=shift;
     (my $first, my $second) = $self->{ID} =~ /(\d+).(\d+)/;
@@ -3186,16 +3522,30 @@ sub symb {
         . '___' . $second . '___' . $symbSrc;
     return &Apache::lonnet::symbclean($symb);
 }
+sub wrap_symb {
+    my $self = shift;
+    return $self->{NAV_MAP}->wrap_symb($self->symb());
+}
 sub title { 
     my $self=shift; 
     if ($self->{ID} eq '0.0') {
 	# If this is the top-level map, return the title of the course
 	# since this map can not be titled otherwise.
-	return $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+	return $env{'course.'.$env{'request.course.id'}.'.description'};
     }
     return $self->navHash("title_", 1); }
 # considered private and undocumented
 sub to { my $self=shift; return $self->navHash("to_", 1); }
+sub condition {
+    my $self=shift;
+    my $undercond=$self->navHash("undercond_", 1);
+    if (!defined($undercond)) { return 1; };
+    my $condid=$self->navHash("condid_$undercond");
+    if (!defined($condid)) { return 1; };
+    my $condition=&Apache::lonnet::directcondval($condid);
+    return $condition;
+}
+
 sub compTitle {
     my $self = shift;
     my $title = $self->title();
@@ -3477,6 +3827,10 @@ sub duedate {
     }
     return $self->parmval("duedate", $part);
 }
+sub handgrade {
+    (my $self, my $part) = @_;
+    return $self->parmval("handgrade", $part);
+}
 sub maxtries {
     (my $self, my $part) = @_;
     return $self->parmval("maxtries", $part);
@@ -3515,10 +3869,19 @@ sub weight {
     my $self = shift; my $part = shift;
     if (!defined($part)) { $part = '0'; }
     return &Apache::lonnet::EXT('resource.'.$part.'.weight',
-				$self->symb(), $ENV{'user.domain'},
-				$ENV{'user.name'}, 
-				$ENV{'request.course.sec'});
-
+				$self->symb(), $env{'user.domain'},
+				$env{'user.name'}, 
+				$env{'request.course.sec'});
+}
+sub part_display {
+    my $self= shift(); my $partID = shift();
+    if (! defined($partID)) { $partID = '0'; }
+    my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',
+                                     $self->symb);
+    if (! defined($display) || $display eq '') {
+        $display = $partID;
+    }
+    return $display;
 }
 
 # Multiple things need this
@@ -3608,6 +3971,16 @@ Returns the number of parts of the probl
 for single part problems, returns 1. For multipart, it returns the
 number of parts in the problem, not including psuedo-part 0. 
 
+=item * B<countResponses>():
+
+Returns the total number of responses in the problem a student can answer.
+
+=item * B<responseTypes>():
+
+Returns a hash whose keys are the response types.  The values are the number 
+of times each response type is used.  This is for the I<entire> problem, not 
+just a single part.
+
 =item * B<multipart>():
 
 Returns true if the problem is multipart, false otherwise. Use this instead
@@ -3654,6 +4027,26 @@ sub countParts {
     return scalar(@{$parts}); # + $delta;
 }
 
+sub countResponses {
+    my $self = shift;
+    my $count;
+    foreach my $part (@{$self->parts()}) {
+        $count+= scalar($self->responseIds($part));
+    }
+    return $count;
+}
+
+sub responseTypes {
+    my $self = shift;
+    my %responses;
+    foreach my $part ($self->parts()) {
+        foreach my $responsetype ($self->responseType($part)) {
+            $responses{$responsetype}++ if (defined($responsetype));
+        }
+    }
+    return %responses;
+}
+
 sub multipart {
     my $self = shift;
     return $self->countParts() > 1;
@@ -3741,6 +4134,7 @@ sub extractParts {
         }
         
 
+        # These hashes probably do not need names that end with "Hash"....
         my %responseIdHash;
         my %responseTypeHash;
 
@@ -3776,17 +4170,27 @@ sub extractParts {
             }
         }
 	my $resorder = &Apache::lonnet::metadata($self->src(),'responseorder');
+        #
+        # Reorder the arrays in the %responseIdHash and %responseTypeHash
 	if ($resorder) {
 	    my @resorder=split(/,/,$resorder);
 	    foreach my $part (keys(%responseIdHash)) {
-		my %resids = map { ($_,1) } @{ $responseIdHash{$part} };
+		my $i=0;
+		my %resids = map { ($_,$i++) } @{ $responseIdHash{$part} };
 		my @neworder;
 		foreach my $possibleid (@resorder) {
 		    if (exists($resids{$possibleid})) {
-			push(@neworder,$possibleid);
+			push(@neworder,$resids{$possibleid});
 		    }
 		}
-		$responseIdHash{$part}=\@neworder;	
+		my @ids;
+		my @type;
+		foreach my $element (@neworder) {
+		    push (@ids,$responseIdHash{$part}->[$element]);
+		    push (@type,$responseTypeHash{$part}->[$element]);
+		}
+		$responseIdHash{$part}=\@ids;
+		$responseTypeHash{$part}=\@type;
 	    }
 	}
         $self->{RESPONSE_IDS} = \%responseIdHash;
@@ -3976,14 +4380,17 @@ sub ATTEMPTED             { return 16; }
 
 sub getCompletionStatus {
     my $self = shift;
+    my $part = shift;
     return $self->NETWORK_FAILURE if ($self->{NAV_MAP}->{NETWORK_FAILURE});
 
-    my $status = $self->queryRestoreHash('solved', shift);
+    my $status = $self->queryRestoreHash('solved', $part);
 
     # Left as separate if statements in case we ever do more with this
     if ($status eq 'correct_by_student') {return $self->CORRECT;}
     if ($status eq 'correct_by_scantron') {return $self->CORRECT;}
-    if ($status eq 'correct_by_override') {return $self->CORRECT_BY_OVERRIDE; }
+    if ($status eq 'correct_by_override') {
+	return $self->CORRECT_BY_OVERRIDE;
+    }
     if ($status eq 'incorrect_attempted') {return $self->INCORRECT; }
     if ($status eq 'incorrect_by_override') {return $self->INCORRECT_BY_OVERRIDE; }
     if ($status eq 'excused') {return $self->EXCUSED; }
@@ -4087,6 +4494,7 @@ An answer has been submitted, but the st
 
 sub TRIES_LEFT       { return 20; }
 sub ANSWER_SUBMITTED { return 21; }
+sub PARTIALLY_CORRECT{ return 22; }
 
 sub status {
     my $self = shift;
@@ -4105,14 +4513,22 @@ sub status {
     my $suppressFeedback = $self->problemstatus($part) eq 'no';
     # If there's an answer date and we're past it, don't
     # suppress the feedback; student should know
-    if ($self->answerdate($part) && $self->answerdate($part) < time()) {
+    if ($self->duedate($part) && $self->duedate($part) < time() &&
+	$self->answerdate($part) && $self->answerdate($part) < time()) {
 	$suppressFeedback = 0;
     }
 
     # There are a few whole rows we can dispose of:
     if ($completionStatus == CORRECT ||
         $completionStatus == CORRECT_BY_OVERRIDE ) {
-        return $suppressFeedback? ANSWER_SUBMITTED : CORRECT; 
+	if ( $suppressFeedback ) { return ANSWER_SUBMITTED }
+	my $awarded=$self->awarded($part);
+	if ($awarded < 1 && $awarded > 0) {
+            return PARTIALLY_CORRECT;
+	} elsif ($awarded<1) {
+	    return INCORRECT;
+	}
+	return CORRECT; 
     }
 
     if ($completionStatus == ATTEMPTED) {
@@ -4199,6 +4615,7 @@ my %compositeToSimple =
       NETWORK_FAILURE()       => ERROR,
       NOTHING_SET()           => CLOSED,
       CORRECT()               => CORRECT,
+      PARTIALLY_CORRECT()     => PARTIALLY_CORRECT,
       EXCUSED()               => CORRECT,
       PAST_DUE_NO_ANSWER()    => INCORRECT,
       PAST_DUE_ANSWER_LATER() => INCORRECT,
@@ -4319,6 +4736,7 @@ sub getNext {
     my $to = $self->to();
     foreach my $branch ( split(/,/, $to) ) {
         my $choice = $self->{NAV_MAP}->getById($branch);
+        if (!$choice->condition()) { next; }
         my $next = $choice->goesto();
         $next = $self->{NAV_MAP}->getById($next);
 
@@ -4347,7 +4765,8 @@ sub browsePriv {
         return $self->{BROWSE_PRIV};
     }
 
-    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre', $self->src());
+    $self->{BROWSE_PRIV} = &Apache::lonnet::allowed('bre',$self->src(),
+						    $self->symb());
 }
 
 =pod