--- loncom/publisher/lonpubdir.pm	2001/04/03 10:48:08	1.2
+++ loncom/publisher/lonpubdir.pm	2001/08/20 20:13:40	1.14
@@ -10,7 +10,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 #
-# 03/31,04/03 Gerd Kortemeyer
+# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
 
 package Apache::lonpubdir;
 
@@ -18,6 +18,8 @@ use strict;
 use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
+use Apache::loncacc;
+use Apache::lonnet;
 
 
 sub handler {
@@ -33,7 +35,22 @@ sub handler {
   } else {
       $fn=$r->filename();
   }
+
+  my $uname;
+  my $udom;
+
+  ($uname,$udom)=
+    &Apache::loncacc::constructaccess(
+             $fn,$r->dir_config('lonDefDomain')); 
+  unless (($uname) && ($udom)) {
+     $r->log_reason($uname.' at '.$udom.
+         ' trying to publish file '.$ENV{'form.filename'}.
+         ' ('.$fn.') - not authorized', 
+         $r->filename); 
+     return HTTP_NOT_ACCEPTABLE;
+  }
      
+  $fn=~s/\/$//;
 
   unless ($fn) { 
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
@@ -43,8 +60,6 @@ sub handler {
 
 # ----------------------------------------------------------- Start page output
 
-  my $uname=$ENV{'user.name'};
-  my $udom=$ENV{'user.domain'};
 
   $r->content_type('text/html');
   $r->send_http_header;
@@ -57,7 +72,13 @@ sub handler {
   my $thisdisfn=$fn;
   $thisdisfn=~s/^\/home\/$uname\/public_html//;
   
-  $r->print('<h1>Construction Space Directory <tt>'.$thisdisfn.'</tt></h1>');
+  $r->print('<h1>Construction Space Directory <tt>'.$thisdisfn.'/</tt></h1>');
+  
+  if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+          $r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.
+               '</font></h3>');
+  }
+
 
   my $docroot=$r->dir_config('lonDocRoot');
 
@@ -65,19 +86,23 @@ sub handler {
   my $linkdir='/~'.$uname.$thisdisfn;
 
   $r->print('<table border=2>'.
-            '<tr><th>Filename</th><th>Modified</th><th>Status</th></tr>');
+ '<tr><th>Filename</th><th>Modified</th><th>Status</th><th>&nbsp;</th></tr>');
 
   my $filename;
   my $dirptr=16384;
 
   opendir(DIR,$fn);
-  while ($filename=readdir(DIR)) {
+  my @files=sort(readdir(DIR));
+  foreach my $filename (@files) {
      my ($cdev,$cino,$cmode,$cnlink,
          $cuid,$cgid,$crdev,$csize,
          $catime,$cmtime,$cctime,
          $cblksize,$cblocks)=stat($fn.'/'.$filename);
-     $filename=~/\.(\w+)$/;
-     if (($1 ne 'meta') && (&Apache::lonnet::fileembstyle($1))) {
+
+     my $extension='';
+     if ($filename=~/\.(\w+)$/) { $extension=$1; }
+     if (($extension ne 'meta') && 
+         (&Apache::lonnet::fileembstyle($extension))) {
          my $status='Unpublished';
          my $bgcol='#FFBBBB';
          if (-e $resdir.'/'.$filename) {
@@ -91,15 +116,37 @@ sub handler {
             } else {
                 $status='Modified';
                 $bgcol='#FFFFBB';
+                if 
+            (&Apache::lonnet::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+                   $status.='<br><a href="/adm/diff?filename=/~'.$uname.
+                                         $thisdisfn.'/'.$filename.
+		       '&versionone=priv" target=cat>Diffs</a>';
+	        }
             }   
+            $status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
+              $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
 	 }
          $r->print('<tr bgcolor='.$bgcol.
          '><td><a href="'.$linkdir.'/'.$filename.'">'.$filename.
-         '</a></td><td>'.localtime($cmtime).'</td><td>'.$status.'</td></tr>');
+         '</a></td><td>'.localtime($cmtime).'</td><td>'.$status.'</td>'.
+     '<td><a target="_parent" href="/adm/publish?filename=/~'.$uname.
+                                      $thisdisfn.'/'.$filename.'">'.
+         'Publish</a></td></tr>');
      } elsif ($cmode&$dirptr) {
-         $r->print('<tr bgcolor=#BBBBFF'.
-         '><td><a href="'.$linkdir.'/'.$filename.'">'.$filename.
-         '</a></td><td>'.localtime($cmtime).'</td><td>&nbsp;</td></tr>');
+         my $disfilename=$filename;
+         if ($filename eq '..') {
+	     $disfilename='<i>Parent Directory</i>';
+         }
+         unless ((($filename eq '..') && ($thisdisfn eq '')) ||
+                 ($filename eq '.')) {
+           $r->print('<tr bgcolor=#BBBBFF'.
+           '><td><a href="'.$linkdir.'/'.$filename.'">'.$disfilename.
+ '</a></td><td>'.localtime($cmtime).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>'
+           );
+         }
+     } else {
+       #no extension that we know of and not a directory
+       #just hide it away
      }
   }
   closedir(DIR);
@@ -107,3 +154,6 @@ sub handler {
   $r->print('</table></body></html>');
   return OK;  
 }
+
+1;
+__END__