--- loncom/interface/loncommon.pm 2006/03/21 20:36:15 1.317 +++ loncom/interface/loncommon.pm 2006/04/06 20:52:58 1.326 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.317 2006/03/21 20:36:15 albertel Exp $ +# $Id: loncommon.pm,v 1.326 2006/04/06 20:52:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2737,7 +2737,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 @@ -2801,7 +2803,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 +2979,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 +2998,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 +3017,6 @@ ADDMETA } $result .= ' LON-CAPA '.&mt($title).''.$head_extra; - return $result; } @@ -3044,8 +3053,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,8 +3080,13 @@ 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 + 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 @@ -3080,10 +3094,14 @@ Inputs: $title - optional title for the 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(). @@ -3091,11 +3109,14 @@ 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); } + if ($args->{'html_encode'}) { + $result = &html_encode($result); + } return $result; } @@ -3110,26 +3131,40 @@ 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 sub end_page { my ($args) = @_; + #&Apache::lonnet::logthis("end_page ".join(':',caller(0))); $env{'internal.end_page'}++; my $result = &endbodytag()."\n"; 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; } @@ -3138,11 +3173,13 @@ sub validate_page { if ( exists($env{'internal.start_page'}) && $env{'internal.start_page'} > 1) { &Apache::lonnet::logthis('start_page called multiple times '. + $env{'internal.start_page'}.' '. $ENV{'request.filename'}); } if ( exists($env{'internal.end_page'}) && $env{'internal.end_page'} > 1) { &Apache::lonnet::logthis('end_page called multiple times '. + $env{'internal.end_page'}.' '. $env{'request.filename'}); } if ( exists($env{'internal.start_page'}) @@ -3157,6 +3194,18 @@ sub validate_page { } } +sub simple_error_page { + my ($r,$title,$msg) = @_; + my $page = + &Apache::loncommon::start_page($title). + &mt($msg). + &Apache::loncommon::end_page(); + if (ref($r)) { + $r->print($page); + return OK; + } + return $page; +} ############################################### =pod