1 files changed, 42 insertions, 18 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 3dcb32350e..5a10f9f411 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -184,7 +184,6 @@ function user_add($user_row, $cp_data = false)
 		'username'			=> $user_row['username'],
 		'username_clean'	=> $username_clean,
 		'user_password'		=> (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
-		'user_pass_convert'	=> 0,
 		'user_email'		=> strtolower($user_row['user_email']),
 		'user_email_hash'	=> phpbb_email_hash($user_row['user_email']),
 		'group_id'			=> $user_row['group_id'],
@@ -756,7 +755,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 		else
 		{
 			$ban_other = explode('-', $ban_len_other);
-			if (sizeof($ban_other) == 3 && ((int)$ban_other[0] < 9999) &&
+			if (sizeof($ban_other) == 3 && ((int) $ban_other[0] < 9999) &&
 				(strlen($ban_other[0]) == 4) && (strlen($ban_other[1]) == 2) && (strlen($ban_other[2]) == 2))
 			{
 				$ban_end = max($current_time, $user->create_datetime()
@@ -1746,25 +1745,21 @@ 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;
-
-	$email = strtolower($email);
-	$allowed_email = ($allowed_email === false) ? strtolower($user->data['user_email']) : strtolower($allowed_email);
-
-	if ($allowed_email == $email)
+	if ($config === null)
 	{
-		return false;
+		global $config;
 	}
 
+	$email = strtolower($email);
+
 	if (!preg_match('/^' . get_preg_expression('email') . '$/i', $email))
 	{
 		return 'EMAIL_INVALID';
@@ -1782,6 +1777,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;
@@ -2062,7 +2086,7 @@ function avatar_delete($mode, $row, $clean_db = false)
 	// Check if the users avatar is actually *not* a group avatar
 	if ($mode == 'user')
 	{
-		if (strpos($row['user_avatar'], 'g') === 0 || (((int)$row['user_avatar'] !== 0) && ((int)$row['user_avatar'] !== (int)$row['user_id'])))
+		if (strpos($row['user_avatar'], 'g') === 0 || (((int) $row['user_avatar'] !== 0) && ((int) $row['user_avatar'] !== (int) $row['user_id'])))
 		{
 			return false;
 		}
@@ -2395,7 +2419,7 @@ function group_correct_avatar($group_id, $old_entry)
 {
 	global $config, $db, $phpbb_root_path;
 
-	$group_id		= (int)$group_id;
+	$group_id		= (int) $group_id;
 	$ext 			= substr(strrchr($old_entry, '.'), 1);
 	$old_filename 	= get_avatar_filename($old_entry);
 	$new_filename 	= $config['avatar_salt'] . "_g$group_id.$ext";
@@ -2820,7 +2844,7 @@ function remove_default_avatar($group_id, $user_ids)
 
 	$sql = 'SELECT *
 		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
+		WHERE group_id = ' . (int) $group_id;
 	$result = $db->sql_query($sql);
 	if (!$row = $db->sql_fetchrow($result))
 	{
@@ -2861,7 +2885,7 @@ function remove_default_rank($group_id, $user_ids)
 
 	$sql = 'SELECT *
 		FROM ' . GROUPS_TABLE . '
-		WHERE group_id = ' . (int)$group_id;
+		WHERE group_id = ' . (int) $group_id;
 	$result = $db->sql_query($sql);
 	if (!$row = $db->sql_fetchrow($result))
 	{
@@ -2872,9 +2896,9 @@ function remove_default_rank($group_id, $user_ids)
 
 	$sql = 'UPDATE ' . USERS_TABLE . '
 		SET user_rank = 0
-		WHERE group_id = ' . (int)$group_id . '
+		WHERE group_id = ' . (int) $group_id . '
 			AND user_rank <> 0
-			AND user_rank = ' . (int)$row['group_rank'] . '
+			AND user_rank = ' . (int) $row['group_rank'] . '
 			AND ' . $db->sql_in_set('user_id', $user_ids);
 	$db->sql_query($sql);
 }