--- loncom/interface/lonindexer.pm	2002/03/25 19:27:17	1.40
+++ loncom/interface/lonindexer.pm	2002/06/20 21:22:20	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.40 2002/03/25 19:27:17 matthew Exp $
+# $Id: lonindexer.pm,v 1.44 2002/06/20 21:22:20 ng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,7 +81,7 @@ my $fnum; # file counter
 my $dnum; # directory counter
 
 # ----- Used to include or exclude files with certain extensions.
-my @Only = (); 
+my @Only = ();
 my @Omit = ();
 
 
@@ -95,6 +95,11 @@ sub handler {
     $dnum=0;
     untie %hash;
 
+    # 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);
+
 # ------------------------------------- read in machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $domain  = $r->dir_config('lonDefDomain');
@@ -127,8 +132,7 @@ sub handler {
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 	if ($ENV{'form.launch'} eq '1') {
 	    &start_fresh_session();
-	}
-
+        }
 # -------------------- refresh environment with user database values (in %hash)
 	if ($hash{'mode_catalog'} eq 'interactive') {
 	    $ENV{'form.catalogmode'}='interactive';
@@ -200,8 +204,14 @@ END
 	    # 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?catalogmode=groupimport&";
+                $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
 function select_data(title,url) {
@@ -368,7 +378,8 @@ ENDHEADER
 	}
 	
 # ---------------------------------------------------------------- output title
-	$r->print('<h2><font color="#888888">The LearningOnline With CAPA '.
+	$r->print(
+'<h2><font color="#339933">The Learning<i>Online</i> Network with CAPA '.
 		  'Network Directory Browser</font></h2>'."\n");
 # ---------------------------------- get state of file attributes to be showing
 	if ($ENV{'form.attrs'} ne "") {
@@ -414,7 +425,7 @@ END
 #        $r->print(&initdebug());
 #        $r->print(&writedebug("Omit:@Omit")) if (@Omit);
 #        $r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print("<table width='100\%' border=0><tr><td bgcolor=#eeeeee>\n");
+        $r->print("<table width='100\%' border=0><tr><td bgcolor=#990404>\n");
 	$r->print("<table width='100\%' 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) ".
@@ -736,8 +747,8 @@ sub display_line {
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
-	    my $titleesc=$title;
-	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote
+	    my $titleesc=HTML::Entities::encode($title);
+	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
             $r->print("<a href=\"javascript:select_data(\'",
                       $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
@@ -749,6 +760,7 @@ sub display_line {
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
+	    my $titleesc=&HTML::Entities::encode($title);
 	    $r->print("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -758,11 +770,11 @@ sub display_line {
 	    }
 	    $r->print(">\n");
 	    $r->print("<input type='hidden' name='title"."' ".
-		      "value='$title'>\n");
+		      "value='$titleesc'>\n");
 	    $r->print("</form>\n");
 	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
-	    $hash{"pre_${fnum}_title"}=$title;
+	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
 	}