--- loncom/interface/lonmenu.pm	2003/08/06 17:23:49	1.82
+++ loncom/interface/lonmenu.pm	2003/09/09 18:46:28	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.82 2003/08/06 17:23:49 www Exp $
+# $Id: lonmenu.pm,v 1.87 2003/09/09 18:46:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,7 +178,8 @@ sub registerurl {
     if (($ENV{'browser.interface'} eq 'textual') ||
         ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) || 
-         (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
+         (!&Apache::lonnet::is_on_map(
+	   &Apache::lonnet::unescape($ENV{'REQUEST_URI'})))) &&
         (!$forcereg))) {
  	return $result.
           '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
@@ -215,7 +216,7 @@ sub innerregister {
 	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
-	my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
+	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
         $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
         my $maptitle=&Apache::lonnet::gettitle($mapurl);
 	my $restitle=&Apache::lonnet::gettitle($resurl);
@@ -376,6 +377,8 @@ $form
 ENDREGTEXT
 # Registered, graphical output
         } else {
+	    my $requri=(split(/\?/,$ENV{'REQUEST_URI'}))[0];
+	    $requri=&Apache::lonnet::unescape($requri);
 	    $result = (<<ENDREGTHIS);
      
 <script language="JavaScript">
@@ -388,8 +391,8 @@ var swmenu=null;
           $timesync
           $newmail
           $buttons
-	  swmenu.currentURL=window.location.pathname;
-          swmenu.reloadURL=window.location.pathname+window.location.search;
+	  swmenu.currentURL="$requri";
+          swmenu.reloadURL=swmenu.currentURL+window.location.search;
           swmenu.currentSymb="$ENV{'request.symb'}";
           swmenu.reloadSymb="$ENV{'request.symb'}";
           swmenu.currentStale=0;