--- loncom/publisher/londiff.pm	2011/11/07 15:18:13	1.28.2.1
+++ loncom/publisher/londiff.pm	2011/12/23 14:54:26	1.34
@@ -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.34 2011/12/23 14:54:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,24 +101,23 @@ sub handler {
 
             if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) {
                 my ($cstrname,$cstrdom) =
-                    &Apache::loncacc::constructaccess("/priv/$cuname".$env{'form.filename'},$cudom);
+                    &Apache::loncacc::constructaccess("/priv/$cudom/$cuname".$env{'form.filename'});
                 unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) {
                     $allowed = 0;
                 }
             }
         }
     } else {
-        ($cuname,$cudom)=
-            &Apache::loncacc::constructaccess($env{'form.filename'},
-                                              $r->dir_config('lonDefDomain'));
+	($cuname,$cudom)=
+	    &Apache::loncacc::constructaccess($env{'form.filename'});
         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;
@@ -127,8 +126,7 @@ sub handler {
 # 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 +154,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,17 +178,16 @@ 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 {
-	    my $fn=
-		'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
+	    my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/";
 	    if ($env{'form.versiontwo'}) {
 		my ($main,$suffix,$is_meta)=
 		    &Apache::lonretrieve::get_file_info($efn);
@@ -233,7 +229,6 @@ sub handler {
     } else {
 	$r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>');
     }
-    $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>');
     $r->print(&Apache::loncommon::end_page()); 
     return OK;  
 }