--- loncom/auth/loncacc.pm	2005/06/19 00:41:32	1.39
+++ loncom/auth/loncacc.pm	2007/02/01 07:13:04	1.44
@@ -2,7 +2,7 @@
 # Cookie Based Access Handler for Construction Area
 # (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
 #
-# $Id: loncacc.pm,v 1.39 2005/06/19 00:41:32 www Exp $
+# $Id: loncacc.pm,v 1.44 2007/02/01 07:13:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,16 +31,15 @@ package Apache::loncacc;
 
 use strict;
 use Apache::Constants qw(:common :http :methods REDIRECT);
-use Apache::File;
 use CGI::Cookie();
-use Fcntl qw(:flock);
 use Apache::lonlocal;
 use Apache::lonnet;
-
+use Apache::lonacc();
+use LONCAPA qw(:DEFAULT :match);
 
 sub constructaccess {
     my ($url,$ownerdomain)=@_;
-    my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//);
+    my ($ownername)=($url=~m{/(?:\~|priv/|home/)($match_username)/});
     unless (($ownername) && ($ownerdomain)) { return ''; }
     # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
@@ -48,38 +47,32 @@ sub constructaccess {
     if ($ownername eq $env{'user.name'}) {
 	foreach my $domain (@possibledomains) {
 	    if ($domain eq $env{'user.domain'}) {
+    &Apache::lonnet::logthis("good1!");
 		return ($ownername,$domain);
 	    }
 	}
     }
-    
     foreach my $domain (@possibledomains) {
-	my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./';
-	foreach (keys %env) {
-	    if ($_ eq $capriv) {
-		return ($ownername,$domain);
-	    }
-	}
-	my $aapriv='user.priv.aa./'.$domain.'/'.$ownername.'./';
-	foreach (keys %env) {
-	    if ($_ eq $aapriv) {
-		return ($ownername,$domain);
-	    }
+	if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) ||
+	    exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) {
+    &Apache::lonnet::logthis("good2!");
+	    return ($ownername,$domain);
 	}
     }
+    &Apache::lonnet::logthis("boo! hiss!");
     return '';
 }
 
 sub handler {
     my $r = shift;
+
     my $requrl=$r->uri;
     $env{'request.editurl'}=$requrl;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};
     my $cookie;
     if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
+      	my $handle=&LONCAPA::clean_handle($lonid->value);
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 
@@ -103,7 +96,7 @@ sub handler {
 
 # -------------------------------------------------------- Load POST parameters
 
-	    &Apache::loncommon::get_posted_cgi($r);
+	    &Apache::lonacc::get_posted_cgi($r);
 
             return OK; 
         } else {