--- loncom/auth/lonlogout.pm 2007/10/01 20:36:37 1.28 +++ 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.28 2007/10/01 20:36:37 albertel Exp $ +# $Id: lonlogout.pm,v 1.42.2.1 2011/10/02 12:09:57 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; @@ -41,23 +54,20 @@ sub handler { #Check for cookie my $requrl=$r->uri; - my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); - my $lonid=$cookies{'lonID'}; - my $cookie; - if (!$lonid) { - return FORBIDDEN; - } - + my $handle = &Apache::lonnet::check_for_valid_session($r); #check if cookie still valid - my $handle=&LONCAPA::clean_handle($lonid->value); - my $lonidsdir=$r->dir_config('lonIDsDir'); - if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) { + if ($handle eq '') { $r->log_reason("Cookie $handle not valid", $r->filename); return FORBIDDEN; } #we've got a valid user + #any locks in place? + my $locknum=&Apache::lonnet::get_locks(); + if ($locknum) { return 409; } + #nope, go ahead my @profile; + my $lonidsdir=$r->dir_config('lonIDsDir'); &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle); unlink("$lonidsdir/$handle.id"); my %temp=('logout' => time); @@ -88,37 +98,57 @@ sub handler { my $relogmessage=''; if ($env{'form.handover'}) { $switch=''; + $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,}); - my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye', - 'cw' => 'close this window', - 'li' => 'log in again', - 'pe' => 'Please either', - 'or' => 'or'); + {'no_inline_link' => 1, + 'no_nav_bar' => 1,}); - $relogmessage.=(<$lt{'gb'}! -ENDRELOG + $relogmessage.='

'.&mt('Goodbye').'

' + .'

'.&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'); - - $relogmessage.=(<$lt{'cw'} $lt{'or'} - $lt{'li'}. -ENDRELOG - + } 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.' + ,'','') # ,'','') + .'

'; +=pod + +=head1 NOTES: + +'','' + +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]' + ,'','') + .'

'; } - my $domain = $env{'user.domain'}; if ($env{'request.sso.login'} && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) { open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain")); @@ -153,7 +183,6 @@ __END__ -