Diff for /loncom/auth/loncacc.pm between versions 1.31.2.1 and 1.32

version 1.31.2.1, 2004/01/27 23:06:22 version 1.32, 2004/01/15 20:22:47
Line 43  use Apache::File; Line 43  use Apache::File;
 use CGI::Cookie();  use CGI::Cookie();
 use Fcntl qw(:flock);  use Fcntl qw(:flock);
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet();  
   
   
 sub constructaccess {  sub constructaccess {
     my ($url,$ownerdomain)=@_;      my ($url,$ownerdomain)=@_;
     my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)/);      my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)(\w+)\//);
     unless (($ownername) && ($ownerdomain)) { return ''; }      unless (($ownername) && ($ownerdomain)) { return ''; }
     # We do not allow editing of previous versions of files.      # We do not allow editing of previous versions of files.
     if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }      if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
     my @possibledomains = &Apache::lonnet::current_machine_domains();      if (($ownername eq $ENV{'user.name'}) &&
     &Apache::lonnet::logthis("got domains of ".join(':',@possibledomains));          ($ownerdomain eq $ENV{'user.domain'})) {
     if ($ownername eq $ENV{'user.name'}) {   return ($ownername,$ownerdomain);
  foreach my $domain (@possibledomains) {  
     if ($domain eq $ENV{'user.domain'}) {  
  return ($ownername,$domain);  
     }  
  }  
     }      }
       
   
     foreach my $domain (@possibledomains) {      my $capriv='user.priv.ca./'.
  my $capriv='user.priv.ca./'.$domain.'/'.$ownername.'./';                 $ownerdomain.'/'.$ownername.'./';
  foreach (keys %ENV) {      foreach (keys %ENV) {
     if ($_ eq $capriv) {          if ($_ eq $capriv) {
  return ($ownername,$domain);             return ($ownername,$ownerdomain);
     }          }
  }  
     }      }
     return '';      return '';
 }  }

Removed from v.1.31.2.1  
changed lines
  Added in v.1.32


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>