--- loncom/interface/lonmenu.pm	2004/12/04 02:01:04	1.137
+++ loncom/interface/lonmenu.pm	2004/12/07 23:59:52	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.137 2004/12/04 02:01:04 raeburn Exp $
+# $Id: lonmenu.pm,v 1.140 2004/12/07 23:59:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -460,10 +460,12 @@ $tableend
 ENDREGTEXT
 # Registered, graphical output
         } else {
-	    my $requri=(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 $navstatus=&get_nav_status();
+	    my $clearcstr;
+	    if ($ENV{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
@@ -498,7 +500,7 @@ var swmenu=null;
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
 			  2000);
       }
 
@@ -1023,14 +1025,18 @@ function gocstr(url,filename) {
     if (url == '/adm/printout') {
         this.document.cstrprint.postdata.value = filename
         this.document.cstrprint.curseed.value = 0;
-        if ((this.document.lonhomework.rndseed.value != null) && (this.document.lonhomework.rndseed.value != '')) {
-            this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value
-        }
         this.document.cstrprint.problemtype.value = 0;
-        for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
-            if (this.document.lonhomework.problemtype.options[i].selected) {
-                if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
-                    this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
+        if (this.document.lonhomework) {
+            if ((this.document.lonhomework.rndseed) && (this.document.lonhomework.rndseed.value != null) && (this.document.lonhomework.rndseed.value != '')) {
+                this.document.cstrprint.curseed.value = this.document.lonhomework.rndseed.value
+            }
+            if (this.document.lonhomework.problemtype) {
+                for (var i=0; i<this.document.lonhomework.problemtype.options.length; i++) {
+                    if (this.document.lonhomework.problemtype.options[i].selected) {
+                        if (this.document.lonhomework.problemtype.options[i].value != null && this.document.lonhomework.problemtype.options[i].value != '') { 
+                            this.document.cstrprint.problemtype.value = this.document.lonhomework.problemtype.options[i].value
+                        }
+                    }
                 }
             }
         }