[BUGFIX] email validator

[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Classes / Validation / Validator / EmailAddressValidator.php

diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
index 6b44b08..0953f22 100644 (file)
--- a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
@@ -38,26 +38,16 @@ class Tx_Extbase_Validation_Validator_EmailAddressValidator extends Tx_Extbase_V
         * Checks if the given value is a valid email address.
         * If at least one error occurred, the result is FALSE.
         *
-        * The regexp is a modified version of the last one shown on
-        * http://www.regular-expressions.info/email.html
-        *
         * @param mixed $value The value that should be validated
         * @return boolean TRUE if the value is valid, FALSE if an error occured
         */
        public function isValid($value) {
                $this->errors = array();
-               if (is_string($value) && preg_match('
-                               /^
-                                       [a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*
-                                       @
-                                       (?:
-                                               (?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+(?:[a-z]{2}|aero|asia|biz|cat|com|edu|coop|gov|info|int|invalid|jobs|localdomain|mil|mobi|museum|name|net|org|pro|tel|travel)|
-                                               localhost|
-                                               (?:(?:\d{1,2}|1\d{1,2}|2[0-4][0-9]|25[0-5])\.){3}(?:(?:\d{1,2}|1\d{1,2}|2[0-4][0-9]|25[0-5]))
-                                       )
-                               $/Dix', $value)) {
+
+               if (is_string($value) && t3lib_div::validEmail($value)) {
                        return TRUE;
                }
+
                $this->addError('The given subject was not a valid email address.', 1221559976);
                return FALSE;
        }