--- loncom/interface/loncommon.pm 2006/07/02 12:36:08 1.412
+++ loncom/interface/loncommon.pm 2006/07/03 00:46:00 1.415
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.412 2006/07/02 12:36:08 raeburn Exp $
+# $Id: loncommon.pm,v 1.415 2006/07/03 00:46:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3477,8 +3477,10 @@ Inputs: $title - optional title for 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
+ redirect -> array ref of
+ 1- seconds before redirect occurs
+ 2- url to redirect to
+ 3- whether the side effect should occur
(side effect of setting
$env{'internal.head.redirect'} to the url
redirected too)
@@ -3505,7 +3507,6 @@ sub headtag {
my $result =
''.
- ''.
&font_settings().
&Apache::lonhtmlcommon::htmlareaheaders();
@@ -3514,9 +3515,11 @@ sub headtag {
}
if (ref($args->{'redirect'})) {
- my ($time,$url) = @{$args->{'redirect'}};
+ my ($time,$url,$inhibit_continue) = @{$args->{'redirect'}};
$url = &Apache::lonenc::check_encrypt($url);
- $env{'internal.head.redirect'} = $url;
+ if (!$inhibit_continue) {
+ $env{'internal.head.redirect'} = $url;
+ }
$result.=<
@@ -3526,7 +3529,9 @@ ADDMETA
$title = 'The LearningOnline Network with CAPA';
}
- $result .= ' LON-CAPA '.&mt($title).''.$head_extra;
+ $result .= ' LON-CAPA '.&mt($title).''
+ .''
+ .$head_extra;
return $result;
}