cvs: pear /Perm_LiveUser LiveUser.php

lsmith Wed Oct 27 06:46:12 2004 EDT Modified files: /pear/Perm_LiveUser LiveUser.php Log: - cosmetic fixes - fixed regenid option http://cvs.php.net/diff.php/pear/Perm_LiveUser/LiveUser.php?r1=1.133&r2=1.134&ty=u Index: pear/Perm_LiveUser/LiveUser.php diff -u pear/Perm_LiveUser/LiveUser.php:1.133 pear/Perm_LiveUser/LiveUser.php:1.134 --- pear/Perm_LiveUser/LiveUser.php:1.133 Sun Oct 24 13:34:33 2004 +++ pear/Perm_LiveUser/LiveUser.php Wed Oct 27 06:46:11 2004 @@ -118,7 +118,7 @@ * @author Lukas Smith <smith@backendmedia.com> * @author Pierre-Alain Joye <pajoye@php.net> * @author Arnaud Limbourg <arnaud@php.net> - * @version $Id: LiveUser.php,v 1.133 2004/10/24 17:34:33 arnaud Exp $ + * @version $Id: LiveUser.php,v 1.134 2004/10/27 10:46:11 lsmith Exp $ * @package LiveUser */ class LiveUser @@ -821,7 +821,7 @@ function init($handle = '', $passwd = '', $logout = false, $remember = false) { // set session save handler if needed - if ($this->_options['session_save_handler'] == true) { + if ($this->_options['session_save_handler']) { session_set_save_handler( $this->_options['session_save_handler']['open'], $this->_options['session_save_handler']['close'], @@ -884,6 +884,9 @@ // Return boolean that indicates whether a auth object has been created // or retrieved from session if ($lulogin) { + if ($this->_options['login']['regenid']) { + session_regenerate_id(); + } return true; } @@ -1051,9 +1054,6 @@ $auth->login($this->_handle, $this->_passwd, true); if ($auth->loggedIn) { - if ($this->_options['login']['regenid'] == true && !$this->_options['session_save_handler']) { - @session_regenerate_id(); - } $this->status = LIVEUSER_STATUS_OK; $userFound = true; $this->_auth = $auth; @@ -1405,11 +1405,11 @@ } // If the session should be destroyed, do so now... - if ($this->_options['logout']['destroy'] == true) { + if ($this->_options['logout']['destroy']) { session_unset(); - @session_destroy(); + session_destroy(); // set session save handler if needed - if ($this->_options['session_save_handler'] == true) { + if ($this->_options['session_save_handler']) { session_set_save_handler( $this->_options['session_save_handler']['open'], $this->_options['session_save_handler']['close'],