version 1.103, 2021/04/29 17:45:25
|
version 1.105, 2021/07/19 14:26:40
|
Line 99 sub hash_src {
|
Line 99 sub hash_src {
|
} |
} |
|
|
sub move { |
sub move { |
my ($next,$endupmap,$direction) = @_; |
my ($next,$endupmap,$direction,$firstres) = @_; |
my $safecount=0; |
my $safecount=0; |
my $allowed=0; |
my $allowed=0; |
my $deeplinkonly=0; |
my $deeplinkonly=0; |
Line 116 sub move {
|
Line 116 sub move {
|
$allowed = 0; |
$allowed = 0; |
} else { |
} else { |
my $priv = &Apache::lonnet::allowed('bre',$url,$symb); |
my $priv = &Apache::lonnet::allowed('bre',$url,$symb); |
$allowed = (($priv eq 'F') || ($priv eq '2')); |
$allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); |
} |
} |
$deeplinkonly = 0; |
$deeplinkonly = 0; |
if ($hash{'deeplinkonly_'.$next}) { |
if ($hash{'deeplinkonly_'.$next}) { |
Line 128 sub move {
|
Line 128 sub move {
|
$deeplinkonly = 1; |
$deeplinkonly = 1; |
} |
} |
} |
} |
} elsif ($hash{'deeplinkonly_'.$prev}) { |
} elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) { |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev}); |
my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev}); |
if ($level eq 'resource') { |
if ($level eq 'resource') { |
$deeplinkonly = 1; |
$deeplinkonly = 1; |
Line 256 sub first_accessible_resource {
|
Line 256 sub first_accessible_resource {
|
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', |
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db', |
&GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
$furl=$hash{'first_url'}; |
$furl=$hash{'first_url'}; |
my %args; |
my (%args,$url,$argstr); |
my ($url,$args) = split(/\?/,$furl); |
if ($furl =~ m{^/enc/}) { |
foreach my $pair (split(/\&/,$args)) { |
($url,$argstr) = split(/\?/,&Apache::lonenc::unencrypted($furl)); |
|
} else { |
|
($url,$argstr) = split(/\?/,$furl); |
|
} |
|
foreach my $pair (split(/\&/,$argstr)) { |
my ($name,$value) = split(/=/,$pair); |
my ($name,$value) = split(/=/,$pair); |
$args{&unescape($name)} = &unescape($value); |
$args{&unescape($name)} = &unescape($value); |
} |
} |
if (!&Apache::lonnet::allowed('bre',$url,$args{'symb'})) { |
my $priv = &Apache::lonnet::allowed('bre',$url,$args{'symb'}); |
|
my $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A')); |
|
if (!$allowed) { |
# Wow, we cannot see this ... move forward to the next one that we can see |
# Wow, we cannot see this ... move forward to the next one that we can see |
my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward'); |
my ($newrid,$newmap)=&move($hash{'first_rid'},$hash{'first_mapurl'},'forward',1); |
# Build the new URL |
# Build the new URL |
my ($newmapid,$newresid)=split(/\./,$newrid); |
if ($newrid eq '') { |
my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); |
$furl = '/adm/navmaps'; |
$furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); |
} else { |
if ($hash{'encrypted_'.$newrid}) { |
my ($newmapid,$newresid)=split(/\./,$newrid); |
$furl=&Apache::lonenc::encrypted($furl); |
my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid}); |
|
$furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb }); |
|
if ($hash{'encrypted_'.$newrid}) { |
|
$furl=&Apache::lonenc::encrypted($furl); |
|
} |
} |
} |
} |
} |
untie(%hash); |
untie(%hash); |
return $furl; |
return $furl; |
} else { |
} else { |