--- loncom/interface/lonmenu.pm	2003/10/24 21:04:21	1.96
+++ loncom/interface/lonmenu.pm	2003/11/01 16:37:21	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.96 2003/10/24 21:04:21 albertel Exp $
+# $Id: lonmenu.pm,v 1.97 2003/11/01 16:37:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ sub menubuttons {
     my $registration=shift;
     my $navmaps='';
     my $reloadlink='';
-    my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
+    my $escurl=&Apache::lonnet::escape($ENV{'request.noversionuri'});
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only
@@ -81,9 +81,9 @@ sub menubuttons {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
 ENDNAV
-            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
-         ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
-         ($ENV{'REQUEST_URI'}!~/^\/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>
@@ -114,7 +114,7 @@ ENDMAINMENU
             $function='admin';
         }
         if (($ENV{'request.role'}=~/^(au|ca)/) ||
-            ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+            ($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
             $function='author';
         }
         my $domain=&Apache::loncommon::determinedomain();
@@ -131,9 +131,9 @@ ENDMAINMENU
 <td bgcolor="$tabbg">
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">$lt{'nav'}</font></a></td>
 ENDNAVREM
-            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
-                ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
-         ($ENV{'REQUEST_URI'}!~/^\/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);
 <td bgcolor="$tabbg">
@@ -181,7 +181,7 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    if ($ENV{'REQUEST_URI'} 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') {
 	$force_title=&Apache::lonxml::display_title();
@@ -196,7 +196,7 @@ sub registerurl {
         ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map(
-	   &Apache::lonnet::unescape($ENV{'REQUEST_URI'})))) &&
+	   &Apache::lonnet::unescape($ENV{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
@@ -217,7 +217,7 @@ sub innerregister {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
@@ -261,7 +261,7 @@ sub innerregister {
     my $tableend=($noremote?'</table>':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
+    if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
 # -- This applies to homework problems for users with grading privileges
         my $hwkadd='';
         if 
@@ -357,7 +357,7 @@ s&8&3&prt.gif&prepare&printout&gopost('/
 s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
-        unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+        unless ($ENV{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 	    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
@@ -397,7 +397,7 @@ $form
 ENDREGTEXT
 # Registered, graphical output
         } else {
-	    my $requri=(split(/\?/,$ENV{'REQUEST_URI'}))[0];
+	    my $requri=(split(/\?/,$ENV{'request.noversionuri'}))[0];
 	    $requri=&Apache::lonnet::unescape($requri);
 	    $result = (<<ENDREGTHIS);
      
@@ -485,12 +485,12 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
-    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
-    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -826,7 +826,7 @@ sub footer {
 sub utilityfunctions {
     unless (($ENV{'browser.interface'} eq 'textual')  ||
         ($ENV{'environment.remote'} eq 'off')) { return ''; }
-    my $currenturl=$ENV{'REQUEST_URI'};
+    my $currenturl=$ENV{'request.noversionuri'};
     my $currentsymb=$ENV{'request.symb'};
 return (<<ENDUTILITY)
 
@@ -906,7 +906,7 @@ sub handler {
 	$function='admin';
     }
     if (($ENV{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+	($ENV{'request.noversionuri'}=~/^(\/priv|\~)/)) {
 	$function='author';
     }
     my $domain=&Apache::loncommon::determinedomain();