--- loncom/publisher/lonpublisher.pm	2001/04/16 20:02:50	1.24
+++ loncom/publisher/lonpublisher.pm	2001/05/09 17:38:13	1.28
@@ -9,6 +9,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29,04/03 Gerd Kortemeyer
 # 04/16/2001 Scott Harrison
+# 05/03,05/05,05/07 Gerd Kortemeyer
 
 package Apache::lonpublisher;
 
@@ -19,6 +20,7 @@ use Apache::Constants qw(:common :http :
 use HTML::TokeParser;
 use Apache::lonxml;
 use Apache::lonhomework;
+use Apache::loncacc;
 use DBI;
 
 my %addid;
@@ -31,6 +33,9 @@ my %metadatakeys;
 
 my $docroot;
 
+my $cuname;
+my $cudom;
+
 # ----------------------------------------------- Evaluate string with metadata
 
 sub metaeval {
@@ -86,6 +91,14 @@ sub metaread {
     return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
 }
 
+# ---------------------------- convert 'time' format into a datetime sql format
+sub sqltime {
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
+	localtime(@_[0]);
+    $mon++; $year+=1900;
+    return "$year-$mon-$mday $hour:$min:$sec";
+}
+
 # --------------------------------------------------------- Various form fields
 
 sub textfield {
@@ -253,17 +266,17 @@ sub publish {
 		                  $ENV{'environment.generation'};
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
-        $metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+        $metadatafields{'owner'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$ENV{'user.name'}\///;
+        $thisdisfn=~s/^\/home\/$cuname\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
 
-        my $currentpath='/home/'.$ENV{'user.name'}.'/';
+        my $currentpath='/home/'.$cuname.'/';
 
         map {
 	    $currentpath.=$_.'/';
@@ -485,6 +498,18 @@ sub phasetwo {
      }
 
 # -------------------------------- Synchronize entry with SQL metadata database
+    my %perlvar;
+    open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
+    my $configline;
+    while ($configline=<CONFIG>) {
+	if ($configline =~ /PerlSetVar/) {
+	    my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+	    chomp($varvalue);
+	    $perlvar{$varname}=$varvalue;
+	}
+    }
+    close(CONFIG);
+
     my $dbh;
     {
 	unless (
@@ -496,7 +521,7 @@ sub phasetwo {
 
     my %sqldatafields;
     $sqldatafields{'url'}=$distarget;
-    $sth=$dbh->prepare("delete from metadata where url like binary \"".
+    my $sth=$dbh->prepare("delete from metadata where url like binary \"".
 		       $sqldatafields{'url'}."\"");
     $sth->execute();
     map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g; 
@@ -515,8 +540,8 @@ sub phasetwo {
 			  '"'.delete($sqldatafields{'abstract'}).'"'.','.
 			  '"'.delete($sqldatafields{'mime'}).'"'.','.
 			  '"'.delete($sqldatafields{'language'}).'"'.','.
-			  '"'.delete($sqldatafields{'creationdate'}).'"'.','.
-			  '"'.delete($sqldatafields{'lastrevisiondate'}).'"'.','.
+			  '"'.sqltime(delete($sqldatafields{'creationdate'})).'"'.','.
+			  '"'.sqltime(delete($sqldatafields{'lastrevisiondate'})).'"'.','.
 			  '"'.delete($sqldatafields{'owner'}).'"'.','.
 			  '"'.delete($sqldatafields{'copyright'}).'"'.')');
     $sth->execute();
@@ -704,16 +729,28 @@ sub handler {
 
   my $fn=$ENV{'form.filename'};
 
+  
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish empty filename', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
 
-  unless ($ENV{'user.home'} eq $r->dir_config('lonHostID')) {
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+  unless (($cuname,$cudom)=
+    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) {
+     $r->log_reason($cuname.' at '.$cudom.
+         ' trying to publish file '.$ENV{'form.filename'}.
+         ' ('.$fn.') - not authorized', 
+         $r->filename); 
+     return HTTP_NOT_ACCEPTABLE;
+  }
+
+  unless (&Apache::lonnet::homeserver($cuname,$cudom) 
+          eq $r->dir_config('lonHostID')) {
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not homeserver ('.$ENV{'user.home'}.')', 
+         ' ('.$fn.') - not homeserver ('.
+         &Apache::lonnet::homeserver($cuname,$cudom).')', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
   }
@@ -722,19 +759,19 @@ sub handler {
 
   my $targetdir='';
   $docroot=$r->dir_config('lonDocRoot'); 
-  if ($1 ne $ENV{'user.name'}) {
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+  if ($1 ne $cuname) {
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish unowned file '.$ENV{'form.filename'}.
          ' ('.$fn.')', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
   } else {
-      $targetdir=$docroot.'/res/'.$ENV{'user.domain'};
+      $targetdir=$docroot.'/res/'.$cudom;
   }
                                  
   
   unless (-e $fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish non-existing file '.$ENV{'form.filename'}.
          ' ('.$fn.')', 
          $r->filename); 
@@ -812,18 +849,31 @@ unless ($ENV{'form.phase'} eq 'two') {
       $thisdistarget=~s/^$docroot//;
 
       my $thisdisfn=$thisfn;
-      $thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///;
+      $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
 
       $r->print('<h2>Publishing '.
         &Apache::lonnet::filedescription($thistype).' <tt>'.
         $thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
+   
+       if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
+          $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
+               '</font></h3>');
+      }
+
+      if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {
+          $r->print('<br><a href="/adm/diff?filename=/~'.$cuname.'/'.
+                    $thisdisfn.
+  	  '&versionone=priv" target=cat>Diffs with Current Version</a><p>');
+      }
   
 # ------------ We are publishing from $thisfn to $thistarget with $thisembstyle
 
        unless ($ENV{'form.phase'} eq 'two') {
-          $r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
+         $r->print(
+          '<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
        } else {
-          $r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));      
+         $r->print(
+          '<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
        }  
 
   }