--- loncom/interface/lonindexer.pm	2006/12/05 02:55:53	1.154
+++ loncom/interface/lonindexer.pm	2007/08/17 22:54:36	1.179
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.154 2006/12/05 02:55:53 albertel Exp $
+# $Id: lonindexer.pm,v 1.179 2007/08/17 22:54:36 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@ use Apache::lonmeta;
 use Apache::File;
 use Apache::lonlocal;
 use Apache::lonsource();
+use Apache::groupsort();
 use GDBM_File;
 use LONCAPA qw(:match);
 
@@ -105,7 +106,7 @@ sub handler {
 
     my $fileclr='#ffffe6';
     my $line;
-    my (@attrchk,@openpath);
+    my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
@@ -128,13 +129,17 @@ sub handler {
 	    if ($env{'form.launch'} eq '1') {
 		&start_fresh_session(\%dbfile);
 	    }
-
 	    while(my($key,$value)=each(%dbfile)) {
 		$hash{$key}=$value;
 	    }
 	    untie(%dbfile);
 	}
     }
+# - Evaluate actions from previous page (both cumulatively and chronologically)
+        if ($env{'form.catalogmode'} eq 'import' || $hash{'form.catalogmode'} eq 'import') {
+	    &Apache::groupsort::update_actions_hash(\%hash);
+	}
+    
     {
   #Hijack lonindexer to verify a title and be close down.
    if ($env{'form.launch'} eq '2') {
@@ -174,7 +179,7 @@ ENDSUBM
 	if ($env{'form.catalogmode'} eq 'interactive') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
-		' border="0" /></td>';
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
             my $cl=&mt('Close');
             $closebutton=<<END;
@@ -184,7 +189,7 @@ END
 	elsif ($env{'form.catalogmode'} eq 'import') {
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
-		' border="0" /></td>';
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
 	    my $cl=&mt('Close');
             my $gi=&mt('Import');
@@ -242,7 +247,7 @@ END
 #
 #
 	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
-                my $location = "/adm/groupsort?catalogmode=import&";
+                my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&";
                 $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
@@ -269,6 +274,9 @@ END
 function select_data(url) {
    var location = "/res/?launch=2&form=$form&element=$element&titleelement=$titleelement&acts=" + url;
    window.location=location;
+   if (window.opener.document.forms["$form"].elements["$element"].value != url) {
+       window.opener.unClean();
+   }
 }
 function select_group() {
     window.location="$location"+document.forms.fileattr.acts.value;
@@ -346,10 +354,41 @@ function queue(val) {
 END
 	}
 
+        my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'";
 # ---------------------------------------------------------------- Print Header
+        
 	my $js = <<"ENDHEADER";
 <script type="text/javascript">
-$catalogmodefunctions
+$catalogmodefunctions;
+function update_only(field) {
+    alert(field.name);
+}
+function checkAll() {
+    var numForms = document.forms.length;
+    for (i=0;i<numForms;i++) {
+        var numElements = document.forms[i].elements.length;
+        for (j=0;j<numElements;j++){
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = true;
+                queue(document.forms[i].name);
+            }
+        }
+    }
+}
+function uncheckAll() {
+    var numForms = document.forms.length;
+    for (i=0;i<numForms;i++) {
+        var numElements = document.forms[i].elements.length;
+        for (j=0;j<numElements;j++){
+            var fieldName = document.forms[i].elements[j].name;
+            if (fieldName == 'filelink') {
+                document.forms[i].elements[j].checked = false;
+                queue(document.forms[i].name);
+            }
+        }
+    }
+}
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;
@@ -362,7 +401,7 @@ function openWindow(url, wdwName, w, h,
     newWin.focus();
 }
 function gothere(val) {
-    window.location=val+'?acts='+document.forms.fileattr.acts.value;
+    window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }
 </script>
 ENDHEADER
@@ -370,48 +409,13 @@ ENDHEADER
         my ($headerdom)=($uri=~m{^/res/($match_domain)/});
 	$r->print(&Apache::loncommon::start_page('Browse Resources',$js,
 						 {'domain' => $headerdom,}));
-# - Evaluate actions from previous page (both cumulatively and chronologically)
-        if ($env{'form.catalogmode'} eq 'import') {
-	    my $acts=$env{'form.acts'};
-	    my @Acts=split(/b/,$acts);
-	    my %ahash;
-	    my %achash;
-	    my $ac=0;
-	    # some initial hashes for working with data
-	    foreach (@Acts) {
-		my ($state,$ref)=split(/a/);
-		$ahash{$ref}=$state;
-		$achash{$ref}=$ac;
-		$ac++;
-	    }
-	    # sorting through the actions and changing the global database hash
-	    foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
-		my $key=$_;
-		if ($ahash{$key} eq '1') {
-		    $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'pre_'.$key.'_title'};
-		    $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}=
-			$hash{'storectr'}+0;
-		    $hash{'storectr'}++;
-		}
-		if ($ahash{$key} eq '0') {
-		    if ($hash{'store_'.$hash{'pre_'.$key.'_link'}}) {
-			delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
-		    }
-		}
-	    }
-	    # deleting the previously cached listing
-	    foreach (keys %hash) {
-		if ($_ =~ /^pre_/ && $_ =~/link$/) {
-		    my $key = $_;
-		    $key =~ s/^pre_//;
-		    $key =~ s/_[^_]*$//;
-		    delete $hash{'pre_'.$key.'_title'};
-		    delete $hash{'pre_'.$key.'_link'};
-		}
-	    }
+# ---------------------------------- get state of file types to be showing
+	if ($env{'form.only'}) {
+	    $typeselect = $env{'form.only'};
+	} else {
+	    $typeselect = '';
 	}
-	
+
 # ---------------------------------- get state of file attributes to be showing
 	if ($env{'form.attrs'}) {
 	    for (my $i=0; $i<=11; $i++) {
@@ -443,7 +447,10 @@ ENDHEADER
 					   'sr' => 'Show resource',
 					   'li' => 'Linked/Related Resources',
 					   'av' => 'All versions',
-					   'ud' => 'Update Display'
+					   'ud' => 'Update Display',
+					   'pr' => 'Problems',
+					   'gr' => 'Graphics',
+					   'at' => 'All types'
 					   );
 	$r->print(<<END);
 <form method="post" name="fileattr" action="$uri"
@@ -470,10 +477,31 @@ ENDHEADER
 </tr>
 </table>
 <input type="hidden" name="attrs" value="1" />
+END
+        my @file_categories = &Apache::loncommon::filecategories();
+        my %select_file_categories;
+        my @select_form_order = ('');
+        $select_file_categories{''} = &mt('All file types');
+        foreach my $cat (@file_categories) {
+	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
+	    $select_file_categories{$types} = $cat;
+	    push(@select_form_order,$types);
+	}
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $type_element=
+	    &Apache::loncommon::select_form($typeselect,'only',
+					    %select_file_categories);
+        $type_element = '<label>'.&mt('File Type Displayed: [_1]',
+				      $type_element).'</label>';
+        $r->print(<<END);
+$type_element
+<br />
 <input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
 $closebutton $groupimportbutton
 END
+        $r->print(&Apache::loncommon::inhibit_menu_check('input'));
+   
 # -------------- Filter out sequence containment in crumbs and "recent folders"
 	my $storeuri=$uri;
 	$storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
@@ -489,7 +517,7 @@ END
 	if ($reshome) {
 	    $r->print("<font size='+2'><a href='");
 	    if ($env{'form.catalogmode'} eq 'import') {
-		$r->print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();');
+		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
 	    } else {
 		$r->print($reshome);
 	    }
@@ -499,6 +527,11 @@ END
 # ------------------------------------------------------ Remember where we were
 	&Apache::loncommon::storeresurl($storeuri);
 	&Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri);
+# -------------------------------------------------- Check All and Uncheck all
+	if ($env{'form.catalogmode'} eq 'import') {
+	    $r->print('<br /><input type="button" value="'.&mt("Check All").'" id="checkallbutton" onClick="javascript:checkAll()" />');
+	    $r->print('<input type="button" value="'.&mt("Uncheck All").'" id="uncheckallbutton" onClick="javascript:uncheckAll()" />');
+	}
 # ----------------- output starting row to the indexed file/directory hierarchy
         my $titleclr="#ddffff";
         #$r->print(&initdebug());
@@ -680,7 +713,7 @@ sub get_list {
 	$uri=~s/\/+/\//g;
 	foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
 	    my @ratpart=split(/\:/,$_);
-	    push @list,$ratpart[1];
+	    push(@list,&LONCAPA::map::qtescape($ratpart[1]));
 	} 
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
@@ -689,7 +722,7 @@ sub get_list {
 	$hash{'dirlist_files_'.$luri} = join("\n",@list);
 	$hash{'dirlist_timestamp_files_'.$luri} = time;
     }
-    return @list=&match_ext($r,@list);
+    return @list=&match_ext($r,@list);    
 }
 
 sub dynmetaread {
@@ -799,7 +832,8 @@ sub display_line {
     my $i=0;
     while ($i<=11) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
-	    if $hash{'display_attrs_'.$i} == 1;
+	    if ($i != 9 &&
+		$hash{'display_attrs_'.$i} == 1);
 	$i++;
     }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
@@ -811,7 +845,7 @@ sub display_line {
 	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
 	$updir=~s/\/+/\//g;
 
-	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
 	$r->print("<td>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
@@ -819,11 +853,12 @@ sub display_line {
 		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
+	$r->print(&Apache::loncommon::inhibit_menu_check('input'));
 	$r->print ('<input type=hidden name=openuri value="'.
 		   $startdir.'" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />'."\n");
 	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	$r->print(&mt("Up")."</form>$tabtag</tr>\n");
 	return OK;
@@ -839,24 +874,24 @@ sub display_line {
     if ($filecom[1] eq 'domain') {
  	$r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
  	    if ($env{'form.dirPointer'} eq "on");
-	$r->print("<tr valign='$valign' bgcolor=$fileclr>$extrafield");
+	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
 	$r->print("<td>");
 	&begin_form ($r,$filecom[0]);
 	my $anchor = $filecom[0];
-	$anchor =~ s/\///g;
+	$anchor =~ s/\W//g;
 	$r->print ('<a name="'.$anchor.'"></a>');
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<input src="'.$iconpath.'folder_pointer_'.
 		   $diropen.'.gif"'); 
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_filecom = &Apache::loncommon::escape_single($filecom[0]);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_filecom.
 		   '\')"><img alt="" src="'.$iconpath.'server.gif"');
-	$r->print (' border="0" /></a>'."\n");
+	$r->print (' class="LC_icon" /></a>'."\n");
 	$r->print (&mt("Domain")." - $listname ");
-	if ($Apache::lonnet::domaindescription{$listname}) {
-	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+	if (&Apache::lonnet::domain($listname,'description')) {
+	    $r->print("(".&Apache::lonnet::domain($listname,'description').
 		      ")");
 	}
 	$r->print ("</form>$tabtag</tr>\n");
@@ -865,24 +900,23 @@ sub display_line {
 # display user directory
     }
     if ($filecom[1] eq 'user') {
-	$r->print("<tr valign=$valign bgcolor=$fileclr>$extrafield");
-	$r->print("<td nowrap>\n");
+	# $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
+	$anchor =~ s/\W//g;
+	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
-		   'whitespace1.gif" border="0" />'."\n");
+		   'whitespace1.gif" class="LC_icon" />'."\n");
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.
 		   '.gif"'); 
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
-		   .'\')"><img alt="" src='.
-		   $iconpath.'quill.gif border="0" name="'.$msg.
-		   '" height="22" /></a>');
+		   .'\')"><img alt="'.$msg.'" src="'.
+		   $iconpath.'quill.gif" class="LC_indexer_icon" /></a>');
 	my $domain=(split(m|/|,$startdir))[2];
 	my $plainname=&Apache::loncommon::plainname($listname,$domain);
 	$r->print ($listname);
@@ -893,26 +927,30 @@ sub display_line {
 
 # display file
     if (($fnptr == 0 and $filecom[3] ne '') or $absolute) {
+        my $title;
 	my $filelink = $pathprefix.$filecom[0];
+	if ($hash{'display_attrs_0'} == 1) {
+	    $title = &Apache::lonnet::gettitle($filelink);
+	}
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
-            foreach (@Omit) { return OK if ($curfext eq $_); }
+            foreach (@Omit) { return OK if (lc($curfext) eq $_); }
         }
         if (@Only) {
             my $skip = 1;
-            foreach (@Only) { $skip = 0 if ($curfext eq $_); }
+            foreach (@Only) { $skip = 0 if (lc($curfext) eq $_); }
             return OK if ($skip > 0);
         }
 	# Set the icon for the file
 	my $iconname = &Apache::loncommon::icon($listname);
-	$r->print("<tr valign='$valign' bgcolor=$fileclr><td nowrap='nowrap' valign='top'>");
+	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\"><td nowrap='nowrap' valign='top'>");
 	
         if ($env{'form.catalogmode'} eq 'interactive') {
 	    my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
             $r->print("<a href=\"javascript:select_data(\'",
                       $quotable_filelink,"')\">");
-	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' border='0' /></a>".
+	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' class='LC_icon' /></a>".
 		      "\n");
 	    $r->print("</td><td nowrap='nowrap' valign='top'>");
 	} elsif ($env{'form.catalogmode'} eq 'import') {
@@ -926,54 +964,56 @@ sub display_line {
 	    $r->print(" />\n");
 	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
+	    $hash{"pre_${fnum}_title"}=$title;
+	    if (!$hash{"pre_${fnum}_title"}) {
+	        $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+	    }
   	    $fnum++;
 	}
 # Form to open or close sequences
 	if ($filelink=~/\.(page|sequence)$/) {
 	    my $curdir = $startdir.$filecom[0].'/';
-	    my $anchor = $curdir;
-	    $anchor =~ s/\///g;
 	    &begin_form($r,$curdir);
 	    $indent--;
 	}
 # General indentation
 	if ($indent > 0 and $indent < 11) {
-	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indent,
-		      ".gif border='0' />\n");
+	    $r->print("<img alt=\"\" src='",$iconpath,"whitespace",$indent,
+		      ".gif' class='LC_icon' />\n");
 	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
 	    my $rem = $indent%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print("<img alt=\"\" src=",$iconpath,
-			  "whitespace10.gif border='0' />\n");
+		$r->print("<img alt=\"\" src=".$iconpath.
+			  "whitespace10.gif class='LC_icon' />\n");
 	    $count++;
 	    }
 	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
-		      ".gif border='0' />\n") if $rem > 0;
+		      ".gif class='LC_icon' />\n") if $rem > 0;
 	}
 # Sequence open/close icon
 	if ($filelink=~/\.(page|sequence)$/) {
 	    my $curdir = $startdir.$filecom[0].'/';
 	    my $anchor = $curdir;
-	    $anchor =~ s/\///g;
+	    $anchor =~ s/\W//g;
 	    $r->print ('<input type="hidden" name="acts" value="" />');
 	    $r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
 		       'folder_pointer_'.$diropen.'.gif"');
-	    $r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	    $r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		       "\n");
 	}
 # Filetype icons
-	$r->print("<img alt=\"\" src='$iconname' border='0' />\n");
+	$r->print("<img alt=\"\" src='$iconname' class='LC_icon' />\n");
 	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
 
-
 	$r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.
-		   "', 'previewfile', '450', '500', 'no', 'yes','yes');\"".
+		   "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".
 		   " target=\"_self\">$listname</a> ");
-
+	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
 	$r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.
-		   ".meta', 'metadatafile', '500', '550', 'no', 'yes','no');\" ".
+		   "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".
 		   " target=\"_self\">metadata</a>) ");
 # Close form to open/close sequence
 	if ($filelink=~/\.(page|sequence)$/) {
@@ -981,7 +1021,6 @@ sub display_line {
 	}
 	$r->print("</td>\n");
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title');
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
@@ -1037,6 +1076,7 @@ sub display_line {
 	    if($source eq 'open') {
 		my $sourcelink = &Apache::lonsource::make_link($filelink,$listname);
 		my $quotable_sourcelink = &Apache::loncommon::escape_single($sourcelink);
+		&Apache::loncommon::inhibit_menu_check(\$quotable_sourcelink);
 		$r->print('<td>'."<a href=\"javascript:openWindow('"
 			  .$quotable_sourcelink.
 			  "', 'previewsource', '700', '700', 'no', 'yes','yes');\"".
@@ -1070,42 +1110,42 @@ sub display_line {
     if ($fnptr == $dirptr) {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
-	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");
+	$anchor =~ s/\W//g;
+	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
 	    $r->print("<img alt=\"\" src=",$iconpath,"whitespace",$indentm1,
-		      ".gif border='0' />\n");
+		      ".gif class='LC_icon' />\n");
 	} else {
 	    my $ten = int($indentm1/10.);
 	    my $rem = $indentm1%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
 		$r->print ("<img alt=\"\" src=",$iconpath
-			   ,"whitespace10.gif border='0' />\n");
+			   ,"whitespace10.gif class='LC_icon' />\n");
 		$count++;
 	    }
 	    $r->print ("<img alt=\"\" src=",$iconpath,"whitespace",$rem,
-		       ".gif border='0' />\n") if $rem > 0;
+		       ".gif class='LC_icon' />\n") if $rem > 0;
 	}
 	$r->print ('<input type="hidden" name="acts" value="" />');
 	$r->print ('<a name="'.$anchor.'"></a><input src="'.$iconpath.
 		   'folder_pointer_'.$diropen.'.gif"');
-	$r->print (' name="'.$msg.'" height="22" type="image" border="0" />'.
+	$r->print (' name="'.$msg.'" type="image" class="LC_indexer_icon" />'.
 		   "\n");
 	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
 	$r->print ('<a href="javascript:gothere(\''
 		   .$quotable_curdir.'\')">'
 		   .'<img alt="'.&mt('Open Folder').'"src="'.
-		   $iconpath.'folder_'.$diropen.'.gif" border="0" /></a>'.
+		   $iconpath.'folder_'.$diropen.'.gif" class="LC_icon" /></a>'.
 		   "\n");
 	$r->print ("$listname</form></td>\n");
 # Attributes
 	my $filelink = $startdir.$filecom[0].'/default';
 
 	if ($hash{'display_attrs_0'} == 1) {
-	    my $title = &Apache::lonnet::gettitle($filelink,'title');
+	    my $title = &Apache::lonnet::gettitle($filelink);
 	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
@@ -1202,7 +1242,7 @@ sub showpreview {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
     } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
        $output='<img  alt="'.&mt('Preview').'" src="http://'.
-                 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
+                 &Apache::lonnet::hostname(&Apache::lonnet::homeserver($2,$1)).
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
     }
     return $output;
@@ -1224,7 +1264,8 @@ sub dynmetaprint {
 sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
-    $anchor =~ s/\///g;
+    $anchor =~ s/\W//g;
+    $uri=&Apache::loncommon::escape_single($uri);
     $r->print ('<form method="post" name="dirpath'.$dnum.'" action="'.$uri.
 	       '#'.$anchor.
 	       '" onSubmit="return rep_dirpath(\''.$dnum.'\''.
@@ -1233,6 +1274,7 @@ sub begin_form {
     $r->print ('<input type="hidden" name="openuri" value="'.$uri.'" />'.
 	       "\n");
     $r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n");
+    $r->print(&Apache::loncommon::inhibit_menu_check('input'));
     $dnum++;
 }