--- loncom/auth/lonlogout.pm 2006/04/05 22:28:58 1.17
+++ loncom/auth/lonlogout.pm 2007/01/12 15:54:12 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Logout Handler
#
-# $Id: lonlogout.pm,v 1.17 2006/04/05 22:28:58 albertel Exp $
+# $Id: lonlogout.pm,v 1.24 2007/01/12 15:54:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -49,8 +49,7 @@ sub handler {
}
#check if cookie still valid
- my $handle=$lonid->value;
- $handle=~s/\W//g;
+ my $handle=&LONCAPA::clean_handle($lonid->value);
my $lonidsdir=$r->dir_config('lonIDsDir');
if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {
$r->log_reason("Cookie $handle not valid", $r->filename);
@@ -59,23 +58,13 @@ sub handler {
#we've got a valid user
my @profile;
- my %sessionhash;
- {
- my $idf=Apache::File->new("$lonidsdir/$handle.id");
- @profile=<$idf>;
- }
- my $envi;
- for ($envi=0;$envi<=$#profile;$envi++) {
- chomp($profile[$envi]);
- my ($envname,$envvalue)=split(/=/,$profile[$envi]);
- $sessionhash{$envname}=$envvalue;
- }
+ &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
unlink("$lonidsdir/$handle.id");
my %temp=('logout' => time);
&Apache::lonnet::put('email_status',\%temp);
- &Apache::lonnet::log($sessionhash{'user.domain'},
- $sessionhash{'user.name'},
- $sessionhash{'user.home'},
+ &Apache::lonnet::log($env{'user.domain'},
+ $env{'user.name'},
+ $env{'user.home'},
"Logout $ENV{'REMOTE_ADDR'}");
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
@@ -87,7 +76,7 @@ sub handler {
# ---------------------------------------------------------------- Get handover
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
my $switch='';
- my $bodytag='';
+ my $start_page='';
my $relogmessage='';
if ($env{'form.handover'}) {
$switch='$lt{'cw'} $lt{'or'}
- $lt{'li'}.
+ $lt{'li'}.
ENDRELOG
+
+ if ($env{'request.sso.login'}
+ && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
+ open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
+ $relogmessage.= join('',<$fh>);
+ }
+
}
- $end_page=&Apache::loncommon::end_page();
+ my $end_page=&Apache::loncommon::end_page();
# --------------------------------------------------------------- Screen Output
$r->print(<