Diff for /loncom/publisher/lonpubdir.pm between versions 1.49 and 1.50

version 1.49, 2003/12/29 19:01:27 version 1.50, 2003/12/30 22:19:18
Line 37  use Apache::loncacc; Line 37  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonmsg;
   
 sub handler {  sub handler {
   
Line 85  sub handler { Line 86  sub handler {
   my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.    my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
   my $linkdir='/priv/'.$uname.$thisdisfn;      # Full URL name of constr space.    my $linkdir='/priv/'.$uname.$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.    &startpage($r, $uname, $udom, $thisdisfn);   # Put out the start of page.
       
   # Start off the diretory table.    # Start off the directory table.
   
   $r->print('<table border=2>'.    $r->print('<table border=2>'.
     '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.      '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
Line 111  sub handler { Line 112  sub handler {
      my $extension='';       my $extension='';
      if ($filename=~/\.(\w+)$/) { $extension=$1; }       if ($filename=~/\.(\w+)$/) { $extension=$1; }
      if ($cmode&$dirptr) {       if ($cmode&$dirptr) {
  putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime);   putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs);
      } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {       } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
  putresource($r, $uname, $filename, $thisdisfn, $resdir,    putresource($r, $uname, $filename, $thisdisfn, $resdir, 
      $targetdir, $linkdir, $cmtime);       $targetdir, $linkdir, $cmtime,\%bombs);
      } else {       } else {
  # "hidden" extension and not a directory, so hide it away.   # "hidden" extension and not a directory, so hide it away.
      }       }
Line 222  ENDPUBDIRSCRIPT Line 223  ENDPUBDIRSCRIPT
   '</h3>');    '</h3>');
     }      }
     $r->print(      $r->print(
        &Apache::lonhtmlcommon::crumbs($thisdisfn.'/','_top','/priv/'.$uname));         &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv'));
 }  }
   
 #  #
Line 255  sub getTitleString { Line 256  sub getTitleString {
 #      modtime - Encoded modification time.  #      modtime - Encoded modification time.
 #   # 
 sub putdirectory {  sub putdirectory {
     my ($r, $reqfile, $here, $dirname, $modtime) = @_;      my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_;
       
     # construct the display filename: the directory name unless ..:      # construct the display filename: the directory name unless ..:
           
Line 265  sub putdirectory { Line 266  sub putdirectory {
     }      }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||      unless (( ($dirname eq '..') && ($reqfile eq '')) ||
     ($dirname eq '.')) {      ($dirname eq '.')) {
    my $kaputt=0;
    foreach (keys %{$bombs}) {
       if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; }
    }
  $r->print('<tr bgcolor="#CCCCFF">'.   $r->print('<tr bgcolor="#CCCCFF">'.
   '<td>'.&mt('Go to ...').'</td>'.    '<td>'.&mt('Go to ...').'</td>'.
   '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.    '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
   $disfilename.'</a></td>'.    $disfilename.'</a></td>'.
         '<td>&nbsp;</td>'.          '<td>'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'&nbsp;').'</td>'.
   '<td>&nbsp;</td>'.    '<td>&nbsp;</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
   "</tr>\n");    "</tr>\n");
Line 282  sub putdirectory { Line 287  sub putdirectory {
 sub putresource {  sub putresource {
     my ($r, $uname, $filename, $thisdisfn,       my ($r, $uname, $filename, $thisdisfn, 
  $resdir, $targetdir, $linkdir,   $resdir, $targetdir, $linkdir,
  $cmtime) = @_;   $cmtime,$bombs) = @_;
   
     my $status=&mt('Unpublished');      my $status=&mt('Unpublished');
     my $bgcolor='#FFCCCC';      my $bgcolor='#FFCCCC';
Line 301  sub putresource { Line 306  sub putresource {
     }      }
     $title='<a href="/res/'.$targetdir.'/'.$filename.      $title='<a href="/res/'.$targetdir.'/'.$filename.
  '.meta" target=cat>'.   '.meta" target=cat>'.
    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
  getTitleString($targetdir.'/'.$filename, 'title').'</a>';   getTitleString($targetdir.'/'.$filename, 'title').'</a>';
  } else {   } else {
     $status=&mt('Modified');      $status=&mt('Modified');
             $bgcolor='#FFFFCC';              $bgcolor='#FFFFCC';
     $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.      $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
  getTitleString($targetdir.'/'.$filename,'title').'</a>';   getTitleString($targetdir.'/'.$filename,'title').'</a>';
     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><a href="/adm/diff?filename=/~'.$uname.

Removed from v.1.49  
changed lines
  Added in v.1.50


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