--- loncom/interface/loncommon.pm 2007/08/24 07:20:22 1.564.2.1 +++ loncom/interface/loncommon.pm 2007/08/30 20:26:50 1.564.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.564.2.1 2007/08/24 07:20:22 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 # @@ -6925,7 +6925,7 @@ sub check_clone { $args->{'crstype'}); } else { my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1}); - if ($env{'request.role.domain'} eq $args->{'form.clonedomain'}) { + if ($env{'request.role.domain'} eq $args->{'clonedomain'}) { $can_clone = 1; } else { my %clonehash = &Apache::lonnet::get('environment',['cloners'], @@ -7309,6 +7309,14 @@ sub lonhttpdurl { 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; }