[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonnavmaps.pm

[raeburn]

raeburn		Fri Dec 31 23:14:04 2021 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonnavmaps.pm 
  Log:
  - For 2.11
    Backport 1.551
  
  
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.509.2.13 loncom/interface/lonnavmaps.pm:1.509.2.14
--- loncom/interface/lonnavmaps.pm:1.509.2.13	Sat May  2 21:40:02 2020
+++ loncom/interface/lonnavmaps.pm	Fri Dec 31 23:14:04 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.509.2.13 2020/05/02 21:40:02 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.14 2021/12/31 23:14:04 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1889,7 +1889,7 @@
             if ($env{'request.course.id'}) {
                 if (($is_ssl) && ($src =~ m{^\Q/public/$cdom/$cnum/syllabus\E($|\?)}) &&
                     ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }
@@ -1897,7 +1897,7 @@
                         $srcHasQuestion = 1;
                     }
                 } elsif (($is_ssl) && ($src =~ m{^\Q/adm/wrapper/ext/\E(?!https:)})) {
-                    unless (&Apache::lonnet::uses_sts()) {
+                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
                         if ($hostname ne '') {
                             $src = 'http://'.$hostname.$src;
                         }