--- loncom/interface/lonmenu.pm	2004/11/10 16:22:25	1.123
+++ loncom/interface/lonmenu.pm	2004/11/11 22:47:55	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.123 2004/11/10 16:22:25 www Exp $
+# $Id: lonmenu.pm,v 1.127 2004/11/11 22:47:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,6 +43,7 @@ use Apache::lonnet();
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
+use Apache::lonenc();
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -74,8 +75,8 @@ sub menubuttons {
 
     my $navmaps='';
     my $reloadlink='';
-    my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
-    my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
+    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{'browser.interface'} eq 'textual') {
 # Textual display only
 	my %lt=&initlittle();
@@ -473,7 +474,8 @@ ENDREGTEXT
 # Registered, graphical output
         } else {
 	    my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
-	    $requri=&Apache::lonnet::unescape($requri);
+	    $requri=&Apache::lonenc::check_encrypt(&Apache::lonnet::unescape($requri));
+	    my $cursymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
 	    my $navstatus=&get_nav_status();
 	    $result = (<<ENDREGTHIS);
      
@@ -489,8 +491,8 @@ var swmenu=null;
           $buttons
 	  swmenu.currentURL="$requri";
           swmenu.reloadURL=swmenu.currentURL+window.location.search;
-          swmenu.currentSymb="$ENV{'request.symb'}";
-          swmenu.reloadSymb="$ENV{'request.symb'}";
+          swmenu.currentSymb="$cursymb";
+          swmenu.reloadSymb="$cursymb";
           swmenu.currentStale=0;
 	  $navstatus
           $hwkadd
@@ -885,6 +887,11 @@ sub rawconfig {
             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}) {
+                $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'}) &&
@@ -975,8 +982,9 @@ NAVCONTROL
 sub utilityfunctions {
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
-    my $currenturl=$ENV{'request.noversionuri'};
-    my $currentsymb=$ENV{'request.symb'};
+    my $currenturl=&Apache::lonenc::check_encrypt($ENV{'request.noversionuri'});
+    
+    my $currentsymb=&Apache::lonenc::check_encrypt($ENV{'request.symb'});
     my $nav_control=&nav_control_js();
 return (<<ENDUTILITY)