--- loncom/interface/lonindexer.pm	2004/07/07 00:02:00	1.119
+++ loncom/interface/lonindexer.pm	2004/10/20 10:54:08	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.119 2004/07/07 00:02:00 taceyjo1 Exp $
+# $Id: lonindexer.pm,v 1.126 2004/10/20 10:54:08 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,8 @@ my @Only = ();
 my @Omit = ();
 
 
+
+
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
@@ -147,7 +149,9 @@ sub handler {
 		<html>
 		<script type="text/javascript">
 		function load() {
-			window.opener.document.forms["$ENV{'form.form'}"].elements["$ENV{'form.element'}"].value='$ENV{'form.acts'}';
+			window.opener.document.forms["$ENV{'form.form'}"]
+			    .elements["$ENV{'form.element'}"]
+			    .value='$ENV{'form.acts'}';
 			$extra
 			window.close();
 		}
@@ -179,7 +183,7 @@ END
 		' border="0" /></td>';
 	    $colspan=" colspan='2' ";
 	    my $cl=&mt('Close');
-            my $gi=&mt('Group Import');
+            my $gi=&mt('Import');
             $closebutton=<<END;
 <input type="button" name="close" value='$cl' onClick="self.close()">
 END
@@ -445,24 +449,24 @@ $r->print(&Apache::loncommon::bodytag('B
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
-<input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onClick="this.form.submit();" /> $lt{'av'}</label>
 <table border="0">
 <tr>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</td>
-<td><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</td>
-<td><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</td>
-<td><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</td>
+<td><label><input type="checkbox" name="attr0" value="1" $attrchk[0] onClick="this.form.submit();" /> $lt{'ti'}</label></td>
+<td><label><input type="checkbox" name="attr4" value="1" $attrchk[4] onClick="this.form.submit();" /> $lt{'au'}</label></td>
+<td><label><input type="checkbox" name="attr5" value="1" $attrchk[5] onClick="this.form.submit();" /> $lt{'kw'}</label></td>
+<td><label><input type="checkbox" name="attr6" value="1" $attrchk[6] onClick="this.form.submit();" /> $lt{'ln'}</label></td>
 </tr>
 <tr>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</td>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</td>
-<td><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</td>
+<td><label><input type="checkbox" name="attr1" value="1" $attrchk[1] onClick="this.form.submit();" /> $lt{'si'}</label></td>
+<td><label><input type="checkbox" name="attr2" value="1" $attrchk[2] onClick="this.form.submit();" /> $lt{'la'}</label></td>
+<td><label><input type="checkbox" name="attr3" value="1" $attrchk[3] onClick="this.form.submit();" /> $lt{'lm'}</label></td>
+<td><label><input type="checkbox" name="attr10" value="1" $attrchk[10] onClick="this.form.submit();" /> $lt{'sa'}</label></td>
 </tr>
 <tr>
-<td><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</td>
-<td><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</td>
-<td><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</td>
+<td><label><input type="checkbox" name="attr8" value="1" $attrchk[8] onClick="this.form.submit();" /> $lt{'st'}</label></td>
+<td><label><input type="checkbox" name="attr11" value="1" $attrchk[11] onClick="this.form.submit();" /> $lt{'li'}</label></td>
+<td><label><input type="checkbox" name="attr7" value="1" $attrchk[7] onClick="this.form.submit();" /> $lt{'sr'}</label></td>
 <td>&nbsp;</td>
 </tr>
 </table>
@@ -519,7 +523,7 @@ END
 	$r->print("<td><b>".&mt("Language")."</b></td>\n")
 	    if ($hash{'display_attrs_6'} == 1);
 	$r->print("<td><b>".&mt("Usage Statistics")." <br />(".
-		  &mt("Courses/Network Hits").")</b></td>\n")
+		  &mt("Courses/Network Hits").")</b> ".&mt('updated periodically')."</td>\n")
 	    if ($hash{'display_attrs_8'} == 1);
 	$r->print("<td><b>".&mt("Source Available")."</b></td>\n")
 	    if ($hash{'display_attrs_10'} == 1);
@@ -662,10 +666,12 @@ sub get_list {
     if ($ENV{'form.updatedisplay'}) {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
+	    delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
 	}
     }
 
-    if ($hash{'dirlist_files_'.$luri}) {
+    if (defined($hash{'dirlist_files_'.$luri}) &&
+	$hash{'dirlist_timestamp_files_'.$luri}+600 > (time)) {
 	@list = split(/\n/,$hash{'dirlist_files_'.$luri});
     } elsif ($uri=~/\.(page|sequence)\/$/) {
 # is a page or a sequence
@@ -681,6 +687,7 @@ sub get_list {
 # is really a directory
 	@list = &Apache::lonnet::dirlist($uri);
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
+	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
     return @list=&match_ext($r,@list);
 }
@@ -839,7 +846,8 @@ sub display_line {
 		   $diropen.'.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
+	my $quotable_filecom = &javascript_escape($filecom[0]);
+	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
 		   '\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
 	$r->print (&mt("Domain")." - $listname ");
@@ -866,7 +874,9 @@ sub display_line {
 		   '.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.
+	my $quotable_curdir = &javascript_escape($curdir);
+	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
+		   .'\')"><img src='.
 		   $iconpath.'quill.gif border="0" name="'.$msg.
 		   '" height="22" /></a>');
 	my $domain=(split(m|/|,$startdir))[2];
@@ -895,8 +905,9 @@ sub display_line {
 	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='1' align='top'>");
 	
         if ($ENV{'form.catalogmode'} eq 'interactive') {
+	    my $quotable_filelink = &javascript_escape($filelink);
             $r->print("<a href=\"javascript:select_data(\'",
-                      $filelink,"')\">");
+                      $quotable_filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
 	    $r->print("</td><td nowrap>");
@@ -955,11 +966,14 @@ sub display_line {
 	if ($filelink=~/\.(page|sequence)$/) {
 	    $r->print('</form>');
 	}
-	$r->print (" <a href=\"javascript:openWindow('".$filelink.
+	my $quotable_filelink = &javascript_escape($filelink);
+
+
+	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
 		   "', 'previewfile', '450', '500', 'no', 'yes','yes')\";".
 		   " TARGET=_self>$listname</a> ");
 
-	$r->print (" (<a href=\"javascript:openWindow('".$filelink.
+	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
 		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no')\"; ".
 		   "TARGET=_self>metadata</a>) ");
 	$r->print("</td>\n");
@@ -1019,7 +1033,9 @@ sub display_line {
 	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
 	    if($source eq 'open') {
 		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
-		$r->print('<td>'."<a href=\"javascript:openWindow('".$sourcelink.
+		my $quotable_sourcelink = &javascript_escape($sourcelink);
+		$r->print('<td>'."<a href=\"javascript:openWindow('"
+			  .$quotable_sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes')\";".
 			  " TARGET=_self>Yes</a> "."</td>\n");
 	    } else { #A cuddled else. :P
@@ -1096,7 +1112,9 @@ sub display_line {
 		   'folder_pointer_'.$diropen.'.gif"');
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'.
 		   "\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src="'.
+	my $quotable_curdir = &javascript_escape($curdir);
+	$r->print ('<a href="javascript:gothere(\''
+		   .$quotable_curdir.'\')"><img src="'.
 		   $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
 		   "\n");
 	$r->print ("$listname</td>\n");
@@ -1214,6 +1232,33 @@ sub cleanup {
     }
 }
 
+
+#
+#    Escapes strings that may have embedded 's that will be put into
+#    javascript strings as 'strings'.
+#    The assumptions are:
+#       There has been no effort to escape ' with \'
+#       Any \'s in the string are intended to be there as part of the URL
+#        and must also be escaped.
+# Parameters:
+#     input     - The string to escape.
+# Returns:
+#     The escaped string (' replaced by \' and \ replaced by \\).
+#
+sub javascript_escape {
+    my ($input) = @_;
+
+    #  I imagine a regexp wizard could combine the two expressions below.
+    #  If you do you might want to comment the result.
+
+    $input =~ s/\\/\\\\/g;	# Escape the /'s..(must be first)>
+    $input =~ s/\'/\\\'/g;	# Esacpe the 's....
+
+    return $input;
+}
+
+
+
 =head1 NAME
 
 Apache::lonindexer - mod_perl module for cross server filesystem browsing
