version 1.110, 2011/10/23 23:46:07
|
version 1.112, 2011/10/30 19:27:27
|
Line 188 sub display {
|
Line 188 sub display {
|
|
|
sub obsolete_unpub { |
sub obsolete_unpub { |
my ($user,$domain,$construct)=@_; |
my ($user,$domain,$construct)=@_; |
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $published=$construct; |
my $published=$construct; |
$published=~ |
$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/}; |
s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//; |
|
if (-e $published) { |
if (-e $published) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
return 1; |
return 1; |
Line 271 sub exists {
|
Line 271 sub exists {
|
my ($user, $domain, $construct, $creating) = @_; |
my ($user, $domain, $construct, $creating) = @_; |
$creating ||= 'file'; |
$creating ||= 'file'; |
|
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $published=$construct; |
my $published=$construct; |
$published=~s{^/home/httpd/html/priv/}{/home/httpd/html/res/}; |
$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/}; |
my ($type,$result); |
my ($type,$result); |
if ( -d $construct ) { |
if ( -d $construct ) { |
return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>'); |
return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>'); |
Line 404 sub relativeDest {
|
Line 405 sub relativeDest {
|
while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m:/\.\./:) { |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
} |
} |
if ($newfilename =~ m{^/home/($match_username)/(?:public\_html|priv)/}) { |
my ($authorname,$authordom)=&Apache::loncacc::constructaccess($newfilename); |
my $otheruname = $1; |
unless (($authorname) && ($authordom)) { |
unless ($otheruname eq $uname) { |
my $otherdir = &display($newfilename); |
my ($authorname,$authordom)= |
$error = &mt('Access denied to [_1]',$otherdir); |
&Apache::loncacc::constructaccess($newfilename,$env{'request.role.domain'}); |
|
unless (($authorname eq $otheruname) && ($authordom ne '')) { |
|
my $otherdir = &display($newfilename); |
|
$error = &mt('Access denied to [_1]',$otherdir); |
|
} |
|
} |
|
} |
} |
return ($newfilename,$error); |
return ($newfilename,$error); |
} |
} |
Line 1445 sub handler {
|
Line 1440 sub handler {
|
my $uname; |
my $uname; |
my $udom; |
my $udom; |
|
|
($uname,$udom)= |
($uname,$udom)=&Apache::loncacc::constructaccess($fn); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
|
&Debug($r, |
&Debug($r, |
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
unless (($uname) && ($udom)) { |
unless (($uname) && ($udom)) { |