--- loncom/publisher/lonpubdir.pm	2001/05/09 17:38:12	1.7
+++ 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,05/09 Gerd Kortemeyer
+# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
 
 package Apache::lonpubdir;
 
@@ -19,6 +19,7 @@ use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
+use Apache::lonnet;
 
 
 sub handler {
@@ -38,9 +39,10 @@ sub handler {
   my $uname;
   my $udom;
 
-  unless (($uname,$udom)=
+  ($uname,$udom)=
     &Apache::loncacc::constructaccess(
-             $fn,$r->dir_config('lonDefDomain'))) {
+             $fn,$r->dir_config('lonDefDomain')); 
+  unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$ENV{'form.filename'}.
          ' ('.$fn.') - not authorized', 
@@ -84,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) {
@@ -113,14 +119,19 @@ sub handler {
                 if 
             (&Apache::lonnet::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
                    $status.='<br><a href="/adm/diff?filename=/~'.$uname.
-                                         '/'.$filename.
+                                         $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) {
          my $disfilename=$filename;
          if ($filename eq '..') {
@@ -130,8 +141,12 @@ sub handler {
                  ($filename eq '.')) {
            $r->print('<tr bgcolor=#BBBBFF'.
            '><td><a href="'.$linkdir.'/'.$filename.'">'.$disfilename.
-           '</a></td><td>'.localtime($cmtime).'</td><td>&nbsp;</td></tr>');
+ '</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);