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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.128 and 1.167

version 1.128, 2011/10/21 18:04:51 version 1.167, 2016/01/06 16:44:35
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 41  use Apache::lonlocal; Line 40  use Apache::lonlocal;
 use Apache::lonmsg;  use Apache::lonmsg;
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonnet;  use Apache::lonnet;
 use LONCAPA;  use LONCAPA qw(:DEFAULT :match);
   
 sub handler {  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,$udom)=&Apache::lonnet::constructaccess($r->uri); 
   my $udom;      unless (($uname) && ($udom)) {
           return HTTP_NOT_ACCEPTABLE;
   ($uname,$udom)=&Apache::loncacc::constructaccess($r->uri);       }
   unless (($uname) && ($udom)) {  
      return HTTP_NOT_ACCEPTABLE;  
   }  
   
 # ----------------------------------------------------------- Start page output  # ----------------------------------------------------------- Start page output
   
   my $fn=$r->filename;      my $fn=$r->filename;
   $fn=~s/\/$//;      $fn=~s/\/$//;
       my $thisdisfn=$fn;
   
       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();
               my $js = '<script type="text/javascript" 
                           src="/res/adm/includes/file_upload.js"></script>';
               $r->print(&Apache::loncommon::start_page('Authoring Space', $js).
                         '<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//;
       
       my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
       my $targetdir='/res'.$thisdisfn; # Publication target directory.
       my $linkdir='/priv'.$thisdisfn;      # Full URL name of constr space.
   
       my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
   
       my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
       my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,
                                   "$londocroot/priv/$udom/$uname"); # expressed in kB
       my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,
                                   'author'); # expressed in MB
   
       # Put out the start of page.
       &startpage($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota); 
   
       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;
       }
   
   my $thisdisfn=$fn;      # Put out actions for directory, browse/upload + new file page.
   my $docroot=$r->dir_config('lonDocRoot');     # Apache  londocument root.      &dircontrols($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota);
   $thisdisfn=~s/^\Q$docroot\E\/priv//;      &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
   
   my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory  
   my $targetdir='/res'.$thisdisfn; # Publication target directory.  
   my $linkdir='/priv'.$thisdisfn;      # Full URL name of constr space.  
   
   my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);  
   
   &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.  
   &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory,   
                                                # browse/upload + new file page.  
   &resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.  
   
   my $numdir = 0;      my $numdir = 0;
   my $numres = 0;      my $numres = 0;
       
   # Start off the directory table.      if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
   $r->print(&Apache::loncommon::start_data_table()          if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
            .&Apache::loncommon::start_data_table_header_row()              $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());
           return OK;
       }
   
       # Retrieving value for "sortby" and "sortorder" from QUERY_STRING
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
           ['sortby','sortorder']);
   
       # Sort by name as default, not reversed
       if (! exists($env{'form.sortby'})) { $env{'form.sortby'} = 'filename' }
       if (! exists($env{'form.sortorder'})) { $env{'form.sortorder'} = '' }
       my $sortby = $env{'form.sortby'};
       my $sortorder = $env{'form.sortorder'};
   
       # Order in which columns are displayed from left to right
       my @order = ('filetype','actions','filename','title',
                       'pubstatus','cmtime','size');
   
       # Up and down arrows to indicate sort order
       my @arrows = ('&nbsp;&#9650;','&nbsp;&#9660;','');
   
       # Default sort order and column title
       my %columns = (
           filetype =>     {
                               order => 'ascending',
                               text  => &mt('Type'),
                           },
           actions =>      {
                               # Not sortable
                               text  => &mt('Actions'),
                           },
           filename =>     {
                               order => 'ascending',
                               text  => &mt('Name'),
                           },
           title =>        {
                               order => 'ascending',
                               text  => &mt('Title'),
                           },
           pubstatus =>    {
                               order => 'ascending',
                               text  => &mt('Status'),
                               colspan => '2',
                           },
           cmtime =>       {
                               order => 'descending',
                               text  => &mt('Last Modified'),
                           },
           size =>         {
                               order => 'ascending',
                               text  => &mt('Size').' (kB)',
                           },
       ); 
   
       # Print column headers
       my $output = '';
       foreach my $key (@order) {
           my $idx;
           # Append an up or down arrow to sorted column
           if ($sortby eq $key) {
               $idx = ($columns{$key}{order} eq 'ascending') ? 0:1;
               if ($sortorder eq 'rev') { $idx ++; }
               $idx = $idx%2;
           } else { $idx = 2; } # No arrow if column is not sorted
           $output .= (($columns{$key}{order}) ?
               '<th'.($columns{$key}{colspan} ? ' colspan="'.$columns{$key}{colspan}.'"' : '')
               .'><a href="'.$linkdir.'/?sortby='.$key.'&amp;sortorder='
               .((($sortby eq $key) && ($sortorder ne 'rev')) ? 'rev' : '').'">'
               .$columns{$key}{text}.$arrows[$idx].'</a></th>' :
               '<th>'.$columns{$key}{text}.'</th>');
       }
   
   my $result = "<script type=\"text/javascript\">
       sessionStorage.setItem('CSTRcache','".&prepareJsonData($uname,$udom,$thisdisfn)."');
       localStorage.setItem('CSTRtrans', '".&prepareJsonTranslations()."');
   </script>";
       $r->print($result);
   
       $r->print('<div id="currentFolder">'.&Apache::loncommon::start_data_table()
           .'<tr><th colspan="8" id="searchtitle" style="display:none"></th></tr>'
           .&Apache::loncommon::start_data_table_header_row() . $output
           .&Apache::loncommon::end_data_table_header_row()
       );
   
       my $dirptr=16384; # Mask indicating a directory in stat.cmode.
       my $filehash = {};
       foreach my $filename (@files) {
           # Skip .DS_Store, .DAV and hidden files
           my ($extension) = ($filename=~/\.(\w+)$/);
           next if (($filename eq '.DS_Store')
                   || ($filename eq '.DAV')
                   || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
                   || ($filename =~ /^\._/));
   
           my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
           my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
           # Identify type of file according to icon used
           my ($filetype) = (&Apache::loncommon::icon($filename) =~ m{/(\w+).gif$}); 
           my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn;
           my $meta_same = &isMetaSame($cstr_dir, $resdir, $filename);
           
           # Store size, title, and status for files but not directories
           my $size = (!($cmode&$dirptr)) ? $csize/1024. : 0;
           my ($status, $pubstatus, $title, $fulltitle);
           if (!($cmode&$dirptr)) {
               ($status, $pubstatus) = &getStatus($resdir, $targetdir, $cstr_dir, 
                   $filename, $linkfilename, $cmtime, $meta_same);
               ($fulltitle, $title) = &getTitle($resdir, $targetdir, $filename, 
                                           $linkfilename, $meta_same, \%bombs);
           } else {
               ($status, $pubstatus) = ('','');
               ($fulltitle, $title) = ('','');
           }
   
           # This hash will allow sorting
           $filehash->{ $filename } = {
               "cmtime"            => $cmtime,
               "size"              => $size,
               "cmode"             => $cmode,
               "filetype"          => $filetype,
               "title"             => $title,
               "fulltitle"         => $fulltitle,
               "status"            => $status,
               "pubstatus"         => $pubstatus,
               "linkfilename"      => $linkfilename,
           }
       }
      
       my @sorted_files;
       # Sorting by something other than "Name".  Name is the secondary key.
       if ($sortby =~ m{cmtime|size}) {    # Numeric fields
           # First check if order should be reversed
           if ($sortorder eq "rev") {
               @sorted_files = sort {
                   $filehash->{$a}->{$sortby} <=> $filehash->{$b}->{$sortby}
                       or
                   uc($a) cmp uc($b)
               } (keys(%{$filehash}));
           } else {
               @sorted_files = sort {
                   $filehash->{$b}->{$sortby} <=> $filehash->{$a}->{$sortby}
                       or
                   uc($a) cmp uc($b)
               } (keys(%{$filehash}));
           }
       } elsif ($sortby =~ m{filetype|title|status}) {     # String fields
           if ($sortorder eq "rev") {
               @sorted_files = sort {
                   $filehash->{$b}->{$sortby} cmp $filehash->{$a}->{$sortby}
                       or
                   uc($a) cmp uc($b)
               } (keys(%{$filehash}));
           } else {
               @sorted_files = sort {
                   $filehash->{$a}->{$sortby} cmp $filehash->{$b}->{$sortby}
                       or
                   uc($a) cmp uc($b)
               } (keys(%{$filehash}));
           }
   
       # Sort by "Name" is the default
       } else { 
           if ($sortorder eq "rev") {
               @sorted_files = sort {uc($b) cmp uc($a)} (keys(%{$filehash}));
           } else {
               @sorted_files = sort {uc($a) cmp uc($b)} (keys(%{$filehash}));
           }
       }
   
       # Print the sorted resources
       foreach my $filename (@sorted_files) {
           if ($filehash->{$filename}->{"cmode"}&$dirptr) {        # Directories
               &putdirectory($r, $thisdisfn, $linkdir, $filename, 
                   $filehash->{$filename}->{"cmtime"}, 
                   $targetdir, \%bombs, \$numdir);
           } else {                                                # Files
               &putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
                   $targetdir, $linkdir, $filehash->{$filename}->{"cmtime"}, 
                   $filehash->{$filename}->{"size"}, \$numres, 
                   $filehash->{$filename}->{"linkfilename"},
                   $filehash->{$filename}->{"fulltitle"},
                   $filehash->{$filename}->{"status"},
                   $filehash->{$filename}->{"pubstatus"});
           }
       }
   
     $r->print(&Apache::loncommon::end_data_table()
              .'</div><div id="otherplaces" style="display:none">'
              .&Apache::loncommon::start_data_table()
              .'<tr><th colspan="7">'.&mt('Results in other directories:').'</th></tr>'
              .'<tr class="LC_header_row" id="otherplacestable">'
            .'<th>'.&mt('Type').'</th>'             .'<th>'.&mt('Type').'</th>'
            .'<th>'.&mt('Actions').'</th>'             .'<th>'.&mt('Directory').'</th>'
            .'<th>'.&mt('Name').'</th>'             .'<th>'.&mt('Name').'</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>'.&mt('Last Modified').'</th>'
            .&Apache::loncommon::end_data_table_header_row()             .'</tr>'
   );             .&Apache::loncommon::end_data_table()
              .'</div>'
   my $filename;  
   my $dirptr=16384; # Mask indicating a directory in stat.cmode.  
   
   opendir(DIR,$fn);  
   my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));  
   foreach my $filename (@files) {  
      my ($cdev,$cino,$cmode,$cnlink,  
          $cuid,$cgid,$crdev,$csize,  
          $catime,$cmtime,$cctime,  
          $cblksize,$cblocks)=stat($fn.'/'.$filename);  
   
      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);  
   
   $r->print(&Apache::loncommon::end_data_table()  
            .&Apache::loncommon::end_page()             .&Apache::loncommon::end_page()
   );    );
   return OK;      return OK;  
 }  }
   
 #  
   
 #   Output the header of the page.  This includes:  #   Output the header of the page.  This includes:
 #   - The HTML header   #   - The HTML header 
 #   - The H1/H3  stuff which includes the directory.  #   - The H1/H3  stuff which includes the directory.
 #  #
 #     startpage($r, $uame, $udom, $thisdisfn);  #     startpage($r, $uame, $udom, $thisdisfn, $current_disk_usage, $disk_quota);
 #      $r     - The apache request object.  #      $r     - The apache request object.
 #      $uname - User name.  #      $uname - User name.
 #      $udom  - Domain name the user is logged in under.  #      $udom  - Domain name the user is logged in under.
 #      $thisdisfn - Displayable version of the filename.  #      $thisdisfn - Displayable version of the filename.
   #      $current_disk_usage - User's current disk usage (in kB).
   #      $disk_quota - Disk quota for user's authoring space (in MB).
   
 sub startpage {  sub startpage {
     my ($r, $uname, $udom, $thisdisfn) = @_;      my ($r, $uname, $udom, $thisdisfn, $current_disk_usage, $disk_quota) = @_;
     my $currdir = '/priv/'.$uname.$thisdisfn;  
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
   
     my $formaction='/priv/'.$uname.$thisdisfn.'/';      my $formaction='/priv'.$thisdisfn.'/';
     $formaction=~s|/+|/|g;      $formaction=~s|/+|/|g;
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);      &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
   
     &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(),          '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'}=$currdir.'/';      $env{'request.noversionuri'}=$formaction;
     $r->print(&Apache::loncommon::start_page('Construction Space',undef));      my $js = '<script type="text/javascript" 
                   src="/res/adm/includes/file_upload.js"></script>';
       $r->print(&Apache::loncommon::start_page('Authoring Space', $js));
   
       $disk_quota = 1024 * $disk_quota; # convert from MB to kB
   
     $r->print(&Apache::loncommon::head_subbox(      $r->print(&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader(1)));                       '<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">
 top.document.title = '$esc_thisdisfn/ - $doctitle';  top.document.title = '$esc_thisdisfn/ - $doctitle';
 // Store directory location for menu bar to find  // Store directory location for menu bar to find
   
 parent.lastknownpriv='/~$uname$esc_thisdisfn/';  parent.lastknownpriv='/priv$esc_thisdisfn/';
   
 // Confirmation dialogues  // Confirmation dialogues
   
Line 271  ENDPUBDIRSCRIPT Line 493  ENDPUBDIRSCRIPT
 }  }
   
 sub dircontrols {  sub dircontrols {
     my ($r,$uname,$udom,$thisdisfn) = @_;      my ($r,$uname,$udom,$thisdisfn, $current_disk_usage, $disk_quota) = @_;
     my %lt=&Apache::lonlocal::texthash(      my %lt=&Apache::lonlocal::texthash(
                                        cnpd => 'Cannot publish directory',                                         cnpd => 'Cannot publish directory',
                                        cnrd => 'Cannot retrieve directory',                                         cnrd => 'Cannot retrieve directory',
Line 302  sub dircontrols { Line 524  sub dircontrols {
                                        go   => 'Go',                                         go   => 'Go',
                                        prnt => 'Print contents of directory',                                         prnt => 'Print contents of directory',
                                        crea => 'Create a new directory or LON-CAPA document',                                         crea => 'Create a new directory or LON-CAPA document',
                                          qs   => 'Quick Search',
                                          cs   => 'Case Sensitive',
                                          re   => 'Regular Expression',
        acti => 'Actions for current directory',         acti => 'Actions for current directory',
        updc => 'Upload a new document',         updc => 'Upload a new document',
        pick => 'Please select an action to perform using the new filename',         pick => 'Please select an action to perform using the new filename',
                                       );                                        );
     my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript      my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     $r->print(<<END);      # Calculate free space in bytes.
       # $disk_quota is in MB and $current_disk_usage is in kB
       my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage);
       $r->printf(<<END,&Apache::loncommon::help_open_topic('Quicksearch'));
 <div class="LC_columnSection">  <div class="LC_columnSection">
   <div>    <div>
     <form name="curractions" method="post" action="">      <form name="curractions" method="post" action="">
Line 320  sub dircontrols { Line 548  sub dircontrols {
             <option value="printdir">$lt{'prnt'}</option>              <option value="printdir">$lt{'prnt'}</option>
             <option value="delete">$lt{'dedr'}</option>              <option value="delete">$lt{'dedr'}</option>
         </select>          </select>
         <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />          <input type="hidden" name="filename" value="/priv$thisdisfn/" />
       </fieldset>        </fieldset>
     </form>      </form>
     <form name="publishdir" method="post" action="/adm/publish" target="_parent">      <form name="publishdir" method="post" action="/adm/publish" target="_parent">
Line 336  sub dircontrols { Line 564  sub dircontrols {
     <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">      <form name="upublisher" enctype="multipart/form-data" method="post" action="/adm/upload" target="_parent">
       <fieldset>        <fieldset>
         <legend>$lt{'updc'}</legend>          <legend>$lt{'updc'}</legend>
         <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />          <input type="hidden" name="filename" value="/priv$thisdisfn/" />
         <input type="file" name="upfile" size="20" />          <input type="file" name="upfile" class="flUpload testclass" size="20" />
           <input type="hidden" id="free_space" value=$free_space />
         <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />          <input type="button" value="$lt{'uplo'}"  onclick="checkUpload(this.form)" />
       </fieldset>        </fieldset>
     </form>      </form>
Line 348  sub dircontrols { Line 577  sub dircontrols {
       <fieldset>        <fieldset>
               <legend>$lt{'crea'}</legend>                <legend>$lt{'crea'}</legend>
       <span class="LC_nobreak">        <span class="LC_nobreak">
  <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />   <input type="hidden" name="filename" value="/priv$thisdisfn/" />
                   <script type="text/javascript">                    <script type="text/javascript">
                     function validate_go() {                      function validate_go() {
                         var selected = document.fileaction.action.selectedIndex;                          var selected = document.fileaction.action.selectedIndex;
Line 371  sub dircontrols { Line 600  sub dircontrols {
                     <option value="newtaskfile">$lt{'nbt'}:</option>                      <option value="newtaskfile">$lt{'nbt'}:</option>
                     <option value="newlibraryfile">$lt{'nlib'}:</option>                      <option value="newlibraryfile">$lt{'nlib'}:</option>
             <option value="newdir">$lt{'nsub'}:</option>              <option value="newdir">$lt{'nsub'}:</option>
   </select>&nbsp;<input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />    </select>&nbsp;<input type="text" name="newfilename" placeholder="$lt{'type'}" value="" onfocus="if (this.value == is.empty()) this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
    <br />
                   <span>Quickactions:
                    <input type="hidden" name="mode"/>
                    <a href="javascript:void(0)" onclick="javascript:validate_action('blank')">
       <img src="/adm/lonIcons/unknown.gif" title="Create blank problem file"></a>
                    <a href="javascript:void(0)" onclick="javascript:validate_action('problemtempl')"> 
                       <img src="/adm/lonIcons/problem.gif" title="Create new problem from template"></a>
                    <a href="javascript:void(0)" onclick="javascript:validate_action('blankhtml')"> 
                       <img src="/adm/lonIcons/html.gif" title="Create new blank HTML file"></a>
                    <a href="javascript:void(0)" onclick="javascript:validate_action('folder')"> 
       <img src="/adm/lonIcons/navmap.folder.closed.gif" title="Create new subdirectory"></a>
                   </span>
                    <script type="text/javascript">
                        function validate_action(action){
   
                            if (document.getElementsByName(\'newfilename\')[0].value != \'\'){
                                if (action == "blank") {
    document.fileaction.action.value=\'newproblemfile\';
    document.fileaction.mode.value=\'blank\';
    } else if (action == "problemtempl") {
    document.fileaction.action.value=\'newproblemfile\';
                                    validate_go();
                                } else if (action == "blankhtml") {
                                    document.fileaction.action.value=\'newhtmlfile\';
                                    validate_go();
                                } else if (action == "folder") {
                                    document.fileaction.action.value=\'newdir\';
                                    document.fileaction.mode.value=\'folder\';
                                }
                                fileaction.submit();
                            } else {
                                alert(\'Please specify file name.\');
                                // TODO: ask for filename? if so, do some refactoring
   
                            }
                        }
                    </script>
  </span>   </span>
       </fieldset>        </fieldset>
     </form>      </form>
       </div>
       <div>
         <fieldset style="display:inline">
               <legend>$lt{'qs'}</legend>
                   <script type="text/javascript" src="/adm/quicksearch/quicksearch.js"></script>
                   <input type="text" id="quickfilter" placeholder="Enter search term" onkeyup="applyFilter()"/>
                   <input type="button" value="Clear" onclick="document.getElementById(\'quickfilter\').value=\'\'; applyFilter()" />
                   %s
                   <br />
                   <label><input type="checkbox" id="casesens" onchange="applyFilter()"/>$lt{'cs'}&nbsp;&nbsp;</label>
                   <label><input type="checkbox" id="regex" onchange="applyFilter()"/>$lt{'re'}&nbsp;&nbsp;</label>
           </fieldset>
   </div>    </div>
 </div>  </div>
 END  END
Line 438  sub getSourceRightString { Line 716  sub getSourceRightString {
 }  }
 #  #
 #  Put out a directory table row:  #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)  #    putdirectory(r, base, here, dirname, modtime, targetdir, bombs, numdir)
 #      r       - Apache request object.  #      r         - Apache request object.
 #      reqfile - File in request.  #      reqfile   - File in request.
 #      here    - Where we are in directory tree.  #      here      - Where we are in directory tree.
 #      dirname - Name of directory special file.  #      dirname   - Name of directory special file.
 #      modtime - Encoded modification time.  #      modtime   - Encoded modification time.
 #   #      targetdir - Publication target directory.
   #      bombs     - Reference to hash of URLs with runtime error messages.
   #      numdir    - Reference to scalar used to track number of sub-directories
   #                  in directory (used in form name for each "actions" dropdown).
   #
 sub putdirectory {  sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;      my ($r, $reqfile, $here, $dirname, $modtime, $targetdir, $bombs, $numdir) = @_;
     # construct the display filename: the directory name unless ..:  
       # construct the display filename: the directory name unless ..:
      
       my $actionitem;
    
     my $disfilename = $dirname;      my $disfilename = $dirname;
     if ($dirname eq '..') {  # Don't display directory itself, and there is no way up from root directory
  $disfilename = '<i>'.&mt('Parent Directory').'</i>';      unless ((($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
     }          my $kaputt=0;
     unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {          if (ref($bombs) eq 'HASH') {
  my $kaputt=0;              foreach my $key (keys(%{$bombs})) {
  foreach (keys %{$bombs}) {                  my $currentdir = &Apache::lonnet::declutter("$targetdir/$disfilename");
     if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }                  if (($key) =~ m{^\Q$currentdir\E/}) { $kaputt=1; last; }
  }              }
           }
   #
   # Get the metadata from that directory's default.meta to display titles
   #
  %Apache::lonpublisher::metadatafields=();   %Apache::lonpublisher::metadatafields=();
  %Apache::lonpublisher::metadatakeys=();   %Apache::lonpublisher::metadatakeys=();
  my $construct=$here;   &Apache::lonpublisher::metaeval(
  $construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};                   &Apache::lonnet::getfile($r->dir_config('lonDocRoot').$here.'/'.$dirname.'/default.meta')
         my $dirpath = $here;                                         );
         $dirpath=~s{^/priv/}{/~};  
  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(  
         $construct.'/'.$dirname.'/default.meta'  
  ));  
         my $actionitem = '';  
         if ($dirname eq '..') {          if ($dirname eq '..') {
             $actionitem = &mt('Go to ...');              $actionitem = &mt('Go to ...');
               $disfilename = '<i>'.&mt('Parent Directory').'</i>';
         } else {          } else {
             $actionitem =               $actionitem = 
                     '<form name="dirselect_'.$$numdir.                      '<form name="dirselect_'.$$numdir.
Line 482  sub putdirectory { Line 767  sub putdirectory {
                       '<option value="printdir">'.&mt('Print directory').'</option>'.                        '<option value="printdir">'.&mt('Print directory').'</option>'.
                       '<option value="delete">'.&mt('Delete directory').'</option>'.                        '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.                      '</select>'.
                      '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.                       '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.                       '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="postdata" value="" />'.                       '<input type="hidden" name="postdata" value="" />'.
                    '</form>';                     '</form>';
Line 494  sub putdirectory { Line 779  sub putdirectory {
   '<td>'.$actionitem.'</td>'.    '<td>'.$actionitem.'</td>'.
   '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.    '<td><span class="LC_filename"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
   $disfilename.'</a></span></td>'.    $disfilename.'</a></span></td>'.
         '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});          '<td colspan="3">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($targetdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
  if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {   if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
     $r->print(' <i>'.      $r->print(' <i>'.
       $Apache::lonpublisher::metadatafields{'subject'}.        $Apache::lonpublisher::metadatafields{'subject'}.
Line 502  sub putdirectory { Line 787  sub putdirectory {
  }   }
  $r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.   $r->print($Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
             '<td></td>'.
   "</tr>\n");    "</tr>\n");
     }      }
     return OK;      return;
 }  }
 #  
 #   Put a table row for a file resource.  sub getTitle {
 #      my ($resdir, $targetdir, $filename, $linkfilename, $meta_same, $bombs) = @_;
 sub putresource {      my $title='';
     my ($r, $udom, $uname, $filename, $thisdisfn,       my $titleString = &getTitleString($targetdir.'/'.$filename);
  $resdir, $targetdir, $linkdir,      if (-e $resdir.'/'.$filename) {
  $cmtime,$bombs,$numres) = @_;   $title = '<a href="'.$targetdir.'/'.$filename.
     &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);      '.meta" target="cat">'.$titleString.'</a>';
           if (!$meta_same) {
       $title = &mt('Metadata Modified').'<br />'.$title.
    '<br />'.
                   &Apache::loncommon::modal_link(
                       '/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);
           } 
       }
       # 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>';
   
       return ($title, $titleString);
   }
   
   
   sub isMetaSame {
       my ($cstr_dir, $resdir, $filename) = @_;
       my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
       my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
       return (&Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
               $cstr_dir.'/'.$filename.'.meta') && $meta_rmtime < $meta_cmtime) 
           ? 0 : 1;
   }
       
   
   sub getStatus {    
       my ($resdir, $targetdir, $cstr_dir, $filename,  
               $linkfilename, $cmtime, $meta_same) = @_;
     my $pubstatus = 'unpublished';      my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');      my $status = &mt('Unpublished');
     my $css_class='LC_browser_file';  
     my $title='&nbsp;';  
     my $publish_button=&mt('Publish');  
     my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';  
 #    my $action_buttons=  
 #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.  
 # $uname.'/'.$thisdisfn.'/'.$filename.'">'.  
 # &mt('Delete').'</a>';  
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
         my $same=0;          my $same = 0;
  my ($rdev,$rino,$rmode,$rnlink,          if ((stat($resdir.'/'.$filename))[9] >= $cmtime) {
     $ruid,$rgid,$rrdev,$rsize,              $same = 1;
     $ratime,$rmtime,$rctime,  
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);  
         if ($rmtime>=$cmtime) {  
            $same=1;  
         } else {          } else {
            if (&Apache::londiff::are_different_files($resdir.'/'.$filename,             if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
      $cstr_dir.'/'.$filename)) {       $cstr_dir.'/'.$filename)) {
               $same=0;                $same = 0;
            } else {             } else {
               $same=1;                $same = 1;
            }             }
         }          }
  my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];  
  my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];  
  my $meta_same = 1;  
  if ($meta_rmtime < $meta_cmtime  
     && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',  
      $cstr_dir.'/'.$filename.'.meta')) {  
     $meta_same = 0;  
  }  
  $publish_button=&mt('Re-publish');  
   
         my $rights_status =          my $rights_status =
             &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';              &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
Line 560  sub putresource { Line 863  sub putresource {
         $rights_status .=          $rights_status .=
             $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};              $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
   
  $title = '<a href="/res/'.$targetdir.'/'.$filename.  
     '.meta" target="cat">'.  
     &getTitleString($targetdir.'/'.$filename).'</a>';  
  if ($same) {   if ($same) {
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';                  $pubstatus = 'obsolete';
Line 576  sub putresource { Line 876  sub putresource {
  $status=&mt('Published').   $status=&mt('Published').
     '<br />'. $rights_status;      '<br />'. $rights_status;
     }      }
 #    } else {  
 # $action_buttons='';  
 #    }  
  } else {   } else {
             $pubstatus = 'modified';              $pubstatus = 'modified';
     $status=&mt('Modified').      $status=&mt('Modified').
  '<br />'. $rights_status;   '<br />'. $rights_status;
 #    $action_buttons='';  
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
  $status.='<br /><a href="/adm/diff?filename=/~'.$uname.   $status.='<br />'.
     $thisdisfn.'/'.$filename.                           &Apache::loncommon::modal_link(
     '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';                               '/adm/diff?filename='.$linkfilename.'&amp;versiontwo=priv',
                                &mt('Diffs'),600,500);
     }      }
  }    } 
   
  $title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'.    $status.="\n".'<br />'.
     ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';               &Apache::loncommon::modal_link(
                    '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
  if (!$meta_same) {  
     $title = &mt('Metadata Modified').'<br />'.$title.  
  '<br /><a href="/adm/diff?filename=/~'.$uname.  
  $thisdisfn.'/'.$filename.'.meta'.  
  '&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';  
     $title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.  
  $thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';  
  }  
  $status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.  
     $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';  
     }      }
   
       return ($status, $pubstatus);
   }
   
   
   #
   #   Put a table row for a file resource.
   #
   sub putresource {
       my ($r, $udom, $uname, $filename, $thisdisfn, $resdir, $targetdir, 
               $linkdir, $cmtime, $size, $numres, $linkfilename, $title, 
               $status, $pubstatus) = @_;
       &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
   
     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.'?forceedit=1" target="_parent">'.&mt('Edit').'</a>)';   $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {      if ($filename=~/$LONCAPA::assess_re/) {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=editxml">'.&mt('EditXML').'</a>)';
  $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&amp;problemmode=edit">'.&mt('Edit').'</a>)';
       }
       if ($filename=~/\.(xml|html|htm|xhtml|xhtm)$/ || $filename=~/$LONCAPA::assess_re/) {
           if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
               my $daxeurl = '/daxepage'.$linkdir.'/'.$filename;
               $editlink .= ' (<a href="'.$daxeurl.'" target="_blank">Daxe</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=/~'.$uname.   $editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';
     $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Clean Up').')</a>';  
     }      }
     if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {      if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
  $editlink=' (<a target="_parent" href="/adm/cfile?decompress=/~'.   $editlink=' (<a target="_parent" href="/adm/cfile?decompress='.$linkfilename.'">'.&mt('Decompress').'</a>)';
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';  
     }      }
       my $publish_button = (-e $resdir.'/'.$filename) ? &mt('Re-publish') : &mt('Publish');
     my $pub_select = '';      my $pub_select = '';
     &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);      &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
     $r->print(&Apache::loncommon::start_data_table_row().      $r->print(&Apache::loncommon::start_data_table_row().
Line 636  sub putresource { Line 942  sub putresource {
               '<td class="LC_browser_file_'.$pubstatus.'">&nbsp;&nbsp;</td>'. # Display publication status                '<td class="LC_browser_file_'.$pubstatus.'">&nbsp;&nbsp;</td>'. # Display publication status
               '<td>'.$status.'</td>'.                '<td>'.$status.'</td>'.
       '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.        '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
         '<td>'.sprintf("%.1f",$size).'</td>'.
       &Apache::loncommon::end_data_table_row()        &Apache::loncommon::end_data_table_row()
     );      );
     return OK;      return;
 }  }
   
 sub create_pubselect {  sub create_pubselect {
Line 668  sub create_pubselect { Line 975  sub create_pubselect {
 '<option value="cleanup">'.&mt('Clean up').'</option>'.  '<option value="cleanup">'.&mt('Clean up').'</option>'.
 '<option value="print">'.&mt('Print').'</option>'.  '<option value="print">'.&mt('Print').'</option>'.
 '</select>  '</select>
 <input type="hidden" name="filename" value="/~'.  <input type="hidden" name="filename" value="/priv'.
  &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />   &HTML::Entities::encode($thisdisfn.'/'.$filename,'<>&"').'" />
  <input type="hidden" name="dispfilename" value="'.   <input type="hidden" name="dispfilename" value="'.
  &HTML::Entities::encode($filename).'" /></form>';   &HTML::Entities::encode($filename).'" /></form>';
     $$numres ++;      $$numres ++;
Line 691  sub check_for_versions { Line 998  sub check_for_versions {
             $versions ++;                      $versions ++;        
         }          }
     }      }
       closedir(DIR);
     return $versions;      return $versions;
 }  }
   
 #  sub prepareJsonTranslations {
 #   Categorize files in the directory.      my $json = 
 #   For each file in a list of files in a file directory,           '{"translations":{'.
 #   the  file categorized as one of:              '"edit":"'.&mt('Edit').'",'.
 #    - directory                '"editxml":"'.&mt('EditXML').'",'.
 #    - sequence              '"editmeta":"'.&mt('Edit Metadata').'",'.
 #    - problem               '"obsolete":"'.&mt('Obsolete').'",'.
 #    - Other resource.              '"modified":"'.&mt('Modified').'",'.
 #              '"published":"'.&mt('Published').'",'.
 #   For each file the modification date is determined as well.              '"unpublished":"'.&mt('Unpublished').'",'.
 #   Returned is a list of sublists:              '"diff":"'.&mt('Diff').'",'.
 #    (directories, sequences, problems, other)              '"retrieve":"'.&mt('Retrieve').'",'.
 #   each of the sublists contains entries of the following form (sorted by              '"directory":"'.&mt('Directory').'",'.
 #   filename):              '"results":"'.&mt('Show results for keyword:').'"'.
 #     (filename, typecode, lastmodtime)          '}}';
 #  }
 #   $list = CategorizeFiles($location, $files)  
 #       $location   - Directory in which the files live (relative to our  # gathers all files in the working directory except the ones that are already on screen
 #                     execution.  sub prepareJsonData {
 #       $files      - list of files.      my ($uname, $udom, $pathToSkip) = @_;
 #      my $path = "/home/httpd/html/priv/$udom/$uname/";
 sub CategorizeFiles {  
     my $location = shift;      # maximum number of entries, to limit workload and required storage space
     my $files    = shift;      my $entries = 100;
       my $firstfile = 1;
       my $firstdir = 1;
   
       my $json = '{"resources":[';
       $json .= &prepareJsonData_rec($path, \$entries, \$firstfile, \$firstdir, $pathToSkip);
       $json .= ']}';
   
       # if the json string is invalid the whole search breaks.
       # so we want to make sure that the string is valid in any case.
       $json =~ s/,\s*,/,/g;
       $json =~ s/\}\s*\{/\},\{/g;
       $json =~ s/\}\s*,\s*\]/\}\]/g;
       return $json;
 }  }
   
   # recursive part of json file gathering
   sub prepareJsonData_rec {
       my ($path, $entries, $firstfile, $firstdir, $pathToSkip) = @_;
       my $json;
       my $skipThisFolder = $path =~ m/$pathToSkip\/$/?1:0;
   
       my @dirs;
       my @resources;
       my @ignored = qw(bak log meta save . ..);
   
   # Phase 1: Gathering
       opendir(DIR,$path);
       my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));
       foreach my $filename (@files) {
           next if ($filename eq '.DS_Store');
   
           # gather all resources
           if ($filename !~ /\./) {
               # its a folder
               push(@dirs, $filename);
           } else {
               # only push files we dont want to ignore
               next if ($skipThisFolder);
   
               $filename =~ /\.(\w+?)$/;
               unless (grep /$1/, @ignored) {
                   push(@resources, $filename);
               }
           }
       }
       closedir(DIR);
       # nothing to do here if both lists are empty
       return unless ( @dirs || @resources );
       
   # Phase 2: Working
       $$firstfile = 1;
   
       foreach (@dirs) {
           $json .= '{"name":"'.$_.'",'.
                     '"path":"'.$path.$_.'",'.
                     '"title":"",'.
                     '"status":"",'.
                     '"cmtime":""},';
       }
   
       foreach (@resources) {
           last if ($$entries < 1);
           my $title = &getTitleString($path.$_);
   
           my $privpath = $path.$_;
           my $respath = $privpath;
           $respath =~ s/httpd\/html\/priv\//httpd\/html\/res\//;
   
           my $cmtime = (stat($privpath))[9];
           my $rmtime = (stat($respath))[9];
   
           unless ($$firstfile) { $json .= ','; } else { $$firstfile = 0; }
   
           my $status = 'unpublished';
   
           # if a resource is published, the published version (/html/res/filepath) gets its own modification time
           # this is newer or equal then the version in your authoring space (/html/priv/filepath)
           if ($rmtime >= $cmtime) {
               # obsolete
               if (&Apache::lonnet::metadata($respath, 'obsolete')) {
                   $status = 'obsolete';
               }else{
                   $status = 'published';
               }
           } else {
               $status = 'modified';
           }
   
           $json .= '{"name":"'.$_.'",'.
                     '"path":"'.$path.'",'.
                     '"title":"'.$title.'",'.
                     '"status":"'.$status.'",'.
                     '"cmtime":"'.&Apache::lonlocal::locallocaltime($cmtime).'"}';
           $$entries--;
       }
   
       foreach(@dirs) {
           next if ($$entries < 1);
           $json .= ',';
           $json .= &prepareJsonData_rec
                       ($path.$_.'/', $entries, $firstfile, $firstdir, $pathToSkip);
       }
       return $json;
   }
 1;  1;
 __END__  __END__
   
   
 =head1 NAME  =head1 NAME
   
 Apache::lonpubdir - Construction space directory lister  Apache::lonpubdir - Authoring space directory lister
   
 =head1 SYNOPSIS  =head1 SYNOPSIS
   
 Invoked (for various locations) by /etc/httpd/conf/srm.conf:  Invoked (for various locations) by /etc/httpd/conf/srm.conf:
   
  <LocationMatch "^/\~.*/$">   <LocationMatch "^/+priv.*/$">
  PerlAccessHandler       Apache::loncacc   PerlAccessHandler       Apache::loncacc
  SetHandler perl-script   SetHandler perl-script
  PerlHandler Apache::lonpubdir   PerlHandler Apache::lonpubdir
Line 805  Output the header of the page.  This inc Line 1215  Output the header of the page.  This inc
     $str = getTitleString($fullname);      $str = getTitleString($fullname);
         $fullname - Fully qualified filename to check.          $fullname - Fully qualified filename to check.
   
 =item putdirectory(r, base, here, dirname, modtime)  =item putdirectory($r, $base, $here, $dirname, $modtime, $targetdir, $bombs,
                      $numdir)
   
     Put out a directory table row:      Put out a directory table row:
           
     putdirectory($r, $base, $here, $dirname, $modtime)          $r        - Apache request object.
         $r       - Apache request object.          $reqfile  - File in request.
         $reqfile - File in request.          $here     - Where we are in directory tree.
         $here    - Where we are in directory tree.          $dirname  - Name of directory special file.
         $dirname - Name of directory special file.          $modtime  - Encoded modification time.
         $modtime - Encoded modification time.          targetdir - Publication target directory.
           bombs     - Reference to hash of URLs with runtime error messages.
 =item CategorizeFiles($location, $files)          numdir    - Reference to scalar used to track number of sub-directories
                           in directory (used in form name for each "actions" dropdown).
     Categorize files in the directory.  
     For each file in a list of files in a file directory,   
     the  file categorized as one of:  
         - directory    
         - sequence  
         - problem   
         - Other resource.  
   
     For each file the modification date is determined as well.  
     Returned is a list of sublists:  
         (directories, sequences, problems, other)  
     each of the sublists contains entries of the following form (sorted by filename):  
     (filename, typecode, lastmodtime)  
       
         $list = CategorizeFiles($location, $files)  
         $location   - Directory in which the files live (relative to our execution)  
         $files      - list of files.  
   
 =back  =back
   
 =cut  =cut
   
Removed from v.1.128  
changed lines
  Added in v.1.167

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