--- loncom/interface/lonmenu.pm	2005/02/21 00:32:04	1.149
+++ loncom/interface/lonmenu.pm	2005/07/05 21:30:14	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.149 2005/02/21 00:32:04 www Exp $
+# $Id: lonmenu.pm,v 1.156 2005/07/05 21:30:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,7 +39,7 @@
 package Apache::lonmenu;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
@@ -60,8 +60,9 @@ sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
 				       'nav' => 'Navigate Contents',
 				       'main' => 'Main Menu',
-                                       'roles' => ($ENV{'user.adv'}?
+                                       'roles' => ($env{'user.adv'}?
                                                     'Roles':'Courses'),
+                                       'docs' => 'Course Documents',
                                        'exit' => 'Exit',
 				       'launch' => 'Launch Remote Control');
 }
@@ -75,49 +76,54 @@ sub menubuttons {
     my $titletable=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['inhibitmenu']);
-    if (($ENV{'form.inhibitmenu'} eq 'yes') ||
+    if (($env{'form.inhibitmenu'} eq 'yes') ||
         ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
 
     my $navmaps='';
     my $reloadlink='';
-    my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'}));
-    my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($ENV{'request.symb'}));
-    if ($ENV{'request.state'} eq 'construct') {
-        if (($ENV{'request.noversionuri'} eq '') || (!defined($ENV{'request.noversionuri'}))) {
-            my $returnurl = $ENV{'request.filename'};
+    my $docs='';
+    my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
+    my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    if ($env{'request.state'} eq 'construct') {
+        if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
+            my $returnurl = $env{'request.filename'};
             $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
             $escurl = &Apache::lonnet::escape($returnurl);
         }
     }
-    if ($ENV{'browser.interface'} eq 'textual') {
+    if ($env{'browser.interface'} eq 'textual') {
 # Textual display only
 	my %lt=&initlittle();
         $pgbg='#FFFFFF';
         $tabbg='#FFFFFF';
 	$font='#000000';
-        if ($ENV{'request.course.id'}) {
+        if ($env{'request.course.id'}) {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV
-            if (($ENV{'request.noversionuri'}=~/^\/adm\//) &&
-         ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-         ($ENV{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+            if (($env{'request.noversionuri'}=~/^\/adm\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+         ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
 ENDRELOAD
             }
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+               $docs=(<<ENDDOCS);
+<a href="/adm/coursedocs" target="_top"><font color="$font">$lt{'docs'}</font></a>
+ENDDOCS
+            }
 	}
         my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 $utility
--->
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
-$reloadlink $navmaps
+$reloadlink $navmaps $docs
 <a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
 <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
 <br />
@@ -128,19 +134,19 @@ $form
 ENDMAINMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
 	return $output."<hr />";
-    } elsif ($ENV{'environment.remote'} eq 'off') {
+    } elsif ($env{'environment.remote'} eq 'off') {
 # Remote Control is switched off
 # figure out colors
 	my %lt=&initlittle();
 	my $function='student';
-        if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+        if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
 	    $function='coordinator';
         }
-	if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+	if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
             $function='admin';
         }
-        if (($ENV{'request.role'}=~/^(au|ca)/) ||
-            ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
+        if (($env{'request.role'}=~/^(au|ca)/) ||
+            ($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
             $function='author';
         }
         my $domain=&Apache::loncommon::determinedomain();
@@ -151,24 +157,48 @@ ENDMAINMENU
         my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
         my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
+	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+	    return (<<ENDINLINEMENU);
+<font face="Arial,Helvetica,sans-serif">
+   <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr>
+      <td bgcolor="$tabbg">
+        <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+     </td>
+     <td align="right" bgcolor="$tabbg">
+       <img align="right" src="$logo" />
+       <b>LON-CAPA</b>&nbsp;
+     </td>
+   </tr>
+  </table>
+</font>
+ENDINLINEMENU
+        }
 # Do we have a NAV link?
-        if ($ENV{'request.course.id'}) {
+        if ($env{'request.course.id'}) {
 	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
 		$escsymb;
-	    if ($ENV{'environment.remotenavmap'} eq 'on') {
+	    if ($env{'environment.remotenavmap'} eq 'on') {
 		$link="javascript:gonav('".$link."')";
 	    }
 	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
 <a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
+	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+		$docs=(<<ENDDOCS);
+<td bgcolor="$tabbg">
+<a href="/adm/coursedocs"><font color="$font">$lt{'docs'}</font></a></td>
+ENDDOCS
+            }
 	    if (
-		($ENV{'request.noversionuri'}=~m[^/(res|public)/] &&
-		 $ENV{'request.symb'} eq '')
+		($env{'request.noversionuri'}=~m[^/(res|public)/] &&
+		 $env{'request.symb'} eq '')
 		||
-		(($ENV{'request.noversionuri'}=~/^\/adm\//) &&
-		 ($ENV{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-		 ($ENV{'request.noversionuri'}!~
+		(($env{'request.noversionuri'}=~/^\/adm\//) &&
+		 ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+		 ($env{'request.noversionuri'}!~
 		        m[^/adm/.*/(smppg|bulletinboard|aboutme)($|\?)])
 		  )
 		 ) {
@@ -188,9 +218,10 @@ ENDRELOAD
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-<!-- // BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
+// <![CDATA[
 $utility
--->
+// ]]>
 </script>
 <font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
@@ -199,6 +230,7 @@ $utility
 </td>
 $reloadlink
 $navmaps
+$docs
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
 <font color="$font">$lt{'launch'}</font></a></td>
@@ -231,9 +263,9 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     my $force_title='';
-    if ($ENV{'request.state'} eq 'construct') {
+    if ($env{'request.state'} eq 'construct') {
 	$force_title=&Apache::lonxml::display_title();
     }
     if ($target eq 'edit') {
@@ -242,11 +274,11 @@ sub registerurl {
             &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";
     }
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off') ||
-        ((($ENV{'request.publicaccess'}) || 
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off') ||
+        ((($env{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map(
-	   &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) &&
+	   &Apache::lonnet::unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
@@ -268,15 +300,15 @@ sub innerregister {
     my $titletable = shift;
     my $result = '';
     my ($uname,$thisdisfn);
-    my $const_space = ($ENV{'request.state'} eq 'construct');
+    my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
-    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
-    my $textinter=($ENV{'browser.interface'} eq 'textual');
-    my $noremote=($ENV{'environment.remote'} eq 'off');
+    my $textinter=($env{'browser.interface'} eq 'textual');
+    my $noremote=($env{'environment.remote'} eq 'off');
     
     my $textual=($textinter || $noremote);
 
@@ -289,11 +321,12 @@ sub innerregister {
     if ($noremote) {
 	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
-    if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
-	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
-        $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
+	my ($mapurl,$rid,$resurl)=
+	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+        $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
         my $maptitle=&Apache::lonnet::gettitle($mapurl);
-	my $restitle=&Apache::lonnet::gettitle($resurl);
+	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
         if ($maptitle && $maptitle ne 'default.sequence') {
 	    $newmail.=', '.$maptitle;
         }
@@ -307,40 +340,40 @@ sub innerregister {
  '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
-    if ($ENV{'request.state'} eq 'construct') {
+    if ($env{'request.state'} eq 'construct') {
         $newmail = $titletable;
-    }
-    if ($noremote) {
-	$newmail.='</td></tr></table></font>';
+    } else {
+	if ($noremote) {
+	    $newmail.='</td></tr></table></font>';
+	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
     my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
     my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($ENV{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
+    if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
-	my $crs='/'.$ENV{'request.course.id'};
-	if ($ENV{'request.course.sec'}) {
-	    $crs.='_'.$ENV{'request.course.sec'};
+	my $crs='/'.$env{'request.course.id'};
+	if ($env{'request.course.sec'}) {
+	    $crs.='_'.$env{'request.course.sec'};
 	}
 	$crs=~s/\_/\//g;
 
         my $hwkadd='';
-        if ($ENV{'request.symb'} ne '' &&
-	    $ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    if (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-[_1]','missions[_1]',
-                       "gocmd('/adm/grades','submission')",
-		       'View user submissions for this assessment resource');
-            }
+        if ($env{'request.symb'} ne '' &&
+	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
 		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
+            } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
+		$hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]',
+                       "gocmd('/adm/grades','submission')",
+		       'View user submissions for this assessment resource');
             }
 	}
-	if ($ENV{'request.symb'} ne '' &&
+	if ($env{'request.symb'} ne '' &&
 	    &Apache::lonnet::allowed('opa',$crs)) {
 	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
 			     "gocmd('/adm/parmset','set')",
@@ -352,17 +385,17 @@ sub innerregister {
         ### resource
         ###
         my $editbutton = '';
-        if ($ENV{'user.author'}) {
-            if ($ENV{'request.role'}=~/^(ca|au)/) {
+        if ($env{'user.author'}) {
+            if ($env{'request.role'}=~/^(ca|au)/) {
                 # Set defaults for authors
                 my ($top,$bottom) = ('con-','struct');
-                my $action = "go('/priv/".$ENV{'user.name'}."');";
-                my $cadom  = $ENV{'request.role.domain'};
-                my $caname = $ENV{'user.name'};
+                my $action = "go('/priv/".$env{'user.name'}."');";
+                my $cadom  = $env{'request.role.domain'};
+                my $caname = $env{'user.name'};
                 my $desc = "Enter my resource construction space";
                 # Set defaults for co-authors
-                if ($ENV{'request.role'} =~ /^ca/) { 
-                    ($cadom,$caname)=($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                if ($env{'request.role'} =~ /^ca/) { 
+                    ($cadom,$caname)=($env{'request.role'}=~/(\w+)\/(\w+)$/);
                     ($top,$bottom) = ('co con-','struct');
                     $action = "go('/priv/".$caname."');";
                     $desc = "Enter construction space as co-author";
@@ -382,8 +415,8 @@ sub innerregister {
             my $cfile='';
             my $cfuname='';
             my $cfudom='';
-            if ($ENV{'request.filename'}) {
-                my $file=&Apache::lonnet::declutter($ENV{'request.filename'});
+            if ($env{'request.filename'}) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 $file=~s/^(\w+)\/(\w+)/\/priv\/$2/;
                 # Check that the user has permission to edit this resource
                 ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
@@ -403,7 +436,10 @@ sub innerregister {
                     ('','',6,1,'cstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
             } elsif ($editbutton eq '') {
-                $editbutton=&clear(6,1);
+                $editbutton=&switch('','',6,1,'port.gif',
+				    'port-[_1]','folio[_1]',
+				    "go('/adm/portfolio');",
+				    "Enter my portfolio space");
             }
         }
         ###
@@ -412,7 +448,7 @@ sub innerregister {
         my $menuitems;
         if ($const_space) {
 	    my ($uname,$thisdisfn) =
-		($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
+		($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
             my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
             if ($currdir =~ m-/$-) {
                 $is_const_dir = 1;
@@ -426,8 +462,8 @@ s&7&1&del.gif&delete[_1]&resource[_2]&go
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
 ENDMENUITEMS
             }
-        } elsif (defined($ENV{'request.course.id'}) && 
-		 $ENV{'request.symb'} ne '') {
+        } elsif (defined($env{'request.course.id'}) && 
+		 $env{'request.symb'} ne '') {
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
@@ -439,7 +475,7 @@ s&8&3&prt.gif&prepare[_1]&printout[_1]&g
 s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&2
 s&9&3&anot.gif&anno-[_1]&tations[_1]&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
-            unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 	        $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
@@ -464,7 +500,7 @@ ENDREALRES
 	    if ($addremote) {
 # Registered, textual output
 
-		if ($ENV{'browser.interface'} eq 'textual') {
+		if ($env{'browser.interface'} eq 'textual') {
 		    $inlinebuttons=
                         join('',map { (defined($_)?$_:'') } @inlineremote);
 		} else {
@@ -493,17 +529,17 @@ $tableend
 ENDREGTEXT
 # Registered, graphical output
         } else {
-	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
+	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
 	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
-	    my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
+	    my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
 	    my $navstatus=&get_nav_status();
 	    my $clearcstr;
 
-	    if ($ENV{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
+	    if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
-// <!-- BEGIN LON-CAPA Internal
+// BEGIN LON-CAPA Internal
 var swmenu=null;
 
     function LONCAPAreg() {
@@ -529,7 +565,6 @@ var swmenu=null;
              swmenu.switchbutton
              (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
 	  }
-          swmenu.clearbut(7,1);
           swmenu.clearbut(7,2);
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
@@ -538,7 +573,7 @@ var swmenu=null;
 			  2000);
       }
 
-// END LON-CAPA Internal -->
+// END LON-CAPA Internal 
 </script>
 ENDREGTHIS
         }
@@ -587,14 +622,14 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
-    if ($ENV{'request.state'} eq 'construct' ||
-	$ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
-    if ($ENV{'request.state'} eq 'construct' ||
-	$ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($env{'request.state'} eq 'construct' ||
+	$env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -602,8 +637,8 @@ sub unloadevents() {
 
 sub startupremote {
     my ($lowerurl)=@_;
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) {
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) {
      return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
 #
@@ -678,8 +713,8 @@ ENDSETFLAGS
 }
 
 sub maincall() {
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
     main();
@@ -690,8 +725,8 @@ ENDMAINCALL
 sub load_remote_msg {
     my ($lowerurl)=@_;
 
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
 
     my $esclowerurl=&Apache::lonnet::escape($lowerurl);
     my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
@@ -708,8 +743,8 @@ ENDREMOTEFORM
 # ================================================================= Reopen menu
 
 sub reopenmenu {
-   if (($ENV{'browser.interface'} eq 'textual') ||
-       ($ENV{'environment.remote'} eq 'off')) { return ''; }
+   if (($env{'browser.interface'} eq 'textual') ||
+       ($env{'environment.remote'} eq 'off')) { return ''; }
    my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
@@ -719,8 +754,8 @@ sub reopenmenu {
 
 sub open {
     my $returnval='';
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { 
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { 
 	return '<script type="text/javascript">self.name="loncapaclient";</script>';
     }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
@@ -747,8 +782,8 @@ ENDOPEN
 
 sub clear {
     my ($row,$col)=@_;
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
    } else { 
        $inlineremote[10*$row+$col]='';
@@ -768,12 +803,12 @@ sub switch {
     $bot=&mt($bot);
     $desc=&mt($desc);
     $img=&mt($img);
-    unless (($ENV{'browser.interface'} eq 'textual')  ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual')  ||
+            ($env{'environment.remote'} eq 'off')) {
 # Remote
        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
-   } elsif ($ENV{'browser.interface'} eq 'textual') {
+   } elsif ($env{'browser.interface'} eq 'textual') {
 # Accessibility
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
@@ -797,7 +832,7 @@ sub switch {
 	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
 	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
 	   ($nobreak==3?'right':'left').'" />';
-       if (($ENV{'browser.interface'} eq 'textual') || ($ENV{'browser.interface'} eq 'faketextual')) {
+       if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) {
 # Accessibility
 	   if ($nobreak==3) {
 	       $inlineremote[10*$row+$col]="\n".
@@ -843,8 +878,8 @@ sub secondlevel {
 
 sub openmenu {
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     return "window.open(".$nothing.",'".$menuname."');";
 }
@@ -859,30 +894,30 @@ sub inlinemenu {
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        $output.=
  "window.status='Opening Remote Control';var swmenu=".&openmenu().
 "\nwindow.status='Configuring Remote Control ';";
     } else {
        unless ($textualoverride) { return ''; }
     }
-    my $uname=$ENV{'user.name'};
-    my $udom=$ENV{'user.domain'};
-    my $adv=$ENV{'user.adv'};
-    my $author=$ENV{'user.author'};
+    my $uname=$env{'user.name'};
+    my $udom=$env{'user.domain'};
+    my $adv=$env{'user.adv'};
+    my $author=$env{'user.author'};
     my $crs='';
-    if ($ENV{'request.course.id'}) {
-       $crs='/'.$ENV{'request.course.id'};
-       if ($ENV{'request.course.sec'}) {
-	   $crs.='_'.$ENV{'request.course.sec'};
+    if ($env{'request.course.id'}) {
+       $crs='/'.$env{'request.course.id'};
+       if ($env{'request.course.sec'}) {
+	   $crs.='_'.$env{'request.course.sec'};
        }
        $crs=~s/\_/\//g;
     }
-    my $pub=($ENV{'request.state'} eq 'published');
-    my $con=($ENV{'request.state'} eq 'construct');
-    my $rol=$ENV{'request.role'};
-    my $requested_domain = $ENV{'request.role.domain'};
+    my $pub=($env{'request.state'} eq 'published');
+    my $con=($env{'request.state'} eq 'construct');
+    my $rol=$env{'request.role'};
+    my $requested_domain = $env{'request.role.domain'};
     foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
@@ -909,32 +944,32 @@ sub rawconfig {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }
         } elsif ($pro eq 'course') {
-            if ($ENV{'request.course.fn'}) {
+            if ($env{'request.course.fn'}) {
                $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
 	    }
         } elsif ($pro =~ /^courseenv_(.*)$/) {
             my $key = $1;
-            if ($ENV{'course.'.$ENV{'request.course.id'}.'.'.$key}) {
+            if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) {
                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
             }
         } elsif ($pro =~ /^course_(.*)$/) {
             # Check for permissions inside of a course
-            if (($ENV{'request.course.id'}) &&
-                (&Apache::lonnet::allowed($1,$ENV{'request.course.id'}.
-            ($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))
+            if (($env{'request.course.id'}) &&
+                (&Apache::lonnet::allowed($1,$env{'request.course.id'}.
+            ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))
                  )) {
                 $output.=switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc);
 	    }
         } elsif ($pro eq 'author') {
             if ($author) {
-                if ((($prt eq 'rca') && ($ENV{'request.role'}=~/^ca/)) ||
-                    (($prt eq 'rau') && ($ENV{'request.role'}=~/^au/))) {
+                if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) ||
+                    (($prt eq 'rau') && ($env{'request.role'}=~/^au/))) {
                     # Check that we are on the correct machine
                     my $cadom=$requested_domain;
-                    my $caname=$ENV{'user.name'};
+                    my $caname=$env{'user.name'};
                     if ($prt eq 'rca') {
 		       ($cadom,$caname)=
-                               ($ENV{'request.role'}=~/(\w+)\/(\w+)$/);
+                               ($env{'request.role'}=~/(\w+)\/(\w+)$/);
                     }                       
                     $act =~ s/\$caname/$caname/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
@@ -949,8 +984,8 @@ sub rawconfig {
             }
         }
     }
-    unless (($ENV{'browser.interface'} eq 'textual') ||
-            ($ENV{'environment.remote'} eq 'off')) {
+    unless (($env{'browser.interface'} eq 'textual') ||
+            ($env{'environment.remote'} eq 'off')) {
        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
        if (&Apache::lonmsg::newmail()) { 
 	   $output.='swmenu.setstatus("you have","messages");';
@@ -963,8 +998,8 @@ sub rawconfig {
 # ======================================================================= Close
 
 sub close {
-    if (($ENV{'browser.interface'} eq 'textual') ||
-        ($ENV{'environment.remote'} eq 'off')) { return ''; }
+    if (($env{'browser.interface'} eq 'textual') ||
+        ($env{'environment.remote'} eq 'off')) { return ''; }
     my $menuname='LCmenu'.$Apache::lonnet::perlvar{'lonHostID'};
     return(<<ENDCLOSE);
 <script type="text/javascript">
@@ -988,7 +1023,7 @@ sub footer {
 }
 
 sub nav_control_js {
-    my $nav=($ENV{'environment.remotenavmap'} eq 'on');
+    my $nav=($env{'environment.remotenavmap'} eq 'on');
     return (<<NAVCONTROL);
     var w_loncapanav_flag="$nav";
 
@@ -1006,12 +1041,12 @@ NAVCONTROL
 
 sub utilityfunctions {
     my $caller = shift;
-    unless (($ENV{'browser.interface'} eq 'textual')  ||
-        ($ENV{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
-    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$ENV{'request.noversionuri'}))[0]));
+    unless (($env{'browser.interface'} eq 'textual')  ||
+        ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
+    my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
     $currenturl=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($currenturl));
     
-    my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
+    my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
     my $nav_control=&nav_control_js();
 return (<<ENDUTILITY)
 
@@ -1138,7 +1173,7 @@ ENDCONSTSPACEFORM
 
 sub get_nav_status {
     my $navstatus="swmenu.w_loncapanav_flag=";
-    if ($ENV{'environment.remotenavmap'} eq 'on') {
+    if ($env{'environment.remotenavmap'} eq 'on') {
 	$navstatus.="1";
     } else {
 	$navstatus.="-1";
@@ -1156,20 +1191,20 @@ sub handler {
     return OK if $r->header_only;
 
     my $form;
-    if ($ENV{'environment.remote'} ne 'off' &&
-	$ENV{'browser.interface'} ne 'textual') {
+    if ($env{'environment.remote'} ne 'off' &&
+	$env{'browser.interface'} ne 'textual') {
 	$form=&serverform();
     }
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
     my $function='student';
-    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
 	$function='coordinator';
     }
-    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
 	$function='admin';
     }
-    if (($ENV{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
+    if (($env{'request.role'}=~/^(au|ca)/) ||
+	($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
 	$function='author';
     }
     my $domain=&Apache::loncommon::determinedomain();
@@ -1177,7 +1212,7 @@ sub handler {
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);
     my $script_tag;
-    if ($ENV{'environment.remote'} ne 'off') {
+    if ($env{'environment.remote'} ne 'off') {
         my $utility=&utilityfunctions('/adm/menu');
         $script_tag=(<<ENDSCRIPT);
 <script type="text/javascript">
@@ -1186,9 +1221,9 @@ $utility
 ENDSCRIPT
     }
 # ---- Print the screen, pretend to be in text mode to generate text-based menu
-    unless ($ENV{'browser.interface'} eq 'textual') {
-	$ENV{'browser.interface'}='faketextual';
-	$ENV{'environment.remote'}='off';
+    unless ($env{'browser.interface'} eq 'textual') {
+	$env{'browser.interface'}='faketextual';
+	$env{'environment.remote'}='off';
     }
     my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEADER);