From 4fb36eb1a83c334a9c9cf20fa8d1caa4c9170150 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 2 Jan 2013 19:15:41 +0100 Subject: Upgrade PEAR:Mail_mime package to latest version --- program/lib/Mail/mime.php | 57 ++++++++++++++++++++++++++--------------- program/lib/Mail/mimeDecode.php | 4 +-- program/lib/Mail/mimePart.php | 35 +++++++++++++++++++------ 3 files changed, 66 insertions(+), 30 deletions(-) (limited to 'program/lib/Mail') diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php index c459b9123..69a032cb8 100644 --- a/program/lib/Mail/mime.php +++ b/program/lib/Mail/mime.php @@ -48,7 +48,7 @@ * @author Aleksander Machniak * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version 1.8.5 + * @version Release: 1.8.7 * @link http://pear.php.net/package/Mail_mime * * This class is based on HTML Mime Mail class from @@ -89,7 +89,7 @@ require_once 'Mail/mimePart.php'; * @author Sean Coates * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.8.5 + * @version Release: 1.8.7 * @link http://pear.php.net/package/Mail_mime */ class Mail_mime @@ -245,7 +245,7 @@ class Mail_mime } } else { $cont = $this->_file2str($data); - if (PEAR::isError($cont)) { + if ($this->_isError($cont)) { return $cont; } if (!$append) { @@ -286,7 +286,7 @@ class Mail_mime $this->_htmlbody = $data; } else { $cont = $this->_file2str($data); - if (PEAR::isError($cont)) { + if ($this->_isError($cont)) { return $cont; } $this->_htmlbody = $cont; @@ -336,7 +336,7 @@ class Mail_mime $filedata = null; $bodyfile = $file; } else { - if (PEAR::isError($filedata = $this->_file2str($file))) { + if ($this->_isError($filedata = $this->_file2str($file))) { return $filedata; } } @@ -416,12 +416,12 @@ class Mail_mime $filedata = null; $bodyfile = $file; } else { - if (PEAR::isError($filedata = $this->_file2str($file))) { + if ($this->_isError($filedata = $this->_file2str($file))) { return $filedata; } } // Force the name the user supplied, otherwise use $file - $filename = ($name ? $name : $file); + $filename = ($name ? $name : $this->_basename($file)); } else { $filedata = $file; $filename = $name; @@ -432,7 +432,6 @@ class Mail_mime $err = PEAR::raiseError($msg); return $err; } - $filename = $this->_basename($filename); $this->_parts[] = array( 'body' => $filedata, @@ -462,7 +461,7 @@ class Mail_mime * @return string Contents of $file_name * @access private */ - function &_file2str($file_name) + function _file2str($file_name) { // Check state of file and raise an error properly if (!file_exists($file_name)) { @@ -501,7 +500,7 @@ class Mail_mime * @return object The text mimePart object * @access private */ - function &_addTextPart(&$obj, $text) + function _addTextPart(&$obj, $text) { $params['content_type'] = 'text/plain'; $params['encoding'] = $this->_build_params['text_encoding']; @@ -527,7 +526,7 @@ class Mail_mime * @return object The html mimePart object * @access private */ - function &_addHtmlPart(&$obj) + function _addHtmlPart(&$obj) { $params['content_type'] = 'text/html'; $params['encoding'] = $this->_build_params['html_encoding']; @@ -551,7 +550,7 @@ class Mail_mime * @return object The multipart/mixed mimePart object * @access private */ - function &_addMixedPart() + function _addMixedPart() { $params = array(); $params['content_type'] = 'multipart/mixed'; @@ -573,7 +572,7 @@ class Mail_mime * @return object The multipart/mixed mimePart object * @access private */ - function &_addAlternativePart(&$obj) + function _addAlternativePart(&$obj) { $params['content_type'] = 'multipart/alternative'; $params['eol'] = $this->_build_params['eol']; @@ -597,7 +596,7 @@ class Mail_mime * @return object The multipart/mixed mimePart object * @access private */ - function &_addRelatedPart(&$obj) + function _addRelatedPart(&$obj) { $params['content_type'] = 'multipart/related'; $params['eol'] = $this->_build_params['eol']; @@ -620,7 +619,7 @@ class Mail_mime * @return object The image mimePart object * @access private */ - function &_addHtmlImagePart(&$obj, $value) + function _addHtmlImagePart(&$obj, $value) { $params['content_type'] = $value['c_type']; $params['encoding'] = 'base64'; @@ -651,7 +650,7 @@ class Mail_mime * @return object The image mimePart object * @access private */ - function &_addAttachmentPart(&$obj, $value) + function _addAttachmentPart(&$obj, $value) { $params['eol'] = $this->_build_params['eol']; $params['filename'] = $value['name']; @@ -719,7 +718,7 @@ class Mail_mime $body = $this->get($params); - if (PEAR::isError($body)) { + if ($this->_isError($body)) { return $body; } @@ -1020,7 +1019,7 @@ class Mail_mime if ($filename) { // Append mimePart message headers and body into file $headers = $message->encodeToFile($filename, $boundary, $skip_head); - if (PEAR::isError($headers)) { + if ($this->_isError($headers)) { return $headers; } $this->_headers = array_merge($this->_headers, $headers); @@ -1028,7 +1027,7 @@ class Mail_mime return $ret; } else { $output = $message->encode($boundary, $skip_head); - if (PEAR::isError($output)) { + if ($this->_isError($output)) { return $output; } $this->_headers = array_merge($this->_headers, $output['headers']); @@ -1090,7 +1089,7 @@ class Mail_mime /** * Get the text version of the headers - * (useful if you want to use the PHP mail() function) + * (usefull if you want to use the PHP mail() function) * * @param array $xtra_headers Assoc array with any extra headers (optional) * (Don't set Content-Type for multipart messages here!) @@ -1473,4 +1472,22 @@ class Mail_mime } } + /** + * PEAR::isError wrapper + * + * @param mixed $data Object + * + * @return bool True if object is an instance of PEAR_Error + * @access private + */ + function _isError($data) + { + // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473) + if (is_object($data) && is_a($data, 'PEAR_Error')) { + return true; + } + + return false; + } + } // End of class diff --git a/program/lib/Mail/mimeDecode.php b/program/lib/Mail/mimeDecode.php index 677d245e3..9f4589441 100644 --- a/program/lib/Mail/mimeDecode.php +++ b/program/lib/Mail/mimeDecode.php @@ -52,7 +52,7 @@ * @author Sean Coates * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id$ + * @version CVS: $Id: mimeDecode.php 305875 2010-12-01 07:17:10Z alan_k $ * @link http://pear.php.net/package/Mail_mime */ @@ -85,7 +85,7 @@ require_once 'PEAR.php'; * @author Sean Coates * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: @package_version@ + * @version Release: 1.5.5 * @link http://pear.php.net/package/Mail_mime */ class Mail_mimeDecode extends PEAR diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php index 292227fb0..f3e75dd10 100644 --- a/program/lib/Mail/mimePart.php +++ b/program/lib/Mail/mimePart.php @@ -48,7 +48,7 @@ * @author Aleksander Machniak * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version 1.8.5 + * @version Release: 1.8.7 * @link http://pear.php.net/package/Mail_mime */ @@ -70,7 +70,7 @@ * @author Aleksander Machniak * @copyright 2003-2006 PEAR * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: 1.8.5 + * @version Release: 1.8.7 * @link http://pear.php.net/package/Mail_mime */ class Mail_mimePart @@ -315,7 +315,7 @@ class Mail_mimePart for ($i = 0; $i < count($this->_subparts); $i++) { $encoded['body'] .= '--' . $boundary . $eol; $tmp = $this->_subparts[$i]->encode(); - if (PEAR::isError($tmp)) { + if ($this->_isError($tmp)) { return $tmp; } foreach ($tmp['headers'] as $key => $value) { @@ -338,7 +338,7 @@ class Mail_mimePart @ini_set('magic_quotes_runtime', $magic_quote_setting); } - if (PEAR::isError($body)) { + if ($this->_isError($body)) { return $body; } $encoded['body'] = $body; @@ -390,7 +390,7 @@ class Mail_mimePart @ini_set('magic_quotes_runtime', $magic_quote_setting); } - return PEAR::isError($res) ? $res : $this->_headers; + return $this->_isError($res) ? $res : $this->_headers; } /** @@ -425,7 +425,7 @@ class Mail_mimePart for ($i = 0; $i < count($this->_subparts); $i++) { fwrite($fh, $f_eol . '--' . $boundary . $eol); $res = $this->_subparts[$i]->_encodePartToFile($fh); - if (PEAR::isError($res)) { + if ($this->_isError($res)) { return $res; } $f_eol = $eol; @@ -440,7 +440,7 @@ class Mail_mimePart $res = $this->_getEncodedDataFromFile( $this->_body_file, $this->_encoding, $fh ); - if (PEAR::isError($res)) { + if ($this->_isError($res)) { return $res; } } @@ -648,7 +648,7 @@ class Mail_mimePart } /** - * Encodes the parameter of a header. + * Encodes the paramater of a header. * * @param string $name The name of the header-parameter * @param string $value The value of the paramter @@ -815,6 +815,7 @@ class Mail_mimePart 'from', 'to', 'cc', 'bcc', 'sender', 'reply-to', 'resent-from', 'resent-to', 'resent-cc', 'resent-bcc', 'resent-sender', 'resent-reply-to', + 'mail-reply-to', 'mail-followup-to', 'return-receipt-to', 'disposition-notification-to', ); $other_headers = array( @@ -1225,4 +1226,22 @@ class Mail_mimePart return sprintf('%%%02X', ord($matches[1])); } + /** + * PEAR::isError wrapper + * + * @param mixed $data Object + * + * @return bool True if object is an instance of PEAR_Error + * @access private + */ + function _isError($data) + { + // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473) + if (is_object($data) && is_a($data, 'PEAR_Error')) { + return true; + } + + return false; + } + } // End of class -- cgit v1.2.3