--- rat/lonpageflip.pm 2021/12/14 21:34:45 1.80.8.13
+++ rat/lonpageflip.pm 2021/12/31 20:03:33 1.80.8.13.2.1
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.80.8.13 2021/12/14 21:34:45 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.80.8.13.2.1 2021/12/31 20:03:33 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,6 +36,7 @@ use LONCAPA;
use Apache::Constants qw(:common :http REDIRECT);
use Apache::lonnet;
use Apache::loncommon();
+use Apache::lonnavmaps();
use Apache::lonuserstate;
use Apache::lonlocal;
use HTML::TokeParser;
@@ -98,9 +99,14 @@ sub hash_src {
}
sub move {
- my ($next,$endupmap,$direction) = @_;
+ my ($next,$endupmap,$direction,$firstres) = @_;
my $safecount=0;
my $allowed=0;
+ my $deeplinkonly=0;
+ my $deeplinkchecked;
+ my $deeplink_login_pc;
+ my $prev=$next;
+ my ($prevmapid)=split(/\./,$next);
do {
($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction);
@@ -111,9 +117,83 @@ sub move {
if ($url eq '' || $symb eq '') {
$allowed = 0;
} else {
- my $priv = &Apache::lonnet::allowed('bre',$url,$symb);
- $allowed = (($priv eq 'F') || ($priv eq '2'));
+ my $nodeeplinkcheck = 0;
+ if ($hash{'is_map_'.$next}) {
+ $nodeeplinkcheck = 1;
+ }
+ my $priv = &Apache::lonnet::allowed('bre',$url,$symb,'','','','',$nodeeplinkcheck);
+ $allowed = (($priv eq 'F') || ($priv eq '2') || ($priv eq 'A'));
}
+ $deeplinkonly = 0;
+ if ($hash{'deeplinkonly_'.$next}) {
+ my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$next});
+ my ($state,$others,$listed,$scope,$protect) = split(/,/,$value);
+ unless (($state eq 'both') || ($hash{'is_map_'.$next})) {
+ if ($level eq 'resource') {
+ $deeplinkonly = 1;
+ } elsif ($level eq 'map') {
+ if ($scope eq 'rec') {
+ unless ($mapid == $prevmapid) {
+ unless ($deeplinkchecked) {
+ $deeplink_login_pc = &get_deeplink_login_pc();
+ $deeplinkchecked = 1;
+ }
+ if ($deeplink_login_pc) {
+ my $poss_map_pc;
+ if ($hash{'is_map_'.$next}) {
+ $poss_map_pc = $hash{'map_pc_'.$url};
+ } else {
+ $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}};
+ }
+ unless ($deeplink_login_pc == $poss_map_pc) {
+ unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) {
+ $deeplinkonly = 1;
+ }
+ }
+ } else {
+ $deeplinkonly = 1;
+ }
+ }
+ } elsif ($mapid != $prevmapid) {
+ $deeplinkonly = 1;
+ }
+ }
+ }
+ } elsif (($hash{'deeplinkonly_'.$prev}) && (!$firstres)) {
+ my ($value,$level) = map { &unescape($_); } split(/:/,$hash{'deeplinkonly_'.$prev});
+ my ($state,$others,$listed,$scope,$protect) = split(/,/,$value);
+ unless (($state eq 'both') || ($hash{'is_map_'.$prev})) {
+ if ($level eq 'resource') {
+ $deeplinkonly = 1;
+ } elsif ($level eq 'map') {
+ if ($scope eq 'rec') {
+ unless ($mapid == $prevmapid) {
+ unless ($deeplinkchecked) {
+ $deeplink_login_pc = &get_deeplink_login_pc();
+ $deeplinkchecked = 1;
+ }
+ if ($deeplink_login_pc) {
+ my $poss_map_pc;
+ if ($hash{'is_map_'.$prev}) {
+ $poss_map_pc = $hash{'map_pc_'.$url};
+ } else {
+ $poss_map_pc = $hash{'map_pc_'.$hash{'map_id_'.$mapid}};
+ }
+ unless ($deeplink_login_pc == $poss_map_pc) {
+ unless (grep(/^$deeplink_login_pc$/,split(/,/,$hash{'map_hierarchy_'.$poss_map_pc}))) {
+ $deeplinkonly = 1;
+ }
+ }
+ }
+ }
+ } else {
+ if ($mapid != $prevmapid) {
+ $deeplinkonly = 1;
+ }
+ }
+ }
+ }
+ }
$safecount++;
} while ( ($next)
&& ($next!~/\,/)
@@ -121,7 +201,9 @@ sub move {
(!$hash{'src_'.$next})
|| (
(!$env{'request.role.adv'})
- && $hash{'randomout_'.$next}
+ && (($hash{'randomout_'.$next})
+ || ($deeplinkonly)
+ || ($hash{'deeplinkout_'.$next}))
)
|| (!$allowed)
)
@@ -156,7 +238,7 @@ sub get_next_possible_move {
}
if ($thiscond>$mincond) { $mincond=$thiscond; }
}
- }
+ }
foreach my $id (split(/\,/,$posnext)) {
my ($linkid,$condval)=split(/\:/,$id);
if ($condval>=$mincond) {
@@ -198,7 +280,7 @@ sub get_next_possible_move {
}
if ($thiscond>$mincond) { $mincond=$thiscond; }
}
- }
+ }
foreach my $id (split(/\,/,$posnext)) {
my ($linkid,$condval)=split(/\:/,$id);
if ($condval>=$mincond) {
@@ -241,9 +323,11 @@ sub first_accessible_resource {
my ($name,$value) = split(/=/,$pair);
$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
- 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
if ($newrid eq '') {
$furl = '/adm/navmaps';
@@ -253,8 +337,8 @@ sub first_accessible_resource {
$furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb });
if ($hash{'encrypted_'.$newrid}) {
$furl=&Apache::lonenc::encrypted($furl);
- }
- }
+ }
+ }
}
untie(%hash);
return $furl;
@@ -313,6 +397,25 @@ setTimeout(function() {
END
}
+sub get_deeplink_login_pc {
+ my $deeplink_login_pc;
+ if (($env{'request.deeplink.login'}) && ($env{'request.course.id'})) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom);
+ if ($deeplink_symb) {
+ my $loginmap;
+ if ($deeplink_symb =~ /\.(page|sequence)$/) {
+ $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[2]);
+ } else {
+ $loginmap = &Apache::lonnet::clutter((&Apache::lonnet::decode_symb($deeplink_symb))[0]);
+ }
+ $deeplink_login_pc = $hash{'map_pc_'.$loginmap};
+ }
+ }
+ return $deeplink_login_pc;
+}
+
# ================================================================ Main Handler
sub handler {
@@ -329,8 +432,8 @@ sub handler {
my %cachehash=();
my $multichoice=0;
my %multichoicehash=();
- my %prog_state=();
- my ($redirecturl,$redirectsymb,$enc,$anchor);
+ my %prog_state=();
+ my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
my $next='';
my $hostname = $r->hostname();
my @possibilities=();
@@ -543,6 +646,15 @@ sub handler {
} else {
# -------------------------------------------------------------- No place to go
$multichoice=-1;
+ if ($position && $env{'request.deeplink.login'}) {
+ my ($map,$resid,$url) = &Apache::lonnet::decode_symb($position);
+ my $mapid = $hash{'map_pc_'.&Apache::lonnet::clutter($map)};
+ my $position_deeplink = $hash{'deeplinkonly_'.$mapid.'.'.$resid};
+ if ($position_deeplink) {
+ (my $value,$deeplinklevel) = map { &unescape($_); }
+ split(/:/,$position_deeplink);
+ }
+ }
}
# ----------------- The program must come past this point to untie the big hash
untie(%hash);
@@ -564,7 +676,7 @@ sub handler {
&Apache::lonnet::linklog($redirecturl,$currenturl);
}
# ------------------------------------- Check for and display critical messages
- my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
+ my ($redirect, $url) = &Apache::loncommon::critical_redirect(300.'flip');
unless ($redirect) {
my $usehttp = &check_http_req(\$redirecturl,$hostname);
if (($usehttp) && ($hostname ne '')) {
@@ -597,6 +709,11 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
my %lt=&Apache::lonlocal::texthash('title' => 'End of Sequence',
+ 'deeplink' => 'No link available',
+ 'deeplinkres' =>
+ 'Navigation to other content is unavailable when accessing content via deep-linking',
+ 'deeplinkmap' =>
+ 'You have reached the end of the sequence of available materials for access via deep-linking',
'explain' =>
'You have reached the end of the sequence of materials.',
'back' => 'Go Back',
@@ -656,12 +773,24 @@ ENDSTART
.$lt{'gonav'}.'');
} else {
$r->print(
- &Apache::loncommon::start_page('No Resource')
- .''.$lt{'title'}.'
'
- .''.$lt{'explain'}.'
');
+ &Apache::loncommon::start_page('No Resource'));
+ if ($deeplinklevel eq 'resource') {
+ $r->print(''.$lt{'deeplink'}.'
'
+ .''.$lt{'deeplinkres'}.'
');
+ } elsif ($deeplinklevel eq 'map') {
+ $r->print(''.$lt{'title'}.'
'
+ .''.$lt{'deeplinkmap'}.'
');
+ } else {
+ $r->print(''.$lt{'title'}.'
'
+ .''.$lt{'explain'}.'
');
+ }
}
}
- if ((!@possibilities) && ($reinitcheck)) {
+ if ($deeplinklevel) {
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''.$lt{'back'}.'']));
+ } elsif ((!@possibilities) && ($reinitcheck)) {
$r->print(
&Apache::lonhtmlcommon::actionbox(
[''.$lt{'nav'}.''