--- loncom/auth/lonlogout.pm	2003/09/17 23:50:18	1.11
+++ loncom/auth/lonlogout.pm	2005/09/20 07:33:54	1.15
@@ -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.15 2005/09/20 07:33:54 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,20 +67,21 @@ 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='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.
-	   $ENV{'form.handover'}.'">';
+	   $env{'form.handover'}.'">';
        $bodytag=&Apache::loncommon::bodytag('Switching Server ...');
    } else {
        $bodytag=&Apache::loncommon::bodytag('Logged Out');
@@ -96,7 +93,7 @@ sub handler {
        $relogmessage=(<<ENDRELOG);
 <h1>$lt{'gb'}!</h1>
     $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}
-<a href="/adm/login">$lt{'li'}</a>.
+<a href="/adm/login?domain=$sessionhash{'user.domain'}">$lt{'li'}</a>.
 ENDRELOG
    }
 # --------------------------------------------------------------- Screen Output