--- rat/lonpageflip.pm	2017/02/18 23:39:24	1.92
+++ rat/lonpageflip.pm	2017/02/20 18:29:33	1.93
@@ -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.93 2017/02/20 18:29:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -245,7 +245,6 @@ sub first_accessible_resource {
 	    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);
 	    }
@@ -283,6 +282,7 @@ sub first_answerable_ressymb {
 sub check_for_syllabus {
     my ($srcref) = @_;
     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'};
@@ -290,8 +290,10 @@ sub check_for_syllabus {
             ($ENV{'SERVER_PORT'} == 443) &&
             ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
             $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
+            $usehttp = 1;
         }
     }
+    return $usehttp;
 }
 
 # ================================================================ Main Handler
@@ -331,9 +333,14 @@ 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;
+          } 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');
@@ -379,22 +386,26 @@ 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;
+          } 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;
       }
       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_for_syllabus(\$newloc);
 		if ($hash{'encrypted_'.$id}) { 
                     $newloc=&Apache::lonenc::encrypted($newloc);
                 } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
@@ -407,10 +418,13 @@ sub handler {
          } else {
 	    $newloc='/adm/navmaps';
          }
+         if ($usehttp) {
+             $newloc='http://'.$ENV{'SERVER_NAME'}.$newloc;
+         } else {
+             $newloc=&Apache::lonnet::absolute_url().$newloc
+         }
 	 &Apache::loncommon::content_type($r,'text/html');
-	 $r->header_out(Location => 
-			&Apache::lonnet::absolute_url().$newloc);
-	     
+	 $r->header_out(Location => $newloc);
 	 return REDIRECT;
       }
 #
@@ -514,8 +528,12 @@ sub handler {
 # ------------------------------------- Check for and display critical messages
                   my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
                   unless ($redirect) {
-                      &check_for_syllabus(\$redirecturl);
-                      $url=&Apache::lonnet::absolute_url().$redirecturl;
+                      my $usehttp = &check_for_syllabus(\$redirecturl);
+                      if ($usehttp) {
+                          $url='http://'.$ENV{'SERVER_NAME'}.$redirecturl;
+                      } else {
+                          $url=&Apache::lonnet::absolute_url().$redirecturl;
+                      }
                       my $addanchor;
                       if (($anchor ne '') && (!$enc || $env{'request.role.adv'})) {
                           $addanchor = 1;
@@ -565,7 +583,10 @@ $lt{'pick'}:
 ENDSTART
                      foreach my $id (@possibilities) {
                         my $src = $multichoicehash{'src_'.$id};
-                        &check_for_syllabus(\$src);
+                        my $usehttp = &check_for_syllabus(\$src);
+                        if ($usehttp) {
+                            $src = 'http://'.$ENV{'SERVER_NAME'}.$src;
+                        }
                         $r->print(
                               '<tr><td><a href="'.
 				  &add_get_param($src,