[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm lonsyllabus.pm

[amueller]

amueller		Sun Sep 27 11:05:06 2009 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm lonsyllabus.pm 
  Log:
  lonsyllabus
  	-encoding the ampersand symbol for valid XHTML 1.0 Transitional
  lonmenu
  	-encoding the link to lonaboutme-page for valid XHTML 1.0 Transitional
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.281 loncom/interface/lonmenu.pm:1.282
--- loncom/interface/lonmenu.pm:1.281	Tue Sep  8 20:56:46 2009
+++ loncom/interface/lonmenu.pm	Sun Sep 27 11:05:06 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.281 2009/09/08 20:56:46 raeburn Exp $
+# $Id: lonmenu.pm,v 1.282 2009/09/27 11:05:06 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,6 +137,7 @@
 use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
 
 use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
 
@@ -1688,7 +1689,7 @@
         }
         $role_selector .= '</select>'."\n".
                '<input type="hidden" name="destinationurl" value="'.
-               $ENV{'REQUEST_URI'}.'" />'."\n".
+               &HTML::Entities::encode($ENV{'REQUEST_URI'}).'" />'."\n".
                '<input type="hidden" name="gotorole" value="1" />'."\n".
                '<input type="hidden" name="selectrole" value="" />'."\n".
                '<input type="hidden" name="switch" value="1" />'."\n".
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.98 loncom/interface/lonsyllabus.pm:1.99
--- loncom/interface/lonsyllabus.pm:1.98	Sat Sep 26 20:07:58 2009
+++ loncom/interface/lonsyllabus.pm	Sun Sep 27 11:05:06 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.98 2009/09/26 20:07:58 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.99 2009/09/27 11:05:06 amueller Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -238,7 +238,7 @@
 			#if you have the register flag, keep it
 			if($env{'form.register'} == 1) {
             	$functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                          '<a href="'.$r->uri.'?forcestudent=1&register=1">'
+                          '<a href="'.$r->uri.'?forcestudent=1&amp;register=1">'
                            .&mt('Show Public View').'</a>'
                            .&Apache::loncommon::help_open_topic(
                                 'Uploaded_Templates_PublicView'));
@@ -252,7 +252,7 @@
         } elsif ($privileged) {
 			if($env{'form.register'} == 1) {
 	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
-                           '<a href="'.$r->uri.'?forceedit=1&register=1">'
+                           '<a href="'.$r->uri.'?forceedit=1&amp;register=1">'
                             .&mt('Edit').'</a>');
 			} else {
 	            $functions.=&Apache::lonhtmlcommon::add_item_funclist(
@@ -276,7 +276,7 @@
                  .'</p>'
                  .'<p class="LC_info">'
                  .&mt('Instead of using this template you can specify an external URL as Syllabus in the [_1]Course Configuration[_2].'
-                     ,'<a href="/adm/courseprefs?actions=courseinfo&phase=display">','</a>')
+                     ,'<a href="/adm/courseprefs?actions=courseinfo&amp;phase=display">','</a>')
                  .'</p>'
         );
         #-Print Help Text