Commented out Zend validate calls

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2023-01-23 17:02:45 +01:00
parent cc5a7df6f6
commit 5a64f804ad
2 changed files with 12 additions and 12 deletions

View File

@ -25,13 +25,13 @@
/** /**
* @see Zend_Validate * @see Zend_Validate
*/ */
require_once 'Zend/Validate.php'; //require_once 'Zend/Validate.php';
/** /**
* @see Zend_Validate_Hostname * @see Zend_Validate_Hostname
*/ */
require_once 'Zend/Validate/Hostname.php'; //require_once 'Zend/Validate/Hostname.php';
/** /**
@ -134,16 +134,16 @@ abstract class Zend_Mail_Protocol_Abstract
*/ */
public function __construct($host = '127.0.0.1', $port = null) public function __construct($host = '127.0.0.1', $port = null)
{ {
$this->_validHost = new Zend_Validate(); //$this->_validHost = new Zend_Validate();
$this->_validHost->addValidator(new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL)); //$this->_validHost->addValidator(new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL));*/
if (!$this->_validHost->isValid($host)) { //if (!$this->_validHost->isValid($host)) {
/** /**
* @see Zend_Mail_Protocol_Exception * @see Zend_Mail_Protocol_Exception
*/ */
require_once 'Zend/Mail/Protocol/Exception.php'; //require_once 'Zend/Mail/Protocol/Exception.php';
throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); //throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages()));
} //}
$this->_host = $host; $this->_host = $host;
$this->_port = $port; $this->_port = $port;

View File

@ -187,13 +187,13 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract
} }
// Validate client hostname // Validate client hostname
if (!$this->_validHost->isValid($host)) { //if (!$this->_validHost->isValid($host)) {
/** /**
* @see Zend_Mail_Protocol_Exception * @see Zend_Mail_Protocol_Exception
*/ */
require_once 'Zend/Mail/Protocol/Exception.php'; //require_once 'Zend/Mail/Protocol/Exception.php';
throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); //throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages()));
} //}
// Initiate helo sequence // Initiate helo sequence
$this->_expect(220, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2 $this->_expect(220, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2