--- loncom/interface/lonindexer.pm	2001/05/21 15:22:48	1.4
+++ loncom/interface/lonindexer.pm	2001/08/07 14:02:27	1.14
@@ -1,13 +1,22 @@
 # The LearningOnline Network with CAPA
+#
 # Directory Indexer
 # (Login Screen
+#
 # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
 # 11/23 Gerd Kortemeyer
 # 07/20-08/04 H.K. Ng
 #
 # 05/9-05/19/2001 H. K. Ng
 # 05/21/2001 H. K. Ng
-#
+# 05/23/2001 H. K. Ng
+# 05/31/2001 Scott Harrison
+# 06/01/2001 Scott Harrison
+# 06/02/2001 Scott Harrison
+# 06/15/2001 Scott Harrison
+# 06/26/2001 H. K. Ng
+# 07/08/2001 H. K. Ng
+
 package Apache::lonindexer;
 
 use strict;
@@ -19,9 +28,12 @@ use GDBM_File;
 my %hash;
 my %dirs;
 my %language;
-
+my $hidden;
+my $extrafield;
+my $fnum;
 sub BEGIN {
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/language.tab');
+    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
+			     '/language.tab');
     map {
 	$_=~/(\w+)\s+([\w\s\-]+)/;
 	$language{$1}=$2;
@@ -33,8 +45,8 @@ sub handler {
     $r->content_type('text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-
-    my $iconpath= $r->dir_config('lonIconsURL');
+    $fnum=0;
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $domain  = $r->dir_config('lonDefDomain');
     my $role    = $r->dir_config('lonRole');
     my $loadlim = $r->dir_config('lonLoadLim');
@@ -43,13 +55,122 @@ sub handler {
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
 
+    my $fileclr='#ffffe6';
+# -------------------------------------- see if called from an interactive mode
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if ($name eq 'catalogmode') {
+           $ENV{'form.'.$name}=$value;
+	   }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+    $hidden=''; my $closebutton='';
+    my $groupimportbutton='';
+    my $colspan=''; 
+
+    $extrafield='';
+    if ($ENV{'form.catalogmode'} eq 'interactive') {
+	$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+	    '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
+	    ' border="0"></td>';
+	$colspan=" colspan='2' ";
+	$hidden=<<END;
+<input type='hidden' name='catalogmode' value='interactive'>
+END
+        $closebutton=<<END;
+<input type="button" name="close" value='CLOSE' onClick="self.close()">
+END
+    }
+    elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	$extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+	    '<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
+	    ' border="0"></td>';
+	$colspan=" colspan='2' ";
+	$hidden=<<END;
+<input type='hidden' name='catalogmode' value='groupimport'>
+END
+        $closebutton=<<END;
+<input type="button" name="close" value='CLOSE' onClick="self.close()">
+END
+        $groupimportbutton=<<END;
+<input type="button" name="groupimport" value='GROUP IMPORT' onClick="javascript:select_group()">
+END
+    }
+
+    my $catalogmodefunctions='';
+    if ($ENV{'form.catalogmode'} eq 'interactive' or
+	$ENV{'form.catalogmode'} eq 'groupimport') {
+	$catalogmodefunctions=<<END;
+function select_data(title,url) {
+    changeTitle(title);
+    changeURL(url);
+    self.close();
+}
+function save_group() {
+    for (var num=0; num<document.forms.fnum.fnum.value; num++) {
+	if (eval("document.forms.form"+num+".filelink.checked")) {
+	    alert(eval("document.forms.form"+num+".title.value")+
+		       eval("document.forms.form"+num+".filelink.value"));
+	}
+    }
+}
+function select_group() {
+    var linkflag=false;
+    for (var num=0; num<document.forms.fnum.fnum.value; num++) {
+	if (eval("document.forms.form"+num+".filelink.checked")) {
+//	    alert(eval("document.forms.form"+num+".title.value")+
+//		       eval("document.forms.form"+num+".filelink.value"));
+	    insertRowInLastRow();
+	    placeResourceInLastRow(
+		   eval("document.forms.form"+num+".title.value"),
+		   eval("document.forms.form"+num+".filelink.value"),
+		   linkflag
+				   );
+	    linkflag=true;
+	}
+    }
+    opener.editmode=0;
+    opener.notclear=0;
+    opener.linkmode=0;
+    opener.infoclear();
+    opener.draw();
+}
+function insertRowInLastRow() {
+    opener.insertrow(opener.maxrow);
+    opener.addobj(opener.maxrow,'e&2');
+}
+function placeResourceInLastRow (title,url,linkflag) {
+    opener.newresource(opener.maxrow,2,opener.escape(title),opener.escape(url),'false','normal');
+    opener.save();
+    opener.mostrecent=opener.obj.length-1;
+    if (linkflag) {
+	opener.joinres(opener.linkmode,opener.mostrecent,0);
+    }
+    opener.linkmode=opener.mostrecent;
+}
+function changeTitle(val) {
+    if (opener.inf.document.forms.resinfo.elements.t) {
+        opener.inf.document.forms.resinfo.elements.t.value=val;
+    }
+}
+function changeURL(val) {
+    if (opener.inf.document.forms.resinfo.elements.u) {
+	opener.inf.document.forms.resinfo.elements.u.value=val;
+    }
+}
+END
+    }
+
 # ---------------------------------------------------------------- Print Header
     $r->print(<<ENDHEADER);
 <html>
 <head>
 <title>The LearningOnline Network With CAPA Directory Browser</title>
 
-<SCRIPT language="javascript">
+<script language="javascript">
+$catalogmodefunctions
 function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
     var options = "width=" + w + ",height=" + h + ",";
     options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
@@ -57,7 +178,7 @@ function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);
     newWin.focus();
 }
-</SCRIPT>
+</script>
 
 </head>
 <body bgcolor="#FFFFFF">
@@ -66,13 +187,26 @@ ENDHEADER
     my $line;
     my (@attrchk,@openpath);
     my $uri=$r->uri;
-    my $iconpath="/res/adm/pages/indexericons/";
 
-    $r->print("<h2><font color=\"\#888888\">The LearningOnline With CAPA Network Directory Browser</font></h2>\n");
+    $r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
 
-    for (my $i=0; $i<=5; $i++) {
-	$attrchk[$i] = "checked" if $ENV{'form.attr'.$i} == 1;
-    }
+    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+
+	if ($ENV{'form.attrs'} ne "") {
+	    for (my $i=0; $i<=5; $i++) {
+		delete $hash{'display_attrs_'.$i};
+		if ($ENV{'form.attr'.$i} == 1) {
+		    $attrchk[$i] = "checked";
+		    $hash{'display_attrs_'.$i} = 1;
+		}
+	    }
+	} else {
+	    for (my $i=0; $i<=5; $i++) {
+		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
+	    }
+	}
     $r->print(<<END);
 <b><font color="#666666">Display file attributes</font></b><br>
 <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
@@ -85,25 +219,26 @@ ENDHEADER
 <td><input type=checkbox name=attr4 value="1" $attrchk[4]> Keywords</td>
 <td><input type=checkbox name=attr5 value="1" $attrchk[5]> Language</td>
 </tr></table>
-<input type="submit" name="dirlistattr" value="Review">&nbsp;
-<input type="submit" name="dirlistattr" value="Refresh">
+<input type=hidden name=dirPointer value="on">
+<input type="submit" name="attrs" value="Review">&nbsp;
+<input type="submit" name="attrs" value="Refresh">
+$hidden
+$closebutton
+$groupimportbutton
 </form>
 END
 
-    my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_diropen.db";
-
-    if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) {
-	my $titleclr="#ddffff";
-	$r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
-	$r->print("<table border=0><tr>\n");
-	$r->print("<td bgcolor=$titleclr><b>Name</b></td>\n");
-	$r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($ENV{'form.attr0'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($ENV{'form.attr1'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($ENV{'form.attr2'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($ENV{'form.attr3'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($ENV{'form.attr4'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($ENV{'form.attr5'} == 1);
-	$r->print("</tr>");
+    my $titleclr="#ddffff";
+    $r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
+    $r->print("<table border=0><tr>\n");
+    $r->print("<td $colspan bgcolor=$titleclr><b>Name</b></td>\n");
+    $r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($hash{'display_attrs_0'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($hash{'display_attrs_1'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($hash{'display_attrs_2'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($hash{'display_attrs_3'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($hash{'display_attrs_4'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($hash{'display_attrs_5'} == 1);
+    $r->print("</tr>");
 
 	map {
 	    if ($_ =~ /^diropen_status_/) {
@@ -128,11 +263,30 @@ END
 		$dirs{$uri} = 'open';
 	    }
 	}
-
-	my $toplevel = "/res/";
+	
+	my $bredir = $ENV{'form.dirPointer'};
+	my $toplevel;
 	my $indent = 0;
-	&scanDir ($r,$toplevel,$indent);
+	$uri = $uri.'/' if $uri !~ /.*\/$/;
+	if ($bredir ne "on") {
+	    $hash{'top.level'} = $uri;
+	    $toplevel = $uri;
 
+	} else {
+	    $toplevel = $hash{'top.level'};
+	}
+	if ($toplevel ne "/res/"){
+	    my (@uri_com) = split(/\//,$uri);
+	    pop @uri_com;
+	    my $upone = join('/',@uri_com);
+	    my @list = qw (0);
+	    &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list);
+	    $indent = 1;
+	}
+	&scanDir ($r,$toplevel,$indent);
+	
+	$r->print("<form name='fnum'>");
+	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
 	$r->print("</table>");
 	$r->print("</td></tr></table>");
 	$r->print("</body></html>\n");
@@ -143,6 +297,7 @@ END
     return OK;
 }
 
+
 # --------------------recursive scan of a directory
 sub scanDir {
     my ($r,$startdir,$indent)=@_;
@@ -153,23 +308,26 @@ sub scanDir {
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$domusr,$foo,$testdir,$foo)=split(/\&/,$line,5); 
+	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
-	if ($domusr eq "domain") {
+	if ($dom eq "domain") {
 	    $compuri = join('',$strip,"/");  # domain list has /res/<domain name>
 	    $curdir = $compuri;
 	} else {
-	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file having name only, i.e., w/o path
+	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file have name only, i.e., w/o path
 	    $curdir = $startdir;
 	}
-	my $diropen = 0;
-	if (($dirptr&$testdir) or ($domusr =~ /^(domain|user)$/)) {
+	my $diropen = "closed";
+	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
-		$diropen = 1 if ($key eq $compuri and $val eq "open");
+		if ($key eq $compuri and $val eq "open") {
+		    $diropen = "opened";
+		    delete $dupdirs{key},$dirs{$key};
+		}
 	    }
 	}
 	&display_line($r,$diropen,$line,$indent,$curdir,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen == 1;
+	&scanDir ($r,$compuri,$indent) if $diropen eq "opened";
     }
     $indent--;
 }
@@ -181,7 +339,7 @@ sub get_list {
     my $luri = $uri;
     $luri =~ s/\//_/g;
 
-    if ($ENV{'form.dirlistattr'} eq "Refresh") {
+    if ($ENV{'form.attrs'} eq "Refresh") {
 	map {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    } keys %hash;
@@ -205,7 +363,7 @@ sub match_ext {
     my $dirptr=16384;
 
     my $tabdir  = $r->dir_config('lonTabDir');
-    my $fn = $tabdir."/filetypes.tab";
+    my $fn = $tabdir.'/filetypes.tab';
     if (-e $fn) {
 	my $FH=Apache::File->new($fn);
 	my @content=<$FH>;
@@ -241,49 +399,60 @@ sub display_line{
     my (@pathfn, $fndir, $fnptr);
     my $dirptr=16384;
     my $fileclr="#ffffe6";
-    my $iconpath="/res/adm/pages/indexericons/";
+    my $iconpath= $r->dir_config('lonIconsURL') . "/";
 
     my @filecom = split (/\&/,$line);
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
     my $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen == 1;
+    $msg = 'Close '.$filecom[0].' directory' if $diropen eq "opened";
 
     my $tabtag="</td>";
     my $i=0;
 
     while ($i<=5) {
-	my $key="form.attr".$i;
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $ENV{$key} == 1;
+	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
+    if ($filecom[1] eq "viewOneUp") {
+	$r->print("<tr>$extrafield");
+	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+	$r->print ('<form method="post" name="dirpath" action="'.$startdir.
+		   '" enctype="application/x-www-form-urlencoded">'."\n");
+	$r->print ($hidden.'<input type=hidden name=openuri value="'.$startdir.'">'."\n");
+	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print("Up $tabtag</tr></form>\n");
+	return OK;
+    }
     if ($filecom[1] eq "domain") {
-	$r->print("<tr>");
+	$r->print ('<input type=hidden name=dirPointer value="on">'."\n") if ($ENV{'form.dirPointer'} eq "on");
+	$r->print("<tr>$extrafield");
 	$r->print("<td bgcolor=$fileclr valign=bottom>");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
-	$r->print ("<a name=\"".$anchor."\">\n<input src=\"".$iconpath."comp.blue.gif\"");
-	$r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n");
+	$r->print ('<a name="'.$anchor.'">');
+	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"'); 
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print ('<a href="'.$filecom[0].'"><img src="'.$iconpath.'server.gif"');
+	$r->print (' border="0"></a>'."\n");
 	$r->print("Domain - $listname $tabtag</tr></form>\n");
 	return OK;
     }
     if ($filecom[1] eq "user") {
-	$r->print("<tr>");
-	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+	$r->print("<tr>$extrafield");
+	$r->print("<td bgcolor=$fileclr valign=bottom nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
-	&begin_form ($r,$curdir);
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-#	$r->print ("<a name=\"$anchor\">\n<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
-	$r->print ("<a name=\"$anchor\">\n<img src=",$iconpath,"whitespace1.gif border=0>\n");
-	$r->print ("<input src=\"$iconpath");
-	$r->print ("folder_pointer_closed.gif\"") if $diropen == 0;
-	$r->print ("folder_pointer_opened.gif\"") if $diropen == 1;
-	$r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n");
-	$r->print ("<img src=",$iconpath,"quill.gif border=0>\n");
-	$r->print ("$listname $tabtag</tr></form>\n");
+	&begin_form ($r,$curdir);
+	$r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.'whitespace1.gif" border=0>'."\n");
+	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"'); 
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print ('<a href="'.$curdir.'"><img src='.$iconpath.'quill.gif border=0 name="'.$msg.'" height="22"></a>');
+	$r->print ($listname.$tabtag.'</tr></form>'."\n");
 	return OK;
     }
 # display file
@@ -291,11 +460,37 @@ sub display_line{
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[scalar(@file_ext)-1];
 	my $filelink = $startdir.$filecom[0];
-	$r->print("<tr><td bgcolor=$fileclr>");
+	$r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");
+	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	my $title;
+        if ($ENV{'form.catalogmode'} eq 'interactive') {
+	    $title=$listname;
+	    $title = &Apache::lonnet::metadata($filelink,'title')
+		if ($metafile == 1);
+	    $title=$listname unless $title;
+	    $r->print("<a href='javascript:select_data(\"",
+	              $title,'","',$filelink,"\")'>");
+	    $r->print("<img src='",$iconpath,"select.gif' border=0></a>\n");
+	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+	}
+        elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
+	    $title=$listname;
+	    $title = &Apache::lonnet::metadata($filelink,'title')
+		if ($metafile == 1);
+	    $title=$listname unless $title;
+	    $r->print("<form name='form$fnum'>\n");
+	    $r->print("<input type='checkbox' name='filelink"."' ".
+		      "value='$filelink'>\n");
+	    $r->print("<input type='hidden' name='title"."' ".
+		      "value='$title'>\n");
+	    $r->print("</form>\n");
+	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+  	    $fnum++;
+	}
 
-	if ($indent < 11) {
+	if ($indent > 0 and $indent < 11) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indent,".gif border=0>\n");
-	} else {
+	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
 	    my $rem = $indent%10.0;
 	    my $count = 0;
@@ -307,27 +502,29 @@ sub display_line{
 	}
 
 	$r->print("<img src=$iconpath$curfext.gif border=0>\n");
-	$r->print(" <a href=$filelink>",$listname,"</a>\n");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	$r->print (" <a href=\"javascript:openWindow('".$filelink."', 'metadatafile', '450', '500', 'no', 'yes')\"; TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
-	$r=>print("</td>\n");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") if $ENV{'form.attr0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>\n") if $ENV{'form.attr1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>\n") if $ENV{'form.attr2'} == 1;
+	$r->print("</td>\n");
+	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") 
+	    if $hash{'display_attrs_0'} == 1;
+	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>\n") 
+	    if $hash{'display_attrs_1'} == 1;
+	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>\n") 
+	    if $hash{'display_attrs_2'} == 1;
 
-	if ($ENV{'form.attr3'} == 1) {
+	if ($hash{'display_attrs_3'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1);
 	    $author = '&nbsp;' if (!$author);
 	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author." </td>\n");
 	}
-	if ($ENV{'form.attr4'} == 1) {
+	if ($hash{'display_attrs_4'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1);
 	    $keywords = '&nbsp;' if (!$keywords);
 	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords." </td>\n");
 	}
-	if ($ENV{'form.attr5'} == 1) {
+	if ($hash{'display_attrs_5'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1);
 	    $lang = $language{$lang};
 	    $lang = '&nbsp;' if (!$lang);
@@ -342,43 +539,38 @@ sub display_line{
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-	$r->print("<tr><td bgcolor=$fileclr valign=bottom>");
+	$r->print("<tr>$extrafield<td bgcolor=$fileclr valign=bottom>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11) {
+	if ($indentm1 < 11 and $indentm1 > 0) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indentm1,".gif border=0>\n");
 	} else {
 	    my $ten = int($indentm1/10.);
 	    my $rem = $indentm1%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print("<img src=",$iconpath,"whitespace10.gif border=0>\n");
-	    $count++;
+		$r->print ("<img src=",$iconpath,"whitespace10.gif border=0>\n");
+		$count++;
 	    }
-	    $r->print("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
+	    $r->print ("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
 	}
-	$r->print ("<a name=\"$anchor\">\n<input src=\"$iconpath");
-	$r->print ("folder_pointer_closed.gif\"") if $diropen == 0;
-	$r->print ("folder_pointer_opened.gif\"") if $diropen == 1;
-	$r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n");
-	$r->print("<img src=",$iconpath,"folder_closed.gif border=0>\n") if $diropen == 0;
-	$r->print("<img src=",$iconpath,"folder_opened.gif border=0>\n") if $diropen == 1;
-	$r->print("$listname $tabtag</tr></form>\n");
+	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"');
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print ('<a href="'.$curdir.'"><img src="'.$iconpath.'folder_'.$diropen.'.gif" border=0></a>'."\n");
+	$r->print ("$listname$tabtag</tr></form>\n");
     }
 
 }
 
-#---------------------prints the beginning of a form for directory or file link
+# ------------------- prints the beginning of a form for directory or file link
 sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
     $anchor =~ s/\///g;
-    $r->print ("<form method=\"post\" name=\"dirpath\" action=\"/res/\#$anchor\" enctype=\"application/x-www-form-urlencoded\">\n");
-    $r->print ("<input type=hidden name=openuri value=\"$uri\">\n");
-
-    for (my $i=0; $i<=5; $i++) {
-	$r->print ("<input type=hidden name=attr$i value=\"1\">\n") if $ENV{'form.attr'.$i} == 1;
-    }
+    $r->print ('<form method="post" name="dirpath" action="'.$uri.'#'.$anchor.
+	       '" enctype="application/x-www-form-urlencoded">'."\n");
+    $r->print ($hidden.'<input type=hidden name=openuri value="'.$uri.'">'."\n");
+    $r->print ('<input type=hidden name=dirPointer value="on">'."\n");
 }
 
 1;