loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.564.2.1, 2007/08/24 07:20:22	version 1.564.2.3, 2007/08/30 20:26:50
Line 6925 sub check_clone {	Line 6925 sub check_clone {
$args->{'crstype'});	$args->{'crstype'});
} else {	} else {
my %clonedesc = &Apache::lonnet::coursedescription($cloneid,{'one_time' => 1});	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;	$can_clone = 1;
} else {	} else {
my %clonehash = &Apache::lonnet::get('environment',['cloners'],	my %clonehash = &Apache::lonnet::get('environment',['cloners'],
Line 7309 sub lonhttpdurl {	Line 7309 sub lonhttpdurl {
my ($url)=@_;	my ($url)=@_;
my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};	my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }	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;	return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
}	}