--- rat/lonpageflip.pm 2017/02/25 19:40:29 1.94
+++ rat/lonpageflip.pm 2017/03/08 02:51:18 1.95
@@ -2,7 +2,7 @@
#
# Page flip handler
#
-# $Id: lonpageflip.pm,v 1.94 2017/02/25 19:40:29 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.95 2017/03/08 02:51:18 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -279,7 +279,7 @@ sub first_answerable_ressymb {
}
}
-sub check_for_syllabus {
+sub check_http_req {
my ($srcref) = @_;
return unless (ref($srcref) eq 'SCALAR');
my $usehttp;
@@ -291,6 +291,9 @@ sub check_for_syllabus {
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
$usehttp = 1;
+ } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
+ ($ENV{'SERVER_PORT'} == 443)) {
+ $usehttp = 1;
}
}
return $usehttp;
@@ -334,7 +337,7 @@ sub handler {
}
} elsif ($direction eq 'firstanswerable') {
my $furl = &first_answerable_ressymb();
- my $usehttp = &check_for_syllabus(\$furl);
+ my $usehttp = &check_http_req(\$furl);
if (($usehttp) && ($hostname ne '')) {
$furl='http://'.$hostname.$furl;
} else {
@@ -387,7 +390,7 @@ sub handler {
}
if ($direction eq 'firstres') {
my $furl=&first_accessible_resource();
- my $usehttp = &check_for_syllabus(\$furl);
+ my $usehttp = &check_http_req(\$furl);
if (($usehttp) && ($hostname ne '')) {
$furl='http://'.$hostname.$furl;
} else {
@@ -406,7 +409,7 @@ sub handler {
$id=$hash{'map_pc_'.&Apache::lonnet::clutter($murl)}.'.'.$id;
$newloc=$hash{'src_'.$id};
if ($newloc) {
- $usehttp = &check_for_syllabus(\$newloc);
+ $usehttp = &check_http_req(\$newloc);
if ($hash{'encrypted_'.$id}) {
$newloc=&Apache::lonenc::encrypted($newloc);
} elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
@@ -529,7 +532,7 @@ sub handler {
# ------------------------------------- Check for and display critical messages
my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
unless ($redirect) {
- my $usehttp = &check_for_syllabus(\$redirecturl);
+ my $usehttp = &check_http_req(\$redirecturl);
if (($usehttp) && ($hostname ne '')) {
$url='http://'.$hostname.$redirecturl;
} else {
@@ -584,7 +587,7 @@ $lt{'pick'}:
ENDSTART
foreach my $id (@possibilities) {
my $src = $multichoicehash{'src_'.$id};
- my $usehttp = &check_for_syllabus(\$src);
+ my $usehttp = &check_http_req(\$src);
if (($usehttp) && ($hostname ne '')) {
$src = 'http://'.$hostname.$src;
}
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.