diff options
Diffstat (limited to 'libs/Zend/Mail/Transport/Smtp.php')
| -rw-r--r-- | libs/Zend/Mail/Transport/Smtp.php | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/libs/Zend/Mail/Transport/Smtp.php b/libs/Zend/Mail/Transport/Smtp.php index 0c1f7cb0b9..288cb4644f 100644 --- a/libs/Zend/Mail/Transport/Smtp.php +++ b/libs/Zend/Mail/Transport/Smtp.php @@ -11,30 +11,30 @@ * If you did not receive a copy of the license and are unable to * 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_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 16219 2009-06-21 19:45:39Z thomas $ + * @version $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $ */ /** * @see Zend_Mime */ -require_once 'Zend/Mime.php'; +// require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Smtp */ -require_once 'Zend/Mail/Protocol/Smtp.php'; +// require_once 'Zend/Mail/Protocol/Smtp.php'; /** * @see Zend_Mail_Transport_Abstract */ -require_once 'Zend/Mail/Transport/Abstract.php'; +// require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -45,7 +45,7 @@ require_once 'Zend/Mail/Transport/Abstract.php'; * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract @@ -111,6 +111,9 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract * @param string $host OPTIONAL (Default: 127.0.0.1) * @param array|null $config OPTIONAL (Default: null) * @return void + * + * @todo Someone please make this compatible + * with the SendMail transport class. */ public function __construct($host = '127.0.0.1', Array $config = array()) { @@ -177,6 +180,7 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract * developer to add a custom adapter if required before mail is sent. * * @return void + * @todo Rename this to sendMail, it's a public method... */ public function _sendMail() { @@ -187,10 +191,10 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract if ($this->_auth) { $connectionClass .= '_Auth_' . ucwords($this->_auth); } - if (!class_exists($connectionClass)) { - require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($connectionClass); - } + // if (!class_exists($connectionClass)) { + // require_once 'Zend/Loader.php'; + // Zend_Loader::loadClass($connectionClass); + // } $this->setConnection(new $connectionClass($this->_host, $this->_port, $this->_config)); $this->_connection->connect(); $this->_connection->helo($this->_name); @@ -199,8 +203,8 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract $this->_connection->rset(); } - // Set mail return path from sender email address - $this->_connection->mail($this->_mail->getReturnPath()); + // Set sender email address + $this->_connection->mail($this->_mail->getFrom()); // Set recipient forward paths foreach ($this->_mail->getRecipients() as $recipient) { @@ -227,7 +231,7 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract /** * @see Zend_Mail_Transport_Exception */ - require_once 'Zend/Mail/Transport/Exception.php'; + // require_once 'Zend/Mail/Transport/Exception.php'; throw new Zend_Mail_Transport_Exception('_prepareHeaders requires a registered Zend_Mail object'); } |