diff --git a/src/mibew/libs/classes/Mibew/Controller/Chat/MailController.php b/src/mibew/libs/classes/Mibew/Controller/Chat/MailController.php index 9d11df86..877c74b9 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Chat/MailController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Chat/MailController.php @@ -96,7 +96,7 @@ class MailController extends AbstractController $group = is_null($thread->groupId) ? null : group_by_id($thread->groupId); if (!$email) { $errors[] = no_field('Your email'); - } elseif (!is_valid_email($email)) { + } elseif (!MailUtils::isValidAddress($email)) { $errors[] = wrong_field('Your email'); } diff --git a/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php b/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php index 9ee24ba5..a923decc 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Group/SettingsController.php @@ -20,6 +20,7 @@ namespace Mibew\Controller\Group; use Mibew\Http\Exception\NotFoundException; +use Mibew\Mail\Utils as MailUtils; use Symfony\Component\HttpFoundation\Request; /** @@ -136,7 +137,7 @@ class SettingsController extends AbstractController $errors[] = no_field("Name"); } - if ($email != '' && !is_valid_email($email)) { + if ($email != '' && !MailUtils::isValidAddress($email)) { $errors[] = wrong_field("E-mail"); } diff --git a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php index 99276798..a2f39b01 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Operator/ProfileController.php @@ -20,6 +20,7 @@ namespace Mibew\Controller\Operator; use Mibew\Http\Exception\NotFoundException; +use Mibew\Mail\Utils as MailUtils; use Symfony\Component\HttpFoundation\Request; /** @@ -147,7 +148,7 @@ class ProfileController extends AbstractController } } - if (!$email || !is_valid_email($email)) { + if (!$email || !MailUtils::isValidAddress($email)) { $errors[] = wrong_field('E-mail'); } diff --git a/src/mibew/libs/classes/Mibew/Controller/PasswordRecoveryController.php b/src/mibew/libs/classes/Mibew/Controller/PasswordRecoveryController.php index f441b182..80689989 100644 --- a/src/mibew/libs/classes/Mibew/Controller/PasswordRecoveryController.php +++ b/src/mibew/libs/classes/Mibew/Controller/PasswordRecoveryController.php @@ -56,7 +56,7 @@ class PasswordRecoveryController extends AbstractController if ($request->request->has('loginoremail')) { $login_or_email = $request->request->get('loginoremail'); - $to_restore = is_valid_email($login_or_email) + $to_restore = MailUtils::isValidAddress($login_or_email) ? operator_by_email($login_or_email) : operator_by_login($login_or_email); if (!$to_restore) { @@ -64,7 +64,7 @@ class PasswordRecoveryController extends AbstractController } $email = $to_restore['vcemail']; - if (count($page['errors']) == 0 && !is_valid_email($email)) { + if (count($page['errors']) == 0 && !MailUtils::isValidAddress($email)) { $page['errors'][] = "Operator hasn't set his e-mail"; } diff --git a/src/mibew/libs/classes/Mibew/Controller/Settings/CommonController.php b/src/mibew/libs/classes/Mibew/Controller/Settings/CommonController.php index c6f1a217..06d160c1 100644 --- a/src/mibew/libs/classes/Mibew/Controller/Settings/CommonController.php +++ b/src/mibew/libs/classes/Mibew/Controller/Settings/CommonController.php @@ -20,6 +20,7 @@ namespace Mibew\Controller\Settings; use Mibew\Http\Exception\BadRequestException; +use Mibew\Mail\Utils as MailUtils; use Mibew\Settings; use Mibew\Style\ChatStyle; use Mibew\Style\InvitationStyle; @@ -153,7 +154,7 @@ class CommonController extends AbstractController $params['left_messages_locale'] = get_home_locale(); } - if ($params['email'] && !is_valid_email($params['email'])) { + if ($params['email'] && !MailUtils::isValidAddress($params['email'])) { $errors[] = getlocal('Enter a valid email address'); } diff --git a/src/mibew/libs/classes/Mibew/Mail/Utils.php b/src/mibew/libs/classes/Mibew/Mail/Utils.php index e1f9339c..91b505c0 100644 --- a/src/mibew/libs/classes/Mibew/Mail/Utils.php +++ b/src/mibew/libs/classes/Mibew/Mail/Utils.php @@ -26,6 +26,17 @@ use Symfony\Component\Yaml\Parser as YamlParser; */ class Utils { + /** + * Checks if the passed in e-mail address is valid. + * + * @param string $address E-mail address to check. + * @return boolean + */ + public static function isValidAddress($address) + { + return (bool)filter_var($address, FILTER_VALIDATE_EMAIL); + } + /** * Builds an instance of \Swift_message. * diff --git a/src/mibew/libs/classes/Mibew/RequestProcessor/ThreadProcessor.php b/src/mibew/libs/classes/Mibew/RequestProcessor/ThreadProcessor.php index dc2fed35..26b5b396 100644 --- a/src/mibew/libs/classes/Mibew/RequestProcessor/ThreadProcessor.php +++ b/src/mibew/libs/classes/Mibew/RequestProcessor/ThreadProcessor.php @@ -744,7 +744,7 @@ class ThreadProcessor extends ClientSideProcessor implements $info = $args['info']; $referrer = $args['referrer']; - if (!is_valid_email($email)) { + if (!MailUtils::isValidAddress($email)) { throw new ThreadProcessorException( wrong_field("Your email"), ThreadProcessorException::ERROR_WRONG_EMAIL diff --git a/src/mibew/libs/common/verification.php b/src/mibew/libs/common/verification.php index cdd18053..43563f8f 100644 --- a/src/mibew/libs/common/verification.php +++ b/src/mibew/libs/common/verification.php @@ -37,8 +37,3 @@ function verify_param($name, $reg_exp, $default = null) echo "Wrong parameter used or absent: " . $name . ""; exit; } - -function is_valid_email($email) -{ - return (bool)filter_var($email, FILTER_VALIDATE_EMAIL); -}