--- loncom/interface/loncommon.pm 2013/09/07 19:58:01 1.1154
+++ loncom/interface/loncommon.pm 2013/11/26 01:19:15 1.1160
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1154 2013/09/07 19:58:01 raeburn Exp $
+# $Id: loncommon.pm,v 1.1160 2013/11/26 01:19:15 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1388,7 +1388,7 @@ sub top_nav_help {
return <<"END";
$banner_link
- $text
+$text
END
}
@@ -5284,7 +5284,7 @@ sub make_attr_string {
}
my $attr_string;
- foreach my $attr (keys(%$attr_ref)) {
+ foreach my $attr (sort(keys(%$attr_ref))) {
$attr_string .= " $attr=\"".$attr_ref->{$attr}.'" ';
}
return $attr_string;
@@ -7282,7 +7282,7 @@ sub headtag {
my $result =
''.
- &font_settings();
+ &font_settings($args);
my $inhibitprint = &print_suppression();
@@ -7347,15 +7347,17 @@ ADDMETA
Returns neccessary to set the proper encoding
-Inputs: none
+Inputs: optional reference to HASH -- $args passed to &headtag()
=cut
sub font_settings {
+ my ($args) = @_;
my $headerstring='';
- if (!$env{'browser.mathml'} && $env{'browser.unicode'}) {
+ if ((!$env{'browser.mathml'} && $env{'browser.unicode'}) ||
+ ((ref($args) eq 'HASH') && ($args->{'browser.unicode'}))) {
$headerstring.=
- '';
+ ''."\n";
}
return $headerstring;
}
@@ -7459,8 +7461,8 @@ sub xml_begin {
.'';
} else {
- $output=''
- .'';
+ $output=''."\n"
+ .''."\n";
}
return $output;
}
@@ -9789,11 +9791,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 +9878,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;
}
@@ -10444,7 +10446,8 @@ sub upload_embedded {
# Check if extension is valid
if (($fname =~ /\.(\w+)$/) &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
- $output .= &mt('Invalid file extension ([_1]) - reserved for LONCAPA use - rename the file with a different extension and re-upload. ',$1).'
';
+ $output .= &mt('Invalid file extension ([_1]) - reserved for internal use.',$1)
+ .' '.&mt('Rename the file with a different extension and re-upload.').'
';
next;
} elsif (($fname =~ /\.(\w+)$/) &&
(!defined(&Apache::loncommon::fileembstyle($1)))) {
@@ -14414,6 +14417,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') {