--- loncom/publisher/londiff.pm	2001/05/02 21:01:47	1.1
+++ loncom/publisher/londiff.pm	2001/05/09 17:38:12	1.5
@@ -15,7 +15,7 @@
 #
 # 03/31,04/03 Gerd Kortemeyer)
 #
-# 05/02/01 Gerd Kortemeyer
+# 05/02/01,05/09 Gerd Kortemeyer
 
 package Apache::londiff;
 
@@ -24,7 +24,7 @@ use Apache::File;
 use File::Copy;
 use Algorithm::Diff qw(diff);
 use Apache::Constants qw(:common :http :methods);
-
+use Apache::loncacc;
 
 sub handler {
 
@@ -46,11 +46,46 @@ sub handler {
 
 # Get the files
 
+  my $cuname=$ENV{'user.name'};
+  my $cudom=$ENV{'user.domain'};
+
+  unless (($cuname,$cudom)=
+    &Apache::loncacc::constructaccess($ENV{'form.filename'},
+                                      $r->dir_config('lonDefDomain'))) {
+     $r->log_reason($cuname.' at '.$cudom.
+         ' trying to get diffs file '.$ENV{'form.filename'}.
+         '  - not authorized', 
+         $r->filename); 
+     return HTTP_NOT_ACCEPTABLE;
+  }
+
+  my $efn=$ENV{'form.filename'};
+
+  $efn=~s/\/\~(\w+)//g;
+
   my @f1=();
   my @f2=();
 
+  $r->content_type('text/html');
+  $r->send_http_header;
+
+  $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
+
+  $r->print('<body bgcolor="#FFFFFF">');
+
+  
+  $r->print('<h1>Compare versions of <tt>'.$efn.'</tt></h1>');
+   
+       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(($efn=~/\.(\w+)$/)) eq
+      'ssi') {
   if ($ENV{'form.versionone'} eq 'priv') {
-      my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};
+      my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if (-e $fn) {
 	  my $fh=Apache::File->new($fn);
           my $line;
@@ -59,21 +94,25 @@ sub handler {
              $f1[$#f1+1]=$line;
 	 }
       }
+      $r->print('<h3>Construction Space Version</h3>');
   } else {
       my $fn=
-       '/home/httpd/html//res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';
+       '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versionone'}) {
-         my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);
+         my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versionone'}.'.'.$suffix;
+	 $r->print('<h3>Version '.$ENV{'form.versionone'}.'</h3>');
       } else {
-         $fn.=$ENV{'form.filename'};
+         $fn.=$efn;
+	 $r->print('<h3>Current Version</h3>');
       }
       @f1=split(/\n/,&Apache::lonnet::getfile($fn));      
   }
 
+  $r->print('versus');
 
   if ($ENV{'form.versiontwo'} eq 'priv') {
-      my $fn='/home/'.$ENV{'user.name'}.'/public_html/'.$ENV{'form.filename'};
+      my $fn='/home/'.$cuname.'/public_html/'.$efn;
       if (-e $fn) {
 	  my $fh=Apache::File->new($fn);
           my $line;
@@ -82,14 +121,17 @@ sub handler {
              $f2[$#f2+1]=$line;
 	 }
       }
+      $r->print('<h3>Construction Space Version</h3>');
   } else {
       my $fn=
-       '/home/httpd/html/res/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/';
+       '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
       if ($ENV{'form.versiontwo'}) {
-         my ($main,$suffix)=($ENV{'form.filename'}=~/^(.+)\.(\w+)$/);
+         my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
          $fn.=$main.'.'.$ENV{'form.versiontwo'}.'.'.$suffix;
+	 $r->print('<h3>Version '.$ENV{'form.versiontwo'}.'</h3>');
       } else {
-         $fn.=$ENV{'form.filename'};
+         $fn.=$efn;
+	 $r->print('<h3>Current Version</h3>');
       }
       @f2=split(/\n/,&Apache::lonnet::getfile($fn));      
   }
@@ -100,39 +142,28 @@ sub handler {
 
 # Start page output
 
-  $r->content_type('text/html');
-  $r->send_http_header;
-
-  $r->print('<html><head><title>LON-CAPA Construction Diffs</title></head>');
-
-  $r->print('<body bgcolor="#FFFFFF">');
-
-  
-  $r->print('<h1>Compare versions of <tt>'.$ENV{'form.filename'}.'</tt></h1>');
-
   my $chunk;
   my $line;
 
-  $r->print('<table border=2><tr><th>Version '.$ENV{'form.versionone'}.
-                    '</th><th>Version '.$ENV{'form.versiontwo'}.'</th>');
+  $r->print('<pre>');
+
   foreach $chunk (@$diffs) {
-    $r->print('</pre></tr><tr><td><pre>');
-    my $presign='-';  
+
     foreach $line (@$chunk) {
       my ($sign, $lineno, $text) = @$line;
-      if ($sign ne $presign) {
-	  $r->print('</pre></td><td><pre>');
-          $presign=$sign;
-      }
       $text=~s/\</\&lt\;/g;
       $text=~s/\>/\&gt\;/g;
-      $lineno=substr($lineno.'        ',0,8);
-      $r->print($lineno.' '.$text."\n");
+      $lineno=substr($lineno.'        ',0,7);
+      $r->print('<font color='.(($sign eq '+')?'green':'red').'>'.
+                $sign.' '.$lineno.' '.$text."</font>\n");
     }
+    $r->print("<hr>\n");
   }
+  $r->print('</pre>');
 
-  $r->print('</tr></table>');
-
+} else {
+    $r->print('<h1><font color=red>Binary File</font></h1>');
+}
   $r->print('</body></html>');
   return OK;  
 }
@@ -143,3 +174,4 @@ __END__
 
 
 
+
