--- loncom/interface/loncommon.pm 2013/11/16 19:56:02 1.1158
+++ loncom/interface/loncommon.pm 2013/12/01 21:29:12 1.1162
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1158 2013/11/16 19:56:02 raeburn Exp $
+# $Id: loncommon.pm,v 1.1162 2013/12/01 21:29:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1388,7 +1388,7 @@ sub top_nav_help {
return <<"END";
$banner_link
- $text
+$text
END
}
@@ -1750,8 +1750,6 @@ RESIZE
=head1 Excel and CSV file utility routines
-=over 4
-
=cut
###############################################################
@@ -1759,6 +1757,8 @@ RESIZE
=pod
+=over 4
+
=item * &csv_translate($text)
Translate $text to allow it to be output as a 'comma separated values'
@@ -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;
}
@@ -12070,7 +12072,7 @@ sub cleanup_empty_dirs {
=pod
-=item &get_folder_hierarchy()
+=item * &get_folder_hierarchy()
Provides hierarchy of names of folders/sub-folders containing the current
item,
@@ -13383,7 +13385,7 @@ sub extract_categories {
=pod
-=item *&recurse_categories()
+=item * &recurse_categories()
Recursively used to generate breadcrumb trails for course categories.
@@ -13454,7 +13456,7 @@ sub recurse_categories {
=pod
-=item *&assign_categories_table()
+=item * &assign_categories_table()
Create a datatable for display of hierarchical categories in a domain,
with checkboxes to allow a course to be categorized.
@@ -13531,7 +13533,7 @@ sub assign_categories_table {
=pod
-=item *&assign_category_rows()
+=item * &assign_category_rows()
Create a datatable row for display of nested categories in a domain,
with checkboxes to allow a course to be categorized,called recursively.
@@ -14908,6 +14910,28 @@ sub check_recaptcha {
return $captcha_chk;
}
+sub cleanup_html {
+ my ($incoming) = @_;
+ my $outgoing;
+ if ($incoming ne '') {
+ $outgoing = $incoming;
+ $outgoing =~ s/;/;/g;
+ $outgoing =~ s/\#/#/g;
+ $outgoing =~ s/\&/&/g;
+ $outgoing =~ s//>/g;
+ $outgoing =~ s/\(/(/g;
+ $outgoing =~ s/\)/)/g;
+ $outgoing =~ s/"/"/g;
+ $outgoing =~ s/'/'/g;
+ $outgoing =~ s/\$/$/g;
+ $outgoing =~ s{/}{/}g;
+ $outgoing =~ s/=/=/g;
+ $outgoing =~ s/\\/\/g
+ }
+ return $outgoing;
+}
+
=pod
=back