[BACK]Return to lonpubdir.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpubdir.pm between versions 1.157 and 1.159

version 1.157, 2014/06/23 17:02:49 version 1.159, 2014/07/31 19:25:39
Line 100  sub handler { Line 100  sub handler {
     }      }
     my @files;      my @files;
     if (opendir(DIR,$fn)) {      if (opendir(DIR,$fn)) {
         @files = readdir(DIR);          @files = grep(!/^\.+$/,readdir(DIR));
         closedir(DIR);          closedir(DIR);
     } else {      } else {
         $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');          $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');
Line 126  sub handler { Line 126  sub handler {
     my $sortby = $env{'form.sortby'};      my $sortby = $env{'form.sortby'};
     my $sortorder = $env{'form.sortorder'};      my $sortorder = $env{'form.sortorder'};
   
     if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username/priv})) {      if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
         if ($thisdisfn =~ m{^/$match_domain/$match_username/priv$}) {          if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
             $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');              $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
         } else {          } else {
             $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');              $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');
Line 170  sub handler { Line 170  sub handler {
     my $dirptr=16384; # Mask indicating a directory in stat.cmode.      my $dirptr=16384; # Mask indicating a directory in stat.cmode.
     my $filehash = {};      my $filehash = {};
     foreach my $filename (@files) {      foreach my $filename (@files) {
         # Skip .DS_Store and hidden files          # Skip .DS_Store, .DAV and hidden files
         my ($extension) = ($filename=~/\.(\w+)$/);          my ($extension) = ($filename=~/\.(\w+)$/);
         next if (($filename eq '.DS_Store')          next if (($filename eq '.DS_Store')
                   || ($filename eq '.DAV')
                 || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')                  || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
                 || ($filename =~ /^\._/));                  || ($filename =~ /^\._/));
   
Removed from v.1.157  
changed lines
  Added in v.1.159

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>