--- loncom/interface/loncommon.pm 2006/03/21 21:01:22 1.318
+++ loncom/interface/loncommon.pm 2006/04/04 15:11:26 1.325
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.318 2006/03/21 21:01:22 albertel Exp $
+# $Id: loncommon.pm,v 1.325 2006/04/04 15:11:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2801,7 +2801,8 @@ form, .inline { display: inline; }
style="margin-top: 0px;$addstyle" $addentries>
END
&Apache::lontexconvert::jsMath_reset();
- if ($env{'environment.texengine'} eq 'jsMath') {
+ if ($env{'environment.texengine'} eq 'jsMath' ||
+ $env{'form.texengine'} eq 'jsMath' ) {
$bodytag.=&Apache::lontexconvert::jsMath_header();
}
@@ -2976,6 +2977,9 @@ Returns a uniform footer for LON-CAPA we
Inputs: $title - optional title for the head
$head_extra - optional extra HTML to put inside the
$args - optional arguments
+ force_register - if is true call registerurl so the remote is
+ informed
+
redirect - array ref of seconds before redirect occurs
url to redirect to
(side effect of setting
@@ -2992,14 +2996,18 @@ sub headtag {
''.
&Apache::lonxml::fontsettings().
&Apache::lonhtmlcommon::htmlareaheaders();
-
+
+ if ($args->{'force_register'}) {
+ $result .= &Apache::lonmenu::registerurl(1);
+ }
+
if (ref($args->{'redirect'})) {
my ($time,$url) = @{$args->{'redirect'}};
$url = &Apache::lonenc::check_encrypt($url);
$env{'internal.head.redirect'} = $url;
$result.=<
-
+
ADDMETA
}
if (!defined($title)) {
@@ -3007,7 +3015,6 @@ ADDMETA
}
$result .= ' LON-CAPA '.&mt($title).''.$head_extra;
-
return $result;
}
@@ -3044,8 +3051,8 @@ Inputs: $title - optional title for the
=cut
sub head {
- my ($title,$head_extra) = @_;
- return &headtag($title,$head_extra).&endheadtag();
+ my ($title,$head_extra,$args) = @_;
+ return &headtag($title,$head_extra,$args).&endheadtag();
}
=pod
@@ -3071,6 +3078,8 @@ Inputs: $title - optional title for the
bgcolor -> override the default page bg color
js_ready -> return a string ready for being used in
a javascript writeln
+ html_encode -> return a string ready for being used in
+ a html attribute
force_register -> if is true will turn on the &bodytag()
$forcereg arg
@@ -3082,9 +3091,12 @@ sub start_page {
my ($title,$head_extra,$args) = @_;
#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
my %head_args;
- if (defined($args->{'redirect'})) {
- $head_args{'redirect'} = $args->{'redirect'};
+ foreach my $arg ('redirect','force_register') {
+ if (defined($args->{$arg})) {
+ $head_args{$arg} = $args->{$arg};
+ }
}
+
$env{'internal.start_page'}++;
my $result =
&Apache::lonxml::xmlbegin().
@@ -3097,6 +3109,9 @@ sub start_page {
if ($args->{'js_ready'}) {
$result = &js_ready($result);
}
+ if ($args->{'html_encode'}) {
+ $result = &html_encode($result);
+ }
return $result;
}
@@ -3111,6 +3126,8 @@ Returns a complete sectio
Inputs: $args - additional optional args supported are:
js_ready -> return a string ready for being used in
a javascript writeln
+ html_encode -> return a string ready for being used in
+ a html attribute
=back
=cut
@@ -3123,15 +3140,26 @@ sub end_page {
if ($args->{'js_ready'}) {
$result = &js_ready($result);
}
+ if ($args->{'html_encode'}) {
+ $result = &html_encode($result);
+ }
return $result;
}
-sub js_ready {
+sub html_encode {
my ($result) = @_;
+
$result = &HTML::Entities::encode($result,'<>&"');
+
+ return $result;
+}
+sub js_ready {
+ my ($result) = @_;
- $result =~ s/[\n\r]/ /g;
- $result =~ s/'/\\'/g;
+ $result =~ s/[\n\r]/ /xmsg;
+ $result =~ s/\\/\\\\/xmsg;
+ $result =~ s/'/\\'/xmsg;
+ $result =~ s{}{}xmsg;
return $result;
}
@@ -3169,7 +3197,7 @@ sub simple_error_page {
&Apache::loncommon::end_page();
if (ref($r)) {
$r->print($page);
- return;
+ return OK;
}
return $page;
}