version 1.299, 2014/03/19 16:20:36
|
version 1.301, 2014/03/25 09:41:16
|
Line 664 ENDENTERKEY
|
Line 664 ENDENTERKEY
|
} |
} |
} |
} |
} |
} |
|
# Are we allowed to look at the first resource? |
# If it's an external resource, |
|
if ($furl =~ m{^(/adm/wrapper|)/ext/}) { |
if ($furl =~ m{^(/adm/wrapper|)/ext/}) { |
|
# If it's an external resource, |
# strip off the symb argument and possible query |
# strip off the symb argument and possible query |
my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$}); |
my ($exturl,$symb) = ($furl =~ m{^(.+)(?:\?|\&)symb=(.+)$}); |
# Unencode $symb |
# Unencode $symb |
Line 675 ENDENTERKEY
|
Line 675 ENDENTERKEY
|
if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) { |
if (!&Apache::lonnet::allowed('bre',$exturl,$symb)) { |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
} |
} |
# For local resources just check for permission |
# For other resources just check for permission |
} elsif (!&Apache::lonnet::allowed('bre',$furl)) { |
} elsif (!&Apache::lonnet::allowed('bre',$furl)) { |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
$furl = &Apache::lonpageflip::first_accessible_resource(); |
} |
} |
Line 1750 sub check_release_required {
|
Line 1750 sub check_release_required {
|
my $otherserver; |
my $otherserver; |
if (($major eq '' && $minor eq '') || |
if (($major eq '' && $minor eq '') || |
(($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { |
(($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { |
my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'}); |
my ($userdomserver) = &Apache::lonnet::choose_server($env{'user.domain'},undef,$required); |
my $switchlcrev = |
my $switchlcrev = |
&Apache::lonnet::get_server_loncaparev($env{'user.domain'}, |
&Apache::lonnet::get_server_loncaparev($env{'user.domain'}, |
$userdomserver); |
$userdomserver); |