import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -11,13 +11,13 @@
|
||||
* 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-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Abstract.php 8064 2008-02-16 10:58:39Z thomas $
|
||||
* @version $Id: Abstract.php 15934 2009-06-08 02:05:48Z yoshida@zend.co.jp $
|
||||
*/
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ require_once 'Zend/Mime.php';
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
*/
|
||||
abstract class Zend_Mail_Transport_Abstract
|
||||
abstract class Zend_Mail_Transport_Abstract
|
||||
{
|
||||
/**
|
||||
* Mail body
|
||||
@ -144,11 +144,11 @@ abstract class Zend_Mail_Transport_Abstract
|
||||
. $this->EOL
|
||||
. " " . 'boundary="' . $boundary . '"'
|
||||
);
|
||||
$this->_headers['MIME-Version'] = array('1.0');
|
||||
|
||||
$this->boundary = $boundary;
|
||||
}
|
||||
|
||||
$this->_headers['MIME-Version'] = array('1.0');
|
||||
|
||||
return $this->_headers;
|
||||
}
|
||||
|
||||
|
@ -17,15 +17,10 @@
|
||||
* @subpackage Transport
|
||||
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Smtp.php 12519 2008-11-10 18:41:24Z alexander $
|
||||
* @version $Id: Smtp.php 15577 2009-05-14 12:43:34Z matthew $
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* @see Zend_Loader
|
||||
*/
|
||||
require_once 'Zend/Loader.php';
|
||||
|
||||
/**
|
||||
* @see Zend_Mime
|
||||
*/
|
||||
@ -192,7 +187,10 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract
|
||||
if ($this->_auth) {
|
||||
$connectionClass .= '_Auth_' . ucwords($this->_auth);
|
||||
}
|
||||
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);
|
||||
|
Reference in New Issue
Block a user