--- loncom/auth/lonlogout.pm 2009/09/23 13:20:38 1.37.4.1 +++ loncom/auth/lonlogout.pm 2011/10/02 12:09:57 1.42.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Logout Handler # -# $Id: lonlogout.pm,v 1.37.4.1 2009/09/23 13:20:38 gci Exp $ +# $Id: lonlogout.pm,v 1.42.2.1 2011/10/02 12:09:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -103,19 +103,35 @@ sub handler { $switch); } else { $start_page=&Apache::loncommon::start_page('Logged Out',undef, - {'no_inline_link' => 1,}); + {'no_inline_link' => 1, + 'no_nav_bar' => 1,}); $relogmessage.='
'.&mt('Thank you for using LON-CAPA.').'
'; + 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 ($login_url eq '') { + $login_url = $relogin_server.'/adm/'. + ($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain); + } $relogmessage.=''.&mt('You have been successfully logged out.').' ' .&mt('You can [_1]close this window[_2] now.' ,'','') # ,'','') @@ -129,15 +145,10 @@ sub handler { 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 .= '
'.&mt('[_1]Log in again[_2]' - ,'',''). - (' 'x6).&mt('[_1]Return to WebCenter front page[_2]', - '','') - .'
'; - + $relogmessage.=''.&mt('[_1]Log in again[_2]' + ,'','') + .'
'; } - my $domain = $env{'user.domain'}; if ($env{'request.sso.login'} && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));