makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10073] Use phpbb_validate_email to verify email address

Browse source 
PHPBB3-10073
This commit is contained in:
Joas Schilling 2014-05-05 17:01:13 +02:00
parent 0108e19d21
commit 427d70d138
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/phpbb/message/admin_form.php
View file

@ -101,9 +101,27 @@ class admin_form extends form
{ {
$this->errors[] = $this->user->lang['EMPTY_SENDER_NAME']; $this->errors[] = $this->user->lang['EMPTY_SENDER_NAME'];
} }
if (!$this->sender_address || !preg_match('/^' . get_preg_expression('email') . '$/i', $this->sender_address))
if (!function_exists('validate_data'))
{ {
$this->errors[] = $this->user->lang['EMPTY_SENDER_EMAIL']; require($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
}
$validate_array = validate_data(
array(
'email' => $this->sender_address,
),
array(
'email' => array(
array('string', false, 6, 60),
array('email'),
),
)
);
foreach ($validate_array as $error)
{
$this->errors[] = $this->user->lang[$error];
} }
$this->message->set_sender($this->user->ip, $this->sender_name, $this->sender_address, $this->user->lang_name); $this->message->set_sender($this->user->ip, $this->sender_name, $this->sender_address, $this->user->lang_name);