--- loncom/auth/lonlogout.pm	2006/04/05 22:40:29	1.18
+++ loncom/auth/lonlogout.pm	2009/09/15 00:06:28	1.32.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.18 2006/04/05 22:40:29 albertel Exp $
+# $Id: lonlogout.pm,v 1.32.2.1 2009/09/15 00:06:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,43 +41,37 @@ 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
+    #any locks in place?
+    my $locknum=&Apache::lonnet::get_locks();
+    if ($locknum) { return 409; }
+    #nope, go ahead
     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
@@ -95,17 +89,44 @@ sub handler {
 	$start_page=&Apache::loncommon::start_page('Switching Server ...',
 						   $switch);
     } else {
-	$start_page=&Apache::loncommon::start_page('Logged Out');
-	my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye',
-					   'cw' => 'close this window',
-					   'li' => 'log in again',
-					   'pe' => 'Please either',
-					   'or' => 'or');
-	$relogmessage=(<<ENDRELOG);
-	<h1>$lt{'gb'}!</h1>
-	    $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}
-	<a href="/adm/login?domain=$sessionhash{'user.domain'}">$lt{'li'}</a>.
-ENDRELOG
+	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
+						   {'no_inline_link' => 1,});
+	
+        $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
+                      .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
+
+	if (!$env{'request.sso.norelogin'}) {
+	    my $relogin_server;
+	    if ($env{'request.sso.reloginserver'}) {
+		$relogin_server = $env{'request.sso.reloginserver'};
+	    }
+	    my $login_url = $relogin_server.'/adm/'.
+		($env{'request.sso.login'} ? 'roles': 'login');
+
+            $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>')
+                          .'</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"));
+	    $relogmessage.= join('',<$fh>);
+	}
+	if ($env{'request.sso.login'}
+	    && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
+	    open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
+	    $relogmessage.= join('',<$fh>);
+	}
+
     }
     my $end_page=&Apache::loncommon::end_page();
 # --------------------------------------------------------------- Screen Output
@@ -115,10 +136,15 @@ $windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT
-    &Apache::lonnet::flushcourselogs();
+    $r->register_cleanup(\&flush_course_logs);
     return OK; 
 }
 
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
+}
+
 1;
 __END__