--- loncom/interface/loncommon.pm 2013/09/10 17:43:58 1.1155 +++ loncom/interface/loncommon.pm 2013/11/16 19:56:02 1.1158 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1155 2013/09/10 17:43:58 bisitz Exp $ +# $Id: loncommon.pm,v 1.1158 2013/11/16 19:56:02 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -9789,11 +9789,10 @@ sub ask_for_embedded_content { my $numexisting = 0; my $numunused = 0; my ($output,$upload_output,$toplevel,$url,$udom,$uname,$getpropath,$cdom,$cnum, - $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path); + $fileloc,$filename,$delete_output,$modify_output,$title,$symb,$path,$navmap); my $heading = &mt('Upload embedded files'); my $buttontext = &mt('Upload'); - my ($navmap,$cdom,$cnum); if ($env{'request.course.id'}) { if ($actionurl eq '/adm/dependencies') { $navmap = Apache::lonnavmaps::navmap->new(); @@ -9877,12 +9876,13 @@ sub ask_for_embedded_content { } else { $embed_file = $file; } - my $absolutepath; - my $cleaned_file = &clean_path($embed_file); - if ($cleaned_file =~ m{^\w+://}) { + my ($absolutepath,$cleaned_file); + if ($embed_file =~ m{^\w+://}) { + $cleaned_file = $embed_file; $newfiles{$cleaned_file} = 1; $mapping{$cleaned_file} = $embed_file; } else { + $cleaned_file = &clean_path($embed_file); if ($embed_file =~ m{^/}) { $absolutepath = $embed_file; } @@ -14415,6 +14415,12 @@ sub init_user_environment { $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 %domdef; unless ($domain eq 'public') {