--- loncom/publisher/londiff.pm	2011/11/07 15:18:13	1.28.2.1
+++ loncom/publisher/londiff.pm	2011/10/30 00:30:19	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to show differences between file versions
 #
-# $Id: londiff.pm,v 1.28.2.1 2011/11/07 15:18:13 raeburn Exp $
+# $Id: londiff.pm,v 1.31 2011/10/30 00:30:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -83,52 +83,42 @@ sub handler {
     my $cuname=$env{'user.name'};
     my $cudom=$env{'user.domain'};
 
-    if ($env{'form.filename'}=~ m{^/res/}) {
+    if ($env{'form.filename'}=~/^\/res\//) {
         if (&Apache::lonnet::allowed('bre',$env{'form.filename'})) {
             if ($env{'request.course.id'}) {
                 if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                     $allowed = 1;
                 }
-            } else {
-                $allowed = 1;
             }
         } elsif (&Apache::lonnet::allowed('bro',$env{'form.filename'})) {
-            $allowed = 1;
+            $allowed = 1; 
         }
         if ($allowed) {
             ($cudom,$cuname,$env{'form.filename'})=
-                ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$});
-
-            if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) {
-                my ($cstrname,$cstrdom) =
-                    &Apache::loncacc::constructaccess("/priv/$cuname".$env{'form.filename'},$cudom);
-                unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) {
-                    $allowed = 0;
-                }
-            }
+                ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$});        
         }
     } else {
-        ($cuname,$cudom)=
-            &Apache::loncacc::constructaccess($env{'form.filename'},
-                                              $r->dir_config('lonDefDomain'));
+	($cuname,$cudom)=
+	    &Apache::loncacc::constructaccess($env{'form.filename'},
+					      $r->dir_config('lonDefDomain'));
         if ($cuname ne '' && $cudom ne '') {
             $allowed = 1;
         } else {
-            $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
-                           ' trying to get diffs file '.$env{'form.filename'}.
-                           '  - not authorized',
-                           $r->filename);
-        }
+	    $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
+			   ' trying to get diffs file '.$env{'form.filename'}.
+			   '  - not authorized', 
+			   $r->filename); 
+	}
     }
     unless ($allowed) {
         return HTTP_NOT_ACCEPTABLE;
     }
 
 # Get the files
-
+  
     my $efn=$env{'form.filename'};
 
-    $efn=~s{/\~($LONCAPA::username_re)}{}g;
+    $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
 
     my @f1=();
     my @f2=();
@@ -156,12 +146,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);
@@ -181,12 +170,12 @@ sub handler {
 
 	if ($env{'form.filetwo'}) {
 	    my $efn2=$env{'form.filetwo'};
-	    $efn2=~s{/\~($LONCAPA::username_re)}{}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 {