--- loncom/auth/lonlogout.pm	2012/01/08 23:35:22	1.42.2.3
+++ loncom/auth/lonlogout.pm	2011/10/22 23:53:46	1.43
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.42.2.3 2012/01/08 23:35:22 raeburn Exp $
+# $Id: lonlogout.pm,v 1.43 2011/10/22 23:53:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,8 +89,6 @@ sub handler {
     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='';
@@ -103,8 +101,7 @@ sub handler {
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-                           {'no_inline_link' => 1,
-                            'no_nav_bar'     => 1,});
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -120,21 +117,11 @@ sub handler {
                      $login_url = $domdefaults{'portal_def'};
                  } else {
                      my $checkloginvia = 1;
-                     my ($lonhost,$server,$path,$isredirect) = 
+                     my ($lonhost,$server,$path) = 
                          &Apache::lonnet::choose_server($domain,$checkloginvia);
                      if ($server && $lonhost) {
                          $login_url = $Apache::lonnet::protocol{$lonhost}.
                                       '://'.$server.$path;
-                         if (($path eq '') && (!$isredirect)) {
-                             my $serverhomeID =
-                                 &Apache::lonnet::get_server_homeID($lonhost);
-                             my $serverhomedom =
-                                 &Apache::lonnet::host_domain($serverhomeID);
-                             if ($serverhomedom ne $domain) {
-                                 $path = '/adm/login';
-                                 $login_url .= $path;
-                             }
-                         }
                          if ($path eq '/adm/login' && $domain ne '') {
                              $login_url .= '?domain='.$domain;
                          }
@@ -178,7 +165,6 @@ Due to security reasons in new web brows
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT