From 5a64f804ad8e58d6b9c031d496ffa637d65bfb87 Mon Sep 17 00:00:00 2001 From: Janos SUTO Date: Mon, 23 Jan 2023 17:02:45 +0100 Subject: [PATCH] Commented out Zend validate calls Signed-off-by: Janos SUTO --- webui/Zend/Mail/Protocol/Abstract.php | 16 ++++++++-------- webui/Zend/Mail/Protocol/Smtp.php | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/webui/Zend/Mail/Protocol/Abstract.php b/webui/Zend/Mail/Protocol/Abstract.php index c0b1da38..27d5f9b0 100644 --- a/webui/Zend/Mail/Protocol/Abstract.php +++ b/webui/Zend/Mail/Protocol/Abstract.php @@ -25,13 +25,13 @@ /** * @see Zend_Validate */ -require_once 'Zend/Validate.php'; +//require_once 'Zend/Validate.php'; /** * @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) { - $this->_validHost = new Zend_Validate(); - $this->_validHost->addValidator(new Zend_Validate_Hostname(Zend_Validate_Hostname::ALLOW_ALL)); + //$this->_validHost = new Zend_Validate(); + //$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 */ - require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); - } + //require_once 'Zend/Mail/Protocol/Exception.php'; + //throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); + //} $this->_host = $host; $this->_port = $port; diff --git a/webui/Zend/Mail/Protocol/Smtp.php b/webui/Zend/Mail/Protocol/Smtp.php index efd25eb8..ea9dd3cc 100644 --- a/webui/Zend/Mail/Protocol/Smtp.php +++ b/webui/Zend/Mail/Protocol/Smtp.php @@ -187,13 +187,13 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract } // Validate client hostname - if (!$this->_validHost->isValid($host)) { + //if (!$this->_validHost->isValid($host)) { /** * @see Zend_Mail_Protocol_Exception */ - require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); - } + //require_once 'Zend/Mail/Protocol/Exception.php'; + //throw new Zend_Mail_Protocol_Exception(join(', ', $this->_validHost->getMessages())); + //} // Initiate helo sequence $this->_expect(220, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2