--- loncom/interface/lonindexer.pm	2012/05/25 23:21:44	1.213.4.2
+++ loncom/interface/lonindexer.pm	2016/06/19 04:27:50	1.225
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.213.4.2 2012/05/25 23:21:44 raeburn Exp $
+# $Id: lonindexer.pm,v 1.225 2016/06/19 04:27:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,9 +34,8 @@
 ## 1. Description of functions                                               ##
 ## 2. Modules used by this module                                            ##
 ## 3. Choices for different output views (detailed, summary, xml, etc)       ##
-## 4. BEGIN block (to be run once after compilation)                         ##
-## 5. Handling routine called via Apache and mod_perl                        ##
-## 6. Other subroutines                                                      ##
+## 4. Handling routine called via Apache and mod_perl                        ##
+## 5. Other subroutines                                                      ##
 ##                                                                           ##
 ###############################################################################
 
@@ -60,7 +59,6 @@ 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 %language; # has the reference information present in language.tab
 my %dynhash; # hash of hashes for dynamic metadata
 my %dynread; # hash of directories already read for dynamic metadata
 my %fieldnames; # Metadata fieldnames
@@ -94,15 +92,8 @@ sub handler {
     undef (@Omit);
     %fieldnames=&Apache::lonmeta::fieldnames();
 
-# ------------------------------------- read in machine configuration variables
+# --------------------------------------------------------------- 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');
 
 #SB my $fileclr='#ffffe6';
     my $line;
@@ -424,7 +415,7 @@ ENDHEADER
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             &Apache::lonhtmlcommon::add_breadcrumb({
                 'text'  => 'Browse published resources',
-                'href'  => '/res/fhwfdev/?launch=1',
+                'href'  => '/res/'.$headerdom.'/?launch=1',
             });
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
                                                      {'domain' => $headerdom,})
@@ -632,7 +623,7 @@ END
     	
 
 # ----------------- read in what directories have previously been set to "open"
-	foreach (keys %hash) {
+	foreach (keys(%hash)) {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
 		$key =~ s/^diropen_status_//;
@@ -718,7 +709,20 @@ sub scanDir {
         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 eq '1');
+	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
@@ -763,7 +767,7 @@ sub get_list {
     
     (my $luri = $uri) =~ s/\//_/g;
     if ($env{'form.updatedisplay'}) {
-	foreach (keys %hash) {
+	foreach (keys(%hash)) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    delete $hash{$_} if ($_ =~ /^dirlist_timestamp_files_/);
 	}
@@ -998,6 +1002,9 @@ $r->print ('<input type="hidden" name="a
 	$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" />');
@@ -1009,7 +1016,7 @@ $r->print ('<input type="hidden" name="a
 # 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','$startdir$listname'".')">'.
+                  '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());
@@ -1092,6 +1099,8 @@ $r->print ('<input type="hidden" name="a
 # 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);
 
 	$r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
 	$quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
@@ -1105,7 +1114,7 @@ $r->print ('<input type="hidden" name="a
 # 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).
-                  "','$startdir$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>');
 	if ($hash{'display_attrs_0'} == 1) {
@@ -1247,7 +1256,9 @@ $r->print ('<input type="hidden" name="a
 	$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('
@@ -1259,7 +1270,7 @@ $r->print ('<input type="hidden" name="a
 # Wishlistlink
         $r->print('</td><td><a href="javascript:;" '.
                   'title="'.&mt('Save a link for this folder in Stored Links').'" '.
-                  'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.
+                  '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
@@ -1306,8 +1317,8 @@ $r->print ('<input type="hidden" name="a
 	}
 	if ($hash{'display_attrs_7'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
-    }     
-    if ($hash{'display_attrs_11'} == 1) {
+        }
+        if ($hash{'display_attrs_11'} == 1) {
 	   $r->print('<td>&nbsp;</td>');
 	}
 	if ($hash{'display_attrs_12'} == 1) {
@@ -1350,15 +1361,18 @@ sub coursecontext {
     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 />[_1] in folder/map [_2].<br />',
-	      &Apache::lonnet::gettitle($resource),
-	      &Apache::lonnet::gettitle($map)));
+	$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/|http://)-) {
+    if ($filelink=~m-^(/ext/|https?://)-) {
 	return &mt('External Resource, preview not enabled');
     }
     my ($curfext)=($filelink=~/\.(\w+)$/);
@@ -1438,7 +1452,7 @@ sub start_fresh_session {
     delete $hash->{'form.element'};
     delete $hash->{'form.omit'};
     delete $hash->{'form.only'};
-    foreach (keys %{$hash}) {
+    foreach (keys(%{$hash})) {
         delete $hash->{$_} if (/^(pre_|store)/);
     }
 }
@@ -1489,18 +1503,6 @@ This module enables a scheme of browsing
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
-=head1 BEGIN SUBROUTINE
-
-This routine is only run once after compilation.
-
-=over 4
-
-=item *
-
-Initializes %language hash table.
-
-=back
-
 =head1 HANDLER SUBROUTINE
 
 This routine is called by Apache and mod_perl.
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>