--- loncom/publisher/londiff.pm	2006/09/19 21:47:29	1.21
+++ loncom/publisher/londiff.pm	2011/10/29 19:11:46	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to show differences between file versions
 #
-# $Id: londiff.pm,v 1.21 2006/09/19 21:47:29 albertel Exp $
+# $Id: londiff.pm,v 1.30 2011/10/29 19:11:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,9 @@
 #
 ###
 
+
+
+
 package Apache::londiff;
 
 use strict;
@@ -40,7 +43,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonretrieve();
 use Apache::lonlocal;
-
+use LONCAPA();
 
 sub get_split_file {
     my ($fn,$style)=@_;
@@ -55,16 +58,9 @@ sub get_split_file {
 	    }
 	}
     } elsif ($style eq 'remote') {
-	my $f1=&Apache::lonnet::getfile($fn);
-    }
-    if ($f1=~/\r/) {
-	@f1=split(/\r/,&Apache::lonnet::getfile($fn));      
-	foreach my $line (@f1) {
-	    $line=~s/\n//g;
-	}
-    } else {
-	@f1=split(/\n/,&Apache::lonnet::getfile($fn));      
+	$f1=&Apache::lonnet::getfile($fn);
     }
+    @f1=split(/\r\n|\r|\n/,$f1);
     return @f1;
 }
 
@@ -88,12 +84,12 @@ sub handler {
 
     if ($env{'form.filename'}=~/^\/res\//) {
 	($cudom,$cuname,$env{'form.filename'})=
-	    ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/);
+	    ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$});
     } else {
 	unless (($cuname,$cudom)=
 		&Apache::loncacc::constructaccess($env{'form.filename'},
 						  $r->dir_config('lonDefDomain'))) {
-	    $r->log_reason($cuname.' at '.$cudom.
+	    $r->log_reason($cuname.':'.$cudom.
 			   ' trying to get diffs file '.$env{'form.filename'}.
 			   '  - not authorized', 
 			   $r->filename); 
@@ -103,7 +99,7 @@ sub handler {
   
     my $efn=$env{'form.filename'};
 
-    $efn=~s/\/\~(\w+)//g;
+    $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
 
     my @f1=();
     my @f2=();
@@ -111,15 +107,19 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&Apache::loncommon::start_page('Resource Differences'));
-
+    $r->print(&Apache::loncommon::start_page('Resource Differences',undef,
+                                             {'no_nav_bar'  => 1, }));
   
-    $r->print('<h1>'.($env{'form.filetwo'}?'':&mt('Compare versions of')).
-	      ' <tt>'.$efn.'</tt></h1>');
+    $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')).
+	      ' <span class="LC_filename">'.$efn.'</span>');
    
     if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
-	$r->print('<h3><span class="LC_diff_coauthor">Co-Author: '.$cuname.' at '.$cudom.
-		  '</span></h3>');
+        $r->print('<p><span class="LC_info">'
+                 .&mt('Co-Author [_1]'
+                     ,&Apache::loncommon::plainname($cuname,$cudom)
+                     .' ('.$cuname.':'.$cudom.')')
+                .'</span></p>'
+        );
     }
 
 
@@ -127,12 +127,11 @@ sub handler {
 	|| $efn =~ /\.meta$/) {
 	$r->print('<p><span class="LC_diff_removed">');
 	if ($env{'form.versionone'} eq 'priv') {
-	    my $fn='/home/'.$cuname.'/public_html/'.$efn;
+	    my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
 	    @f1=&get_split_file($fn,'local');
 	    $r->print('<b>'.&mt('Construction Space Version').'</b>');
 	} else {
-	    my $fn=
-		'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+	    my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
 	    if ($env{'form.versionone'}) {
 		my ($main,$suffix,$is_meta)=
 		    &Apache::lonretrieve::get_file_info($efn);
@@ -152,12 +151,12 @@ sub handler {
 
 	if ($env{'form.filetwo'}) {
 	    my $efn2=$env{'form.filetwo'};
-	    $efn2=~s/\/\~(\w+)//g;
-	    my $fn='/home/'.$cuname.'/public_html/'.$efn2;
+	    $efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
+	    my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2;
 	    @f2=&get_split_file($fn,'local');
 	    $r->print('<tt>'.$efn2.'</tt>');
 	} elsif ($env{'form.versiontwo'} eq 'priv') {
-	    my $fn='/home/'.$cuname.'/public_html/'.$efn;
+	    my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
 	    @f2=&get_split_file($fn,'local');
 	    $r->print('<b>'.&mt('Construction Space Version').'</b>');
 	} else {
@@ -180,28 +179,27 @@ sub handler {
 # Run diff
 
 	my $diffs = diff(\@f1, \@f2);
-	
-# Start page output
-
-	my $chunk;
-	my $line;
 
-	$r->print('<pre>');
-	
-	foreach $chunk (@$diffs) {
-	 
-	    foreach $line (@$chunk) {
-		my ($sign, $lineno, $text) = @$line;
-		$text=&HTML::Entities::encode($text,'<>&"');
-		$lineno=substr($lineno.'        ',0,7);
-		$r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
-                                                         :'LC_diff_removed').'">'.
-			  $sign.' '.$lineno.' '.$text."</span>\n");
-	    }
-	    $r->print("</pre><hr /><pre>\n");
-	}
-	$r->print('</pre>');
-	
+        if (@$diffs) {
+            # Start page output
+            my $chunk;
+            my $line;
+            $r->print('<pre>');
+            foreach $chunk (@$diffs) {
+                foreach $line (@$chunk) {
+                    my ($sign, $lineno, $text) = @$line;
+                    $text=&HTML::Entities::encode($text,'<>&"');
+                    $lineno=substr($lineno.'        ',0,7);
+                    $r->print('<span class="'.(($sign eq '+')?'LC_diff_added'
+                                                             :'LC_diff_removed').'">'.
+                              $sign.' '.$lineno.' '.$text."</span>\n");
+                }
+                $r->print("</pre><hr /><pre>\n");
+            }
+            $r->print('</pre>');
+        } else {
+            $r->print('<p class="LC_info">'.&mt('No differences found').'</p>');
+        }
     } else {
 	$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
     }
@@ -215,5 +213,27 @@ sub handler {
 __END__
 
 
+=pod
+
+=head1 NAME
+
+Apache::londiff
+
+=head1 SYNOPSIS
+
+Handler to show difference between two files.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 Subroutines
+
+=over
+
+=item get_split_file()
+
+=item are_different_files()
 
+=item handler()
 
+=cut