--- loncom/publisher/lonpubdir.pm	2001/04/09 23:49:04	1.4
+++ loncom/publisher/lonpubdir.pm	2001/06/23 18:26:40	1.9
@@ -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 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,6 +35,20 @@ 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/\/$//;
 
@@ -44,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;
@@ -59,6 +73,12 @@ sub handler {
   $thisdisfn=~s/^\/home\/$uname\/public_html//;
   
   $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');
 
@@ -92,6 +112,12 @@ sub handler {
             } else {
                 $status='Modified';
                 $bgcol='#FFFFBB';
+                if 
+            (&Apache::lonnet::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+                   $status.='<br><a href="/adm/diff?filename=/~'.$uname.
+                                         '/'.$filename.
+		       '&versionone=priv" target=cat>Diffs</a>';
+	        }
             }   
 	 }
          $r->print('<tr bgcolor='.$bgcol.