[Phpgroupware-cvs] [20875] Unset sessionid on logout and failed login

[Sigurd Nes]

Revision: 20875
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20875
Author:   sigurdne
Date:     2009-11-21 11:59:18 +0000 (Sat, 21 Nov 2009)
Log Message:
-----------
Unset sessionid on logout and failed login

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php        
2009-11-21 11:57:44 UTC (rev 20874)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/sso/include_login.inc.php        
2009-11-21 11:59:18 UTC (rev 20875)
@@ -106,6 +106,7 @@
                */
                function check_logoutcode($code)
                {
+                       
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
                        switch($code)
                        {
                                case 1:
@@ -119,21 +120,19 @@
                                case 21:
                                        return lang('you had inactive mapping 
to %1 account', phpgw::get_var('phpgw_account', 'string', 'GET', ''));
                                case 22:
-                                       
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
                                        return lang('you seemed to have an 
active session elsewhere for the domain "%1", now set to expired - please try 
again', phpgw::get_var('domain', 'string', 'COOKIE'));
                                case 99:
                                        return lang('Blocked, too many 
attempts');
                                case 10:
-                                       
$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
                                        
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
 
                                        // fix for bug php4 expired sessions bug
                                        
if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php')
                                        {
-                                               
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
+//                                             
$GLOBALS['phpgw']->session->phpgw_setcookie('phpgwsessid');
                                        }
 
                                        return lang('Your session could not be 
verified.');