--- loncom/auth/lonlogout.pm 2003/09/17 23:50:18 1.11
+++ loncom/auth/lonlogout.pm 2006/04/05 22:25:44 1.16
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Logout Handler
#
-# $Id: lonlogout.pm,v 1.11 2003/09/17 23:50:18 www Exp $
+# $Id: lonlogout.pm,v 1.16 2006/04/05 22:25:44 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,10 +25,6 @@
#
# http://www.lon-capa.org/
#
-# (Cookie Based Access Handler
-# 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,
-# 01/06,01/13 Gerd Kortemeyer)
-# 05/31,11/29,12/29 Gerd Kortemeyer
package Apache::lonlogout;
@@ -71,23 +67,25 @@ sub handler {
$sessionhash{'user.name'},
$sessionhash{'user.home'},
"Logout $ENV{'REMOTE_ADDR'}");
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
# -------------------------------------------------------- Menu script and info
my $windowinfo=&Apache::lonmenu::close();
+ $windowinfo.=&Apache::lonnavmaps::close();
# ---------------------------------------------------------------- Get handover
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
my $switch='';
my $bodytag='';
my $relogmessage='';
- if ($ENV{'form.handover'}) {
+ if ($env{'form.handover'}) {
$switch='';
- $bodytag=&Apache::loncommon::bodytag('Switching Server ...');
+ $env{'form.handover'}.'">';
+ $start_page=&Apache::loncommon::start_page('Switching Server ...',
+ $switch);
} else {
- $bodytag=&Apache::loncommon::bodytag('Logged Out');
+ $start_page=&Apache::loncommon::start_page('Logged Out');
my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye',
'cw' => 'close this window',
'li' => 'log in again',
@@ -96,20 +94,16 @@ sub handler {
$relogmessage=(<$lt{'gb'}!
$lt{'pe'} $lt{'cw'} $lt{'or'}
-$lt{'li'}.
+$lt{'li'}.
ENDRELOG
}
+ $end_page=&Apache::loncommon::end_page();
# --------------------------------------------------------------- Screen Output
$r->print(<
-The LearningOnline Network with CAPA Logout
-$switch
-
-$bodytag
+$start_page
$windowinfo
$relogmessage
-
-