diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-11-09 19:38:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-11-09 19:38:33 +0100 |
| commit | 4fd2d49461cd871a99a63c51563b8aee3d023abd (patch) | |
| tree | 9741f7f48680d6c18d0aa4dc45ab076c9a144ec2 | |
| parent | 37134fd545ba39804b3f9fb6f51547d422d1e261 (diff) | |
More on #5003
| -rw-r--r-- | system/libraries/Email.php | 18 | ||||
| -rw-r--r-- | system/libraries/Form_validation.php | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 3b1da8de0..948cdb5c2 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1034,10 +1034,13 @@ class CI_Email { */ public function valid_email($email) { - if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) + if (function_exists('idn_to_ascii') && strpos($email, '@')) { - $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003; - $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant); + list($account, $domain) = explode('@', $email, 2); + $domain = is_php('5.4') + ? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) + : idn_to_ascii($domain); + $email = $account.'@'.$domain; } return (bool) filter_var($email, FILTER_VALIDATE_EMAIL); @@ -1852,10 +1855,13 @@ class CI_Email { */ protected function _validate_email_for_shell(&$email) { - if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) + if (function_exists('idn_to_ascii') && strpos($email, '@')) { - $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003; - $email = self::substr($email, 0, ++$atpos).idn_to_ascii(self::substr($email, $atpos), 0, $variant); + list($account, $domain) = explode('@', $email, 2); + $domain = is_php('5.4') + ? idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) + : idn_to_ascii($domain); + $email = $account.'@'.$domain; } return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email)); diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php index cd1d4a759..73fb2dab9 100644 --- a/system/libraries/Form_validation.php +++ b/system/libraries/Form_validation.php @@ -1231,8 +1231,10 @@ class CI_Form_validation { { if (function_exists('idn_to_ascii') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) { - $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : INTL_IDNA_VARIANT_2003; - $str = $matches[1].'@'.idn_to_ascii($matches[2], 0, $variant); + $domain = is_php('5.4') + ? idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46) + : idn_to_ascii($matches[2]); + $str = $matches[1].'@'.$domain; } return (bool) filter_var($str, FILTER_VALIDATE_EMAIL); |