version 1.317, 2006/03/21 20:36:15
|
version 1.328, 2006/04/09 16:43:43
|
Line 58 use strict;
|
Line 58 use strict;
|
use Apache::lonnet; |
use Apache::lonnet; |
use GDBM_File; |
use GDBM_File; |
use POSIX qw(strftime mktime); |
use POSIX qw(strftime mktime); |
use Apache::Constants qw(:common :http :methods); |
|
use Apache::lonmenu(); |
use Apache::lonmenu(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use HTML::Entities; |
use HTML::Entities; |
Line 2737 Inputs:
|
Line 2736 Inputs:
|
=item * $forcereg, if page should register as content page (relevant for |
=item * $forcereg, if page should register as content page (relevant for |
text interface only) |
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 |
=item * $notopbar, if true, keep the 'what is this' info but remove the |
navigational links |
navigational links |
Line 2801 form, .inline { display: inline; }
|
Line 2802 form, .inline { display: inline; }
|
style="margin-top: 0px;$addstyle" $addentries> |
style="margin-top: 0px;$addstyle" $addentries> |
END |
END |
&Apache::lontexconvert::jsMath_reset(); |
&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(); |
$bodytag.=&Apache::lontexconvert::jsMath_header(); |
} |
} |
|
|
Line 2976 Returns a uniform footer for LON-CAPA we
|
Line 2978 Returns a uniform footer for LON-CAPA we
|
Inputs: $title - optional title for the head |
Inputs: $title - optional title for the head |
$head_extra - optional extra HTML to put inside the <head> |
$head_extra - optional extra HTML to put inside the <head> |
$args - optional arguments |
$args - optional arguments |
|
force_register - if is true call registerurl so the remote is |
|
informed |
|
|
redirect - array ref of seconds before redirect occurs |
redirect - array ref of seconds before redirect occurs |
url to redirect to |
url to redirect to |
(side effect of setting |
(side effect of setting |
Line 2992 sub headtag {
|
Line 2997 sub headtag {
|
'<head>'. |
'<head>'. |
&Apache::lonxml::fontsettings(). |
&Apache::lonxml::fontsettings(). |
&Apache::lonhtmlcommon::htmlareaheaders(); |
&Apache::lonhtmlcommon::htmlareaheaders(); |
|
|
|
if ($args->{'force_register'}) { |
|
$result .= &Apache::lonmenu::registerurl(1); |
|
} |
|
|
if (ref($args->{'redirect'})) { |
if (ref($args->{'redirect'})) { |
my ($time,$url) = @{$args->{'redirect'}}; |
my ($time,$url) = @{$args->{'redirect'}}; |
$url = &Apache::lonenc::check_encrypt($url); |
$url = &Apache::lonenc::check_encrypt($url); |
$env{'internal.head.redirect'} = $url; |
$env{'internal.head.redirect'} = $url; |
$result.=<<ADDMETA |
$result.=<<ADDMETA |
<meta http-equiv="pragma" content="no-cache" /> |
<meta http-equiv="pragma" content="no-cache" /> |
<meta HTTP-EQUIV="Refresh" CONTENT="2; url=$url" /> |
<meta HTTP-EQUIV="Refresh" CONTENT="$time; url=$url" /> |
ADDMETA |
ADDMETA |
} |
} |
if (!defined($title)) { |
if (!defined($title)) { |
Line 3007 ADDMETA
|
Line 3016 ADDMETA
|
} |
} |
|
|
$result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra; |
$result .= '<title> LON-CAPA '.&mt($title).'</title>'.$head_extra; |
|
|
return $result; |
return $result; |
} |
} |
|
|
Line 3044 Inputs: $title - optional title for the
|
Line 3052 Inputs: $title - optional title for the
|
=cut |
=cut |
|
|
sub head { |
sub head { |
my ($title,$head_extra) = @_; |
my ($title,$head_extra,$args) = @_; |
return &headtag($title,$head_extra).&endheadtag(); |
return &headtag($title,$head_extra,$args).&endheadtag(); |
} |
} |
|
|
=pod |
=pod |
Line 3071 Inputs: $title - optional title for the
|
Line 3079 Inputs: $title - optional title for the
|
bgcolor -> override the default page bg color |
bgcolor -> override the default page bg color |
js_ready -> return a string ready for being used in |
js_ready -> return a string ready for being used in |
a javascript writeln |
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() |
force_register -> if is true will turn on the &bodytag() |
$forcereg arg |
$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 |
=back |
|
|
Line 3080 Inputs: $title - optional title for the
|
Line 3093 Inputs: $title - optional title for the
|
|
|
sub start_page { |
sub start_page { |
my ($title,$head_extra,$args) = @_; |
my ($title,$head_extra,$args) = @_; |
|
#&Apache::lonnet::logthis("start_page ".join(':',caller(0))); |
my %head_args; |
my %head_args; |
if (defined($args->{'redirect'})) { |
foreach my $arg ('redirect','force_register') { |
$head_args{'redirect'} = $args->{'redirect'}; |
if (defined($args->{$arg})) { |
|
$head_args{$arg} = $args->{$arg}; |
|
} |
} |
} |
|
|
$env{'internal.start_page'}++; |
$env{'internal.start_page'}++; |
my $result = |
my $result = |
&Apache::lonxml::xmlbegin(). |
&Apache::lonxml::xmlbegin(). |
Line 3091 sub start_page {
|
Line 3108 sub start_page {
|
&bodytag($title, |
&bodytag($title, |
$args->{'function'}, $args->{'add_entries'}, |
$args->{'function'}, $args->{'add_entries'}, |
$args->{'only_body'}, $args->{'domain'}, |
$args->{'only_body'}, $args->{'domain'}, |
$args->{'force_register'}, undef, |
$args->{'force_register'}, $args->{'body_title'}, |
$args->{'no_nav_bar'}, $args->{'bgcolor'}); |
$args->{'no_nav_bar'}, $args->{'bgcolor'}); |
if ($args->{'js_ready'}) { |
if ($args->{'js_ready'}) { |
$result = &js_ready($result); |
$result = &js_ready($result); |
} |
} |
|
if ($args->{'html_encode'}) { |
|
$result = &html_encode($result); |
|
} |
return $result; |
return $result; |
} |
} |
|
|
Line 3110 Returns a complete </body></html> sectio
|
Line 3130 Returns a complete </body></html> sectio
|
Inputs: $args - additional optional args supported are: |
Inputs: $args - additional optional args supported are: |
js_ready -> return a string ready for being used in |
js_ready -> return a string ready for being used in |
a javascript writeln |
a javascript writeln |
|
html_encode -> return a string ready for being used in |
|
a html attribute |
=back |
=back |
|
|
=cut |
=cut |
|
|
sub end_page { |
sub end_page { |
my ($args) = @_; |
my ($args) = @_; |
|
#&Apache::lonnet::logthis("end_page ".join(':',caller(0))); |
$env{'internal.end_page'}++; |
$env{'internal.end_page'}++; |
my $result = &endbodytag()."\n</html>"; |
my $result = &endbodytag()."\n</html>"; |
if ($args->{'js_ready'}) { |
if ($args->{'js_ready'}) { |
$result = &js_ready($result); |
$result = &js_ready($result); |
} |
} |
|
if ($args->{'html_encode'}) { |
|
$result = &html_encode($result); |
|
} |
return $result; |
return $result; |
} |
} |
|
|
sub js_ready { |
sub html_encode { |
my ($result) = @_; |
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/[\n\r]/ /xmsg; |
$result =~ s/'/\\'/g; |
$result =~ s/\\/\\\\/xmsg; |
|
$result =~ s/'/\\'/xmsg; |
|
$result =~ s{</script>}{</scrip'+'t>}xmsg; |
|
|
return $result; |
return $result; |
} |
} |
Line 3138 sub validate_page {
|
Line 3172 sub validate_page {
|
if ( exists($env{'internal.start_page'}) |
if ( exists($env{'internal.start_page'}) |
&& $env{'internal.start_page'} > 1) { |
&& $env{'internal.start_page'} > 1) { |
&Apache::lonnet::logthis('start_page called multiple times '. |
&Apache::lonnet::logthis('start_page called multiple times '. |
|
$env{'internal.start_page'}.' '. |
$ENV{'request.filename'}); |
$ENV{'request.filename'}); |
} |
} |
if ( exists($env{'internal.end_page'}) |
if ( exists($env{'internal.end_page'}) |
&& $env{'internal.end_page'} > 1) { |
&& $env{'internal.end_page'} > 1) { |
&Apache::lonnet::logthis('end_page called multiple times '. |
&Apache::lonnet::logthis('end_page called multiple times '. |
|
$env{'internal.end_page'}.' '. |
$env{'request.filename'}); |
$env{'request.filename'}); |
} |
} |
if ( exists($env{'internal.start_page'}) |
if ( exists($env{'internal.start_page'}) |
Line 3157 sub validate_page {
|
Line 3193 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; |
|
} |
|
return $page; |
|
} |
############################################### |
############################################### |
|
|
=pod |
=pod |
Line 3641 sub get_posted_cgi {
|
Line 3689 sub get_posted_cgi {
|
} |
} |
} |
} |
} |
} |
|
# |
|
# Digested POSTed values |
|
# |
|
# Remember the way this was originally done (GET or POST) |
|
# |
$env{'request.method'}=$ENV{'REQUEST_METHOD'}; |
$env{'request.method'}=$ENV{'REQUEST_METHOD'}; |
$r->method_number(M_GET); |
# |
|
# There may also be stuff in the query string |
|
# Tell subsequent handlers that this was GET, not POST, so they can access query string. |
|
# Also, unset POSTed content length to cover all tracks. |
|
# |
|
|
|
# This does not work, because M_GET is not defined (if it's defined, it is just 0). |
|
# Commenting out for now ... not sure if harm is done. |
|
# $r->method_number(M_GET); |
|
|
$r->method('GET'); |
$r->method('GET'); |
$r->headers_in->unset('Content-length'); |
$r->headers_in->unset('Content-length'); |
} |
} |