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

Diff for /loncom/publisher/lonpubdir.pm between versions 1.129 and 1.131

version 1.129, 2011/10/21 22:33:14 version 1.131, 2011/10/22 15:16:20
Line 447  sub getSourceRightString { Line 447  sub getSourceRightString {
 sub putdirectory {  sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;      my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
   
 #&Apache::lonnet::logthis("reqfile $reqfile here $here dirname $dirname resdir $resdir");  
   
   
 # construct the display filename: the directory name unless ..:  # construct the display filename: the directory name unless ..:
           
     my $disfilename = $dirname;      my $disfilename = $dirname;
     if ($dirname eq '..') {      if ($dirname eq '..') {
  $disfilename = '<i>'.&mt('Parent Directory').'</i>';   $disfilename = '<i>'.&mt('Parent Directory').'</i>';
     }      }
     unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {  # Don't display directory itself, and there is no way up from root directory
       unless ( (($dirname eq '..') && ($reqfile=~/^\/[^\/]+\/[^\/]+$/)) || ($dirname eq '.')) {
  my $kaputt=0;   my $kaputt=0;
  foreach (keys %{$bombs}) {   foreach (keys %{$bombs}) {
     if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }      if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
Line 523  sub putresource { Line 521  sub putresource {
     my $title='&nbsp;';      my $title='&nbsp;';
     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/'.$udom.'/'.$uname.'/'.$thisdisfn.'/';
     my $linkfilename='/priv'.$thisdisfn.'/'.$filename;      my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
   
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
         my $same=0;          my $same=0;
Line 659  sub create_pubselect { Line 657  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 ++;
Removed from v.1.129  
changed lines
  Added in v.1.131

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