loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.1156, 2013/09/21 13:56:22	version 1.1158, 2013/11/16 19:56:02
Line 9876 sub ask_for_embedded_content {	Line 9876 sub ask_for_embedded_content {
} else {	} else {
$embed_file = $file;	$embed_file = $file;
}	}
my $absolutepath;	my ($absolutepath,$cleaned_file);
my $cleaned_file = &clean_path($embed_file);	if ($embed_file =~ m{^\w+://}) {
if ($cleaned_file =~ m{^\w+://}) {	$cleaned_file = $embed_file;
$newfiles{$cleaned_file} = 1;	$newfiles{$cleaned_file} = 1;
$mapping{$cleaned_file} = $embed_file;	$mapping{$cleaned_file} = $embed_file;
} else {	} else {
	$cleaned_file = &clean_path($embed_file);
if ($embed_file =~ m{^/}) {	if ($embed_file =~ m{^/}) {
$absolutepath = $embed_file;	$absolutepath = $embed_file;
}	}
Line 14414 sub init_user_environment {	Line 14415 sub init_user_environment {
$env{'browser.interface'}=$form->{'interface'};	$env{'browser.interface'}=$form->{'interface'};
}	}

	if ($form->{'iptoken'}) {
	my $lonhost = $r->dir_config('lonHostID');
	$initial_env{"user.noloadbalance"} = $lonhost;
	$env{'user.noloadbalance'} = $lonhost;
	}

my %is_adv = ( is_adv => $env{'user.adv'} );	my %is_adv = ( is_adv => $env{'user.adv'} );
my %domdef;	my %domdef;
unless ($domain eq 'public') {	unless ($domain eq 'public') {