--- rat/lonpageflip.pm 2017/02/18 23:39:24 1.92
+++ rat/lonpageflip.pm 2021/07/19 14:26:40 1.105
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.92 2017/02/18 23:39:24 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.105 2021/07/19 14:26:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -99,9 +99,12 @@ sub hash_src {
}
sub move {
- my ($next,$endupmap,$direction) = @_;
+ my ($next,$endupmap,$direction,$firstres) = @_;
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);
@@ -113,16 +116,37 @@ sub move {
$allowed = 0;
} else {
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;
+ 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}) && (!$firstres)) {
+ 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)
)
@@ -232,24 +256,33 @@ sub first_accessible_resource {
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
&GDBM_READER(),0640)) {
$furl=$hash{'first_url'};
- my %args;
- my ($url,$args) = split(/\?/,$furl);
- foreach my $pair (split(/\&/,$args)) {
+ my (%args,$url,$argstr);
+ if ($furl =~ m{^/enc/}) {
+ ($url,$argstr) = split(/\?/,&Apache::lonenc::unencrypted($furl));
+ } else {
+ ($url,$argstr) = split(/\?/,$furl);
+ }
+ foreach my $pair (split(/\&/,$argstr)) {
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
- my ($newmapid,$newresid)=split(/\./,$newrid);
- my $symb=&Apache::lonnet::encode_symb($newmap,$newresid,$hash{'src_'.$newrid});
- $furl=&add_get_param($hash{'src_'.$newrid},{ 'symb' => $symb });
- &check_for_syllabus(\$furl);
- if ($hash{'encrypted_'.$newrid}) {
- $furl=&Apache::lonenc::encrypted($furl);
+ if ($newrid eq '') {
+ $furl = '/adm/navmaps';
+ } else {
+ my ($newmapid,$newresid)=split(/\./,$newrid);
+ 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);
return $furl;
} else {
@@ -280,18 +313,54 @@ sub first_answerable_ressymb {
}
}
-sub check_for_syllabus {
- my ($srcref) = @_;
+sub check_http_req {
+ my ($srcref,$hostname) = @_;
return unless (ref($srcref) eq 'SCALAR');
+ my $usehttp;
if ($env{'request.course.id'}) {
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
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';
+ 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)) {
+ unless ((&Apache::lonnet::uses_sts()) ||
+ (&Apache::lonnet::waf_allssl($hostname))) {
+ my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/);
+ $$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor;
+ $usehttp = 1;
+ }
}
}
+ return $usehttp;
+}
+
+sub reinited_js {
+ my ($url,$cid,$timeout) = @_;
+ if (!$timeout) {
+ $timeout = 0;
+ }
+ return <<"END";
+
+END
}
# ================================================================ Main Handler
@@ -310,8 +379,10 @@ sub handler {
my %cachehash=();
my $multichoice=0;
my %multichoicehash=();
- my ($redirecturl,$redirectsymb,$enc,$anchor);
+ my %prog_state=();
+ my ($redirecturl,$redirectsymb,$enc,$anchor,$deeplinklevel);
my $next='';
+ my $hostname = $r->hostname();
my @possibilities=();
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
if (($env{'form.postdata'})&&($env{'request.course.fn'})) {
@@ -331,9 +402,14 @@ sub handler {
}
} elsif ($direction eq 'firstanswerable') {
my $furl = &first_answerable_ressymb();
+ my $usehttp = &check_http_req(\$furl,$hostname);
+ if (($usehttp) && ($hostname ne '')) {
+ $furl='http://'.$hostname.$furl;
+ } else {
+ $furl=&Apache::lonnet::absolute_url().$furl;
+ }
&Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location =>
- &Apache::lonnet::absolute_url().$furl);
+ $r->header_out(Location => $furl);
return REDIRECT;
} elsif ($direction eq 'endplacement') {
&Apache::loncommon::content_type($r,'text/html');
@@ -361,8 +437,20 @@ sub handler {
untie(%hash);
}
}
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ $r->print(&Apache::loncommon::start_page('Content Changed'));
+ my $preamble = '
'.
+ '
'.
+ &mt('Your course session is being updated because of recent changes by course personnel.').
+ ' '.&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!'));
if ($ferr) {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
my $requrl = $r->uri;
$env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
$env{'user.reinit'} = 1;
@@ -379,26 +467,41 @@ sub handler {
}
if ($direction eq 'firstres') {
my $furl=&first_accessible_resource();
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location =>
- &Apache::lonnet::absolute_url().$furl);
-
- return REDIRECT;
+ my $usehttp = &check_http_req(\$furl,$hostname);
+ if (($usehttp) && ($hostname ne '')) {
+ $furl='http://'.$hostname.$furl;
+ } else {
+ $furl=&Apache::lonnet::absolute_url().$furl;
+ }
+ if ($reinitcheck eq 'update') {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->print(&reinited_js($furl,$env{'request.course.id'},100));
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $furl);
+ return REDIRECT;
+ }
}
- if ($direction eq 'return') {
+ if ($direction eq 'return') {
# -------------------------------------------------------- Return to last known
- my $newloc;
+ my ($newloc,$usehttp);
if (($last) && (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'.db',
&GDBM_READER(),0640))) {
my ($murl,$id,$fn)=&Apache::lonnet::decode_symb($last);
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id;
$newloc=$hash{'src_'.$id};
if ($newloc) {
- &check_for_syllabus(\$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';
@@ -407,11 +510,20 @@ sub handler {
} else {
$newloc='/adm/navmaps';
}
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location =>
- &Apache::lonnet::absolute_url().$newloc);
-
- return REDIRECT;
+ if (($usehttp) && ($hostname ne '')) {
+ $newloc='http://'.$hostname.$newloc;
+ } else {
+ $newloc=&Apache::lonnet::absolute_url().$newloc
+ }
+ if ($reinitcheck eq 'update') {
+ $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $newloc);
+ return REDIRECT;
+ }
}
#
# Is the current URL on the map? If not, start with last known URL
@@ -425,15 +537,21 @@ sub handler {
$last=$hash{'last_known'};
untie(%hash);
}
- my $newloc;
if ($last) {
$currenturl=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($last))[2]);
} else {
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location =>
- &Apache::lonnet::absolute_url().
- '/adm/navmaps');
- return REDIRECT;
+ my $newloc = &Apache::lonnet::absolute_url().
+ '/adm/navmaps';
+ if ($reinitcheck eq 'update') {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $newloc);
+ return REDIRECT;
+ }
}
}
# ------------------------------------------- Do we have any idea where we are?
@@ -491,6 +609,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);
@@ -512,10 +633,14 @@ 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) {
- &check_for_syllabus(\$redirecturl);
- $url=&Apache::lonnet::absolute_url().$redirecturl;
+ my $usehttp = &check_http_req(\$redirecturl,$hostname);
+ if (($usehttp) && ($hostname ne '')) {
+ $url='http://'.$hostname.$redirecturl;
+ } else {
+ $url=&Apache::lonnet::absolute_url().$redirecturl;
+ }
my $addanchor;
if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) {
$addanchor = 1;
@@ -526,14 +651,26 @@ sub handler {
$url .= $anchor;
}
}
- &Apache::loncommon::content_type($r,'text/html');
- $r->header_out(Location => $url);
- return REDIRECT;
+ if ($reinitcheck eq 'update') {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->print(&reinited_js($url,$env{'request.course.id'},100));
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->header_out(Location => $url);
+ return REDIRECT;
+ }
} else {
# --------------------------------------------------------- There was a problem
&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',
@@ -565,7 +702,10 @@ $lt{'pick'}:
ENDSTART
foreach my $id (@possibilities) {
my $src = $multichoicehash{'src_'.$id};
- &check_for_syllabus(\$src);
+ my $usehttp = &check_http_req(\$src,$hostname);
+ if (($usehttp) && ($hostname ne '')) {
+ $src = 'http://'.$hostname.$src;
+ }
$r->print(
''.$lt{'back'}.'']));
+ } elsif ((!@possibilities) && ($reinitcheck)) {
$r->print(
&Apache::lonhtmlcommon::actionbox(
[''.$lt{'nav'}.''
@@ -628,12 +780,23 @@ ENDSTART
}
} else {
# ------------------------------------------------- Problem, could not tie hash
+ if ($reinitcheck eq 'update') {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->print(&Apache::loncommon::end_page());
+ }
$env{'user.error.msg'}="/adm/flip:bre:0:1:Course Data Missing";
return HTTP_NOT_ACCEPTABLE;
}
} else {
# ---------------------------------------- No, could not determine where we are
- $r->internal_redirect('/adm/ambiguous');
+ my $newloc = '/adm/ambiguous';
+ if ($reinitcheck eq 'update') {
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ $r->print(&reinited_js($newloc,$env{'request.course.id'},100));
+ $r->print(&Apache::loncommon::end_page());
+ } else {
+ $r->internal_redirect($newloc);
+ }
return OK;
}
} else {
|