--- loncom/auth/loncacc.pm	2004/01/15 20:22:47	1.32
+++ loncom/auth/loncacc.pm	2005/04/07 06:56:21	1.38
@@ -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.32 2004/01/15 20:22:47 www Exp $
+# $Id: loncacc.pm,v 1.38 2005/04/07 06:56:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,14 +26,6 @@
 #
 # http://www.lon-capa.org/
 #
-# YEAR=2000
-# 6/15,16/11,22/11,
-# YEAR=2001
-# 01/06,01/11,6/1,9/25,9/28,11/22,12/25,12/26,
-# 01/06/01,05/04,05/05,05/09 Gerd Kortemeyer
-# YEAR=2002
-# 1/4 Gerd Kortemeyer
-###
 
 package Apache::loncacc;
 
@@ -43,6 +35,8 @@ use Apache::File;
 use CGI::Cookie();
 use Fcntl qw(:flock);
 use Apache::lonlocal;
+use Apache::lonnet;
+
 
 sub constructaccess {
     my ($url,$ownerdomain)=@_;
@@ -50,17 +44,22 @@ sub constructaccess {
     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.'./';
-    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 '';
 }
@@ -68,7 +67,7 @@ sub constructaccess {
 sub handler {
     my $r = shift;
     my $requrl=$r->uri;
-    $ENV{'request.editurl'}=$requrl;
+    $env{'request.editurl'}=$requrl;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
     my $lonid=$cookies{'lonID'};
     my $cookie;
@@ -88,22 +87,13 @@ sub handler {
 
 # -------------------------------------------------------------- Resource State
 
-            $ENV{'request.state'}    = "construct";
-            $ENV{'request.filename'} = $r->filename;
+            $env{'request.state'}    = "construct";
+            $env{'request.filename'} = $r->filename;
 
             unless (&constructaccess($requrl,$r->dir_config('lonDefDomain'))) {
                 $r->log_reason("Unauthorized $requrl", $r->filename); 
 	        return HTTP_NOT_ACCEPTABLE;
             }
-# Construction space needs Remote to work
-            if ($ENV{'environment.remote'} eq 'off') {
-	        $r->content_type('text/html');
-                $r->header_out(Location => 
-                    'http://'.$r->server->server_hostname.
-                    '/adm/remote?action=launch&url='.
-                    &Apache::lonnet::escape($requrl));
-                return REDIRECT;
-            }
 
 # -------------------------------------------------------- Load POST parameters
 
@@ -117,7 +107,7 @@ sub handler {
 
 # ----------------------------------------------- Store where they wanted to go
 
-    $ENV{'request.firsturl'}=$requrl;
+    $env{'request.firsturl'}=$requrl;
     return FORBIDDEN;
 }