--- loncom/auth/lonlogout.pm 2006/04/05 22:28:58 1.17
+++ loncom/auth/lonlogout.pm 2007/10/02 01:09:59 1.29
@@ -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.29 2007/10/02 01:09:59 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,43 +41,33 @@ 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=$lonid->value;
- $handle=~s/\W//g;
- 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
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;
- }
+ my $lonidsdir=$r->dir_config('lonIDsDir');
+ &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');
+
+ #expire the cookie
+ my $c = new CGI::Cookie(-name => 'lonID',
+ -value => '',
+ -expires => '-10y',);
+ $r->header_out('Set-cookie' => $c);
+
$r->send_http_header;
return OK if $r->header_only;
# -------------------------------------------------------- Menu script and info
@@ -87,7 +77,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
+
+ }
+ my $domain = $env{'user.domain'};
+ if ($env{'request.sso.login'}
+ && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
+ open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));
+ $relogmessage.= join('',<$fh>);
+ }
+ 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(<register_cleanup(\&flush_course_logs);
return OK;
}
+sub flush_course_logs {
+ &Apache::lonnet::flushcourselogs();
+ return OK;
+}
+
1;
__END__