[LON-CAPA-cvs] cvs: rat(version_2_11_X) / lonpageflip.pm

[raeburn]

raeburn		Sun Jul 28 01:08:50 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /rat	lonpageflip.pm 
  Log:
  - For 2.11
    Backport 1.92, 1.93, 1.94, 1.95, 1.99, 1.100, 1.101
  
  
Index: rat/lonpageflip.pm
diff -u rat/lonpageflip.pm:1.80.8.10 rat/lonpageflip.pm:1.80.8.11
--- rat/lonpageflip.pm:1.80.8.10	Mon Sep 10 19:17:39 2018
+++ rat/lonpageflip.pm	Sun Jul 28 01:08:50 2019
@@ -2,7 +2,7 @@
 #
 # Page flip handler
 #
-# $Id: lonpageflip.pm,v 1.80.8.10 2018/09/10 19:17:39 raeburn Exp $
+# $Id: lonpageflip.pm,v 1.80.8.11 2019/07/28 01:08:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -255,6 +255,32 @@
     }
 }
 
+sub check_http_req {
+    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://})) {
+            unless (&Apache::lonnet::uses_sts()) {
+                $$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1';
+                $usehttp = 1;
+            }
+        } elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) &&
+                 ($ENV{'SERVER_PORT'} == 443)) {
+            unless (&Apache::lonnet::uses_sts()) {
+                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 +322,7 @@
   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'})) {
@@ -364,7 +391,12 @@
       }
       if ($direction eq 'firstres') {
 	  my $furl=&first_accessible_resource();
-          $furl=&Apache::lonnet::absolute_url().$furl;
+          my $usehttp = &check_http_req(\$furl);
+          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 +408,25 @@
 	      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);
+                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 +434,11 @@
          } 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());
@@ -511,7 +556,12 @@
 # ------------------------------------- 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_http_req(\$redirecturl);
+                      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 +616,14 @@
 <tr><th>$lt{'titleheader'}</th><th>$lt{'type'}</th></tr>
 ENDSTART
                      foreach my $id (@possibilities) {
+                        my $src = $multichoicehash{'src_'.$id};
+                        my $usehttp = &check_http_req(\$src);
+                        if (($usehttp) && ($hostname ne '')) {
+                            $src = 'http://'.$hostname.$src;
+                        }
                         $r->print(
                               '<tr><td><a href="'.
-				  &add_get_param($multichoicehash{'src_'.$id},
+				  &add_get_param($src,
 						 {'symb' =>
 						      $multichoicehash{'symb_'.$id},
 						  }).'">'.