--- loncom/auth/loncacc.pm	2003/05/13 00:52:46	1.28
+++ loncom/auth/loncacc.pm	2004/08/23 18:57:16	1.35
@@ -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.28 2003/05/13 00:52:46 www Exp $
+# $Id: loncacc.pm,v 1.35 2004/08/23 18:57:16 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,27 +42,33 @@ use Apache::Constants qw(:common :http :
 use Apache::File;
 use CGI::Cookie();
 use Fcntl qw(:flock);
+use Apache::lonlocal;
+use Apache::lonnet();
+
 
 sub constructaccess {
     my ($url,$ownerdomain)=@_;
-    my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/);
+    my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//);
     unless (($ownername) && ($ownerdomain)) { return ''; }
     # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
-    if (($ownername eq $ENV{'user.name'}) &&
-        ($ownerdomain eq $ENV{'user.domain'})) {
-	return ($ownername,$ownerdomain);
+    my @possibledomains = &Apache::lonnet::current_machine_domains();
+    if ($ownername eq $ENV{'user.name'}) {
+	foreach my $domain (@possibledomains) {
+	    if ($domain eq $ENV{'user.domain'}) {
+		return ($ownername,$domain);
+	    }
+	}
     }
-
-    my $capriv='user.priv.ca./'.
-               $ownerdomain.'/'.$ownername.'./'.
-	       $ownerdomain.'/'.$ownername;
-    foreach (keys %ENV) {
-        if ($_ eq $capriv) {
-           return ($ownername,$ownerdomain);
-        }
+    
+    foreach my $domain (@possibledomains) {
+	my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./';
+	foreach (keys %ENV) {
+	    if ($_ eq $capriv) {
+		return ($ownername,$domain);
+	    }
+	}
     }
-
     return '';
 }
 
@@ -73,7 +79,9 @@ sub handler {
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};
     my $cookie;
+    &Apache::lonnet::logthis("Wha? cookie");
     if ($lonid) {
+	&Apache::lonnet::logthis("Valid cookie");
 	my $handle=$lonid->value;
         $handle=~s/\W//g;
         my $lonidsdir=$r->dir_config('lonIDsDir');
@@ -83,6 +91,10 @@ sub handler {
 
             &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
 
+# --------------------------------------------------------- Initialize Language
+ 
+ 	    &Apache::lonlocal::get_language_handle($r);
+
 # -------------------------------------------------------------- Resource State
 
             $ENV{'request.state'}    = "construct";
@@ -108,6 +120,7 @@ sub handler {
 
             return OK; 
         } else { 
+	    &Apache::lonnet::logthis("Invalid cookie");
             $r->log_reason("Cookie $handle not valid", $r->filename) 
         };
     }