--- loncom/auth/lonlogout.pm	2009/09/15 00:06:28	1.32.2.1
+++ loncom/auth/lonlogout.pm	2011/11/19 19:10:34	1.42.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.32.2.1 2009/09/15 00:06:28 raeburn Exp $
+# $Id: lonlogout.pm,v 1.42.2.2 2011/11/19 19:10:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,19 @@
 # http://www.lon-capa.org/
 #
 
+=head1 NAME
+
+Apache::lonlogout
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=cut
+
 package Apache::lonlogout;
 
 use strict;
@@ -85,37 +98,60 @@ sub handler {
     my $relogmessage='';
     if ($env{'form.handover'}) {
 	$switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.
-	    $env{'form.handover'}.'">';
+	    $env{'form.handover'}.'" />';
 	$start_page=&Apache::loncommon::start_page('Switching Server ...',
 						   $switch);
     } else {
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-						   {'no_inline_link' => 1,});
+                           {'no_inline_link' => 1,
+                            'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
 
+        my $domain = $env{'user.domain'};
 	if (!$env{'request.sso.norelogin'}) {
-	    my $relogin_server;
+	    my ($relogin_server,$login_url);
 	    if ($env{'request.sso.reloginserver'}) {
 		$relogin_server = $env{'request.sso.reloginserver'};
-	    }
-	    my $login_url = $relogin_server.'/adm/'.
-		($env{'request.sso.login'} ? 'roles': 'login');
-
+	    } else {
+                 my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
+                 if ($domdefaults{'portal_def'}) {
+                     $login_url = $domdefaults{'portal_def'};
+                 } else {
+                     my $checkloginvia = 1;
+                     my ($lonhost,$server,$path) = 
+                         &Apache::lonnet::choose_server($domain,$checkloginvia);
+                     if ($server && $lonhost) {
+                         $login_url = $Apache::lonnet::protocol{$lonhost}.
+                                      '://'.$server.$path;
+                         if ($path eq '/adm/login' && $domain ne '') {
+                             $login_url .= '?domain='.$domain;
+                         }
+                     }
+                 }
+            }
+            if ($login_url eq '') {
+	        $login_url = $relogin_server.'/adm/'.
+		    ($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain);
+            }
             $relogmessage.='<p>'.&mt('You have been successfully logged out.').' '
                           .&mt('You can [_1]close this window[_2] now.'
-                              ,'','')
-#                              ,'<a href="javascript:self.close();">','</a>');
-# Due to security reasons in new web browsers a window could only be closed with java script, if this window has also been opend with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01)
-                          .'</p>'
-                          .'<p>'.&mt('[_1]Log in again[_2]'
-                              ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>').
-                           ('&nbsp;'x6).&mt('[_1]Return to WebCenter front page[_2]',
-                               '<a href="/">','</a>')
+                              ,'','') # ,'<a href="javascript:self.close();">','</a>')
+                          .'</p>';
+=pod
+
+=head1 NOTES:
+
+'<a href="javascript:self.close();">','</a>'
+
+Due to security reasons in new web browsers a window could only be closed with java script, if this window has also been opend with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01)
+
+=cut
+            $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
+                              ,'<a href="'.$login_url.'">','</a>')
                           .'</p>';
         }
-	my $domain = $env{'user.domain'};
         if ($env{'request.sso.login'}
 	    && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
 	    open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));
@@ -150,7 +186,6 @@ __END__
 
 
 
-