--- rat/lonpageflip.pm	2016/05/30 02:52:42	1.91
+++ rat/lonpageflip.pm	2017/02/20 18:29:33	1.93
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.91 2016/05/30 02:52:42 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.93 2017/02/20 18:29:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -279,6 +279,23 @@ 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'};
+        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';
+            $usehttp = 1;
+        }
+    }
+    return $usehttp;
+}
+
 # ================================================================ Main Handler
 
 sub handler {
@@ -316,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');
@@ -364,22 +386,31 @@ 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) {
-		if ($hash{'encrypted_'.$id}) { $newloc=&Apache::lonenc::encrypted($newloc); }
+                $usehttp = &check_for_syllabus(\$newloc);
+		if ($hash{'encrypted_'.$id}) { 
+                    $newloc=&Apache::lonenc::encrypted($newloc);
+                } elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) {
+                    $newloc = $1.&escape('#').$2;
+                }
 	    } else {
 		$newloc='/adm/navmaps';
 	    }
@@ -387,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;
       }
 #
@@ -494,7 +528,12 @@ sub handler {
 # ------------------------------------- Check for and display critical messages
                   my ($redirect, $url) = &Apache::loncommon::critical_redirect(300);
                   unless ($redirect) {
-                      $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;
@@ -543,9 +582,14 @@ $lt{'pick'}:
 <tr><th>$lt{'titleheader'}</th><th>$lt{'type'}</th></tr>
 ENDSTART
                      foreach my $id (@possibilities) {
+                        my $src = $multichoicehash{'src_'.$id};
+                        my $usehttp = &check_for_syllabus(\$src);
+                        if ($usehttp) {
+                            $src = 'http://'.$ENV{'SERVER_NAME'}.$src;
+                        }
                         $r->print(
                               '<tr><td><a href="'.
-				  &add_get_param($multichoicehash{'src_'.$id},
+				  &add_get_param($src,
 						 {'symb' =>
 						      $multichoicehash{'symb_'.$id},
 						  }).'">'.