diff options
| -rw-r--r-- | BitUser.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/BitUser.php b/BitUser.php index 1d63ee0..0cbc104 100644 --- a/BitUser.php +++ b/BitUser.php @@ -1,6 +1,6 @@ <?php /** - * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.246 2010/02/04 15:07:35 wjames5 Exp $ + * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.247 2010/02/08 20:24:29 wjames5 Exp $ * * Lib for user administration, groups and permissions * This lib uses pear so the constructor requieres @@ -12,7 +12,7 @@ * All Rights Reserved. See below for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See http://www.gnu.org/copyleft/lesser.html for details * - * $Id: BitUser.php,v 1.246 2010/02/04 15:07:35 wjames5 Exp $ + * $Id: BitUser.php,v 1.247 2010/02/08 20:24:29 wjames5 Exp $ * @package users */ @@ -42,7 +42,7 @@ define( "ACCOUNT_DISABLED", -6 ); * Class that holds all information for a given user * * @author spider <spider@steelsun.com> - * @version $Revision: 1.246 $ + * @version $Revision: 1.247 $ * @package users * @subpackage BitUser */ @@ -292,8 +292,8 @@ class BitUser extends LibertyMime { if( isset( $_REQUEST["password2"] ) && $_REQUEST["password"] != $_REQUEST["password2"] ) { $passwordErrors['password2'] = tra("The passwords didn't match"); } - if (!$this->isValid() || isset($pParamHash['password']) ) { - $passwordErrors['password'] = $this->verifyPasswordFormat( $pParamHash['password'] ); + if( ( !$this->isValid() || isset( $pParamHash['password'] ) ) && $error = $this->verifyPasswordFormat( $pParamHash['password'] ) ) { + $passwordErrors['password'] = $error; } if( !empty( $passwordErrors ) ) { $this->mErrors = array_merge( $this->mErrors,$passwordErrors ); @@ -332,7 +332,7 @@ class BitUser extends LibertyMime { * @param array $pPassword * @param array $pPassword2 * @access public - * @return TRUE on success, FALSE on failure - mErrors will contain reason for failure + * @return FALSE on success, Error string on failure */ function verifyPasswordFormat( $pPassword, $pPassword2=NULL ) { global $gBitSystem; |