Diff for /loncom/publisher/lonpubdir.pm between versions 1.48 and 1.59

version 1.48, 2003/12/22 19:30:25 version 1.59, 2004/01/29 00:44:43
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="0" cellspacing="2" cellpadding="2">'.
     '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.      '<tr><th>&nbsp;</th><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
     &mt('Title').'</th>'.      &mt('Title').'</th>'.
     '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').      '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').
     '</th></tr>');      '</th></tr>');
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 221  ENDPUBDIRSCRIPT Line 222  ENDPUBDIRSCRIPT
  $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.   $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
   '</h3>');    '</h3>');
     }      }
     $r->print(      my $formaction='/priv/'.$uname.'/'.$thisdisfn.'/';
        &Apache::lonhtmlcommon::crumbs($thisdisfn,'_top','/priv/'.$uname));      $formaction=~s/\/+/\//g;
       $r->print('<form name="dirs" method="post" action="'.$formaction
         .'" target="_top">'.
         &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv').
         &Apache::lonhtmlcommon::select_recent('construct','recent',
            'this.form.action=this.form.recent.value;this.form.submit()').
         '</form>');
       &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
 }  }
   
 #  #
Line 244  sub getTitleString { Line 252  sub getTitleString {
     return $title;      return $title;
 }  }
   
   sub getCopyRightString {
       my $fullname = shift;
       return &Apache::lonnet::metadata($fullname, 'copyright');
   }
 #  #
 #  Put out a directory table row:  #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)  #    putdirectory(r, base, here, dirname, modtime)
Line 255  sub getTitleString { Line 266  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 276  sub putdirectory {
     }      }
     unless (( ($dirname eq '..') && ($reqfile eq '')) ||      unless (( ($dirname eq '..') && ($reqfile eq '')) ||
     ($dirname eq '.')) {      ($dirname eq '.')) {
    my $kaputt=0;
    foreach (keys %{$bombs}) {
       if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
    }
    %Apache::lonpublisher::metadatafields=();
    %Apache::lonpublisher::metadatakeys=();
    my $construct=$here;
    $construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
    &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
           $construct.'/'.$dirname.'/default.meta'
    ));
  $r->print('<tr bgcolor="#CCCCFF">'.   $r->print('<tr bgcolor="#CCCCFF">'.
     '<td><img src="'.
     $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
   '<td>'.&mt('Go to ...').'</td>'.    '<td>'.&mt('Go to ...').'</td>'.
   '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.    '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
   $disfilename.'</a></td>'.    $disfilename.'</a></font></td>'.
         '<td>&nbsp;</td>'.          '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
   '<td>&nbsp;</td>'.    $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
     $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
   "</tr>\n");    "</tr>\n");
     }      }
Line 282  sub putdirectory { Line 307  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='#FFAA99';
     my $title='&nbsp;';      my $title='&nbsp;';
     if (-e $resdir.'/'.$filename) {      if (-e $resdir.'/'.$filename) {
  my ($rdev,$rino,$rmode,$rnlink,   my ($rdev,$rino,$rmode,$rnlink,
Line 293  sub putresource { Line 318  sub putresource {
     $ratime,$rmtime,$rctime,      $ratime,$rmtime,$rctime,
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);      $rblksize,$rblocks)=stat($resdir.'/'.$filename);
  if ($rmtime>=$cmtime) {   if ($rmtime>=$cmtime) {
     $status=&mt('Published');      $status=&mt('Published').'<br />'.
             $bgcolor='#CCFFCC';   &mt(&getCopyRightString($targetdir.'/'.$filename));
               $bgcolor='#CCFF88';
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
                 $bgcolor='#AAAAAA';                  $bgcolor='#AAAAAA';
     }      }
     $title='<a href="/res/'.$targetdir.'/'.$filename.      $title='<a href="/res/'.$targetdir.'/'.$filename.
  '.meta" target=cat>'.   '.meta" target=cat>'.
  getTitleString($targetdir.'/'.$filename, 'title').'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
  } else {   } else {
     $status=&mt('Modified');      $status=&mt('Modified').'<br />'.
             $bgcolor='#FFFFCC';   &mt(&getCopyRightString($targetdir.'/'.$filename));
               $bgcolor='#FFFF77';
     $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.      $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
  getTitleString($targetdir.'/'.$filename,'title').'</a>';   &getTitleString($targetdir.'/'.$filename).'</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.
     $thisdisfn.'/'.$filename.      $thisdisfn.'/'.$filename.
     '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';      '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
     }      }
  }      }
    $title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
       ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
  $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.   $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';      $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</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=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';   $editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
     }      }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {      if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
  $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';   $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';
  $editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';   $editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</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=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';        $uname.$thisdisfn.'/'.$filename.'">'.&mt('Decompress').'</a>)';
     }      }
     $r->print('<tr bgcolor="'.$bgcolor.'">'.      $r->print('<tr bgcolor="'.$bgcolor.'">'.
         '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
         '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
       '<td><a target="_parent" href="/adm/publish?filename=/~'.        '<td><a target="_parent" href="/adm/publish?filename=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.        $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
       '</td>'.        '</td>'.
       '<td>'.        '<td><font face="arial">'.
       '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
                $filename.'</a>'.$editlink2.$editlink.                 $filename.'</a></font>'.$editlink2.$editlink.
       '</td>'.        '</td>'.
       '<td>'.$title.'</td>'.        '<td>'.$title.'</td>'.
       '<td>'.$status.'</td>'.        '<td>'.$status.'</td>'.

Removed from v.1.48  
changed lines
  Added in v.1.59


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