--- loncom/xml/lonxml.pm	2002/11/06 23:05:02	1.212
+++ loncom/xml/lonxml.pm	2002/11/12 20:11:10	1.214
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.212 2002/11/06 23:05:02 albertel Exp $
+# $Id: lonxml.pm,v 1.214 2002/11/12 20:11:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -404,17 +404,20 @@ sub registerurl {
         if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDSUBM);
-                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")');
+                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")',
+                     'View user submissions for this assessment resource');
 ENDSUBM
             }
 	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDGRDS);
-                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")');
+                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","gradingmenu")',
+                     'Modify user grades for this assessment resource');
 ENDGRDS
             }
 	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDPARM);
-                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")');
+                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")',
+                     'Modify deadlines, etc, for this assessment resource');
 ENDPARM
             }
 	}
@@ -430,26 +433,28 @@ ENDPARM
           $newmail
 	  menu.currentURL=window.location.pathname;
           menu.reloadURL=window.location.pathname;
+          menu.currentSymb="$ENV{'request.symb'}";
+          menu.reloadSymb="$ENV{'request.symb'}";
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
        (6,3,'catalog.gif','catalog','info','catalog_info()');
           menu.switchbutton
-       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
+       (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)','Provide my evaluation of this resource');
           menu.switchbutton
-    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)');
+    (8,2,'fdbk.gif','feedback','discuss','gopost("/adm/feedback",currentURL)','Provide feedback messages or contribute to the course discussion about this resource');
           menu.switchbutton
-     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)');
+     (8,3,'prt.gif','prepare','printout','gopost("/adm/printout",currentURL)','Prepare a printable document');
           menu.switchbutton
-       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)');
+       (2,1,'back.gif','backward','','gopost("/adm/flip","back:"+currentURL)','Go to the previous resource in the course sequence');
           menu.switchbutton
-     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)');
+     (2,3,'forw.gif','forward','','gopost("/adm/flip","forward:"+currentURL)','Go to the next resource in the course sequence');
           menu.switchbutton
-                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()');
+                            (9,1,'sbkm.gif','set','bookmark','set_bookmark()','Set a bookmark for this resource');
           menu.switchbutton
-                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()');
+                         (9,2,'vbkm.gif','view','bookmark','edit_bookmarks()','Use or edit my bookmark collection');
           menu.switchbutton
-                               (9,3,'anot.gif','anno-','tations','annotate()');
+                               (9,3,'anot.gif','anno-','tations','annotate()','Make notes and annotations about this resource');
           $hwkadd
     }
 
@@ -458,7 +463,7 @@ ENDPARM
           menu.currentStale=1;
           if (menu.reloadURL!='' && menu.reloadURL!= null) { 
              menu.switchbutton
-             (3,1,'reload.gif','return','location','go(reloadURL)');
+             (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
 	  }
           menu.clearbut(7,1);
           menu.clearbut(7,2);
@@ -1354,24 +1359,38 @@ sub warning {
 }
 
 sub get_param {
-  my ($param,$parstack,$safeeval,$context) = @_;
-  if ( ! $context ) { $context = -1; }
-  my $args ='';
-  if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-  if ( ! $args ) { return undef; }
-  if ( $args =~ /my \$$param=\"/ ) {
-    return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
-  } else {
-    return undef;
-  }
+    my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
+    if ( ! $context ) { $context = -1; }
+    my $args ='';
+    if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
+    if ( ! $args ) { return undef; }
+    if ( $case_insensitive ) {
+	if ($args =~ s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei) {
+	    return &Apache::run::run("{$args;".'return $'.$param.'}',
+                                     $safeeval); #'
+	} else {
+	    return undef;
+	}
+    } else {
+	if ( $args =~ /my \$\Q$param\E=\"/ ) {
+	    return &Apache::run::run("{$args;".'return $'.$param.'}',
+                                     $safeeval); #'
+	} else {
+	    return undef;
+	}
+    }
 }
 
 sub get_param_var {
-  my ($param,$parstack,$safeeval,$context) = @_;
+  my ($param,$parstack,$safeeval,$context,$case_insensitive) = @_;
   if ( ! $context ) { $context = -1; }
   my $args ='';
   if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
-  if ( $args !~ /my \$$param=\"/ ) { return undef; }
+  if ($case_insensitive) {
+      if (! ($args=~s/(my \$)(\Q$param\E)(=\")/$1.lc($2).$3/ei)) {
+	  return undef;
+      }
+  } elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; }
   my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
   if ($value =~ /^[\$\@\%]/) {
     return &Apache::run::run("return $value",$safeeval,1);