--- loncom/auth/lonlogout.pm	2006/04/05 22:25:44	1.16
+++ loncom/auth/lonlogout.pm	2009/03/16 17:07:38	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.16 2006/04/05 22:25:44 albertel Exp $
+# $Id: lonlogout.pm,v 1.37 2009/03/16 17:07:38 bisitz 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;
@@ -39,37 +52,41 @@ use Apache::lonlocal;
 sub handler {
     my $r = shift;
 
+    #Check for cookie
     my $requrl=$r->uri;
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    my $lonid=$cookies{'lonID'};
-    my $cookie;
-    if ($lonid) {
-	my $handle=$lonid->value;
-        $handle=~s/\W//g;
-        my $lonidsdir=$r->dir_config('lonIDsDir');
-        if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
-           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;
-            }
-            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'},
-                                 "Logout $ENV{'REMOTE_ADDR'}");
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            return OK if $r->header_only;
+    my $handle = &Apache::lonnet::check_for_valid_session($r);
+    #check if cookie still valid
+    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);
+    &Apache::lonnet::put('email_status',\%temp);
+    &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
 
     my $windowinfo=&Apache::lonmenu::close();
@@ -77,41 +94,73 @@ 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='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.
-	   $env{'form.handover'}.'">';
-       $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
-   }
-   $end_page=&Apache::loncommon::end_page();
+	$switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.
+	    $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,});
+	
+        $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>')
+                          .'</p>';
+=pod
+
+=head1 NOTES:
+
+'<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)
+
+=cut
+            $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
+                              ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</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
-            $r->print(<<ENDDOCUMENT);
+    $r->print(<<ENDDOCUMENT);
 $start_page
 $windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT
-            &Apache::lonnet::flushcourselogs();
-            return OK; 
-        } else { 
-            $r->log_reason("Cookie $handle not valid", $r->filename); 
-        }
-    }
-    return FORBIDDEN;
+    $r->register_cleanup(\&flush_course_logs);
+    return OK; 
+}
+
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
 }
 
 1;
@@ -119,7 +168,6 @@ __END__
 
 
 
-