--- rat/lonpageflip.pm	2017/02/20 18:29:33	1.93
+++ rat/lonpageflip.pm	2017/03/08 02:51:18	1.95
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.93 2017/02/20 18:29:33 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;
@@ -314,6 +317,7 @@ sub handler {
   my %multichoicehash=();
   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'})) {
@@ -333,9 +337,9 @@ sub handler {
           }
       } elsif ($direction eq 'firstanswerable') {
           my $furl = &first_answerable_ressymb();
-          my $usehttp = &check_for_syllabus(\$furl);
-          if ($usehttp) {
-              $furl='http://'.$ENV{'SERVER_NAME'}.$furl;
+          my $usehttp = &check_http_req(\$furl);
+          if (($usehttp) && ($hostname ne '')) {
+              $furl='http://'.$hostname.$furl;
           } else {
               $furl=&Apache::lonnet::absolute_url().$furl;
           }
@@ -386,9 +390,9 @@ sub handler {
       }
       if ($direction eq 'firstres') {
 	  my $furl=&first_accessible_resource();
-          my $usehttp = &check_for_syllabus(\$furl);
-          if ($usehttp) {
-              $furl='http://'.$ENV{'SERVER_NAME'}.$furl;
+          my $usehttp = &check_http_req(\$furl);
+          if (($usehttp) && ($hostname ne '')) {
+              $furl='http://'.$hostname.$furl;
           } else {
               $furl=&Apache::lonnet::absolute_url().$furl;
           }
@@ -405,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/[^\#]+)\#([^\#]+)$}) {
@@ -418,8 +422,8 @@ sub handler {
          } else {
 	    $newloc='/adm/navmaps';
          }
-         if ($usehttp) {
-             $newloc='http://'.$ENV{'SERVER_NAME'}.$newloc;
+         if (($usehttp) && ($hostname ne '')) {
+             $newloc='http://'.$hostname.$newloc;
          } else {
              $newloc=&Apache::lonnet::absolute_url().$newloc
          }
@@ -528,9 +532,9 @@ sub handler {
 # ------------------------------------- Check for and display critical messages
                   my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
                   unless ($redirect) {
-                      my $usehttp = &check_for_syllabus(\$redirecturl);
-                      if ($usehttp) {
-                          $url='http://'.$ENV{'SERVER_NAME'}.$redirecturl;
+                      my $usehttp = &check_http_req(\$redirecturl);
+                      if (($usehttp) && ($hostname ne '')) {
+                          $url='http://'.$hostname.$redirecturl;
                       } else {
                           $url=&Apache::lonnet::absolute_url().$redirecturl;
                       }
@@ -583,9 +587,9 @@ $lt{'pick'}:
 ENDSTART
                      foreach my $id (@possibilities) {
                         my $src = $multichoicehash{'src_'.$id};
-                        my $usehttp = &check_for_syllabus(\$src);
-                        if ($usehttp) {
-                            $src = 'http://'.$ENV{'SERVER_NAME'}.$src;
+                        my $usehttp = &check_http_req(\$src);
+                        if (($usehttp) && ($hostname ne '')) {
+                            $src = 'http://'.$hostname.$src;
                         }
                         $r->print(
                               '<tr><td><a href="'.