tweet_live: comparison web/lib/Zend/Validate/EmailAddress.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Validate
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: EmailAddress.php 25057 2012-11-02 20:35:40Z rob $
+* @version    $Id$
 */
 /**
 * @see Zend_Validate_Abstract
 */
 require_once 'Zend/Validate/Hostname.php';
 /**
 * @category   Zend
 * @package    Zend_Validate
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
 {
 const INVALID            = 'emailAddressInvalid';
 * 'hostname' => A hostname validator, see Zend_Validate_Hostname
 * 'allow'    => Options for the hostname validator, see Zend_Validate_Hostname::ALLOW_*
 * 'mx'       => If MX check should be enabled, boolean
 * 'deep'     => If a deep MX check should be done, boolean
 *
-* @param array|Zend_Config $options OPTIONAL
+* @param array|string|Zend_Config $options OPTIONAL
-* @return void
 */
 public function __construct($options = array())
 {
 if ($options instanceof Zend_Config) {
 $options = $options->toArray();
 /**
 * Set options for the email validator
 *
 * @param array $options
-* @return Zend_Validate_EmailAddress fluid interface
+* @return Zend_Validate_EmailAddress Provides a fluent inteface
 */
 public function setOptions(array $options = array())
 {
 if (array_key_exists('messages', $options)) {
 $this->setMessages($options['messages']);
 }
 /**
 * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
 * @param int                    $allow             OPTIONAL
-* @return void
+* @return $this
 */
 public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
 {
 if (!$hostnameValidator) {
 $hostnameValidator = new Zend_Validate_Hostname($allow);
 * Set whether we check for a valid MX record via DNS
 *
 * This only applies when DNS hostnames are validated
 *
 * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them
-* @return Zend_Validate_EmailAddress Fluid Interface
+* @throws Zend_Validate_Exception
+* @return Zend_Validate_EmailAddress Provides a fluent inteface
 */
 public function setValidateMx($mx)
 {
 if ((bool) $mx && !$this->validateMxSupported()) {
 require_once 'Zend/Validate/Exception.php';
 /**
 * Set whether we check MX record should be a deep validation
 *
 * @param boolean $deep Set deep to true to perform a deep validation process for MX records
-* @return Zend_Validate_EmailAddress Fluid Interface
+* @return Zend_Validate_EmailAddress Provides a fluent inteface
 */
 public function setDeepMxCheck($deep)
 {
 $this->_options['deep'] = (bool) $deep;
 return $this;
 /**
 * Sets if the domain should also be checked
 * or only the local part of the email address
 *
 * @param boolean $domain
-* @return Zend_Validate_EmailAddress Fluid Interface
+* @return Zend_Validate_EmailAddress Provides a fluent inteface
 */
 public function setDomainCheck($domain = true)
 {
 $this->_options['domain'] = (boolean) $domain;
 return $this;
 //        "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~"
 $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e';
 if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) {
 $result = true;
 } else {
-// Try quoted string format
+// Try quoted string format (RFC 5321 Chapter 4.1.2)
-// Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE
+// Quoted-string characters are: DQUOTE *(qtext/quoted-pair) DQUOTE
-// qtext: Non white space controls, and the rest of the US-ASCII characters not
+$qtext      = '\x20-\x21\x23-\x5b\x5d-\x7e'; // %d32-33 / %d35-91 / %d93-126
-//   including "\" or the quote character
+$quotedPair = '\x20-\x7e'; // %d92 %d32-126
-$noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f';
+if (preg_match('/^"(['. $qtext .']|\x5c[' . $quotedPair . '])*"$/', $this->localPart)) {
-$qtext   = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e';
-$ws      = '\x20\x09';
-if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) {
 $result = true;
 } else {
 $this->_error(self::DOT_ATOM);
 $this->_error(self::QUOTED_STRING);
 $this->_error(self::INVALID_LOCAL_PART);
 * @return boolean
 */
 private function _validateMXRecords()
 {
 $mxHosts = array();
-$result = getmxrr($this->_hostname, $mxHosts);
+$hostname = $this->_hostname;
+//decode IDN domain name if possible
+if (function_exists('idn_to_ascii')) {
+$hostname = idn_to_ascii($this->_hostname);
+}
+$result = getmxrr($hostname, $mxHosts);
 if (!$result) {
 $this->_error(self::INVALID_MX_RECORD);
 } else if ($this->_options['deep'] && function_exists('checkdnsrr')) {
 $validAddress = false;
 $reserved     = true;

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd