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

[albertel]

albertel		Thu Mar  8 20:29:54 2007 EDT

  Modified files:              
    /loncom/publisher	lonpubdir.pm 
    /loncom/interface	lonmenu.pm 
  Log:
  - some ' breakage
  
  
  
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.100 loncom/publisher/lonpubdir.pm:1.101
--- loncom/publisher/lonpubdir.pm:1.100	Thu Jan 18 21:36:04 2007
+++ loncom/publisher/lonpubdir.pm	Thu Mar  8 20:29:51 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.100 2007/01/19 02:36:04 albertel Exp $
+# $Id: lonpubdir.pm,v 1.101 2007/03/09 01:29:51 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -215,12 +215,13 @@
 	$r->print($pagetitle);
     }
 
+    my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">
-top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
+top.document.title = '$esc_thisdisfn/ - LON-CAPA Construction Space';
 // Store directory location for menu bar to find
 
-parent.lastknownpriv='/~$uname$thisdisfn/';
+parent.lastknownpriv='/~$uname$esc_thisdisfn/';
 
 // Confirmation dialogues
 
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.207 loncom/interface/lonmenu.pm:1.208
--- loncom/interface/lonmenu.pm:1.207	Wed Dec  6 06:34:37 2006
+++ loncom/interface/lonmenu.pm	Thu Mar  8 20:29:54 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.207 2006/12/06 11:34:37 foxr Exp $
+# $Id: lonmenu.pm,v 1.208 2007/03/09 01:29:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -464,8 +464,9 @@
             } else {
                 $currdir =~ s#[^/]+$##;
 		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
+		my $esc_currdir = &Apache::loncommon::escape_single($currdir);
                 $menuitems=(<<ENDMENUITEMS);
-s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory
+s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
 s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
 s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
 s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource