summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2008-10-18 07:41:09 +0000
committerMax Kremmel <xing@synapse.plus.com>2008-10-18 07:41:09 +0000
commitae2a26696c91f8802f5547ab4a119828093bfcd2 (patch)
treef7f5ed35d2caf8ea96df86a35af2f77aa8fb42bb
parente9875d25d47077532cde1174cc1c2372827314f8 (diff)
downloadusers-ae2a26696c91f8802f5547ab4a119828093bfcd2.tar.gz
users-ae2a26696c91f8802f5547ab4a119828093bfcd2.tar.bz2
users-ae2a26696c91f8802f5547ab4a119828093bfcd2.zip
make sure guest and admin @ localhost email addresses can pass through. this allows the installer to store necessary users. should we allow @localhost email addresses by default?
-rw-r--r--BitUser.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/BitUser.php b/BitUser.php
index d78a290..0ffc69d 100644
--- a/BitUser.php
+++ b/BitUser.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.199 2008/10/18 07:08:13 squareing Exp $
+ * $Header: /cvsroot/bitweaver/_bit_users/BitUser.php,v 1.200 2008/10/18 07:41:09 squareing Exp $
*
* Lib for user administration, groups and permissions
* This lib uses pear so the constructor requieres
@@ -12,7 +12,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: BitUser.php,v 1.199 2008/10/18 07:08:13 squareing Exp $
+ * $Id: BitUser.php,v 1.200 2008/10/18 07:41:09 squareing 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.199 $
+ * @version $Revision: 1.200 $
* @package users
* @subpackage BitUser
*/
@@ -353,8 +353,8 @@ class BitUser extends LibertyMime {
$errors = array();
}
- // during install we have root@localhost as email address. we'll ignore that here.
- if( $pEmail == 'root@localhost' ) {
+ // during install we have some <user>@localhost as email address. we won't cause problems on those
+ if( $pEmail == 'root@localhost' || $pEmail == 'guest@localhost' ) {
// nothing to do
} elseif( !validate_email_syntax( $pEmail ) ) {
$errors['email'] = 'The email address "'.$pEmail.'" is invalid.';