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

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

version 1.154, 2014/05/31 13:55:17 version 1.159, 2014/07/31 19:25:39
Line 60  sub handler { Line 60  sub handler {
     my $thisdisfn=$fn;      my $thisdisfn=$fn;
   
     my $docroot=$r->dir_config('lonDocRoot');     # Apache  londocument root.      my $docroot=$r->dir_config('lonDocRoot');     # Apache  londocument root.
       if ($thisdisfn eq "$docroot/priv/$udom") {
           if ((-d "/home/$uname/public_html/") && (!-e "$docroot/priv/$udom/$uname")) {
               my ($version) = ($r->dir_config('lonVersion') =~ /^\'?(\d+\.\d+)\./);
               &Apache::loncommon::content_type($r,'text/html');
               $r->send_http_header;
   
               &Apache::lonhtmlcommon::clear_breadcrumbs();
               $r->print(&Apache::loncommon::start_page('Authoring Space').
                         '<div class="LC_error">'.
                         '<br /><p>'.
                         &mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'.
                         '<p>'.
                         &mt('Please ask your Domain Coordinator to move your Authoring Space to the new location.').
                         '</p>'.
                         '</div>'.
                         &Apache::loncommon::end_page());
               return OK;
           }
       }
     $thisdisfn=~s/^\Q$docroot\E\/priv//;      $thisdisfn=~s/^\Q$docroot\E\/priv//;
           
     my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory      my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
Line 69  sub handler { Line 88  sub handler {
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);      my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
   
     &startpage($r, $uname, $udom, $thisdisfn);  # Put out the start of page.      &startpage($r, $uname, $udom, $thisdisfn);  # Put out the start of page.
   
       if (!-d $fn) {
           if (-e $fn) {
               $r->print('<p class="LC_info">'.&mt('Requested item is a file not a directory.').'</p>');
           } else {
               $r->print('<p class="LC_info">'.&mt('The requested subdirectory does not exist.').'</p>');
           }
           $r->print(&Apache::loncommon::end_page());
           return OK;
       }
       my @files;
       if (opendir(DIR,$fn)) {
           @files = grep(!/^\.+$/,readdir(DIR));
           closedir(DIR);
       } else {
           $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');
           $r->print(&Apache::loncommon::end_page());
           return OK;
       }
   
     &dircontrols($r,$uname,$udom,$thisdisfn);   # Put out actions for directory,       &dircontrols($r,$uname,$udom,$thisdisfn);   # Put out actions for directory, 
                                                 # browse/upload + new file page.                                                  # browse/upload + new file page.
     &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.      &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
Line 87  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'};
   
     opendir(DIR,$fn);  
     my @files = readdir(DIR);  
     closedir(DIR);  
   
     if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {      if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
         $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');          if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
               $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
           } else {
               $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');
           }
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
         return OK;          return OK;
     }      }
Line 131  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')
                 || &Apache::loncommon::fileembstyle($extension) eq 'hdn');                  || ($filename eq '.DAV')
                   || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
                   || ($filename =~ /^\._/));
   
         my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];          my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
         my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');          my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
Removed from v.1.154  
changed lines
  Added in v.1.159

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