diff options
Diffstat (limited to 'libs/Zend/Mail')
32 files changed, 409 insertions, 490 deletions
diff --git a/libs/Zend/Mail/Exception.php b/libs/Zend/Mail/Exception.php index c912769ee4..864d1ca932 100644 --- a/libs/Zend/Mail/Exception.php +++ b/libs/Zend/Mail/Exception.php @@ -14,22 +14,22 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Exception */ -// require_once 'Zend/Exception.php'; +require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Exception extends Zend_Exception diff --git a/libs/Zend/Mail/Message.php b/libs/Zend/Mail/Message.php index bff51340d2..5b35ab2f67 100644 --- a/libs/Zend/Mail/Message.php +++ b/libs/Zend/Mail/Message.php @@ -14,26 +14,26 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Message.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Message.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * Zend_Mail_Part */ -// require_once 'Zend/Mail/Part.php'; +require_once 'Zend/Mail/Part.php'; /** * Zend_Mail_Message_Interface */ -// require_once 'Zend/Mail/Message/Interface.php'; +require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Interface @@ -63,7 +63,7 @@ class Zend_Mail_Message extends Zend_Mail_Part implements Zend_Mail_Message_Inte /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } } else { diff --git a/libs/Zend/Mail/Message/File.php b/libs/Zend/Mail/Message/File.php index 7857c743d6..6d621ae39c 100644 --- a/libs/Zend/Mail/Message/File.php +++ b/libs/Zend/Mail/Message/File.php @@ -14,26 +14,26 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 16971 2009-07-22 18:05:45Z mikaelkael $ */ /** * Zend_Mail_Part */ -// require_once 'Zend/Mail/Part/File.php'; +require_once 'Zend/Mail/Part/File.php'; /** * Zend_Mail_Message_Interface */ -// require_once 'Zend/Mail/Message/Interface.php'; +require_once 'Zend/Mail/Message/Interface.php'; /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Message_File extends Zend_Mail_Part_File implements Zend_Mail_Message_Interface @@ -59,7 +59,7 @@ class Zend_Mail_Message_File extends Zend_Mail_Part_File implements Zend_Mail_Me // set key and value to the same value for easy lookup $this->_flags = array_combine($params['flags'], $params['flags']); } - + parent::__construct($params); } diff --git a/libs/Zend/Mail/Message/Interface.php b/libs/Zend/Mail/Message/Interface.php index 833be6b44a..a9752a3230 100644 --- a/libs/Zend/Mail/Message/Interface.php +++ b/libs/Zend/Mail/Message/Interface.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 16971 2009-07-22 18:05:45Z mikaelkael $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/libs/Zend/Mail/Part.php b/libs/Zend/Mail/Part.php index bb7b38e447..4541a5acc1 100644 --- a/libs/Zend/Mail/Part.php +++ b/libs/Zend/Mail/Part.php @@ -14,27 +14,27 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Part.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Part.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mime_Decode */ -// require_once 'Zend/Mime/Decode.php'; +require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part_Interface */ -// require_once 'Zend/Mail/Part/Interface.php'; +require_once 'Zend/Mail/Part/Interface.php'; /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface @@ -108,14 +108,14 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('handler is not a valid mail handler'); } if (!isset($params['id'])) { /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('need a message id with a handler'); } @@ -176,7 +176,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no content'); } } @@ -216,7 +216,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } $parts = Zend_Mime_Decode::splitMessageStruct($this->_content, $boundary); @@ -246,7 +246,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -261,7 +261,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } @@ -343,7 +343,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception("no Header with Name $name or $lowerName found"); } } @@ -381,7 +381,7 @@ class Zend_Mail_Part implements RecursiveIterator, Zend_Mail_Part_Interface return false; } } - + /** * Get a specific field from a header like content type or all fields as array * diff --git a/libs/Zend/Mail/Part/File.php b/libs/Zend/Mail/Part/File.php index 581195bcc0..efa0538b4d 100644 --- a/libs/Zend/Mail/Part/File.php +++ b/libs/Zend/Mail/Part/File.php @@ -14,27 +14,27 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 16971 2009-07-22 18:05:45Z mikaelkael $ */ /** * @see Zend_Mime_Decode */ -// require_once 'Zend/Mime/Decode.php'; +require_once 'Zend/Mime/Decode.php'; /** * @see Zend_Mail_Part */ -// require_once 'Zend/Mail/Part.php'; +require_once 'Zend/Mail/Part.php'; /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Part_File extends Zend_Mail_Part @@ -60,10 +60,10 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no file given in params'); } - + if (!is_resource($params['file'])) { $this->_fh = fopen($params['file'], 'r'); } else { @@ -73,7 +73,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('could not open file'); } if (isset($params['startPos'])) { @@ -86,7 +86,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part } Zend_Mime_Decode::splitMessage($header, $this->_headers, $null); - + $this->_contentPos[0] = ftell($this->_fh); if ($endPos !== null) { $this->_contentPos[1] = $endPos; @@ -97,16 +97,16 @@ class Zend_Mail_Part_File extends Zend_Mail_Part if (!$this->isMultipart()) { return; } - + $boundary = $this->getHeaderField('content-type', 'boundary'); if (!$boundary) { /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('no boundary found in content type to split message'); } - + $part = array(); $pos = $this->_contentPos[0]; fseek($this->_fh, $pos); @@ -119,7 +119,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('error reading file'); } @@ -141,7 +141,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part } } $this->_countParts = count($this->_partPos); - + } @@ -157,7 +157,7 @@ class Zend_Mail_Part_File extends Zend_Mail_Part { fseek($this->_fh, $this->_contentPos[0]); if ($stream !== null) { - return stream_copy_to_stream($this->_fh, $stream, $this->_contentPos[1] - $this->_contentPos[0]); + return stream_copy_to_stream($this->_fh, $stream, $this->_contentPos[1] - $this->_contentPos[0]); } $length = $this->_contentPos[1] - $this->_contentPos[0]; return $length < 1 ? '' : fread($this->_fh, $length); @@ -188,11 +188,11 @@ class Zend_Mail_Part_File extends Zend_Mail_Part /** * @see Zend_Mail_Exception */ - // require_once 'Zend/Mail/Exception.php'; + require_once 'Zend/Mail/Exception.php'; throw new Zend_Mail_Exception('part not found'); } - return new self(array('file' => $this->_fh, 'startPos' => $this->_partPos[$num][0], + return new self(array('file' => $this->_fh, 'startPos' => $this->_partPos[$num][0], 'endPos' => $this->_partPos[$num][1])); } } diff --git a/libs/Zend/Mail/Part/Interface.php b/libs/Zend/Mail/Part/Interface.php index 2d8f6f8943..46cc4b0843 100644 --- a/libs/Zend/Mail/Part/Interface.php +++ b/libs/Zend/Mail/Part/Interface.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 16971 2009-07-22 18:05:45Z mikaelkael $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -95,7 +95,7 @@ interface Zend_Mail_Part_Interface extends RecursiveIterator * @throws Zend_Mail_Exception */ public function getHeader($name, $format = null); - + /** * Get a specific field from a header like content type or all fields as array * diff --git a/libs/Zend/Mail/Protocol/Abstract.php b/libs/Zend/Mail/Protocol/Abstract.php index cbfeaa8946..4ef5792b11 100644 --- a/libs/Zend/Mail/Protocol/Abstract.php +++ b/libs/Zend/Mail/Protocol/Abstract.php @@ -12,39 +12,39 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21635 2010-03-24 15:25:13Z yoshida@zend.co.jp $ + * @version $Id: Abstract.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @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'; /** * Zend_Mail_Protocol_Abstract * * Provides low-level methods for concrete adapters to communicate with a remote mail server and track requests and responses. - * + * * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21635 2010-03-24 15:25:13Z yoshida@zend.co.jp $ + * @version $Id: Abstract.php 16219 2009-06-21 19:45:39Z thomas $ * @todo Implement proxy settings */ abstract class Zend_Mail_Protocol_Abstract @@ -60,11 +60,6 @@ abstract class Zend_Mail_Protocol_Abstract */ const TIMEOUT_CONNECTION = 30; - /** - * Maximum of the transaction log - */ - const MAXIMUM_LOG = 64; - /** * Hostname or IP address of remote server @@ -111,16 +106,15 @@ abstract class Zend_Mail_Protocol_Abstract /** * String template for parsing server responses using sscanf (default: 3 digit code and response string) * @var resource - * @deprecated Since 1.10.3 */ protected $_template = '%d%s'; /** * Log of mail requests and server responses for a session - * @var array + * @var string */ - private $_log = array(); + private $_log; /** @@ -140,7 +134,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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())); } @@ -197,7 +191,7 @@ abstract class Zend_Mail_Protocol_Abstract */ public function getLog() { - return implode('', $this->_log); + return $this->_log; } @@ -208,23 +202,9 @@ abstract class Zend_Mail_Protocol_Abstract */ public function resetLog() { - $this->_log = array(); + $this->_log = ''; } - /** - * Add the transaction log - * - * @param string new transaction - * @return void - */ - protected function _addLog($value) - { - if (count($this->_log) >= self::MAXIMUM_LOG) { - array_shift($this->_log); - } - - $this->_log[] = $value; - } /** * Connect to the server using the supplied transport and target @@ -250,7 +230,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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($errorStr); } @@ -258,7 +238,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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('Could not set stream timeout'); } @@ -292,7 +272,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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('No connection has been established to ' . $this->_host); } @@ -301,13 +281,13 @@ abstract class Zend_Mail_Protocol_Abstract $result = fwrite($this->_socket, $request . self::EOL); // Save request to internal log - $this->_addLog($request . self::EOL); + $this->_log .= $request . self::EOL; if ($result === false) { /** * @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('Could not send request to ' . $this->_host); } @@ -328,7 +308,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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('No connection has been established to ' . $this->_host); } @@ -341,7 +321,7 @@ abstract class Zend_Mail_Protocol_Abstract $reponse = fgets($this->_socket, 1024); // Save request to internal log - $this->_addLog($reponse); + $this->_log .= $reponse; // Check meta data to ensure connection is still valid $info = stream_get_meta_data($this->_socket); @@ -350,7 +330,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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($this->_host . ' has timed out'); } @@ -358,7 +338,7 @@ abstract class Zend_Mail_Protocol_Abstract /** * @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('Could not read from ' . $this->_host); } @@ -379,10 +359,8 @@ abstract class Zend_Mail_Protocol_Abstract protected function _expect($code, $timeout = null) { $this->_response = array(); - $cmd = ''; - $more = ''; - $msg = ''; - $errMsg = ''; + $cmd = ''; + $msg = ''; if (!is_array($code)) { $code = array($code); @@ -390,23 +368,17 @@ abstract class Zend_Mail_Protocol_Abstract do { $this->_response[] = $result = $this->_receive($timeout); - list($cmd, $more, $msg) = preg_split('/([\s-]+)/', $result, 2, PREG_SPLIT_DELIM_CAPTURE); - - if ($errMsg !== '') { - $errMsg .= ' ' . $msg; - } elseif ($cmd === null || !in_array($cmd, $code)) { - $errMsg = $msg; + sscanf($result, $this->_template, $cmd, $msg); + + if ($cmd === null || !in_array($cmd, $code)) { + /** + * @see Zend_Mail_Protocol_Exception + */ + require_once 'Zend/Mail/Protocol/Exception.php'; + throw new Zend_Mail_Protocol_Exception($result); } - } while (strpos($more, '-') === 0); // The '-' message prefix indicates an information string instead of a response string. - - if ($errMsg !== '') { - /** - * @see Zend_Mail_Protocol_Exception - */ - // require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception($errMsg); - } + } while (strpos($msg, '-') === 0); // The '-' message prefix indicates an information string instead of a response string. return $msg; } diff --git a/libs/Zend/Mail/Protocol/Exception.php b/libs/Zend/Mail/Protocol/Exception.php index 30999c2d14..117cafb56e 100644 --- a/libs/Zend/Mail/Protocol/Exception.php +++ b/libs/Zend/Mail/Protocol/Exception.php @@ -11,27 +11,27 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Exception */ -// require_once 'Zend/Mail/Exception.php'; +require_once 'Zend/Mail/Exception.php'; /** * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Exception extends Zend_Mail_Exception diff --git a/libs/Zend/Mail/Protocol/Imap.php b/libs/Zend/Mail/Protocol/Imap.php index 286642fb48..2adc9efb14 100644 --- a/libs/Zend/Mail/Protocol/Imap.php +++ b/libs/Zend/Mail/Protocol/Imap.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 18499 2009-10-08 22:24:02Z yoshida@zend.co.jp $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Imap @@ -50,7 +50,7 @@ class Zend_Mail_Protocol_Imap /** * Public constructor * - * @param string $host hostname or IP address of IMAP server, if given connect() is called + * @param string $host hostname of IP address of IMAP server, if given connect() is called * @param int|null $port port of IMAP server, null for default (143 or 993 for ssl) * @param bool $ssl use ssl? 'SSL', 'TLS' or false * @throws Zend_Mail_Protocol_Exception @@ -71,9 +71,9 @@ class Zend_Mail_Protocol_Imap } /** - * Open connection to IMAP server + * Open connection to POP3 server * - * @param string $host hostname or IP address of IMAP server + * @param string $host hostname of IP address of POP3 server * @param int|null $port of IMAP server, default is 143 (993 for ssl) * @param string|bool $ssl use 'SSL', 'TLS' or false * @return string welcome message @@ -96,16 +96,15 @@ class Zend_Mail_Protocol_Imap /** * @see Zend_Mail_Protocol_Exception */ - // require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . - ' (errno = ' . $errno . ' )'); + require_once 'Zend/Mail/Protocol/Exception.php'; + throw new Zend_Mail_Protocol_Exception('cannot connect to host : ' . $errno . ' : ' . $errstr); } if (!$this->_assumedNextLine('* OK')) { /** * @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('host doesn\'t allow connection'); } @@ -116,7 +115,7 @@ class Zend_Mail_Protocol_Imap /** * @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('cannot enable TLS'); } } @@ -135,7 +134,7 @@ class Zend_Mail_Protocol_Imap /** * @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('cannot read - connection closed?'); } @@ -209,7 +208,7 @@ class Zend_Mail_Protocol_Imap $token = substr($token, 1); } if ($token[0] == '"') { - if (preg_match('%^\(*"((.|\\\\|\\")*?)" *%', $line, $matches)) { + if (preg_match('%^"((.|\\\\|\\")*?)" *%', $line, $matches)) { $tokens[] = $matches[1]; $line = substr($line, strlen($matches[0])); continue; @@ -348,14 +347,14 @@ class Zend_Mail_Protocol_Imap /** * @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('cannot write - connection closed?'); } if (!$this->_assumedNextLine('+ ')) { /** * @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('cannot send literal string'); } $line = $token[1]; @@ -368,7 +367,7 @@ class Zend_Mail_Protocol_Imap /** * @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('cannot write - connection closed?'); } } @@ -629,7 +628,7 @@ class Zend_Mail_Protocol_Imap /** * @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('the single id was not found in response'); } diff --git a/libs/Zend/Mail/Protocol/Pop3.php b/libs/Zend/Mail/Protocol/Pop3.php index 78f01fe376..cc7d5b2f09 100644 --- a/libs/Zend/Mail/Protocol/Pop3.php +++ b/libs/Zend/Mail/Protocol/Pop3.php @@ -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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Pop3 @@ -34,7 +34,7 @@ class Zend_Mail_Protocol_Pop3 * Default timeout in seconds for initiating session */ const TIMEOUT_CONNECTION = 30; - + /** * saves if server supports top * @var null|bool @@ -57,7 +57,7 @@ class Zend_Mail_Protocol_Pop3 /** * Public constructor * - * @param string $host hostname or IP address of POP3 server, if given connect() is called + * @param string $host hostname of IP address of POP3 server, if given connect() is called * @param int|null $port port of POP3 server, null for default (110 or 995 for ssl) * @param bool|string $ssl use ssl? 'SSL', 'TLS' or false * @throws Zend_Mail_Protocol_Exception @@ -82,7 +82,7 @@ class Zend_Mail_Protocol_Pop3 /** * Open connection to POP3 server * - * @param string $host hostname or IP address of POP3 server + * @param string $host hostname of IP address of POP3 server * @param int|null $port of POP3 server, default is 110 (995 for ssl) * @param string|bool $ssl use 'SSL', 'TLS' or false * @return string welcome message @@ -105,9 +105,8 @@ class Zend_Mail_Protocol_Pop3 /** * @see Zend_Mail_Protocol_Exception */ - // require_once 'Zend/Mail/Protocol/Exception.php'; - throw new Zend_Mail_Protocol_Exception('cannot connect to host; error = ' . $errstr . - ' (errno = ' . $errno . ' )'); + require_once 'Zend/Mail/Protocol/Exception.php'; + throw new Zend_Mail_Protocol_Exception('cannot connect to host : ' . $errno . ' : ' . $errstr); } $welcome = $this->readResponse(); @@ -127,7 +126,7 @@ class Zend_Mail_Protocol_Pop3 /** * @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('cannot enable TLS'); } } @@ -150,7 +149,7 @@ class Zend_Mail_Protocol_Pop3 /** * @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('send failed - connection closed?'); } } @@ -170,7 +169,7 @@ class Zend_Mail_Protocol_Pop3 /** * @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('read failed - connection closed?'); } @@ -186,7 +185,7 @@ class Zend_Mail_Protocol_Pop3 /** * @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('last request failed'); } @@ -385,7 +384,7 @@ class Zend_Mail_Protocol_Pop3 /** * @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('top not supported and no fallback wanted'); } } diff --git a/libs/Zend/Mail/Protocol/Smtp.php b/libs/Zend/Mail/Protocol/Smtp.php index a7d8153fa2..819b89551c 100644 --- a/libs/Zend/Mail/Protocol/Smtp.php +++ b/libs/Zend/Mail/Protocol/Smtp.php @@ -12,37 +12,37 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smtp.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mime */ -// require_once 'Zend/Mime.php'; +require_once 'Zend/Mime.php'; /** * @see Zend_Mail_Protocol_Abstract */ -// require_once 'Zend/Mail/Protocol/Abstract.php'; +require_once 'Zend/Mail/Protocol/Abstract.php'; /** * Smtp implementation of Zend_Mail_Protocol_Abstract * * Minimum implementation according to RFC2821: EHLO, MAIL FROM, RCPT TO, DATA, RSET, NOOP, QUIT - * + * * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract @@ -140,7 +140,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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($config['ssl'] . ' is unsupported SSL type'); break; } @@ -182,7 +182,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('Cannot issue HELO to existing session'); } @@ -191,7 +191,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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())); } @@ -207,7 +207,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('Unable to connect via TLS'); } $this->_ehlo($host); @@ -253,7 +253,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('A valid session has not been started'); } @@ -280,7 +280,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('No sender reverse path has been supplied'); } @@ -305,7 +305,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('No recipient forward path has been supplied'); } @@ -403,7 +403,7 @@ class Zend_Mail_Protocol_Smtp extends Zend_Mail_Protocol_Abstract /** * @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('Already authenticated for this session'); } } diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php index 523d383e23..ec5594e067 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Crammd5.php @@ -11,20 +11,20 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Crammd5.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Crammd5.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Protocol_Smtp */ -// require_once 'Zend/Mail/Protocol/Smtp.php'; +require_once 'Zend/Mail/Protocol/Smtp.php'; /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Crammd5 extends Zend_Mail_Protocol_Smtp diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php index 892f6724ec..a624792f4d 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Login.php @@ -11,20 +11,20 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Login.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Login.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Protocol_Smtp */ -// require_once 'Zend/Mail/Protocol/Smtp.php'; +require_once 'Zend/Mail/Protocol/Smtp.php'; /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Login extends Zend_Mail_Protocol_Smtp diff --git a/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php b/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php index 02784cb9d3..26e65d3009 100644 --- a/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php +++ b/libs/Zend/Mail/Protocol/Smtp/Auth/Plain.php @@ -11,20 +11,20 @@ * 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 Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Plain.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Plain.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Protocol_Smtp */ -// require_once 'Zend/Mail/Protocol/Smtp.php'; +require_once 'Zend/Mail/Protocol/Smtp.php'; /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Protocol - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Protocol_Smtp_Auth_Plain extends Zend_Mail_Protocol_Smtp diff --git a/libs/Zend/Mail/Storage.php b/libs/Zend/Mail/Storage.php index 771f7ae23b..4c1a321962 100644 --- a/libs/Zend/Mail/Storage.php +++ b/libs/Zend/Mail/Storage.php @@ -14,15 +14,15 @@ * * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Storage.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Storage.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @category Zend * @package Zend_Mail - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage diff --git a/libs/Zend/Mail/Storage/Abstract.php b/libs/Zend/Mail/Storage/Abstract.php index 0d5f1ed1e7..052654b706 100644 --- a/libs/Zend/Mail/Storage/Abstract.php +++ b/libs/Zend/Mail/Storage/Abstract.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, SeekableIterator @@ -78,11 +78,11 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See $var = strtolower(substr($var, 3)); return isset($this->_has[$var]) ? $this->_has[$var] : null; } - + /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception($var . ' not found'); } @@ -264,7 +264,7 @@ abstract class Zend_Mail_Storage_Abstract implements Countable, ArrayAccess, See /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot write mail messages via array access'); } diff --git a/libs/Zend/Mail/Storage/Exception.php b/libs/Zend/Mail/Storage/Exception.php index 29cbc26981..497ab2c7ce 100644 --- a/libs/Zend/Mail/Storage/Exception.php +++ b/libs/Zend/Mail/Storage/Exception.php @@ -11,27 +11,27 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Exception */ -// require_once 'Zend/Mail/Exception.php'; +require_once 'Zend/Mail/Exception.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Exception extends Zend_Mail_Exception diff --git a/libs/Zend/Mail/Storage/Folder.php b/libs/Zend/Mail/Storage/Folder.php index 51d8a61a5d..1fc9641fdf 100644 --- a/libs/Zend/Mail/Storage/Folder.php +++ b/libs/Zend/Mail/Storage/Folder.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Folder.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Folder.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder implements RecursiveIterator @@ -154,7 +154,7 @@ class Zend_Mail_Storage_Folder implements RecursiveIterator /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("no subfolder named $name"); } diff --git a/libs/Zend/Mail/Storage/Folder/Interface.php b/libs/Zend/Mail/Storage/Folder/Interface.php index b5c89ac917..683dc22e43 100644 --- a/libs/Zend/Mail/Storage/Folder/Interface.php +++ b/libs/Zend/Mail/Storage/Folder/Interface.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Mail_Storage_Folder_Interface diff --git a/libs/Zend/Mail/Storage/Folder/Maildir.php b/libs/Zend/Mail/Storage/Folder/Maildir.php index 228465a9e3..c2bf340c7d 100644 --- a/libs/Zend/Mail/Storage/Folder/Maildir.php +++ b/libs/Zend/Mail/Storage/Folder/Maildir.php @@ -11,37 +11,37 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Folder */ -// require_once 'Zend/Mail/Storage/Folder.php'; +require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -// require_once 'Zend/Mail/Storage/Folder/Interface.php'; +require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Maildir */ -// require_once 'Zend/Mail/Storage/Maildir.php'; +require_once 'Zend/Mail/Storage/Maildir.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir implements Zend_Mail_Storage_Folder_Interface @@ -90,7 +90,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -123,7 +123,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read folders in maildir"); } $dirs = array(); @@ -152,7 +152,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } array_push($stack, $parent); @@ -171,7 +171,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while reading maildir'); } } @@ -208,7 +208,7 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -238,17 +238,17 @@ class Zend_Mail_Storage_Folder_Maildir extends Zend_Mail_Storage_Maildir impleme /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; - throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); + require_once 'Zend/Mail/Storage/Exception.php'; + throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable"); } // seems like file has vanished; rebuilding folder tree - but it's still an exception $this->_buildFolderTree($this->_rootdir); /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the maildir has vanished, I\'ve rebuild the ' . - 'folder tree, search for an other folder and try again', 0, $e); + 'folder tree, search for an other folder and try again'); } } diff --git a/libs/Zend/Mail/Storage/Folder/Mbox.php b/libs/Zend/Mail/Storage/Folder/Mbox.php index fc1d50b2a0..e942322980 100644 --- a/libs/Zend/Mail/Storage/Folder/Mbox.php +++ b/libs/Zend/Mail/Storage/Folder/Mbox.php @@ -11,37 +11,37 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Folder */ -// require_once 'Zend/Mail/Storage/Folder.php'; +require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -// require_once 'Zend/Mail/Storage/Folder/Interface.php'; +require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Mbox */ -// require_once 'Zend/Mail/Storage/Mbox.php'; +require_once 'Zend/Mail/Storage/Mbox.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Zend_Mail_Storage_Folder_Interface @@ -86,7 +86,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('use Zend_Mail_Storage_Mbox for a single file'); } @@ -94,7 +94,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -130,7 +130,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("can't read dir $currentDir"); } while (($entry = readdir($dh)) !== false) { @@ -182,7 +182,7 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("folder $rootFolder not found"); } return $currentFolder; @@ -212,17 +212,17 @@ class Zend_Mail_Storage_Folder_Mbox extends Zend_Mail_Storage_Mbox implements Ze /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; - throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable", 0, $e); + require_once 'Zend/Mail/Storage/Exception.php'; + throw new Zend_Mail_Storage_Exception("{$this->_currentFolder} is not selectable"); } // seems like file has vanished; rebuilding folder tree - but it's still an exception $this->_buildFolderTree($this->_rootdir); /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('seems like the mbox file has vanished, I\'ve rebuild the ' . - 'folder tree, search for an other folder and try again', 0, $e); + 'folder tree, search for an other folder and try again'); } } diff --git a/libs/Zend/Mail/Storage/Imap.php b/libs/Zend/Mail/Storage/Imap.php index 2efc5b856b..2495e90782 100644 --- a/libs/Zend/Mail/Storage/Imap.php +++ b/libs/Zend/Mail/Storage/Imap.php @@ -11,56 +11,56 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Imap.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Imap.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Abstract */ -// require_once 'Zend/Mail/Storage/Abstract.php'; +require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Imap */ -// require_once 'Zend/Mail/Protocol/Imap.php'; +require_once 'Zend/Mail/Protocol/Imap.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -// require_once 'Zend/Mail/Storage/Writable/Interface.php'; +require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** * @see Zend_Mail_Storage_Folder_Interface */ -// require_once 'Zend/Mail/Storage/Folder/Interface.php'; +require_once 'Zend/Mail/Storage/Folder/Interface.php'; /** * @see Zend_Mail_Storage_Folder */ -// require_once 'Zend/Mail/Storage/Folder.php'; +require_once 'Zend/Mail/Storage/Folder.php'; /** * @see Zend_Mail_Message */ -// require_once 'Zend/Mail/Message.php'; +require_once 'Zend/Mail/Message.php'; /** * @see Zend_Mail_Storage */ -// require_once 'Zend/Mail/Storage.php'; +require_once 'Zend/Mail/Storage.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract @@ -116,14 +116,14 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('No selected folder to count'); } if ($flags === null) { return count($this->_protocol->search(array('ALL'))); } - + $params = array(); foreach ((array)$flags as $flag) { if (isset(self::$_searchFlags[$flag])) { @@ -189,7 +189,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -213,7 +213,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -250,8 +250,8 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; - throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?', 0, $e); + require_once 'Zend/Mail/Storage/Exception.php'; + throw new Zend_Mail_Storage_Exception('cannot select INBOX, is this a valid transport?'); } return; } @@ -260,7 +260,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -275,7 +275,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot login, user or password wrong'); } $this->selectFolder(isset($params->folder) ? $params->folder : 'INBOX'); @@ -305,7 +305,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not do nothing'); } } @@ -325,7 +325,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set deleted flag'); } // TODO: expunge here or at close? we can handle an error here better and are more fail safe @@ -333,7 +333,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('message marked as deleted, but could not expunge'); } } @@ -379,7 +379,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } @@ -399,7 +399,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder not found'); } @@ -437,7 +437,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while constructing folder tree'); } } @@ -463,7 +463,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot change folder, maybe it does not exist'); } } @@ -506,7 +506,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create folder'); } } @@ -528,7 +528,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot delete folder'); } } @@ -553,7 +553,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename folder'); } } @@ -582,7 +582,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot create message, please check if the folder exists and your flags'); } } @@ -601,7 +601,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot copy message, does the folder exist?'); } } @@ -636,7 +636,7 @@ class Zend_Mail_Storage_Imap extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot set flags, have you tried to set the recent flag or special chars?'); } } diff --git a/libs/Zend/Mail/Storage/Maildir.php b/libs/Zend/Mail/Storage/Maildir.php index 736b70cc66..3954db4a1c 100644 --- a/libs/Zend/Mail/Storage/Maildir.php +++ b/libs/Zend/Mail/Storage/Maildir.php @@ -11,37 +11,37 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Abstract */ -// require_once 'Zend/Mail/Storage/Abstract.php'; +require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -// require_once 'Zend/Mail/Message/File.php'; +require_once 'Zend/Mail/Message/File.php'; /** * @see Zend_Mail_Storage */ -// require_once 'Zend/Mail/Storage.php'; +require_once 'Zend/Mail/Storage.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract @@ -71,7 +71,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract 'R' => Zend_Mail_Storage::FLAG_ANSWERED, 'S' => Zend_Mail_Storage::FLAG_SEEN, 'T' => Zend_Mail_Storage::FLAG_DELETED); - + // TODO: getFlags($id) for fast access if headers are not needed (i.e. just setting flags)? /** @@ -86,7 +86,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract return count($this->_files); } - $count = 0; + $count = 0; if (!is_array($flags)) { foreach ($this->_files as $file) { if (isset($file['flaglookup'][$flags])) { @@ -95,7 +95,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract } return $count; } - + $flags = array_flip($flags); foreach ($this->_files as $file) { foreach ($flags as $flag => $v) { @@ -122,7 +122,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -134,7 +134,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('field does not exist'); } @@ -179,7 +179,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract return new $this->_messageClass(array('file' => $this->_getFileData($id, 'filename'), 'flags' => $this->_getFileData($id, 'flags'))); } - + return new $this->_messageClass(array('handler' => $this, 'id' => $id, 'headers' => $this->getRawHeader($id), 'flags' => $this->_getFileData($id, 'flags'))); } @@ -200,7 +200,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -234,7 +234,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -270,7 +270,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid dirname given in params'); } @@ -278,7 +278,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid maildir given'); } @@ -322,7 +322,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildir'); } $this->_getMaildirFiles($dh, $dirname . '/cur/'); @@ -336,7 +336,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot read recent mails in maildir'); } } @@ -422,7 +422,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir is (currently) read-only'); } @@ -469,7 +469,7 @@ class Zend_Mail_Storage_Maildir extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } } diff --git a/libs/Zend/Mail/Storage/Mbox.php b/libs/Zend/Mail/Storage/Mbox.php index 97bc56e394..8fad784c5d 100644 --- a/libs/Zend/Mail/Storage/Mbox.php +++ b/libs/Zend/Mail/Storage/Mbox.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Mbox.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Mbox.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,24 +25,24 @@ * @see Zend_Loader * May be used in constructor, but commented out for now */ -// // require_once 'Zend/Loader.php'; +// require_once 'Zend/Loader.php'; /** * @see Zend_Mail_Storage_Abstract */ -// require_once 'Zend/Mail/Storage/Abstract.php'; +require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Message_File */ -// require_once 'Zend/Mail/Message/File.php'; +require_once 'Zend/Mail/Message/File.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract @@ -124,7 +124,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('id does not exist'); } @@ -180,7 +180,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -204,7 +204,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } $messagePos = $this->_getPos($id); @@ -224,12 +224,12 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract if (is_array($params)) { $params = (object)$params; } - + if (!isset($params->filename) /* || Zend_Loader::isReadable($params['filename']) */) { /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('no valid filename given in params'); } @@ -290,7 +290,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } $this->_filename = $filename; @@ -301,7 +301,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('file is not a valid mbox format'); } @@ -362,7 +362,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('mbox is read-only'); } @@ -438,7 +438,7 @@ class Zend_Mail_Storage_Mbox extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open mbox file'); } } diff --git a/libs/Zend/Mail/Storage/Pop3.php b/libs/Zend/Mail/Storage/Pop3.php index 0841c3c352..b3ea092032 100644 --- a/libs/Zend/Mail/Storage/Pop3.php +++ b/libs/Zend/Mail/Storage/Pop3.php @@ -11,37 +11,37 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Pop3.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Pop3.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Abstract */ -// require_once 'Zend/Mail/Storage/Abstract.php'; +require_once 'Zend/Mail/Storage/Abstract.php'; /** * @see Zend_Mail_Protocol_Pop3 */ -// require_once 'Zend/Mail/Protocol/Pop3.php'; +require_once 'Zend/Mail/Protocol/Pop3.php'; /** * @see Zend_Mail_Message */ -// require_once 'Zend/Mail/Message.php'; +require_once 'Zend/Mail/Message.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract @@ -112,7 +112,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -135,7 +135,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('not implemented'); } @@ -177,7 +177,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('need at least user in params'); } @@ -244,7 +244,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract } $count = $this->countMessages(); if ($count < 1) { - return array(); + return array(); } $range = range(1, $count); return array_combine($range, $range); @@ -279,7 +279,7 @@ class Zend_Mail_Storage_Pop3 extends Zend_Mail_Storage_Abstract /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unique id not found'); } diff --git a/libs/Zend/Mail/Storage/Writable/Interface.php b/libs/Zend/Mail/Storage/Writable/Interface.php index 982b44eeb9..fd73380df7 100644 --- a/libs/Zend/Mail/Storage/Writable/Interface.php +++ b/libs/Zend/Mail/Storage/Writable/Interface.php @@ -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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Interface.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Interface.php 16219 2009-06-21 19:45:39Z thomas $ */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/libs/Zend/Mail/Storage/Writable/Maildir.php b/libs/Zend/Mail/Storage/Writable/Maildir.php index 3519a4b411..303b86066d 100644 --- a/libs/Zend/Mail/Storage/Writable/Maildir.php +++ b/libs/Zend/Mail/Storage/Writable/Maildir.php @@ -11,32 +11,32 @@ * 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 Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Maildir.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Maildir.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Storage_Folder_Maildir */ -// require_once 'Zend/Mail/Storage/Folder/Maildir.php'; +require_once 'Zend/Mail/Storage/Folder/Maildir.php'; /** * @see Zend_Mail_Storage_Writable_Interface */ -// require_once 'Zend/Mail/Storage/Writable/Interface.php'; +require_once 'Zend/Mail/Storage/Writable/Interface.php'; /** * @category Zend * @package Zend_Mail * @subpackage Storage - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Maildir @@ -49,7 +49,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai * @var bool|int */ protected $_quota; - + /** * create a new maildir * @@ -66,7 +66,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('maildir must be a directory if already exists'); } } else { @@ -74,7 +74,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; $dir = dirname($dir); if (!file_exists($dir)) { throw new Zend_Mail_Storage_Exception("parent $dir not found"); @@ -85,7 +85,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai } } } - + foreach (array('cur', 'tmp', 'new') as $subdir) { if (!@mkdir($dir . DIRECTORY_SEPARATOR . $subdir)) { // ignore if dir exists (i.e. was already valid maildir or two processes try to create one) @@ -93,13 +93,13 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not create subdir ' . $subdir); } } } } - + /** * Create instance with parameters * Additional parameters are (see parent for more): @@ -112,11 +112,11 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai if (is_array($params)) { $params = (object)$params; } - + if (!empty($params->create) && isset($params->dirname) && !file_exists($params->dirname . DIRECTORY_SEPARATOR . 'cur')) { self::initMaildir($params->dirname); } - + parent::__construct($params); } @@ -154,7 +154,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('folder already exists'); } @@ -162,7 +162,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - folder parts may not be empty'); } @@ -178,7 +178,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('invalid name - no directory seprator allowed in folder name'); } @@ -199,7 +199,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while creating new folder, may be created incompletly'); } @@ -241,7 +241,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('delete children first'); } @@ -249,7 +249,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete INBOX'); } @@ -257,7 +257,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont delete selected folder'); } @@ -271,7 +271,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error opening $subdir"); } while (($entry = readdir($dh)) !== false) { @@ -282,7 +282,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error cleaning $subdir"); } } @@ -292,7 +292,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing $subdir"); } } @@ -304,7 +304,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("error removing maindir"); } @@ -345,7 +345,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('new folder cannot be a child of old folder'); } @@ -356,7 +356,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename INBOX'); } @@ -364,7 +364,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('wont rename selected folder'); } @@ -387,7 +387,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('error while moving ' . $subdir); } } @@ -442,7 +442,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('problems creating tmp dir'); } } @@ -464,7 +464,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('could not open temp file'); } break; @@ -476,7 +476,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception("tried $max_tries unique ids for a temp file, but all were taken" . ' - giving up'); } @@ -500,7 +500,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('recent flag may not be set'); } @@ -520,7 +520,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('unknown flag(s): ' . $wanted_flags); } @@ -545,8 +545,8 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; - throw new Zend_Mail_Storage_Exception('storage is over quota!'); + require_once 'Zend/Mail/Storage/Exception.php'; + throw new Zend_Mail_Storage_Exception('storage is over quota!'); } if ($folder === null) { @@ -587,7 +587,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -618,10 +618,10 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; - throw new Zend_Mail_Storage_Exception('storage is over quota!'); + require_once 'Zend/Mail/Storage/Exception.php'; + throw new Zend_Mail_Storage_Exception('storage is over quota!'); } - + if (!($folder instanceof Zend_Mail_Storage_Folder)) { $folder = $this->getFolders($folder); } @@ -656,13 +656,13 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot copy message file'); } else if (!link($temp_file['filename'], $new_file)) { /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot link message file to final dir'); } @unlink($temp_file['filename']); @@ -677,7 +677,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai 'flags' => $flags, 'filename' => $new_file); } - + if ($this->_quota) { $this->_addQuotaEntry((int)$size, 1); } @@ -695,16 +695,16 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai if (!($folder instanceof Zend_Mail_Storage_Folder)) { $folder = $this->getFolders($folder); } - + if ($folder->getGlobalName() == $this->_currentFolder || ($this->_currentFolder == 'INBOX' && $folder->getGlobalName() == '/')) { /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('target is current folder'); } - + $filedata = $this->_getFileData($id); $old_file = $filedata['filename']; $flags = $filedata['flags']; @@ -734,7 +734,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; $exception = new Zend_Mail_Storage_Exception('cannot move message file'); } @unlink($temp_file['filename']); @@ -770,7 +770,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot rename file'); } @@ -790,16 +790,16 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai public function removeMessage($id) { $filename = $this->_getFileData($id, 'filename'); - + if ($this->_quota) { $size = filesize($filename); } - + if (!@unlink($filename)) { /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot remove message'); } unset($this->_files[$id - 1]); @@ -809,7 +809,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai $this->_addQuotaEntry(0 - (int)$size, -1); } } - + /** * enable/disable quota and set a quota value if wanted or needed * @@ -824,7 +824,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai public function setQuota($value) { $this->_quota = $value; } - + /** * get currently set quota * @@ -839,7 +839,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai /** * @see Zend_Mail_Storage_Exception */ - // require_once 'Zend/Mail/Storage/Exception.php'; + require_once 'Zend/Mail/Storage/Exception.php'; throw new Zend_Mail_Storage_Exception('cannot open maildirsize'); } $definition = fgets($fh); @@ -855,10 +855,10 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai } return $quota; } - + return $this->_quota; } - + /** * @see http://www.inter7.com/courierimap/README.maildirquota.html "Calculating maildirsize" */ @@ -873,10 +873,10 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai try { $quota = $this->getQuota(true); } catch (Zend_Mail_Storage_Exception $e) { - throw new Zend_Mail_Storage_Exception('no quota definition found', 0, $e); + throw new Zend_Mail_Storage_Exception('no quota defintion found'); } } - + $folders = new RecursiveIteratorIterator($this->getFolders(), RecursiveIteratorIterator::SELF_FIRST); foreach ($folders as $folder) { $subdir = $folder->getGlobalName(); @@ -888,29 +888,29 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai if ($subdir == 'Trash') { continue; } - + foreach (array('cur', 'new') as $subsubdir) { $dirname = $this->_rootdir . $subdir . DIRECTORY_SEPARATOR . $subsubdir . DIRECTORY_SEPARATOR; if (!file_exists($dirname)) { continue; } // NOTE: we are using mtime instead of "the latest timestamp". The latest would be atime - // and as we are accessing the directory it would make the whole calculation useless. + // and as we are accessing the directory it would make the whole calculation useless. $timestamps[$dirname] = filemtime($dirname); $dh = opendir($dirname); - // NOTE: Should have been checked in constructor. Not throwing an exception here, quotas will + // NOTE: Should have been checked in constructor. Not throwing an exception here, quotas will // therefore not be fully enforeced, but next request will fail anyway, if problem persists. if (!$dh) { continue; } - - + + while (($entry = readdir()) !== false) { if ($entry[0] == '.' || !is_file($dirname . $entry)) { continue; } - + if (strpos($entry, ',S=')) { strtok($entry, '='); $filesize = strtok(':'); @@ -930,7 +930,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai } } } - + $tmp = $this->_createTmpFile(); $fh = $tmp['handle']; $definition = array(); @@ -951,10 +951,10 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai break; } } - + return array('size' => $total_size, 'count' => $messages, 'quota' => $quota); } - + /** * @see http://www.inter7.com/courierimap/README.maildirquota.html "Calculating the quota for a Maildir++" */ @@ -1001,9 +1001,9 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai $messages += $count; } } - + $over_quota = false; - $over_quota = $over_quota || (isset($quota['size']) && $total_size > $quota['size']); + $over_quota = $over_quota || (isset($quota['size']) && $total_size > $quota['size']); $over_quota = $over_quota || (isset($quota['count']) && $messages > $quota['count']); // NOTE: $maildirsize equals false if it wasn't set (AKA we recalculated) or it's only // one line, because $maildirsize[0] gets unsetted. @@ -1015,18 +1015,18 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai $messages = $result['count']; $quota = $result['quota']; $over_quota = false; - $over_quota = $over_quota || (isset($quota['size']) && $total_size > $quota['size']); + $over_quota = $over_quota || (isset($quota['size']) && $total_size > $quota['size']); $over_quota = $over_quota || (isset($quota['count']) && $messages > $quota['count']); } - + if ($fh) { // TODO is there a safe way to keep the handle open for writing? fclose($fh); } - + return array('size' => $total_size, 'count' => $messages, 'quota' => $quota, 'over_quota' => $over_quota); } - + protected function _addQuotaEntry($size, $count = 1) { if (!file_exists($this->_rootdir . 'maildirsize')) { // TODO: should get file handler from _calculateQuota @@ -1035,7 +1035,7 @@ class Zend_Mail_Storage_Writable_Maildir extends Zend_Mail_Storage_Folder_Mai $count = (int)$count; file_put_contents($this->_rootdir . 'maildirsize', "$size $count\n", FILE_APPEND); } - + /** * check if storage is currently over quota * diff --git a/libs/Zend/Mail/Transport/Abstract.php b/libs/Zend/Mail/Transport/Abstract.php index 74d6ab005f..5ef4b7019c 100644 --- a/libs/Zend/Mail/Transport/Abstract.php +++ b/libs/Zend/Mail/Transport/Abstract.php @@ -15,16 +15,16 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 17334 2009-08-01 01:25:22Z yoshida@zend.co.jp $ */ /** * @see Zend_Mime */ -// require_once 'Zend/Mime.php'; +require_once 'Zend/Mime.php'; /** @@ -34,7 +34,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 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 @@ -140,7 +140,7 @@ abstract class Zend_Mail_Transport_Abstract } $this->_headers['Content-Type'] = array( - $type . ';' + $type . '; charset=' . $this->_mail->getCharset() . ';' . $this->EOL . " " . 'boundary="' . $boundary . '"' ); @@ -184,7 +184,7 @@ abstract class 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('Missing Zend_Mail object in _mail property'); } @@ -213,7 +213,7 @@ abstract class 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_Exception('At least one mail header line is too long'); } } @@ -280,7 +280,7 @@ abstract class 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('No body specified'); } @@ -319,7 +319,7 @@ abstract class 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('Empty mail cannot be sent'); } diff --git a/libs/Zend/Mail/Transport/Exception.php b/libs/Zend/Mail/Transport/Exception.php index cf4165a886..9947f45a79 100644 --- a/libs/Zend/Mail/Transport/Exception.php +++ b/libs/Zend/Mail/Transport/Exception.php @@ -11,27 +11,27 @@ * 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-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Exception.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Exception.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @see Zend_Mail_Exception */ -// require_once 'Zend/Mail/Exception.php'; +require_once 'Zend/Mail/Exception.php'; /** * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Exception extends Zend_Mail_Exception diff --git a/libs/Zend/Mail/Transport/Sendmail.php b/libs/Zend/Mail/Transport/Sendmail.php index c12eb46a23..cef1e2091f 100644 --- a/libs/Zend/Mail/Transport/Sendmail.php +++ b/libs/Zend/Mail/Transport/Sendmail.php @@ -11,20 +11,20 @@ * 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-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sendmail.php 21605 2010-03-22 15:09:03Z yoshida@zend.co.jp $ + * @version $Id: Sendmail.php 18264 2009-09-18 18:25:38Z beberlei $ */ /** * @see Zend_Mail_Transport_Abstract */ -// require_once 'Zend/Mail/Transport/Abstract.php'; +require_once 'Zend/Mail/Transport/Abstract.php'; /** @@ -33,7 +33,7 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract @@ -53,6 +53,7 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract */ public $parameters; + /** * EOL character string * @var string @@ -60,28 +61,15 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract */ public $EOL = PHP_EOL; - /** - * error information - * @var string - */ - protected $_errstr; /** * Constructor. * - * @param string|array|Zend_Config $parameters OPTIONAL (Default: null) + * @param string $parameters OPTIONAL (Default: null) * @return void */ public function __construct($parameters = null) { - if ($parameters instanceof Zend_Config) { - $parameters = $parameters->toArray(); - } - - if (is_array($parameters)) { - $parameters = implode(' ', $parameters); - } - $this->parameters = $parameters; } @@ -91,50 +79,30 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract * * @access public * @return void - * @throws Zend_Mail_Transport_Exception if parameters is set - * but not a string * @throws Zend_Mail_Transport_Exception on mail() failure */ public function _sendMail() { if ($this->parameters === null) { - set_error_handler(array($this, '_handleMailErrors')); $result = mail( $this->recipients, $this->_mail->getSubject(), $this->body, $this->header); - restore_error_handler(); } else { - if(!is_string($this->parameters)) { - /** - * @see Zend_Mail_Transport_Exception - * - * Exception is thrown here because - * $parameters is a public property - */ - // require_once 'Zend/Mail/Transport/Exception.php'; - throw new Zend_Mail_Transport_Exception( - 'Parameters were set but are not a string' - ); - } - - set_error_handler(array($this, '_handleMailErrors')); $result = mail( $this->recipients, $this->_mail->getSubject(), $this->body, $this->header, $this->parameters); - restore_error_handler(); } - - if ($this->_errstr !== null || !$result) { + if (!$result) { /** * @see Zend_Mail_Transport_Exception */ - // require_once 'Zend/Mail/Transport/Exception.php'; - throw new Zend_Mail_Transport_Exception('Unable to send mail. ' . $this->_errstr); + require_once 'Zend/Mail/Transport/Exception.php'; + throw new Zend_Mail_Transport_Exception('Unable to send mail'); } } @@ -157,7 +125,7 @@ class Zend_Mail_Transport_Sendmail 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'); } @@ -169,7 +137,7 @@ class Zend_Mail_Transport_Sendmail 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('Missing To addresses'); } } else { @@ -178,7 +146,7 @@ class Zend_Mail_Transport_Sendmail 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('Missing To header'); } @@ -201,20 +169,5 @@ class Zend_Mail_Transport_Sendmail extends Zend_Mail_Transport_Abstract $this->header = rtrim($this->header); } - /** - * Temporary error handler for PHP native mail(). - * - * @param int $errno - * @param string $errstr - * @param string $errfile - * @param string $errline - * @param array $errcontext - * @return true - */ - public function _handleMailErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null) - { - $this->_errstr = $errstr; - return true; - } - } + diff --git a/libs/Zend/Mail/Transport/Smtp.php b/libs/Zend/Mail/Transport/Smtp.php index 288cb4644f..0c1f7cb0b9 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-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Smtp.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Smtp.php 16219 2009-06-21 19:45:39Z thomas $ */ /** * @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 @@ * @category Zend * @package Zend_Mail * @subpackage Transport - * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2009 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,9 +111,6 @@ 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()) { @@ -180,7 +177,6 @@ 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() { @@ -191,10 +187,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); @@ -203,8 +199,8 @@ class Zend_Mail_Transport_Smtp extends Zend_Mail_Transport_Abstract $this->_connection->rset(); } - // Set sender email address - $this->_connection->mail($this->_mail->getFrom()); + // Set mail return path from sender email address + $this->_connection->mail($this->_mail->getReturnPath()); // Set recipient forward paths foreach ($this->_mail->getRecipients() as $recipient) { @@ -231,7 +227,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'); } |