--- loncom/interface/lonnavmaps.pm	2005/03/23 22:16:57	1.319
+++ loncom/interface/lonnavmaps.pm	2005/04/07 06:56:23	1.320
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.319 2005/03/23 22:16:57 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.320 2005/04/07 06:56:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,7 +110,7 @@ sub launch_win {
 }
 
 sub close {
-    if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
+    if ($env{'environment.remotenavmap'} ne 'on') { return ''; }
     return(<<ENDCLOSE);
 <script type="text/javascript">
 window.status='Accessing Nav Control';
@@ -124,8 +124,8 @@ ENDCLOSE
 }
 
 sub update {
-    if ($ENV{'environment.remotenavmap'} ne 'on') { return ''; }
-    if (!$ENV{'request.course.id'}) { return ''; }
+    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>
@@ -147,7 +147,7 @@ sub real_handler {
     #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');
@@ -157,7 +157,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');
@@ -213,7 +213,7 @@ ENDSUBM
 
     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;
     }
     my $html=&Apache::lonxml::xmlbegin();
@@ -226,7 +226,7 @@ ENDSUBM
     my $addentries='';
     my $more_unload;
     my $body_only='';
-    if ($ENV{'environment.remotenavmap'} eq 'on') {
+    if ($env{'environment.remotenavmap'} eq 'on') {
 	$r->print('<script type="text/javascript">
                       function collapse() {
                          this.document.location="/adm/navmaps?collapseExternal";
@@ -236,7 +236,7 @@ ENDSUBM
 #	$more_unload="collapse()"
 	$body_only=1;
     }
-    if ($ENV{'form.register'}) {
+    if ($env{'form.register'}) {
 	$addentries=' onLoad="'.&Apache::lonmenu::loadevents().
 	    '" onUnload="'.&Apache::lonmenu::unloadevents().';'.
 	    $more_unload.'"';
@@ -249,7 +249,7 @@ ENDSUBM
     $r->print('</head>'.
               &Apache::loncommon::bodytag('Navigate Course Contents','',
 					  $addentries,$body_only,'',
-					  $ENV{'form.register'}));
+					  $env{'form.register'}));
     $r->print('<script>window.focus();</script>');
      
     $r->rflush();
@@ -280,9 +280,9 @@ ENDSUBM
         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";
         }
     }
 
@@ -297,10 +297,10 @@ ENDSUBM
           </script>');
     }
 
-    if ($ENV{'environment.remotenavmap'} ne 'on') {
+    if ($env{'environment.remotenavmap'} ne 'on') {
 	$r->print(&launch_win('link','yes',\%toplinkitems));
     } 
-    if ($ENV{'environment.remotenavmap'} eq 'on') {
+    if ($env{'environment.remotenavmap'} eq 'on') {
 	&add_linkitem(\%toplinkitems,'closenav','collapse()',
 		      "Close navigation window");
     } 
@@ -327,10 +327,10 @@ ENDSUBM
                     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();
                 }
             }
         }
@@ -351,30 +351,30 @@ ENDSUBM
 
     # Display only due homework.
     my $showOnlyHomework = 0;
-    if ($ENV{'form.showOnlyHomework'} eq "1") {
+    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'}.'"',
+		     '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 {
 	&add_linkitem(\%toplinkitems,'uncompleted',
-		      'location.href="navmaps?sort='.$ENV{'form.sort'}.
+		      'location.href="navmaps?sort='.$env{'form.sort'}.
 		          '&showOnlyHomework=1"',
 		      "Show Only Uncompleted Homework");
     }
 
-    my %selected=($ENV{'form.sort'} => 'selected=on');
+    my %selected=($env{'form.sort'} => 'selected=on');
     my $sort_html=("<form>
                  <nobr>
-                    <input type=\"hidden\" name=\"showOnlyHomework\" value=\"".$ENV{'form.showOnlyHomework'}."\" />
+                    <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>
@@ -386,7 +386,7 @@ ENDSUBM
                </form>");
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
-		       'sort' => $ENV{'form.sort'},
+		       'sort' => $env{'form.sort'},
                        'url' => '/adm/navmaps',
                        'navmap' => $navmap,
                        'suppressNavmap' => 1,
@@ -565,10 +565,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'};
 }
 
 
@@ -871,13 +871,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
@@ -887,11 +887,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
@@ -917,12 +917,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
@@ -950,7 +950,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
 
@@ -1143,7 +1143,7 @@ sub render_resource {
     }
 
     my $target;
-    if ($ENV{'environment.remotenavmap'} eq 'on') {
+    if ($env{'environment.remotenavmap'} eq 'on') {
 	$target=' target="loncapaclient" ';
     }
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
@@ -1390,7 +1390,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";
         }
@@ -1410,11 +1410,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();
@@ -1424,18 +1424,18 @@ 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 = &Apache::lonnet::symbclean($ENV{'form.postsymb'});
-        } elsif ($ENV{'form.postdata'}) {
+        if ($env{'form.postsymb'}) {
+            $here = $jump = &Apache::lonnet::symbclean($env{'form.postsymb'});
+        } elsif ($env{'form.postdata'}) {
             # 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);
         } else {
 	    my $last;
-	    if (tie(my %hash,'GDBM_File',$ENV{'request.course.fn'}.'_symb.db',
+	    if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
                     &GDBM_READER(),0640)) {
 		$last=$hash{'last_known'};
 		untie(%hash);
@@ -1468,16 +1468,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)) {
@@ -1612,14 +1612,14 @@ END
     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') {
+	if ($env{'environment.remotenavmap'} ne 'on') {
 	    $result .= '<td>&nbsp;</td>'; 
         } else {
 	    $result .= '</tr><tr>'; 
         }
 	$result.=&show_linkitems($args->{'linkitems'});
         if ($args->{'sort_html'}) {
-	    if ($ENV{'environment.remotenavmap'} ne 'on') {
+	    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 {
@@ -2070,6 +2070,7 @@ See iterator documentation below.
 
 use strict;
 use GDBM_File;
+use Apache::lonnet;
 
 sub new {
     # magic invocation to create a class instance
@@ -2089,7 +2090,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;
@@ -2115,11 +2116,11 @@ 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 $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 $userprefix=$uname.'_'.$udom.'_';
@@ -2175,18 +2176,18 @@ sub generate_email_discuss_status {
     my $symb = shift;
     if ($self->{EMAIL_DISCUSS_GENERATED}) { return; }
 
-    my $cid=$ENV{'request.course.id'};
+    my $cid=$env{'request.course.id'};
     my ($cdom,$cnum)=split(/\_/,$cid);
     
     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 = $_;
@@ -2197,9 +2198,9 @@ 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'});
+				      $env{'user.domain'}.':'.
+				      $env{'user.name'}.':nohist_email',
+				      $env{'user.home'});
     
     foreach my $msgid (split(/\&/, $keys)) {
 	$msgid=&Apache::lonnet::unescape($msgid);
@@ -2233,9 +2234,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;
@@ -2260,7 +2261,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");
@@ -2401,7 +2402,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);
 }
 
@@ -2417,7 +2418,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);
 }
 
@@ -2444,10 +2445,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='';
@@ -2662,6 +2663,8 @@ sub hasResource {
 
 package Apache::lonnavmaps::iterator;
 use WeakRef;
+use Apache::lonnet;
+
 =pod
 
 =back
@@ -3141,6 +3144,8 @@ sub populateStack {
 
 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
 #  fashion, ignorant of conditionals, randomized resources, etc. It presents
@@ -3531,7 +3536,7 @@ sub title {
     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
@@ -3865,9 +3870,9 @@ 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();