[LON-CAPA-cvs] cvs: loncom(version_2_5_X) /interface loncommon.pm

[albertel]

albertel		Thu Aug 30 16:26:52 2007 EDT

  Modified files:              (Branch: version_2_5_X)
    /loncom/interface	loncommon.pm 
  Log:
  - backport 1.574
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.564.2.2 loncom/interface/loncommon.pm:1.564.2.3
--- loncom/interface/loncommon.pm:1.564.2.2	Fri Aug 24 14:41:50 2007
+++ loncom/interface/loncommon.pm	Thu Aug 30 16:26:50 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.564.2.2 2007/08/24 18:41:50 albertel Exp $
+# $Id: loncommon.pm,v 1.564.2.3 2007/08/30 20:26:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7309,6 +7309,14 @@
     my ($url)=@_;
     my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
     if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
+
+    # IE doesn't like a secure page getting images from a non-secure
+    # port (when logging we haven't parsed the browser type so default
+    # back to secure
+    if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+	&& $ENV{'SERVER_PORT'} == 443) {
+	return 'https://'.$ENV{'SERVER_NAME'}.$url;
+    }
     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
 }