--- loncom/interface/lonindexer.pm	2001/08/08 03:00:11	1.16
+++ loncom/interface/lonindexer.pm	2025/03/18 19:36:59	1.232
@@ -1,391 +1,639 @@
 # 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
-# 8/6,8/7 Scott Harrison
+# $Id: lonindexer.pm,v 1.232 2025/03/18 19:36:59 raeburn Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+###
+
+###############################################################################
+##                                                                           ##
+## ORGANIZATION OF THIS PERL MODULE                                          ##
+##                                                                           ##
+## 1. Description of functions                                               ##
+## 2. Modules used by this module                                            ##
+## 3. Choices for different output views (detailed, summary, xml, etc)       ##
+## 4. Handling routine called via Apache and mod_perl                        ##
+## 5. Other subroutines                                                      ##
+##                                                                           ##
+###############################################################################
 
 package Apache::lonindexer;
 
+# ------------------------------------------------- modules used by this module
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
+use Apache::loncommon();
+use Apache::lonhtmlcommon();
+use Apache::lonsequence();
 use Apache::Constants qw(:common);
+use Apache::lonmeta;
 use Apache::File;
+use Apache::lonlocal;
+use Apache::lonsource();
+use Apache::groupsort();
 use GDBM_File;
+use LONCAPA qw(:match);
+
+# ---------------------------------------- variables used throughout the module
+my %hash; # global user-specific gdbm file
+my %dirs; # keys are directories, values are the open/close status
+my %dynhash; # hash of hashes for dynamic metadata
+my %dynread; # hash of directories already read for dynamic metadata
+my %fieldnames; # Metadata fieldnames
+# ----- Values which are set by the handler subroutine and are accessible to
+# -----     other methods.
+my $extrafield; # default extra table cell
+my $fnum; # file counter
+my $dnum; # directory counter
+
+# ----- Used to include or exclude files with certain extensions.
+my @Only = ();
+my @Omit = ();
+
+
 
-my %hash;
-my %dirs;
-my %language;
-my $hidden;
-my $extrafield;
-my $fnum;
-my $dnum;
-sub BEGIN {
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-			     '/language.tab');
-    map {
-	$_=~/(\w+)\s+([\w\s\-]+)/;
-	$language{$1}=$2;
-    } <$fh>;
-}
 
+# ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    my $c = $r->connection();
+    &Apache::loncommon::content_type($r,'text/html');
+    &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
+
+    # Deal with stupid global variables (is there a way around making
+    # these global to this package?  It is just so wrong....)
+    undef (@Only);
+    undef (@Omit);
+    %fieldnames=&Apache::lonmeta::fieldnames();
+
+# --------------------------------------------------------------- get icon path
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    my $domain  = $r->dir_config('lonDefDomain');
-    my $role    = $r->dir_config('lonRole');
-    my $loadlim = $r->dir_config('lonLoadLim');
-    my $servadm = $r->dir_config('lonAdmEMail');
-    my $sysadm  = $r->dir_config('lonSysEMail');
-    my $lonhost = $r->dir_config('lonHostID');
-    my $tabdir  = $r->dir_config('lonTabDir');
+    my $defdom = &Apache::lonnet::default_login_domain();
 
-    my $fileclr='#ffffe6';
+#SB my $fileclr='#ffffe6';
     my $line;
-    my (@attrchk,@openpath);
+    my (@attrchk,@openpath,$typeselect);
     my $uri=$r->uri;
 
 # -------------------------------------- see if called from an interactive mode
-#    foreach my $key (sort(keys(%ENV))) {
-#	$r->print("$key is $ENV{$key}<br />");
-#    }
-#    $r->print("END ENV");
-    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;
-       }
-       if ($name eq 'launch') {
-           $ENV{'form.'.$name}=$value;
-       }
-       if ($name eq 'acts') {
-           $ENV{'form.'.$name}=$value;
-       }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
-
-    $hidden=''; my $closebutton='';
+    # Get the parameters from the query string
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+	     ['catalogmode','launch','acts','mode','form','element',
+              'only','omit','titleelement']);
+    #-------------------------------------------------------------------
+    my $closebutton='';
     my $groupimportbutton='';
     my $colspan=''; 
-
+    
     $extrafield='';
-    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
-
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
-	if ($ENV{'form.launch'} eq '1') {
-	    delete $hash{'mode_catalog'};
-	    map {
-		if ($_ =~ /^pre_/) {
-		    delete $hash{$_};
-		}
-		if ($_ =~ /^store/) {
-		    delete $hash{$_};
-		}
-	    } keys %hash;    
-	}
-	if ($hash{'mode_catalog'} eq 'interactive') {
-	    $ENV{'form.catalogmode'}='interactive';
-	}
-	if ($hash{'mode_catalog'} eq 'groupimport') {
-	    $ENV{'form.catalogmode'}='groupimport';
+    my $diropendb = LONCAPA::tempdir() .
+	"$env{'user.domain'}_$env{'user.name'}_sel_res.db";
+    %hash = ();
+    {
+	my %dbfile;
+	if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRITER(),0640)) {
+	    if ($env{'form.launch'} eq '1') {
+		&start_fresh_session(\%dbfile);
+	    }
+	    while(my($key,$value)=each(%dbfile)) {
+		$hash{$key}=$value;
+	    }
+	    untie(%dbfile);
 	}
-
-	if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    $hash{'mode_catalog'}='interactive';
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-		' border="0"></td>';
+    }
+# - 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') {
+       &Apache::loncommon::content_type($r,'text/html');
+       my $extra='';
+       if (defined($env{'form.titleelement'}) && 
+	   $env{'form.titleelement'} ne '') {
+	   my $verify_title = &Apache::lonnet::gettitle($env{'form.acts'});
+#	   &Apache::lonnet::logthis("Hrrm $env{'form.acts'} -- $verify_title");
+	   $verify_title=~s/'/\\'/g;
+	   $extra='window.opener.document.forms["'.$env{'form.form'}.'"].elements["'.$env{'form.titleelement'}.'"].value=\''.$verify_title.'\';';
+       }
+       my $js = <<ENDSUBM;
+	       <script type="text/javascript">
+		function load() {
+			window.opener.document.forms["$env{'form.form'}"]
+			    .elements["$env{'form.element'}"]
+			    .value='$env{'form.acts'}';
+			$extra
+			window.close();
+		}
+   	       </script>
+ENDSUBM
+       $r->print(&Apache::loncommon::start_page(undef,$js,
+						{'only_body'   =>1,
+                                                 'add_modal' => 1,
+                                                 'add_wishlist' => 1,
+						 'add_entries' =>
+						     {'onload' => "load();"},}
+						).
+		 &Apache::loncommon::end_page());
+       return OK;
+   }
+    
+# -------------------- refresh environment with user database values (in %hash)
+	&setvalues(\%hash,'form.catalogmode',\%env,'form.catalogmode'   );
+
+# --------------------- define extra fields and buttons in case of special mode
+	if ($env{'form.catalogmode'} eq 'interactive') {
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td class="LC_bottom">'.
+		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
-	    $hidden=<<END;
-<input type='hidden' name='catalogmode' value='interactive'>
-END
+            my $cl=&mt('Close');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 END
         }
-	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $hash{'mode_catalog'}='groupimport';
-	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
-		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
-		' border="0"></td>';
+	elsif ($env{'form.catalogmode'} eq 'import') {
+#SB	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
+            $extrafield='<td class="LC_bottom">'.
+		'<img alt="" src="'.$iconpath.'whitespace1.gif"'.
+		' class="LC_icon" /></td>';
 	    $colspan=" colspan='2' ";
-	    $hidden=<<END;
-<input type='hidden' name='catalogmode' value='groupimport'>
-END
+	    my $cl=&mt('Close');
+            my $gi=&mt('Import');
             $closebutton=<<END;
-<input type="button" name="close" value='CLOSE' onClick="self.close()">
+<input type="button" name="close" value='$cl' onclick="self.close()" />
 END
             $groupimportbutton=<<END;
-<input type="button" name="groupimport" value='GROUP IMPORT' onClick="javascript:select_group()">
+<input type="button" name="groupimport" value='$gi'
+onclick="javascript:select_group()" />
 END
         }
-
+	# Additions made by Matthew to make the browser a little easier to deal
+	# with in the future.
+	#
+	# $mode (at this time) indicates if we are in edit mode.
+	# $form is the name of the form that the URL is placed when the
+	#       selection is made.
+	# $element is the name of the element in $formname which receives
+	#       the URL.
+	#&Apache::lonxml::debug('Checking mode, form, element');
+	&setvalues(\%hash,'form.mode'        ,\%env,'form.mode'   );
+	&setvalues(\%hash,'form.form'        ,\%env,'form.form'   );
+	&setvalues(\%hash,'form.element'     ,\%env,'form.element');
+	&setvalues(\%hash,'form.titleelement',\%env,'form.titleelement');
+	&setvalues(\%hash,'form.only'        ,\%env,'form.only'   );
+	&setvalues(\%hash,'form.omit'        ,\%env,'form.omit'   );
+
+        # Deal with 'omit' and 'only' 
+        if (exists $env{'form.omit'}) {
+            @Omit = split(',',$env{'form.omit'});
+        }
+        if (exists $env{'form.only'}) {
+            @Only = split(',',$env{'form.only'});
+        }
+        
+	my $mode = $env{'form.mode'};
+	my ($form,$element,$titleelement);
+	if ($mode eq 'edit' || $mode eq 'parmset') {
+	    $form         = $env{'form.form'};
+	    $element      = $env{'form.element'};
+	    $titleelement = $env{'form.titleelement'};
+	}
+	#&Apache::lonxml::debug("mode=$mode form=$form element=$element titleelement=$titleelement");
+# ------ set catalogmodefunctions to have extra needed javascript functionality
 	my $catalogmodefunctions='';
-	if ($ENV{'form.catalogmode'} eq 'interactive' or
-	    $ENV{'form.catalogmode'} eq 'groupimport') {
-	    $catalogmodefunctions=<<END;
-function select_data(title,url) {
-    changeTitle(title);
+	if ($env{'form.catalogmode'} eq 'interactive' or
+	    $env{'form.catalogmode'} eq 'import') {
+	    # The if statement below sets us up to use the old version
+	    # by default (ie. if $mode is undefined).  This is the easy
+	    # way out.  Hopefully in the future I'll find a way to get 
+	    # the calls dealt with in a more comprehensive manner.
+
+#
+# There is now also mode "simple", which is for the simple version of the rat
+#
+#
+	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
+                my $location = "/adm/groupsort?&inhibitmenu=yes&catalogmode=import&";
+                $location .= "mode=".$mode."&";
+                $location .= "acts=";
+		$catalogmodefunctions=<<"END";
+function select_data(url) {
     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() {
+    window.location="$location"+document.forms.fileattr.acts.value;
+}
+function changeURL(val) {
+    if (opener.inf) {
+        if (opener.inf.document.forms.resinfo.elements.u) {
+	    opener.inf.document.forms.resinfo.elements.u.value=val;
+        }
     }
 }
-function select_group() {
-//    window.location="http://"+window.location.hostname+"/adm/groupsort?acts="+document.forms.fileattr.acts.value;
-    window.location="/adm/groupsort?acts="+document.forms.fileattr.acts.value;
+END
+            } elsif ($mode eq 'edit') { # we are in 'edit' mode
+                my $location = "/adm/groupsort?catalogmode=interactive&";
+                $location .= "form=$form&element=$element&mode=edit&acts=";
+		$catalogmodefunctions=<<END;
+// mode = $mode
+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_group2() {
-    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();
-    self.close();
+function select_group() {
+    window.location="$location"+document.forms.fileattr.acts.value;
 }
-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);
+
+function changeURL(val) {
+    if (window.opener.document) {
+	window.opener.document.forms["$form"].elements["$element"].value=val;
+    } else {
+	    alert("The file you selected is: "+val);
     }
-    opener.linkmode=opener.mostrecent;
 }
+END
+                if (!$titleelement) {
+		    $catalogmodefunctions.='function changeTitle(val) {}';
+		} else {
+		    $catalogmodefunctions.=<<END;
 function changeTitle(val) {
-    if (opener.inf.document.forms.resinfo.elements.t) {
-        opener.inf.document.forms.resinfo.elements.t.value=val;
+    if (window.opener.document) {
+	    window.opener.document.forms["$form"].elements["$titleelement"].value=val;
+    } else {
+	    alert("The title of the file you selected is: "+val);
     }
 }
+END
+                }
+            } elsif ($mode eq 'parmset') {
+                my $location = "/adm/groupsort?catalogmode=interactive&";
+                $location .= "form=$form&element=$element&mode=parmset&acts=";
+		$catalogmodefunctions=<<END;
+// mode = $mode
+function select_data(url) {
+    changeURL(url);
+    self.close();
+}
+
+function select_group() {
+    window.location="$location"+document.forms.fileattr.acts.value;
+}
+
 function changeURL(val) {
-    if (opener.inf.document.forms.resinfo.elements.u) {
-	opener.inf.document.forms.resinfo.elements.u.value=val;
+    if (window.opener.document) {
+        var elementname  = "$element";
+	window.opener.document.forms["$form"].elements[elementname].value=val;
+    } else {
+	    alert("The file you selected is: "+val);
     }
 }
+
 END
+            }
         }
-	if ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $catalogmodefunctions.=<<END;
+        $catalogmodefunctions.=<<END;
 var acts='';
+function rep_dirpath(suffix,val) {
+    eval("document.forms.dirpath"+suffix+".acts.value=val");
+}
+END
+	if ($env{'form.catalogmode'} eq 'import') {
+            $catalogmodefunctions.=<<END;
 function queue(val) {
     if (eval("document.forms."+val+".filelink.checked")) {
 	var l=val.length;
 	var v=val.substring(4,l);
 	document.forms.fileattr.acts.value+='1a'+v+'b';
-//	alert(document.forms.fileattr.acts.value);
     }
     else {
 	var l=val.length;
 	var v=val.substring(4,l);
 	document.forms.fileattr.acts.value+='0a'+v+'b';
-//	alert(document.forms.fileattr.acts.value);
-    }
-    if (typeof(document.forms.dirpathUP)!="undefined") {
-//	document.forms.dirpathUP.acts.value=document.forms.fileattr.acts.value;
-//	alert(document.forms.dirpathUP.acts.value);
     }
 }
-function rep_dirpath(suffix,val) {
-    eval("document.forms.dirpath"+suffix+".acts.value=val");
-//    eval("alert(document.forms.dirpath"+suffix+".acts.value)");
-//    return false;
-}
 END
 	}
+
+        my $inhibit_menu = "+'&".&Apache::loncommon::inhibit_menu_check()."'";
 # ---------------------------------------------------------------- Print Header
-	$r->print(<<ENDHEADER);
-<html>
-<head>
-<title>The LearningOnline Network With CAPA Directory Browser</title>
-
-<script language="javascript">
-$catalogmodefunctions
-function openWindow(url, wdwName, w, h, toolbar,scrollbar) {
-    var options = "width=" + w + ",height=" + h + ",";
+        
+	my $js = <<"ENDHEADER";
+<script type="text/javascript">
+// <![CDATA[
+$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;
+    var ypos = (screen.height-h)/2-30;
+    ypos = (ypos < 0) ? '0' : ypos;
+    var options = "width=" + w + ",height=" + h + ",screenx="+xpos+",screeny="+ypos+",";
     options += "resizable=yes,scrollbars="+scrollbar+",status=no,";
-    options += "menubar=no,toolbar="+toolbar+",location=no,directories=no";
+    options += "menubar=no,toolbar="+toolbar+",location="+locationbar+",directories=no";
     var newWin = window.open(url, wdwName, options);
     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>
-
-</head>
-<body bgcolor="#FFFFFF">
 ENDHEADER
-        if ($ENV{'form.catalogmode'} eq 'groupimport') {
-#	    $r->print($ENV{'form.acts'}."<br />");
-	    my $acts=$ENV{'form.acts'};
-	    my @Acts=split(/b/,$acts);
-	    my %ahash;
-	    my %achash;
-	    my $ac=0;
-	    map {
-		my ($state,$ref)=split(/a/);
-		$ahash{$ref}=$state;
-		$achash{$ref}=$ac;
-		$ac++;
-	    } (@Acts);
-	    map {
-		my $key=$_;
-		if ($ahash{$key} eq '1') {
-#		    $r->print("<b>NEW: ");
-#		    $r->print($hash{'pre_'.$key.'_title'});
-#		    $r->print(" : ");
-#		    $r->print($hash{'pre_'.$key.'_link'});
-#		    $r->print("</b><br />");
-		    $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'}};
-		    }
-		}
-	    } sort {$achash{$a}<=>$achash{$b}} (keys %ahash);
-	    map {
-		if ($_ =~ /^store_/) {
-		    my $key=$_;
-		    $key=~s/^store_//;
-#		    $r->print("<b>STORE: ");
-#		    $r->print($hash{'storectr_'.$key});
-#		    $r->print(':');
-#		    $r->print($hash{'store_'.$key});
-#		    $r->print(':');
-#		    $r->print($key);
-#		    $r->print("</b><br />");
-		}
-	    } keys %hash;
-	    map {
-		if ($_ =~ /^pre_/ && $_ =~/link$/) {
-		    my $key = $_;
-		    $key =~ s/^pre_//;
-		    $key =~ s/_[^_]*$//;
-#		    $r->print($key);
-#		    $r->print(':');
-#		    $r->print($hash{'pre_'.$key.'_title'});
-#		    $r->print(':');
-#		    $r->print($hash{'pre_'.$key.'_link'});
-#		    $r->print('<br />');
-		    delete $hash{'pre_'.$key.'_title'};
-		    delete $hash{'pre_'.$key.'_link'};
-		}
-	    } keys %hash;
+
+        my ($headerdom)=($uri=~m{^/res/($match_domain)/});
+
+        if ($env{'form.catalogmode'}) {
+            # "Popup mode"
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'only_body' => 1, 'add_wishlist'=>1, 'add_modal' =>1, 
+                                                      'domain' => $headerdom,}));
+        } else {
+            # Only display page header and breadcrumbs in non-popup mode
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            &Apache::lonhtmlcommon::add_breadcrumb({
+                'text'  => 'Browse published resources',
+                'href'  => '/res/'.$headerdom.'/?launch=1',
+            });
+            $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
+                                                     {'domain' => $headerdom,})
+                     .&Apache::lonhtmlcommon::breadcrumbs()
+            );
+        }
+
+# ---------------------------------- get state of file types to be showing
+	if ($env{'form.only'}) {
+	    $typeselect = $env{'form.only'};
+	} else {
+	    $typeselect = '';
 	}
-	
-	$r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
-    } else {
-	$r->print('<html><head></head><body>Unable to tie hash to db file</body></html>');
-	return OK;
-    }
-    untie %hash;
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 
-	if ($ENV{'form.attrs'} ne "") {
-	    for (my $i=0; $i<=5; $i++) {
+# ---------------------------------- get state of file attributes to be showing
+	if ($env{'form.attrs'}) {
+	    for (my $i=0; $i<=16; $i++) {
 		delete $hash{'display_attrs_'.$i};
-		if ($ENV{'form.attr'.$i} == 1) {
-		    $attrchk[$i] = "checked";
+		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;
+	    for (my $i=0; $i<=16; $i++) {
+		$attrchk[$i] = 'checked="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">
-<table border=0><tr>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Size</td>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Last access</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last modified</td>
-</tr><tr>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Author</td>
-<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="hidden" name="dirPointer" value="on" />
+
+        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} = &mt($cat);
+            push(@select_form_order,$types);
+        }
+        $select_file_categories{'select_form_order'} = \@select_form_order;
+        my $onchange = 'this.form.submit();';
+        my $type_element=
+            &Apache::loncommon::select_form(
+                $typeselect,
+                'only',
+                \%select_file_categories,$onchange);
+        my $type_selector = '<label>'.&mt('File Type Displayed: [_1]',
+                                          $type_element).'</label>';
+
+# ------------------------------- output state of file attributes to be showing
+#                                 All versions has to the last item
+#                                 since it does not take an extra col
+	my %lt=&Apache::lonlocal::texthash(
+					   'av' => 'All versions',
+					   'ud' => 'Update Display',
+					   'pr' => 'Problems',
+					   'gr' => 'Graphics',
+					   'at' => 'All types',
+					   'hd' => 'Display Options'
+					   );
+        my @disp_order = ('0','4','5','6','13','1','2','3','10','14','8','11','7','12','15','16');
+        my %disp_options = &Apache::lonlocal::texthash (
+                              0  => 'Title',
+                              4  => 'Author',
+                              5  => 'Keywords',
+                              6  => 'Language',
+                              13 => 'Notes',
+                              1  => 'Size',
+                              2  => 'Last access',
+                              3  => 'Last modified',
+                              10 => 'Source Available',
+                              14 => 'Abstract',
+                              8  => 'Statistics',
+                              11 => 'Linked/Related Resources',
+                              7  => 'Show resource',
+                              12 => 'Subject',
+                              15 => 'Grade Level',
+                              16 => 'Standards',
+                           );
+        my $cell = 0;
+        my $numinrow = 4;
+	$r->print('
+<form method="post" name="fileattr" action="'.$uri.'" enctype="application/x-www-form-urlencoded">
+<fieldset>
+<legend>'.$lt{'hd'}.'</legend>
+<table style=" border-collapse: collapse; border-style: none;">'."\n");
+        foreach my $item (@disp_order) {
+            my $style = 'padding-left: 12px; padding-right: 8px;';
+            if ($cell%$numinrow == 0) {
+                $r->print('<tr>');
+            }
+            $cell ++;
+            if ($cell > 3 * $numinrow) {
+                $style .= ' padding-bottom: 6px;'; 
+            }
+            if (defined($disp_options{$item})) {
+                $r->print('<td style="'.$style.'"><span class="LC_nobreak">'.
+                          '<label><input type="checkbox" name="attr'.$item.'" value="1" '.
+                          $attrchk[$item].' onclick="this.form.submit();" /> '.$disp_options{$item}.
+                          '</label></span></td>'."\n");
+            }
+            if ($cell > 1 && $cell%$numinrow == 0) {
+                $r->print('</tr>');
+            }
+        }
+        $r->print(<<END);
+<tr>
+<td style="font-style: italic; border-top: 1px solid black; padding-top: 6px"> 
+<label><input type="checkbox" name="attr9" value="1" $attrchk[9] onclick="this.form.submit();" /> $lt{'av'}</label>
+</td>
+<td colspan="3" style="padding-left:8px; padding-top: 4px; font-style: italic; border-top: 1px solid black; padding-top: 8px">$type_selector</td>
+</tr>
+</table>
+<input type="hidden" name="attrs" value="1" />
+</fieldset>
+<input type="submit" name="updatedisplay" value="$lt{'ud'}" />
 <input type="hidden" name="acts" value="" />
-<input type="submit" name="attrs" value="Review" />&nbsp;
-<input type="submit" name="attrs" value="Refresh" />
-$hidden
-$closebutton
-$groupimportbutton
-</form>
+$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];
+	$storeuri=~s/\/+/\//g;
+# ---------------------------------------------------------------- Bread crumbs
+        $r->print(
+            '<p>'
+           .&Apache::lonhtmlcommon::crumbs(
+                $storeuri,
+                '',
+                '',
+                (($env{'form.catalogmode'} eq 'import')?
+                                 'document.forms.fileattr':''))
+           .'<br />'
+           .&Apache::lonhtmlcommon::select_recent(
+                'residx',
+                'resrecent',
+                '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();')
+           .'</p>'
+        );
+# -------------------------------------------------------- Resource Home Button
+	my $reshome=$env{'course.'.$env{'request.course.id'}.'.reshome'};
+	if ($reshome) {
+	    $r->print("<span class=\"LC_fontsize_large\"><a href='");
+	    if ($env{'form.catalogmode'} eq 'import') {
+		$r->print('javascript:document.forms.fileattr.action="'.&Apache::loncommon::inhibit_menu_check($reshome).'";document.forms.fileattr.submit();');
+	    } else {
+		$r->print($reshome);
+	    }
+	    $r->print("'>".&mt('Home directory').'</a></span>');
+	}
+	$r->print('</form>');
+# ------------------------------------------------------ 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('<p><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()" /></p>');
+	}
+# ----------------- output starting row to the indexed file/directory hierarchy
+        #$r->print(&initdebug());
+        #$r->print(&writedebug("Omit:@Omit")) if (@Omit);
+        #$r->print(&writedebug("Only:@Only")) if (@Only);
+        $r->print(&Apache::loncommon::start_data_table("LC_tableBrowseRes")
+                 .&Apache::loncommon::start_data_table_header_row());
+	$r->print("<th $colspan>".&mt('Name')."</th>\n");
+	$r->print('<th><span class="LC_visually_hidden">'.&mt('Add to Stored Links')."</span></th>\n");
+	$r->print("<th>".&mt('Title')."</th>\n") 
+	    if ($hash{'display_attrs_0'} == 1);
+	$r->print('<th class="LC_right">'.&mt("Size")." (".&mt("bytes").") ".
+		  "</th>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<th>".&mt("Last accessed")."</th>\n") 
+	    if ($hash{'display_attrs_2'} == 1);
+	$r->print("<th>".&mt("Last modified")."</th>\n")
+	    if ($hash{'display_attrs_3'} == 1);
+	$r->print("<th>".&mt("Author(s)")."</th>\n")
+	    if ($hash{'display_attrs_4'} == 1);
+	$r->print("<th>".&mt("Keywords")."</th>\n")
+	    if ($hash{'display_attrs_5'} == 1);
+	$r->print("<th>".&mt("Language")."</th>\n")
+	    if ($hash{'display_attrs_6'} == 1);
+	$r->print("<th>".&mt("Usage Statistics")." <br />(".
+		  &mt("Courses/Network Hits").") ".&mt('updated periodically')."</th>\n")
+	    if ($hash{'display_attrs_8'} == 1);
+	$r->print("<th>".&mt("Source Available")."</th>\n")
+	    if ($hash{'display_attrs_10'} == 1);
+	$r->print("<th>".&mt("Linked/Related Resources")."</th>\n")
+	    if ($hash{'display_attrs_11'} == 1);
+	$r->print("<th>".&mt("Resource")."</th>\n")
+	    if ($hash{'display_attrs_7'} == 1);
+	$r->print("<th>".&mt("Subject")."</th>\n")
+	    if ($hash{'display_attrs_12'} == 1);
+	$r->print("<th>".&mt("Notes")."</th>\n")
+	    if ($hash{'display_attrs_13'} == 1);
+	$r->print("<th>".&mt("Abstract")."</th>\n")
+	    if ($hash{'display_attrs_14'} == 1);
+	$r->print("<th>".&mt("Grade Level")."</th>\n")
+	    if ($hash{'display_attrs_15'} == 1);
+	$r->print("<th>".&mt("Standards")."</th>\n")
+	    if ($hash{'display_attrs_16'} == 1);
+	    
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+    
+    	
 
-        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 {
+# ----------------- read in what directories have previously been set to "open"
+	foreach (keys(%hash)) {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
 		$key =~ s/^diropen_status_//;
 		$dirs{$key} = $hash{$_};
 	    }
-	} keys %hash;
+	}
 
-	if ($ENV{'form.openuri'}) {  # take care of review and refresh options
-	    my $uri=$ENV{'form.openuri'};
+	if ($env{'form.openuri'}) {  # take care of review and refresh options
+	    my $uri=$env{'form.openuri'};
 	    if (exists($hash{'diropen_status_'.$uri})) {
 		my $cursta = $hash{'diropen_status_'.$uri};
 		$dirs{$uri} = 'open';
@@ -400,97 +648,213 @@ END
 	    }
 	}
 	
-	my $bredir = $ENV{'form.dirPointer'};
 	my $toplevel;
 	my $indent = 0;
 	$uri = $uri.'/' if $uri !~ /.*\/$/;
-	if ($bredir ne "on") {
-	    $hash{'top.level'} = $uri;
-	    $toplevel = $uri;
 
-	} else {
-	    $toplevel = $hash{'top.level'};
-	}
-	if ($toplevel ne "/res/"){
+ 	if ($env{'form.dirPointer'} ne 'on') {
+ 	    $hash{'top.level'} = $uri;
+ 	    $toplevel = $uri;
+ 	} else {
+ 	    $toplevel = $hash{'top.level'};
+ 	}
+
+# -------------------------------- if not at top level, provide an uplink arrow
+	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);
+	    &display_line ($r,$defdom,'opened',$upone.'&viewOneUp',0,$upone,@list);
 	    $indent = 1;
 	}
-	&scanDir ($r,$toplevel,$indent,\%hash);
-	
-	$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");
-	untie(%hash);
-    } else {
-	$r->print("Unable to tie hash to db file");
+
+# -------- recursively go through all the directories and output as appropriate
+	&scanDir ($r,$toplevel,$indent,\%hash,$defdom);
+
+# -------------------------------------------------------------- end the tables
+        $r->print(&Apache::loncommon::end_data_table());
+
+# ---------------------------- embed hidden information useful for group import
+	$r->print("<form name='fnum' action=''>");
+	$r->print("<input type='hidden' name='fnum' value='$fnum' /></form>");
+
+# --------------------------------------------------- end the output and return
+	$r->print(&Apache::loncommon::end_page()."\n");
+    }
+    if(! $c->aborted()) {
+# write back into the temporary file
+	my %dbfile;
+        if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) {
+            while (my($key,$value) = each(%hash)) {
+                $dbfile{$key}=$value;
+            }
+            untie(%dbfile);
+        }
     }
+
     return OK;
 }
 
-
-# --------------------recursive scan of a directory
+# ----------------------------------------------- recursive scan of a directory
 sub scanDir {
-    my ($r,$startdir,$indent,$hashref)=@_;
+    my ($r,$startdir,$indent,$hashref,$defdom)=@_;
+    my $c = $r->connection();
     my ($compuri,$curdir);
     my $dirptr=16384;
+    my $obs;
     $indent++;
-
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
-	next if $strip =~ /.*\.meta$/;
-	if ($dom eq "domain") {
-	    $compuri = join('',$strip,"/");  # domain list has /res/<domain name>
-	    $curdir = $compuri;
+        return if ($c->aborted());
+	#This is a kludge, sorry aboot this
+	my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
+	next if (($strip =~ /\.meta$/) || ($obs));
+        if ($dom ne 'domain') {
+            my ($udom,$uname);
+            if ($dom eq 'user') {
+                ($udom) = ($startdir =~ m{^/res/($match_domain)});
+                $uname = $strip;
+            } else {
+                ($udom,$uname) = ($startdir =~ m{^/res/($match_domain)/($match_courseid)});
+            }
+            if ($udom ne '' && $uname ne '') {
+                # Don't display "course author" directory.
+                next if (&Apache::lonnet::is_course($udom,$uname));
+            }
+        }
+	my (@fileparts) = split(/\./,$strip);
+	if ($hash{'display_attrs_9'} != 1) {
+            # if not all versions to be shown
+	    if (scalar(@fileparts) >= 3) {
+		my $fext = pop @fileparts;
+		my $ov = pop @fileparts;
+		my $fname = join ('.',@fileparts,$fext);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/);
+	    }
+	}
+
+	if ($dom eq 'domain') {
+	    # dom list has full path /res/<domain name>/ already
+	    $curdir='';
+	    $compuri = (split(/\&/,$line))[0];
 	} else {
-	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file have name only, i.e., w/o path
+	    # user, dir & file have name only, i.e., w/o path
+	    $compuri = join('',$startdir,$strip,'/');
 	    $curdir = $startdir;
 	}
-	my $diropen = "closed";
-	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
+	my $diropen = 'closed';
+	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
 		if ($key eq $compuri and $val eq "open") {
 		    $diropen = "opened";
-		    delete $dupdirs{key},$dirs{$key};
+		    delete($dupdirs{$key});
+		    delete($dirs{$key});
 		}
 	    }
 	}
-	&display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen eq "opened";
+	&display_line($r,$defdom,$diropen,$line,$indent,$curdir,$hashref,@list);
+	&scanDir ($r,$compuri,$indent,undef,$defdom) if $diropen eq 'opened';
     }
     $indent--;
 }
 
-# ----------------- get complete matched list based on the uri ------
+# --------------- get complete matched list based on the uri (returns an array)
 sub get_list {
     my ($r,$uri)=@_;
-    my @list;
-    my $luri = $uri;
-    $luri =~ s/\//_/g;
-
-    if ($ENV{'form.attrs'} eq "Refresh") {
-	map {
+    my @list=();
+    my $listerror;
+    
+    (my $luri = $uri) =~ s/\//_/g;
+    if ($env{'form.updatedisplay'}) {
+	foreach (keys(%hash)) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
-	    } keys %hash;
+	    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
+	$uri=~s/\/$//;
+	$uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1];
+	$uri=~s/\/+/\//g;
+	foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) {
+	    my @ratpart=split(/\:/,$_);
+	    push(@list,&LONCAPA::map::qtescape($ratpart[1]));
+	} 
+	$hash{'dirlist_files_'.$luri} = join("\n",@list);
     } else {
-	@list = &Apache::lonnet::dirlist($uri);
-	$hash{'dirlist_files_'.$luri} = join('\n',@list);
+# is really a directory
+	(my $listref,$listerror) = &Apache::lonnet::dirlist($uri);
+        if (ref($listref) eq 'ARRAY') {
+            @list = @{$listref};
+        }
+	$hash{'dirlist_files_'.$luri} = join("\n",@list);
+	$hash{'dirlist_timestamp_files_'.$luri} = time;
+    }
+#Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
+    if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) { 
+        $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
+    } elsif ($listerror eq 'con_lost') {
+        $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
     }
-    return @list=&match_ext($r,@list);
+
+    return @list=&match_ext($r,@list);    
 }
 
-#-------------------------- filters out files based on extensions
+sub dynmetaread {
+    my $uri=shift;
+    if (($hash{'display_attrs_8'}==1) || ($hash{'display_attrs_11'}==1)) {
+# We don't want the filename
+	$uri=~s/\/[^\/]+$//;
+# Did we already see this?
+	my $builddir=$uri;
+	while ($builddir) {
+	    if ($dynread{$builddir}) {
+		return 0;
+	    }
+	    $builddir=~s/\/[^\/]+$//;
+	}
+# Actually get the data
+	%dynhash=
+	    (%dynhash,&Apache::lonmeta::get_dynamic_metadata_from_sql($uri.'/'));
+# Remember that we got it
+	$dynread{$uri}=1;
+    } 
+}
+
+sub initdebug {
+    my $start_page=
+	&Apache::loncommon::start_page('Debug',undef,
+				       {'only_body' => 1,});
+    $start_page =~ s/\n/ /g;
+    return <<ENDJS;
+<script type="text/javascript">
+var debugging = true;
+if (debugging) {
+    var debuggingWindow = window.open('','Debug','width=400,height=300',true);
+} 
+
+function output(text) {
+    if (debugging) {
+        debuggingWindow.document.writeln(text);
+    }
+}
+output('$start_page<pre>');   
+</script>
+ENDJS
+}
+
+sub writedebug {
+    my ($text) = @_;
+    return "<script type=\"text/javascript\">output('$text');</script>";
+}
+
+# -------------------- filters out files based on extensions (returns an array)
 sub match_ext {
     my ($r,@packlist)=@_;
     my @trimlist;
@@ -498,232 +862,777 @@ sub match_ext {
     my @fileext;
     my $dirptr=16384;
 
-    my $tabdir  = $r->dir_config('lonTabDir');
-    my $fn = $tabdir.'/filetypes.tab';
-    if (-e $fn) {
-	my $FH=Apache::File->new($fn);
-	my @content=<$FH>;
-	foreach my $line (@content) {
-	    (my $ext,my $foo) = split /\s+/,$line;
-	    push @fileext,$ext;
-	}
-    }
     foreach my $line (@packlist) {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
 	my @unpackline = split (/\&/,$line);
-	next if ($unpackline[0] eq ".");
-	next if ($unpackline[0] eq "..");
+	next if ($unpackline[0] eq '.');
+	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
-	my $fnptr = $unpackline[3]&$dirptr;
+	my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/);
  	if ($fnptr == 0 and $unpackline[3] ne "") {
-	    foreach my $nextline (@fileext) {
-		push @trimlist,$line if $nextline eq $fext;
-	    }
+	    my $embstyle = &Apache::loncommon::fileembstyle($fext);
+            push @trimlist,$line if (defined($embstyle) && 
+				     ($embstyle ne 'hdn' or $fext eq 'meta'));
 	} else {
 	    push @trimlist,$line;
 	}
     }
-    @trimlist = sort (@trimlist);
+    @trimlist = sort {uc($a) cmp uc($b)} (@trimlist);
     return @trimlist;
 }
 
-#------------------- displays one line in appropriate table format
-sub display_line{
-    my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
-    my (@pathfn, $fndir, $fnptr);
+# ------------------------------- displays one line in appropriate table format
+sub display_line {
+    my ($r,$defdom,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
+    my (@pathfn, $fndir);
+# there could be relative paths (files actually belonging into this directory)
+# or absolute paths (for example, from sequences)
+    my $absolute;
+    my $pathprefix;
+    if ($line=~m|^/res/| && $startdir ne '') {
+	$absolute=1;
+	$pathprefix='';
+    } else {
+	$absolute=0;
+	$pathprefix=$startdir;
+    }
     my $dirptr=16384;
-    my $fileclr="#ffffe6";
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+#SB my $fileclr="#ffffe6";
+    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 eq "opened";
+    my $msg = &mt('View').' '.$filecom[0].' '.&mt('resources');
+    $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened';
+    my $nowOpen = ($diropen eq 'opened' ? 1 : 0);
 
-    my $tabtag="</td>";
+    my $tabtag='</td>';
     my $i=0;
-
-    while ($i<=5) {
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $hash{'display_attrs_'.$i} == 1;
+    while ($i<=16) {
+	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
+	    if ($i != 9 &&
+		$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="dirpathUP" action="'.$startdir.
+    my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
+
+# display uplink arrow
+    if ($filecom[1] eq 'viewOneUp') {
+	my $updir=$startdir;
+# -------------- Filter out sequence containment in crumbs and "recent folders"
+	$updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1];
+	$updir=~s/\/+/\//g;
+
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+        $r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?
+        $r->print($extrafield);
+	$r->print("<td>\n");
+	$r->print ('<form method="post" name="dirpathUP" action="'.$updir.
 		   '/" '.
-		   'onSubmit="return rep_dirpath(\'UP\',document.forms.fileattr.acts.value)" '.
+		   'onsubmit="return rep_dirpath(\'UP\','.
+		   'document.forms.fileattr.acts.value)" '.
 		   'enctype="application/x-www-form-urlencoded"'.
                    '>'."\n");
-	$r->print ($hidden.'<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">'."\n");
-	$r->print("Up $tabtag</tr></form>\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 ('<a href="#" onclick="document.dirpathUP.submit()"><img src="'.$iconpath.'arrow.up.gif"');
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" />'.
+		   "\n");
+	$r->print(&mt("Up")."</a></form></td><td>$tabtag");
+        $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
     }
-    if ($filecom[1] eq "domain") {
-	$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.'">');
-	$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">'."\n");
-	$r->print ('<a href="javascript:gothere(\''.$filecom[0].'/\')"><img src="'.$iconpath.'server.gif"');
-	$r->print (' border="0"></a>'."\n");
-	$r->print("Domain - $listname $tabtag</tr></form>\n");
+# Do we have permission to look at this?
+    if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }
+
+    if (($filecom[1] eq 'domain') && ($defdom ne $listname)) {
+        unless (&Apache::lonnet::will_trust('shared',$listname,$defdom)) {
+            return OK;   
+        }
+        unless (&Apache::lonnet::will_trust('content',$defdom,$listname)) {
+            return OK;
+        }
+    }
+
+# make absolute links appear on different background
+#SB    if ($absolute) { $fileclr='#ccdd99'; }
+
+# display domain
+    if ($filecom[1] eq 'domain') {
+ 	$r->print ('<input type="hidden" name="dirPointer" value="on" />'."\n")
+ 	    if ($env{'form.dirPointer'} eq "on");
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">$extrafield");
+	$r->print(&Apache::loncommon::start_data_table_row()); # valign="$valign" ?!?"
+        $r->print($extrafield);
+	$r->print("<td>");
+	&begin_form ($r,$filecom[0]);
+	my $anchor = $filecom[0];
+	$anchor =~ s/\W//g;
+	$r->print ('<a name="'.$anchor.'"></a>');
+$r->print ('<input type="hidden" name="acts" value="" />');
+	$r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"'); 
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
+		   "\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 (' class="LC_fileicon" />'."\n");
+	$r->print (&mt("Domain")." - $listname </a>");
+	if (&Apache::lonnet::domain($listname,'description')) {
+	    $r->print("<br />(".&Apache::lonnet::domain($listname,'description').
+		      ")");
+	}
+	$r->print("</form></td><td>$tabtag");
+         $r->print(&Apache::loncommon::end_data_table_row());
 	return OK;
+
+# display user directory
     }
-    if ($filecom[1] eq "user") {
-	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom nowrap>\n");
+
+    if ($filecom[1] eq 'user') {
+        my $domain=(split(m|/|,$startdir))[2];
+        if ($defdom ne $domain) {
+            unless (&Apache::lonnet::will_trust('shared',$domain,$defdom)) {
+                return OK;
+            }
+            unless (&Apache::lonnet::will_trust('content',$defdom,$domain)) {
+                return OK;
+            }
+        }
+	# $r->print("<tr valign=$valign bgcolor=\"$fileclr\">$extrafield");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
+	$anchor =~ s/\W//g;
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()
+                 .$extrafield.'<td class="LC_'.$valign.'">');
 	&begin_form ($r,$curdir);
-	$r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.'whitespace1.gif" border=0>'."\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">'."\n");
-	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.$iconpath.'quill.gif border=0 name="'.$msg.'" height="22"></a>');
-	$r->print ($listname.$tabtag.'</tr></form>'."\n");
-	return OK;
+	$r->print ('<a name="'.$anchor.'"></a><img alt="" src="'.$iconpath.
+		   'whitespace_21.gif" class="LC_icon" />'."\n");
+	$r->print ('<input type="hidden" name="acts" value="" />');
+	$r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
+        $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+		   '.gif" class="LC_fileicon"'); 
+	$r->print (' alt="'.$msg.'"/></a>'.
+		   "\n");
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
+        my $quotable_startdir = &Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
+
+	$r->print ('<a href="javascript:gothere(\''.$quotable_curdir
+		   .'\')"><img alt="'.$msg.'" src="'.
+		   $iconpath.'quill.gif" class="LC_fileicon" />');
+	my $domain=(split(m|/|,$startdir))[2];
+	my $plainname=&Apache::loncommon::plainname($listname,$domain);
+        $r->print ($listname.'</a>');
+
+        if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+# Wishlistlink
+        $r->print('</form></td><td><a href="javascript:;" '.
+                  'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
+                  'onclick="set_wishlistlink('."'$plainname','$quotable_startdir$quotable_listname"."/'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);
+        $r->print(&Apache::loncommon::end_data_table_row());
+        return OK;
     }
+
 # display file
-    if ($fnptr == 0 and $filecom[3] ne "") {
-	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
-	my $filelink = $startdir.$filecom[0];
-	$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");
+        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 (lc($curfext) eq $_); }
+            }
+            if (@Only) {
+                my $skip = 1;
+                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);
+#SB	$r->print("<tr valign='$valign' bgcolor=\"$fileclr\">);
+        $r->print(&Apache::loncommon::start_data_table_row()); #SB valign="$valign" ?!?
+        $r->print('<td class="LC_middle LC_nobreak">');
+	
+        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' class='LC_icon' /></a>".
+		      "\n");
+	    $r->print('</td><td class="LC_middle">');
+	} elsif ($env{'form.catalogmode'} eq 'import') {
+	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
-		      "value='$filelink' onClick='".
+		      "value='$filelink' onclick='".
 		      "javascript:queue(\"form$fnum\")' ");
 	    if ($hash{'store_'.$filelink}) {
 		$r->print("checked");
 	    }
-	    $r->print(">\n");
-	    $r->print("<input type='hidden' name='title"."' ".
-		      "value='$title'>\n");
-	    $r->print("</form>\n");
-	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+	    $r->print(" />\n");
+	    $r->print('</form></td><td class="LC_middle">');
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$title;
+	    if (!$hash{"pre_${fnum}_title"}) {
+	        $hash{"pre_${fnum}_title"} = 'Not_retrieved';
+	    }
   	    $fnum++;
 	}
-
-	if ($indent > 0 and $indent < 11) {
-	    $r->print("<img src=",$iconpath,"whitespace",$indent,".gif border=0>\n");
-	} elsif ($indent >0) {
-	    my $ten = int($indent/10.);
-	    my $rem = $indent%10.0;
+# Form to open or close sequences
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    &begin_form($r,$curdir);
+	    $indent--;
+	}
+# General indentation
 	    my $count = 0;
-	    while ($count < $ten) {
-		$r->print("<img src=",$iconpath,"whitespace10.gif border=0>\n");
-	    $count++;
+	    while ($count < $indent) {
+            $r->print('<img alt="" src="'.$iconpath.'whitespace_21.gif" 
+                class="LC_icon" />');
+	        $count++;
 	    }
-	    $r->print("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
-	}
-
-	$r->print("<img src=$iconpath$curfext.gif border=0>\n");
-	$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);
+# Sequence open/close icon
+	if ($filelink=~/\.(page|sequence)$/) {
+	    my $curdir = $startdir.$filecom[0].'/';
+	    my $anchor = $curdir;
+	    $anchor =~ s/\W//g;
+	    $r->print ('<input type="hidden" name="acts" value="" />');
+	    $r->print ('<a name="'.$anchor.'"></a>');
+            $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()">');
+            $r->print ('<img src="'.$iconpath.'arrow.'.($nowOpen ? "open" : "closed" ).
+                       '.gif" class="LC_fileicon"');
+	    $r->print (' alt="'.$msg.'" /></a>'.
+		       "\n");
+	}
+# Filetype icons
+	$r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
+	my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
+        my $quotable_startdir = Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
+        my $curfext = lc((split(/\./,$listname))[-1]);
+        my $modalstyle;
+        if ($curfext =~ /^js|css|txt|tab$/) {
+            $modalstyle = ",'','background-color:#ffffff'";
+        }
 
+	$r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes'".$modalstyle.");\">$listname</a> ");
+	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
+	&Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
+	$r->print (" (<a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
+# Close form to open/close sequence
+	if ($filelink=~/\.(page|sequence)$/) {
+	    $r->print('</form>');
+	}
 	$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") 
+# Wishlistlink
+        $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.
+                  'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
+                  "','$quotable_startdir$quotable_listname'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
+	if ($hash{'display_attrs_0'} == 1) {
+	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
+		      ' </td>'."\n");
+	}
+	$r->print('<td class="LC_right"> ',
+		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>\n") 
+	$r->print('<td class="LC_nobreak"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
 	    if $hash{'display_attrs_2'} == 1;
+	$r->print('<td class="LC_nobreak"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
+	    if $hash{'display_attrs_3'} == 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 ($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");
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print('<td class="LC_nobreak"> '.($author eq '' ? '&nbsp;' : $author).
+		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
-	    my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1);
-	    $lang = $language{$lang};
-	    $lang = '&nbsp;' if (!$lang);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang." </td>\n");
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
+		      " </td>\n");
+	}
+
+	if ($hash{'display_attrs_6'} == 1) {
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
+	    $lang = &Apache::loncommon::languagedescription($lang);
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_8'} == 1) {
+# statistics
+	    &dynmetaread($filelink);
+	    $r->print("<td>");
+
+        for (qw(count course stdno avetries difficulty disc clear technical
+            correct helpful depth)) {
+
+            dynmetaprint($r,$filelink,$_);
+        }
+
+	    $r->print("&nbsp;</td>\n");
+
 	}
-	$r->print("</tr>\n");
-    }
+	if ($hash{'display_attrs_10'} == 1) {
+	    my $source = &Apache::lonnet::metadata($filelink,'sourceavail');
+	    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');\"".
+			  " target=\"_self\">".&mt('Source Code')."</a> "."</td>\n");
+	    } else { #A cuddled else. :P
+		$r->print("<td>&nbsp;</td>\n");
+	    }
+	}
+	if ($hash{'display_attrs_11'} == 1) {
+# links
+	   &dynmetaread($filelink);
+	   $r->print('<td>');
+	   &coursecontext($r,$filelink);
+       for (qw(goto_list comefrom_list sequsage_list dependencies course_list)) {
+             dynmetaprint($r,$filelink,$_);
+       }
+	   $r->print('</td>');
+        }
+        
+   
+	
+	if ($hash{'display_attrs_7'} == 1) {
+# Show resource
+	   my $output=&showpreview($filelink);
+           $r->print('<td class="LC_fontsize_medium">'.($output eq '' ? '&nbsp;':$output).
+		      " </td>\n");
+    }
+    
+    if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_13'} == 1) {
+	    my $notes = &Apache::lonnet::metadata($filelink,'notes');
+	    $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_14'} == 1) {
+	    my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+	    $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </td>\n");
+	}
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
+}
+    
+    
+
 # -- display directory
     if ($fnptr == $dirptr) {
-	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
-	$anchor =~ s/\///g;
-	$r->print("<tr>$extrafield<td bgcolor=$fileclr valign=bottom>");
+	$anchor =~ s/\W//g;
+#SB	$r->print("<tr bgcolor=\"$fileclr\">$extrafield<td valign=$valign>");
+        $r->print(&Apache::loncommon::start_data_table_row()); # SB: bgcolor suggestion: darkgrey ("LC_info_row"?!?)
+#	$r->print('<tr class="LC_info_row">');
+        $r->print($extrafield.'<td class="LC_middle LC_nobreak">');
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	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,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
-	}
-	$r->print ('<input type="hidden" name="acts" value="">');
-	$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="javascript:gothere(\''.$curdir.'\')"><img src="'.$iconpath.'folder_'.$diropen.'.gif" border=0></a>'."\n");
-	$r->print ("$listname$tabtag</tr></form>\n");
+	my $count = 0;
+	while ($count < $indentm1) {
+	    $r->print ('<img alt="" src="',$iconpath
+	               ,'whitespace_21.gif" class="LC_icon" />');
+            $count++;
+	}
+	$r->print ('<input type="hidden" name="acts" value="" />');
+	$r->print ('<a name="'.$anchor.'"></a>');
+        $r->print ('<a href="#" onclick="document.dirpath'.($dnum-1).'.submit()"><img src="'.$iconpath.
+		   'arrow.'.($nowOpen ? "open" : "closed" ).'.gif"');
+	$r->print (' alt="'.$msg.'" class="LC_fileicon" /></a>'.
+		   "\n");
+	my $quotable_curdir = &Apache::loncommon::escape_single($curdir);
+        my $quotable_startdir = &Apache::loncommon::escape_single($startdir);
+        my $quotable_listname = &Apache::loncommon::escape_single($listname);
+
+        my $location = &Apache::loncommon::lonhttpdurl("/adm/lonIcons");
+	my $icon = "navmap.folder.".($nowOpen ? "open":"closed").'.gif';
+        $r->print ('<a href="javascript:gothere('
+                  ."'$quotable_curdir'".');">'
+                  .'<img class="LC_fileicon" alt="'.&mt('Open Folder').'" src="'
+                  .$location.'/'.$icon.'" />'
+                  ."\n");
+	$r->print ("$listname</a></form>");
+# Wishlistlink
+        $r->print('</td><td><a href="javascript:;" '.
+                  'title="'.&mt('Save a link for this folder in Stored Links').'" '.
+                  'onclick="set_wishlistlink('."'$listname','$quotable_startdir$quotable_listname"."/'".')">'.
+                  '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
+                  'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
+# Attributes
+	my $filelink = $startdir.$filecom[0].'/default';
+
+	if ($hash{'display_attrs_0'} == 1) {
+	    my $title = &Apache::lonnet::gettitle($filelink);
+	    $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
+		      ' </td>'."\n");
+	}
+	$r->print('<td class="LC_right"> ',
+		  $filecom[8]," </td>\n") 
+	    if $hash{'display_attrs_1'} == 1;
+	$r->print('<td class="LC_break"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[9]))." </td>\n")
+	    if $hash{'display_attrs_2'} == 1;
+	$r->print('<td class="LC_break"> '.
+                  (&Apache::lonlocal::locallocaltime($filecom[10]))." </td>\n")
+	    if $hash{'display_attrs_3'} == 1;
+
+	if ($hash{'display_attrs_4'} == 1) {
+	    my $author = &Apache::lonnet::metadata($filelink,'author');
+	    $r->print('<td> '.($author eq '' ? '&nbsp;' : $author).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_5'} == 1) {
+	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords');
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td> '.($keywords eq '' ? '&nbsp;' : $keywords).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_6'} == 1) {
+	    my $lang = &Apache::lonnet::metadata($filelink,'language');
+	    $lang = &Apache::loncommon::languagedescription($lang);
+	    $r->print('<td> '.($lang eq '' ? '&nbsp;' : $lang).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_8'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+ 	if ($hash{'display_attrs_10'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+	if ($hash{'display_attrs_7'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+        }
+        if ($hash{'display_attrs_11'} == 1) {
+	   $r->print('<td>&nbsp;</td>');
+	}
+	if ($hash{'display_attrs_12'} == 1) {
+	    my $subject = &Apache::lonnet::metadata($filelink,'subject');
+	    $r->print('<td> '.($subject eq '' ? '&nbsp;' : $subject).
+		      " </td>\n");
+	}
+	if ($hash{'display_attrs_13'} == 1) {
+	    my $notes = &Apache::lonnet::metadata($filelink,'notes');
+	    $r->print('<td> '.($notes eq '' ? '&nbsp;' : $notes).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_14'} == 1) {
+	    my $abstract = &Apache::lonnet::metadata($filelink,'abstract');
+	    $r->print('<td> '.($abstract eq '' ? '&nbsp;' : $abstract).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_15'} == 1) {
+	    my $gradelevel = &Apache::lonnet::metadata($filelink,'gradelevel');
+	    $r->print('<td> '.($gradelevel eq '' ? '&nbsp;' : $gradelevel).
+		      " </td>\n");
+	}
+	
+	if ($hash{'display_attrs_16'} == 1) {
+	    my $standards = &Apache::lonnet::metadata($filelink,'standards');
+	    $r->print('<td> '.($standards eq '' ? '&nbsp;' : $standards).
+		      " </td>\n");
+	}
+	
+	
+	$r->print(&Apache::loncommon::end_data_table_row());
     }
 
 }
 
+sub coursecontext {
+    my ($r,$filelink)=@_;
+    my $filesymb=&Apache::lonnet::symbread($filelink);
+    if ($filesymb) {
+	my ($map,$index,$resource)=&Apache::lonnet::decode_symb($filesymb);
+	$r->print(
+            &mt('Already in this course:').'<br />'
+           .&mt('[_1] in folder/map [_2]',
+                    &Apache::lonnet::gettitle($resource),
+                    &Apache::lonnet::gettitle($map))
+           .'<br />');
+    }
+}
+
+sub showpreview {
+    my ($filelink)=@_;
+    if ($filelink=~m-^(/ext/|https?://)-) {
+	return &mt('External Resource, preview not enabled');
+    }
+    my ($curfext)=($filelink=~/\.(\w+)$/);
+    my $output='';
+    my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+    if ($embstyle eq 'ssi') {
+       my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
+                    '.tmp';
+       if ((!$env{'form.updatedisplay'}) &&
+                    (-e $cache)) {
+          open(FH,$cache);
+          $output=join("\n",<FH>);
+          close(FH);
+       } else {
+# In update display mode, remove old cache. This is done to retroactively
+# clean up course context renderings.
+	  if (-e $cache) {
+	       unlink($cache);
+	  }
+          $output=&Apache::lonnet::ssi_body($filelink);
+# Is access denied? Don't render, don't store
+          if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
+             $output='';
+# Was this rendered in course content? Don't store
+          } elsif (!&Apache::lonnet::symbread($filelink)) {
+             open(FH,">$cache");
+             print FH $output;
+             close(FH);
+          }
+       }
+    } elsif ($embstyle eq 'img') {
+       $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)).
+                 '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
+    }
+    return $output;
+}
+
+sub dynmetaprint {
+    my ($r,$filelink,$item)=@_;
+    if ($dynhash{$filelink}->{$item}) {
+	$r->print("\n<br />".$fieldnames{$item}.': '.
+		  &Apache::lonmeta::prettyprint($item,
+						$dynhash{$filelink}->{$item},
+		  (($env{'form.catalogmode'} ne 'import')?'preview':''),
+		  '',
+		  (($env{'form.catalogmode'} eq 'import')?'document.forms.fileattr':''),1));
+    }
+}
+
 # ------------------- 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'.$dnum.'" action="'.$uri.'#'.$anchor.
-	       '" onSubmit="return rep_dirpath(\''.$dnum.'\',document.forms.fileattr.acts.value)" '.
+    $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.'\''.
+	       ',document.forms.fileattr.acts.value)" '.
 	       '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");
+    $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++;
 }
 
+# --------- settings whenever the user causes the indexer window to be launched
+sub start_fresh_session {
+    my ($hash) = @_;
+    delete $hash->{'form.catalogmode'};
+    delete $hash->{'form.mode'};
+    delete $hash->{'form.form'};
+    delete $hash->{'form.element'};
+    delete $hash->{'form.omit'};
+    delete $hash->{'form.only'};
+    foreach (keys(%{$hash})) {
+        delete $hash->{$_} if (/^(pre_|store)/);
+    }
+}
+
+# ------------------------------------------------------------------- setvalues
+sub setvalues {
+    # setvalues is used in registerurl to synchronize the database
+    # hash and environment hashes
+    my ($H1,$h1key,$H2,$h2key) =@_;
+    #
+    if (exists $H2->{$h2key}) {
+	$H1->{$h1key} = $H2->{$h2key};
+    } elsif (exists $H1->{$h1key}) {
+	$H2->{$h2key} = $H1->{$h1key};
+    } 
+}
+
 1;
-__END__
+
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup indexer: hash');
+    }
+    return OK;
+}
+
+
+
+
+
+=head1 NAME
+
+Apache::lonindexer - mod_perl module for cross server filesystem browsing
+
+=head1 SYNOPSIS
+
+Invoked by /etc/httpd/conf/srm.conf:
+
+ <LocationMatch "^/res.*/$">
+ SetHandler perl-script
+ PerlHandler Apache::lonindexer
+ </LocationMatch>
+
+=head1 INTRODUCTION
+
+This module enables a scheme of browsing across a cross server.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+read in machine configuration variables
+
+=item *
+
+see if called from an interactive mode
+
+=item *
+
+refresh environment with user database values (in %hash)
+
+=item *
+
+define extra fields and buttons in case of special mode
+
+=item *
+
+set catalogmodefunctions to have extra needed javascript functionality
+
+=item *
+
+print header
+
+=item *
+
+evaluate actions from previous page (both cumulatively and chronologically)
+
+=item *
+
+output title
+
+=item *
+
+get state of file attributes to be showing
+
+=item *
+
+output state of file attributes to be showing
+
+=item *
+
+output starting row to the indexed file/directory hierarchy
+
+=item *
+
+read in what directories have previously been set to "open"
+
+=item *
+
+if not at top level, provide an uplink arrow
+
+=item *
+
+recursively go through all the directories and output as appropriate
+
+=item *
+
+information useful for group import
+
+=item *
+
+end the tables
+
+=item *
+
+end the output and return
+
+=back
+
+=head1 OTHER SUBROUTINES
+
+=over 4
+
+=item *
+
+scanDir - recursive scan of a directory
+
+=item *
+
+get_list - get complete matched list based on the uri (returns an array)
+
+=item *
+
+match_ext - filters out files based on extensions (returns an array)
+
+=item *
+
+display_line - displays one line in appropriate table format
+
+=item *
+
+begin_form - prints the beginning of a form for directory or file link
+
+=item *
+
+start_fresh_session - settings whenever the user causes the indexer window
+to be launched
+
+=back
+
+=cut