version 1.44, 2007/02/01 07:13:04
|
version 1.45, 2007/02/01 07:13:59
|
Line 32 package Apache::loncacc;
|
Line 32 package Apache::loncacc;
|
use strict; |
use strict; |
use Apache::Constants qw(:common :http :methods REDIRECT); |
use Apache::Constants qw(:common :http :methods REDIRECT); |
use CGI::Cookie(); |
use CGI::Cookie(); |
|
use Fcntl qw(:flock); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::lonacc(); |
use Apache::lonacc; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
|
sub constructaccess { |
sub constructaccess { |
my ($url,$ownerdomain)=@_; |
my ($url,$ownerdomain)=@_; |
my ($ownername)=($url=~m{/(?:\~|priv/|home/)($match_username)/}); |
my ($ownername)=($url=~/\/(?:\~|priv\/|home\/)($match_username)\//); |
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 ''; } |
Line 47 sub constructaccess {
|
Line 48 sub constructaccess {
|
if ($ownername eq $env{'user.name'}) { |
if ($ownername eq $env{'user.name'}) { |
foreach my $domain (@possibledomains) { |
foreach my $domain (@possibledomains) { |
if ($domain eq $env{'user.domain'}) { |
if ($domain eq $env{'user.domain'}) { |
&Apache::lonnet::logthis("good1!"); |
|
return ($ownername,$domain); |
return ($ownername,$domain); |
} |
} |
} |
} |
} |
} |
|
|
foreach my $domain (@possibledomains) { |
foreach my $domain (@possibledomains) { |
if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) || |
if (exists($env{'user.priv.ca./'.$domain.'/'.$ownername.'./'}) || |
exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) { |
exists($env{'user.priv.aa./'.$domain.'/'.$ownername.'./'}) ) { |
&Apache::lonnet::logthis("good2!"); |
|
return ($ownername,$domain); |
return ($ownername,$domain); |
} |
} |
} |
} |
&Apache::lonnet::logthis("boo! hiss!"); |
|
return ''; |
return ''; |
} |
} |
|
|
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
|
|
my $requrl=$r->uri; |
my $requrl=$r->uri; |
$env{'request.editurl'}=$requrl; |
$env{'request.editurl'}=$requrl; |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |