[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 21 Mar 2006 21:49:31 -0000
albertel Tue Mar 21 16:49:31 2006 EDT
Modified files:
/loncom/interface loncommon.pm
Log:
- if force_register is used, need to do registerurl in the head
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.318 loncom/interface/loncommon.pm:1.319
--- loncom/interface/loncommon.pm:1.318 Tue Mar 21 16:01:22 2006
+++ loncom/interface/loncommon.pm Tue Mar 21 16:49:30 2006
@@ -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.319 2006/03/21 21:49:30 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2976,6 +2976,9 @@
Inputs: $title - optional title for the head
$head_extra - optional extra HTML to put inside the <head>
$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,7 +2995,11 @@
'<head>'.
&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);
@@ -3082,9 +3089,12 @@
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->{$args};
+ }
}
+
$env{'internal.start_page'}++;
my $result =
&Apache::lonxml::xmlbegin().
@@ -3169,7 +3179,7 @@
&Apache::loncommon::end_page();
if (ref($r)) {
$r->print($page);
- return;
+ return OK;
}
return $page;
}