--- loncom/interface/loncommon.pm 2006/03/24 18:09:27 1.321
+++ loncom/interface/loncommon.pm 2006/04/07 21:56:00 1.327
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.321 2006/03/24 18:09:27 albertel Exp $
+# $Id: loncommon.pm,v 1.327 2006/04/07 21:56:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -58,7 +58,6 @@ use strict;
use Apache::lonnet;
use GDBM_File;
use POSIX qw(strftime mktime);
-use Apache::Constants qw(:common :http :methods);
use Apache::lonmenu();
use Apache::lonlocal;
use HTML::Entities;
@@ -2737,7 +2736,9 @@ Inputs:
=item * $forcereg, if page should register as content page (relevant for
text interface only)
-=item * $customtitle, overrides the $title in some way ????
+=item * $customtitle, alternate text to use instead of $title
+ in the title box that appears, this text
+ is not auto translated like the $title is
=item * $notopbar, if true, keep the 'what is this' info but remove the
navigational links
@@ -3007,7 +3008,7 @@ sub headtag {
$env{'internal.head.redirect'} = $url;
$result.=<
-
+
ADDMETA
}
if (!defined($title)) {
@@ -3015,7 +3016,6 @@ ADDMETA
}
$result .= '
LON-CAPA '.&mt($title).''.$head_extra;
-
return $result;
}
@@ -3052,8 +3052,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
@@ -3083,6 +3083,9 @@ Inputs: $title - optional title for the
a html attribute
force_register -> if is true will turn on the &bodytag()
$forcereg arg
+ body_title -> alternate text to use instead of $title
+ in the title box that appears, this text
+ is not auto translated like the $title is
=back
@@ -3094,7 +3097,7 @@ sub start_page {
my %head_args;
foreach my $arg ('redirect','force_register') {
if (defined($args->{$arg})) {
- $head_args{$arg} = $args->{$args};
+ $head_args{$arg} = $args->{$arg};
}
}
@@ -3105,7 +3108,7 @@ sub start_page {
&bodytag($title,
$args->{'function'}, $args->{'add_entries'},
$args->{'only_body'}, $args->{'domain'},
- $args->{'force_register'}, undef,
+ $args->{'force_register'}, $args->{'body_title'},
$args->{'no_nav_bar'}, $args->{'bgcolor'});
if ($args->{'js_ready'}) {
$result = &js_ready($result);
@@ -3150,15 +3153,17 @@ sub end_page {
sub html_encode {
my ($result) = @_;
- $result = &HTML::Entities::encode($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;
}
@@ -3196,7 +3201,7 @@ sub simple_error_page {
&Apache::loncommon::end_page();
if (ref($r)) {
$r->print($page);
- return OK;
+ return;
}
return $page;
}