--- loncom/interface/lonindexer.pm	2004/10/21 09:53:44	1.127
+++ loncom/interface/lonindexer.pm	2005/02/17 08:29:42	1.129
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.127 2004/10/21 09:53:44 foxr Exp $
+# $Id: lonindexer.pm,v 1.129 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -145,9 +145,12 @@ sub handler {
 	   $verify_title=~s/'/\\'/g;
 	   $extra='window.opener.document.forms["'.$ENV{'form.form'}.'"].elements["'.$ENV{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
        }
+       my $html=&Apache::lonxml::xmlbegin();
        $r->print(<<ENDSUBM);
-		<html>
-		<script type="text/javascript">
+	   $html
+	     <!-- Generated by lonindexer.pm -->
+	     <head>
+	       <script type="text/javascript">
 		function load() {
 			window.opener.document.forms["$ENV{'form.form'}"]
 			    .elements["$ENV{'form.element'}"]
@@ -155,8 +158,9 @@ sub handler {
 			$extra
 			window.close();
 		}
-   	</script>
-    	<body onLoad=load();>
+   	       </script>
+	     </head>
+    	<body onLoad="load();">
      	</body>
     	</html>
 ENDSUBM
@@ -343,11 +347,14 @@ END
 	}
 
 # ---------------------------------------------------------------- Print Header
+	my $html=&Apache::lonxml::xmlbegin();
 	$r->print(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
+<!-- Generated by lonindexer.pm -->
+
 <script type="text/javascript">
 $catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
@@ -484,7 +491,7 @@ END
 				(($ENV{'form.catalogmode'} eq 'groupimport')?
 				 'document.forms.fileattr':'')).
 		  &Apache::lonhtmlcommon::select_recent('residx','resrecent',
-'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
+'window.status=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'));
 # -------------------------------------------------------- Resource Home Button
 	my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'};
 	if ($reshome) {
@@ -502,11 +509,11 @@ END
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
-#        $r->print(&initdebug());
-#        $r->print(&writedebug("Omit:@Omit")) if (@Omit);
-#        $r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");
-	$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");
+        #$r->print(&initdebug());
+        #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
+        #$r->print(&writedebug("Only:@Only")) if (@Only);
+        $r->print('<table width="100%" border="0"><tr><td bgcolor="#777777">'."\n");
+	$r->print('<table width="100%" border="0"><tr bgcolor="'.$titleclr.'">'."\n");
 	$r->print("<td $colspan><b>".&mt('Name')."</b></td>\n");
 	$r->print("<td><b>".&mt('Title')."</b></td>\n") 
 	    if ($hash{'display_attrs_0'} == 1);
@@ -714,6 +721,7 @@ sub dynmetaread {
 }
 
 sub initdebug {
+    my $html=&Apache::lonxml::xmlbegin();
     return <<ENDJS;
 <script>
 var debugging = true;
@@ -726,7 +734,7 @@ function output(text) {
         debuggingWindow.document.writeln(text);
     }
 }
-output("<html><head><title>Debugging Window</title></head><body><pre>");   
+output('$html<head><title>Debugging Window</title><!-- for lonindexer.pm --></head><body><pre>');   
 </script>
 ENDJS
 }
@@ -846,7 +854,7 @@ sub display_line {
 		   $diropen.'.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	my $quotable_filecom = &Apache::loncommon::javascript_escape($filecom[0]);
+	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
 		   '\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
@@ -874,7 +882,7 @@ sub display_line {
 		   '.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	my $quotable_curdir = &Apache::loncommon::javascript_escape($curdir);
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
 		   .'\')"><img src='.
 		   $iconpath.'quill.gif border="0" name="'.$msg.
@@ -905,7 +913,7 @@ sub display_line {
 	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='1' align='top'>");
 	
         if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    my $quotable_filelink = &Apache::loncommon::javascript_escape($filelink);
+	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("<a href=\"javascript:select_data(\'",
                       $quotable_filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
@@ -966,7 +974,7 @@ sub display_line {
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	my $quotable_filelink = &Apache::loncommon::javascript_escape($filelink);
+	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
 
 	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
@@ -1033,7 +1041,7 @@ sub display_line {
 	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
 	    if($source eq 'open') {
 		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
-		my $quotable_sourcelink = &Apache::loncommon::javascript_escape($sourcelink);
+		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
 		$r->print('<td>'."<a href=\"javascript:openWindow('"
 			  .$quotable_sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
@@ -1112,7 +1120,7 @@ sub display_line {
 		   'folder_pointer_'.$diropen.'.gif"');
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	my $quotable_curdir = &Apache::loncommon::javascript_escape($curdir);
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''
 		   .$quotable_curdir.'\')"><img src="'.
 		   $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
