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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.138 and 1.151

version 1.138, 2011/11/23 19:13:01 version 1.151, 2014/04/06 19:39:04
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Construction Space Directory Lister  # Authoring Space Directory Lister
 #  #
 # $Id$  # $Id$
 #  #
Line 33  use strict; Line 33  use strict;
 use Apache::File;  use Apache::File;
 use File::Copy;  use File::Copy;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::londiff();  use Apache::londiff();
Line 47  sub handler { Line 46  sub handler {
   
   my $r=shift;    my $r=shift;
   
   # Validate access to the construction space and get username@domain.    # Validate access to the construction space and get username:domain.
   
   my $uname;    my $uname;
   my $udom;    my $udom;
   
   ($uname,$udom)=&Apache::loncacc::constructaccess($r->uri);     ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); 
   unless (($uname) && ($udom)) {    unless (($uname) && ($udom)) {
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
   }    }
Line 80  sub handler { Line 79  sub handler {
   my $numdir = 0;    my $numdir = 0;
   my $numres = 0;    my $numres = 0;
       
     # Retrieving value for sortby from QUERY_STRING
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sortby']);
   
     # Default sort by 'Name'
     if (! exists($env{'form.sortby'})) {
       $env{'form.sortby'} = 'filename';
     }
   
   # Start off the directory table.    # Start off the directory table.
   $r->print(&Apache::loncommon::start_data_table()    $r->print(&Apache::loncommon::start_data_table()
            .&Apache::loncommon::start_data_table_header_row()             .&Apache::loncommon::start_data_table_header_row()
            .'<th>'.&mt('Type').'</th>'             .'<th>'.&mt('Type').'</th>'
            .'<th>'.&mt('Actions').'</th>'             .'<th>'.&mt('Actions').'</th>'
            .'<th>'.&mt('Name').'</th>'             .'<th><a href="'.$linkdir.'/?sortby=filename">'.&mt('Name').'<span class="LC_fontsize_small"> &#9660;</span></a></th>'
            .'<th>'.&mt('Title').'</th>'             .'<th>'.&mt('Title').'</th>'
            .'<th colspan="2">'.&mt('Status').'</th>'             .'<th colspan="2">'.&mt('Status').'</th>'
            .'<th>'.&mt('Last Modified').'</th>'             .'<th><a href="'.$linkdir.'/?sortby=cmtime">'.&mt('Last Modified').'<span class="LC_fontsize_small"> &#9660;</span></a></th>'
            .&Apache::loncommon::end_data_table_header_row()             .&Apache::loncommon::end_data_table_header_row()
   );    );
   
Line 96  sub handler { Line 103  sub handler {
   my $dirptr=16384; # Mask indicating a directory in stat.cmode.    my $dirptr=16384; # Mask indicating a directory in stat.cmode.
   
   opendir(DIR,$fn);    opendir(DIR,$fn);
     my $filehash = {};
     my $sortby = $env{'form.sortby'};
   my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));    my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));
   foreach my $filename (@files) {    foreach my $filename (@files) {
      my ($cdev,$cino,$cmode,$cnlink,       next if ($filename eq '.DS_Store');
          $cuid,$cgid,$crdev,$csize,       my ($cmode,$cmtime)=(stat($fn.'/'.$filename))[2,9];
          $catime,$cmtime,$cctime,       # If you want to sort by "last modified", we need to make this hash.
          $cblksize,$cblocks)=stat($fn.'/'.$filename);       if ($sortby eq 'cmtime') {
          $filehash->{ $filename } = {"cmtime" => $cmtime,};
      my $extension='';  
      if ($filename=~/\.(\w+)$/) { $extension=$1; }  
      if ($cmode&$dirptr) {  
  &putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);  
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {  
  &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,   
      $targetdir, $linkdir, $cmtime,\%bombs,\$numres);  
      } else {  
  # "hidden" extension and not a directory, so hide it away.  
      }       }
   }       # Otherwise sort by name.  Don't bother with filehash.  Continue printing contents.
        else {
            my $extension='';
            if ($filename=~/\.(\w+)$/) { $extension=$1; }
            if ($cmode&$dirptr) {
                &putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
            } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
                &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, 
                            $targetdir, $linkdir, $cmtime,\%bombs,\$numres);
            } else {
               # "hidden" extension and not a directory, so hide it away.
            }
        }
     };
   
     # Sorting files by "last modified" if that's what you selected   
     if ($sortby eq 'cmtime') {
         my @sorted_files = sort {
           $filehash->{$b}->{$sortby} <=> $filehash->{$a}->{$sortby}
           } (keys(%{$filehash}));
         foreach my $filename (@sorted_files) {
            my ($cmode,$cmtime)=(stat($fn.'/'.$filename))[2,9];
            my $extension='';
            if ($filename=~/\.(\w+)$/) { $extension=$1; }
            if ($cmode&$dirptr) {
                &putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
            } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
                &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir, 
                            $targetdir, $linkdir, $cmtime,\%bombs,\$numres);
            } else {
               # "hidden" extension and not a directory, so hide it away.
            };
         };
     };
     
   closedir(DIR);    closedir(DIR);
   
   $r->print(&Apache::loncommon::end_data_table()    $r->print(&Apache::loncommon::end_data_table()
Line 144  sub startpage { Line 178  sub startpage {
   
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({      &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Construction Space',          'text'  => 'Authoring Space',
         'href'  => &Apache::loncommon::authorspace($formaction),          'href'  => &Apache::loncommon::authorspace($formaction),
     });      });
     # breadcrumbs (and tools) will be created       # breadcrumbs (and tools) will be created 
     # in start_page->bodytag->innerregister      # in start_page->bodytag->innerregister
   
     $env{'request.noversionuri'}=$formaction;      $env{'request.noversionuri'}=$formaction;
     $r->print(&Apache::loncommon::start_page('Construction Space',undef));      $r->print(&Apache::loncommon::start_page('Authoring Space',undef));
   
       my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
       my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
       my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in Mb
       $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
   
     $r->print(&Apache::loncommon::head_subbox(      $r->print(&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader()));                       '<div style="float:right;padding-top:0;margin-top;0">'
                       .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
                       .'</div>'
                       .&Apache::loncommon::CSTR_pageheader()));
   
     my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);      my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
     my $doctitle = 'LON-CAPA '.&mt('Construction Space');      my $doctitle = 'LON-CAPA '.&mt('Authoring Space');
     my $newname = &mt('New Name');      my $newname = &mt('New Name');
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);      my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">  <script type="text/javascript">
Line 458  sub putdirectory { Line 500  sub putdirectory {
     my $disfilename = $dirname;      my $disfilename = $dirname;
 # Don't display directory itself, and there is no way up from root directory  # Don't display directory itself, and there is no way up from root directory
     unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {      unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
  my $kaputt=0;          my $kaputt=0;
         if (ref($bombs) eq 'HASH') {          if (ref($bombs) eq 'HASH') {
     foreach my $key (keys(%{$bombs})) {              foreach my $key (keys(%{$bombs})) {
         if ($key =~ m{^\Q$targetdir/$disfilename\E/}) { $kaputt=1; last; }                  my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename");
     }                  if (($key) =~ m{^\Q$currentdir\E/}) { $kaputt=1; last; }
               }
         }          }
 #  #
 # Get the metadata from that directory's default.meta to display titles  # Get the metadata from that directory's default.meta to display titles
Line 522  sub putresource { Line 565  sub putresource {
     my $pubstatus = 'unpublished';      my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $css_class='LC_browser_file';      my $css_class='LC_browser_file';
     my $title='&nbsp;';      my $title='';
     my $publish_button=&mt('Publish');      my $publish_button=&mt('Publish');
     my $cstr_dir = $r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.'/'.$thisdisfn.'/';      my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn;
     my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');      my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
   
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
Line 584  sub putresource { Line 627  sub putresource {
     $status=&mt('Modified').      $status=&mt('Modified').
  '<br />'. $rights_status;   '<br />'. $rights_status;
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
  $status.='<br /><a href="/adm/diff?filename='.$linkfilename.   $status.='<br />'.
     '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';                           &Apache::loncommon::modal_link(
                                '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
                                &mt('Diffs'),600,500);
     }      }
  }    } 
   
  $title.="\n".'<br /><a href="'.$linkfilename.'.meta">'.   
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';  
   
  if (!$meta_same) {   if (!$meta_same) {
     $title = &mt('Metadata Modified').'<br />'.$title.      $title = &mt('Metadata Modified').'<br />'.$title.
  '<br /><a href="/adm/diff?filename=/priv/'.$linkfilename.'.meta'.   '<br />'.
  '&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';                  &Apache::loncommon::modal_link(
     $title.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';                      '/adm/diff?filename='.$linkfilename.'.meta'.'&amp;versiontwo=priv',
                       &mt('Metadata Diffs'),600,500);
       $title.="\n".'<br />'.
                   &Apache::loncommon::modal_link(
                       '/adm/retrieve?filename='.$linkfilename.'.meta&amp;inhibitmenu=yes&amp;add_modal=yes',
                       &mt('Retrieve Metadata'),600,500);
  }   }
  $status.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'" target="_parent">'.&mt('Retrieve').'</a>';   $status.="\n".'<br />'.
     }               &Apache::loncommon::modal_link(
                    '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
       }
       # Allow editing metadata of published and unpublished resources
       $title .= "\n".'<br />' if ($title);
       $title .= '<a href="'.$linkfilename.'.meta">'.
                 ($$bombs{&Apache::lonnet::declutter($targetdir.'/'.$filename)}?
                     '<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':
                     &mt('Edit Metadata')).
                 '</a>';
   
     my $editlink='';      my $editlink='';
     my $editlink2='';      my $editlink2='';
     if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {      if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
  $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';   $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/$LONCAPA::assess_re/) {      if ($filename=~/$LONCAPA::assess_re/) {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
  $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {      if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
  $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';   $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
Line 693  __END__ Line 749  __END__
   
 =head1 NAME  =head1 NAME
   
 Apache::lonpubdir - Construction space directory lister  Apache::lonpubdir - Authoring space directory lister
   
 =head1 SYNOPSIS  =head1 SYNOPSIS
   
Removed from v.1.138  
changed lines
  Added in v.1.151

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