--- rat/lonpageflip.pm 2017/11/16 13:42:01 1.97
+++ rat/lonpageflip.pm 2021/04/29 17:45:25 1.103
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.97 2017/11/16 13:42:01 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.103 2021/04/29 17:45:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,6 +102,9 @@ sub move {
my ($next,$endupmap,$direction) = @_;
my $safecount=0;
my $allowed=0;
+ my $deeplinkonly=0;
+ my $prev=$next;
+ my ($prevmapid)=split(/\./,$next);
do {
($next,$endupmap)=&get_next_possible_move($next,$endupmap,$direction);
@@ -115,14 +118,35 @@ sub move {
my $priv = &Apache::lonnet::allowed('bre',$url,$symb);
$allowed = (($priv eq 'F') || ($priv eq '2'));
}
+ $deeplinkonly = 0;
+ if ($hash{'deeplinkonly_'.$next}) {
+ my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$next});
+ if ($level eq 'resource') {
+ $deeplinkonly = 1;
+ } elsif ($level eq 'map') {
+ if ($mapid != $prevmapid) {
+ $deeplinkonly = 1;
+ }
+ }
+ } elsif ($hash{'deeplinkonly_'.$prev}) {
+ my ($value,$level) = split(/:/,$hash{'deeplinkonly_'.$prev});
+ if ($level eq 'resource') {
+ $deeplinkonly = 1;
+ } elsif ($level eq 'map') {
+ if ($mapid != $prevmapid) {
+ $deeplinkonly = 1;
+ }
+ }
+ }
$safecount++;
} while ( ($next)
&& ($next!~/\,/)
&& (
(!$hash{'src_'.$next})
|| (
- (!$env{'request.role.adv'})
- && $hash{'randomout_'.$next}
+ (!$env{'request.role.adv'})
+ && (($hash{'randomout_'.$next})
+ || ($deeplinkonly))
)
|| (!$allowed)
)
@@ -280,7 +304,7 @@ sub first_answerable_ressymb {
}
sub check_http_req {
- my ($srcref) = @_;
+ my ($srcref,$hostname) = @_;
return unless (ref($srcref) eq 'SCALAR');
my $usehttp;
if ($env{'request.course.id'}) {
@@ -289,11 +313,19 @@ sub check_http_req {
if (($$srcref =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
($ENV{'SERVER_PORT'} == 443) &&
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
- $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
- $usehttp = 1;
+ unless ((&Apache::lonnet::uses_sts()) ||
+ (&Apache::lonnet::waf_allssl($hostname))) {
+ $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
+ $usehttp = 1;
+ }
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
($ENV{'SERVER_PORT'} == 443)) {
- $usehttp = 1;
+ unless ((&Apache::lonnet::uses_sts()) ||
+ (&Apache::lonnet::waf_allssl($hostname))) {
+ my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
+ $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor;
+ $usehttp = 1;
+ }
}
}
return $usehttp;
@@ -338,7 +370,7 @@ sub handler {
my $multichoice=0;
my %multichoicehash=();
my %prog_state=();
- my ($redirecturl,$redirectsymb,$enc,$anchor);
+ my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
my $next='';
my $hostname = $r->hostname();
my @possibilities=();
@@ -360,7 +392,7 @@ sub handler {
}
} elsif ($direction eq 'firstanswerable') {
my $furl = &first_answerable_ressymb();
- my $usehttp = &check_http_req(\$furl);
+ my $usehttp = &check_http_req(\$furl,$hostname);
if (($usehttp) && ($hostname ne '')) {
$furl='http://'.$hostname.$furl;
} else {
@@ -401,12 +433,12 @@ sub handler {
my $preamble = ''.
'
'.
&mt('Your course session is being updated because of recent changes by course personnel.').
- ' '.&mt('Please be patient.').'
'.
+ ' '.&mt('Please be patient').'.
'.
'';
%prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
&Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
- &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
+ &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
if ($ferr) {
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
my $requrl = $r->uri;
@@ -425,7 +457,7 @@ sub handler {
}
if ($direction eq 'firstres') {
my $furl=&first_accessible_resource();
- my $usehttp = &check_http_req(\$furl);
+ my $usehttp = &check_http_req(\$furl,$hostname);
if (($usehttp) && ($hostname ne '')) {
$furl='http://'.$hostname.$furl;
} else {
@@ -442,7 +474,7 @@ sub handler {
return REDIRECT;
}
}
- if ($direction eq 'return') {
+ if ($direction eq 'return') {
# -------------------------------------------------------- Return to last known
my ($newloc,$usehttp);
if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
@@ -451,11 +483,15 @@ sub handler {
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id;
$newloc=$hash{'src_'.$id};
if ($newloc) {
- $usehttp = &check_http_req(\$newloc);
+ $usehttp = &check_http_req(\$newloc,$hostname);
if ($hash{'encrypted_'.$id}) {
$newloc=&Apache::lonenc::encrypted($newloc);
- } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
- $newloc = $1.&escape('#').$2;
+ }
+ if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
+ my ($url,$anchor) = ($1,$2);
+ if ($anchor) {
+ $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor;
+ }
}
} else {
$newloc='/adm/navmaps';
@@ -491,7 +527,6 @@ sub handler {
$last=$hash{'last_known'};
untie(%hash);
}
- my $newloc;
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
} else {
@@ -564,6 +599,9 @@ sub handler {
} else {
# -------------------------------------------------------------- No place to go
$multichoice=-1;
+ if ($hash{'deeplinkonly_'.$rid}) {
+ (my $value,$deeplinklevel) = split(/:/,$hash{'deeplinkonly_'.$rid});
+ }
}
# ----------------- The program must come past this point to untie the big hash
untie(%hash);
@@ -587,7 +625,7 @@ sub handler {
# ------------------------------------- Check for and display critical messages
my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip');
unless ($redirect) {
- my $usehttp = &check_http_req(\$redirecturl);
+ my $usehttp = &check_http_req(\$redirecturl,$hostname);
if (($usehttp) && ($hostname ne '')) {
$url='http://'.$hostname.$redirecturl;
} else {
@@ -618,6 +656,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',
@@ -649,7 +692,7 @@ $lt{'pick'}:
ENDSTART
foreach my $id (@possibilities) {
my $src = $multichoicehash{'src_'.$id};
- my $usehttp = &check_http_req(\$src);
+ my $usehttp = &check_http_req(\$src,$hostname);
if (($usehttp) && ($hostname ne '')) {
$src = 'http://'.$hostname.$src;
}
@@ -685,17 +728,29 @@ ENDSTART
} else {
$r->print(&Apache::lonplacementtest::showresult(1));
}
- } else {
+ } 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'}.'
');
+ }
}
}
}
unless (($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Placement') ||
($env{'request.role.adv'})) {
- if ((!@possibilities) && ($reinitcheck)) {
+ if ($deeplinklevel) {
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox(
+ [''.$lt{'back'}.'']));
+ } elsif ((!@possibilities) && ($reinitcheck)) {
$r->print(
&Apache::lonhtmlcommon::actionbox(
[''.$lt{'nav'}.''