mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/10073] Split email validation from email ban and taken checks

Browse Source 
PHPBB3-10073
This commit is contained in:
Joas Schilling
2014-05-05 16:59:55 +02:00
parent f01e0a2eef
commit 911725a581
6 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View File

@@ -814,7 +814,7 @@ class acp_users
$check_ary += array(
'email' => array(
array('string', false, 6, 60),
array('email', $user_row['user_email'])
array('user_email', $user_row['user_email']),
),
);
}

45
phpBB/includes/functions_user.php
View File

@@ -1746,24 +1746,20 @@ function validate_password($password)
}
/**
* Check to see if email address is banned or already present in the DB
* Check to see if email address is a valid address and contains a MX record
*
* @param string $email The email to check
* @param string $allowed_email An allowed email, default being $user->data['user_email']
*
* @return mixed Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
*/
function validate_email($email, $allowed_email = false)
function phpbb_validate_email($email, $config = null)
{
global $config, $db, $user;
if ($config === null)
{
global $config;
}
$email = strtolower($email);
$allowed_email = ($allowed_email === false) ? strtolower($user->data['user_email']) : strtolower($allowed_email);
if ($allowed_email == $email)
{
return false;
}
if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email))
{
@@ -1782,6 +1778,35 @@ function validate_email($email, $allowed_email = false)
}
}
return false;
}
/**
* Check to see if email address is banned or already present in the DB
*
* @param string $email The email to check
* @param string $allowed_email An allowed email, default being $user->data['user_email']
*
* @return mixed Either false if validation succeeded or a string which will be used as the error message (with the variable name appended)
*/
function validate_user_email($email, $allowed_email = false)
{
global $config, $db, $user;
$email = strtolower($email);
$allowed_email = ($allowed_email === false) ? strtolower($user->data['user_email']) : strtolower($allowed_email);
if ($allowed_email == $email)
{
return false;
}
$validate_email = phpbb_validate_email($email, $config);
if ($validate_email)
{
return $validate_email;
}
if (($ban_reason = $user->check_ban(false, false, $email, true)) !== false)
{
return ($ban_reason === true) ? 'EMAIL_BANNED' : $ban_reason;

2
phpBB/includes/ucp/ucp_profile.php
View File

@@ -66,7 +66,7 @@ class ucp_profile
'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
'email' => array(
array('string', false, 6, 60),
array('email')),
array('user_email')),
);
if ($auth->acl_get('u_chgname') && $config['allow_namechange'])

2
phpBB/includes/ucp/ucp_register.php
View File

@@ -211,7 +211,7 @@ class ucp_register
'password_confirm' => array('string', false, $config['min_pass_chars'], $config['max_pass_chars']),
'email' => array(
array('string', false, 6, 60),
array('email')),
array('user_email')),
'tz' => array('timezone'),
'lang' => array('language_iso_name'),
));