version 1.354, 2011/10/24 23:29:33
|
version 1.359, 2011/11/07 18:22:37
|
Line 334 sub secondary_menu {
|
Line 334 sub secondary_menu {
|
and ( $env{'request.noversionuri'} eq '' |
and ( $env{'request.noversionuri'} eq '' |
|| !defined($env{'request.noversionuri'}))) |
|| !defined($env{'request.noversionuri'}))) |
{ |
{ |
($escurl = $env{'request.filename'}) =~ s{^/home/httpd/html}{}; |
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
|
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; |
$escurl = &escape($escurl); |
$escurl = &escape($escurl); |
} |
} |
$menu =~ s/\[url\]/$escurl/g; |
$menu =~ s/\[url\]/$escurl/g; |
Line 491 sub innerregister {
|
Line 492 sub innerregister {
|
$uploaded = &is_course_upload($file,$cnum,$cdom); |
$uploaded = &is_course_upload($file,$cnum,$cdom); |
} |
} |
if (!$uploaded) { |
if (!$uploaded) { |
$file=~s/^($match_domain)\/($match_username)/\/priv\/$1\/$2/; |
|
|
$file=~s{^(priv/$match_domain/$match_username)}{/$1}; |
|
$file=~s{^($match_domain/$match_username)}{/priv/$1}; |
|
|
# Check that the user has permission to edit this resource |
# Check that the user has permission to edit this resource |
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file); |
my $setpriv = 1; |
|
($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$setpriv); |
if (defined($cfudom)) { |
if (defined($cfudom)) { |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
$home=&Apache::lonnet::homeserver($cfuname,$cfudom); |
my $allowed=0; |
my $allowed=0; |
Line 575 sub innerregister {
|
Line 580 sub innerregister {
|
# We are in construction space |
# We are in construction space |
# |
# |
|
|
|
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my ($udom,$uname,$thisdisfn) = |
my ($udom,$uname,$thisdisfn) = |
($env{'request.filename'}=~m|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$|); |
($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); |
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; |
if ($currdir =~ m-/$-) { |
if ($currdir =~ m-/$-) { |
$is_const_dir = 1; |
$is_const_dir = 1; |