--- loncom/auth/loncacc.pm	2003/09/16 18:15:43	1.30
+++ loncom/auth/loncacc.pm	2004/10/29 20:44:30	1.37
@@ -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.30 2003/09/16 18:15:43 www Exp $
+# $Id: loncacc.pm,v 1.37 2004/10/29 20:44:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,24 +43,31 @@ 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.'./';
-    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 '';
 }
@@ -84,7 +91,7 @@ sub handler {
 
 # --------------------------------------------------------- Initialize Language
  
- 	    &Apache::lonlocal::get_language_handle();
+ 	    &Apache::lonlocal::get_language_handle($r);
 
 # -------------------------------------------------------------- Resource State
 
@@ -95,15 +102,6 @@ sub handler {
                 $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