--- rat/lonpageflip.pm 2020/05/25 16:42:59 1.80.8.10.2.1
+++ rat/lonpageflip.pm 2021/12/14 21:34:45 1.80.8.13
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.80.8.10.2.1 2020/05/25 16:42:59 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.80.8.13 2021/12/14 21:34:45 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -231,9 +231,13 @@ 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);
}
@@ -241,13 +245,17 @@ sub first_accessible_resource {
# 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');
# 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 });
- 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 {
@@ -255,6 +263,34 @@ sub first_accessible_resource {
}
}
+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://})) {
+ 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) {
@@ -296,6 +332,7 @@ sub handler {
my %prog_state=();
my ($redirecturl,$redirectsymb,$enc,$anchor);
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'})) {
@@ -340,12 +377,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;
@@ -364,7 +401,12 @@ sub handler {
}
if ($direction eq 'firstres') {
my $furl=&first_accessible_resource();
- $furl=&Apache::lonnet::absolute_url().$furl;
+ 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));
@@ -376,16 +418,25 @@ sub handler {
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) {
- if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
+ $usehttp = &check_http_req(\$newloc,$hostname);
+ if ($hash{'encrypted_'.$id}) {
+ $newloc=&Apache::lonenc::encrypted($newloc);
+ }
+ if ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|(\#[^\#]+))$}) {
+ my ($url,$anchor) = ($1,$2);
+ if ($anchor) {
+ $newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last).$anchor;
+ }
+ }
} else {
$newloc='/adm/navmaps';
}
@@ -393,7 +444,11 @@ sub handler {
} else {
$newloc='/adm/navmaps';
}
- $newloc=&Apache::lonnet::absolute_url().$newloc;
+ 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());
@@ -509,9 +564,14 @@ sub handler {
&Apache::lonnet::linklog($redirecturl,$currenturl);
}
# ------------------------------------- Check for and display critical messages
- my ($redirect, $url) = &Apache::loncommon::critical_redirect(300,'flip');
+ my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
unless ($redirect) {
- $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;
@@ -566,9 +626,14 @@ $lt{'pick'}:
$lt{'titleheader'} | $lt{'type'} |
ENDSTART
foreach my $id (@possibilities) {
+ my $src = $multichoicehash{'src_'.$id};
+ my $usehttp = &check_http_req(\$src,$hostname);
+ if (($usehttp) && ($hostname ne '')) {
+ $src = 'http://'.$hostname.$src;
+ }
$r->print(
''.
|