--- loncom/publisher/londiff.pm	2006/09/19 21:47:29	1.21
+++ loncom/publisher/londiff.pm	2006/12/05 02:55:55	1.22
@@ -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.22 2006/12/05 02:55:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonretrieve();
 use Apache::lonlocal;
-
+use LONCAPA();
 
 sub get_split_file {
     my ($fn,$style)=@_;
@@ -88,12 +88,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 +103,7 @@ sub handler {
   
     my $efn=$env{'form.filename'};
 
-    $efn=~s/\/\~(\w+)//g;
+    $efn=~s{/\~($LONCAPA::username_re)}{}g;
 
     my @f1=();
     my @f2=();
@@ -152,7 +152,7 @@ sub handler {
 
 	if ($env{'form.filetwo'}) {
 	    my $efn2=$env{'form.filetwo'};
-	    $efn2=~s/\/\~(\w+)//g;
+	    $efn2=~s{/\~($LONCAPA::username_re)}{}g;
 	    my $fn='/home/'.$cuname.'/public_html/'.$efn2;
 	    @f2=&get_split_file($fn,'local');
 	    $r->print('<tt>'.$efn2.'</tt>');