version 1.106, 2021/07/19 15:48:25
|
version 1.108, 2021/08/06 01:27:04
|
Line 127 sub move {
|
Line 127 sub move {
|
$deeplinkonly = 0; |
$deeplinkonly = 0; |
if ($hash{'deeplinkonly_'.$next}) { |
if ($hash{'deeplinkonly_'.$next}) { |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next}); |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next}); |
my ($listed,$scope,$access) = split(/,/,$value); |
my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); |
unless (($access eq 'any') || ($hash{'is_map_'.$next})) { |
unless (($state eq 'both') || ($hash{'is_map_'.$next})) { |
if ($level eq 'resource') { |
if ($level eq 'resource') { |
$deeplinkonly = 1; |
$deeplinkonly = 1; |
} elsif ($level eq 'map') { |
} elsif ($level eq 'map') { |
Line 161 sub move {
|
Line 161 sub move {
|
} |
} |
} elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) { |
} elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) { |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev}); |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev}); |
my ($listed,$scope,$access) = split(/,/,$value); |
my ($state,$others,$listed,$scope,$protect) = split(/,/,$value); |
unless (($access eq 'any') || ($hash{'is_map_'.$prev})) { |
unless (($state eq 'both') || ($hash{'is_map_'.$prev})) { |
if ($level eq 'resource') { |
if ($level eq 'resource') { |
$deeplinkonly = 1; |
$deeplinkonly = 1; |
} elsif ($level eq 'map') { |
} elsif ($level eq 'map') { |
my ($listed,$scope,$access) = split(/,/,$value); |
|
if ($scope eq 'rec') { |
if ($scope eq 'rec') { |
unless ($mapid == $prevmapid) { |
unless ($mapid == $prevmapid) { |
unless ($deeplinkchecked) { |
unless ($deeplinkchecked) { |
Line 204 sub move {
|
Line 203 sub move {
|
(!$env{'request.role.adv'}) |
(!$env{'request.role.adv'}) |
&& (($hash{'randomout_'.$next}) |
&& (($hash{'randomout_'.$next}) |
|| ($deeplinkonly) |
|| ($deeplinkonly) |
|| ($hash{'deeplinkout_'.$next}) |
|| ($hash{'deeplinkout_'.$next})) |
) |
) |
|| (!$allowed) |
|| (!$allowed) |
) |
) |
Line 339 sub first_accessible_resource {
|
Line 338 sub first_accessible_resource {
|
if ($hash{'encrypted_'.$newrid}) { |
if ($hash{'encrypted_'.$newrid}) { |
$furl=&Apache::lonenc::encrypted($furl); |
$furl=&Apache::lonenc::encrypted($furl); |
} |
} |
{ |
} |
} |
} |
untie(%hash); |
untie(%hash); |
return $furl; |
return $furl; |