[LON-CAPA-cvs] cvs: loncom /interface londocs.pm

[raeburn]

raeburn		Mon Aug 24 03:50:15 2026 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - For servers using Apache/SSL, where an External Resource in Supplemental
    Content points at an http:// URL, links to display the page use http:// 
    to avoid mixed active content issue in whether or not URL includes anchor.  
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.745 loncom/interface/londocs.pm:1.746
--- loncom/interface/londocs.pm:1.745	Thu Aug 20 20:51:47 2026
+++ loncom/interface/londocs.pm	Mon Aug 24 03:50:15 2026
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.745 2026/08/20 20:51:47 raeburn Exp $
+# $Id: londocs.pm,v 1.746 2026/08/24 03:50:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5593,15 +5593,15 @@
             if ($url =~ /^([^#]+)#([^#]+)$/) {
                 $url = $1;
                 $anchor = $2;
-                if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
-                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                        if ($hostname ne '') {
-                            $url = 'http://'.$hostname.$url;
-                        }
-                        $url .= (($url =~ /\?/) ? '&':'?').'usehttp=1';
+            }
+            if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) {
+                unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
+                    if ($hostname ne '') {
+                        $url = 'http://'.$hostname.$url;
                     }
-                    $nomodal = 1;
+                    $url .= (($url =~ /\?/) ? '&':'?').'usehttp=1';
                 }
+                $nomodal = 1;
             }
         } elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) {
             if (($ENV{'SERVER_PORT'} == 443) &&