No OneTemporary
Actions

Size

99 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
	index 69a032cb8..e079af7e9 100644
	--- a/program/lib/Mail/mime.php
	+++ b/program/lib/Mail/mime.php
	@@ -1,1493 +1,1495 @@
	<?php
	/**
	* The Mail_Mime class is used to create MIME E-mail messages
	*
	* The Mail_Mime class provides an OO interface to create MIME
	* enabled email messages. This way you can create emails that
	* contain plain-text bodies, HTML bodies, attachments, inline
	* images and specific headers.
	*
	* Compatible with PHP versions 4 and 5
	*
	* LICENSE: This LICENSE is in the BSD license style.
	* Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
	* Copyright (c) 2003-2006, PEAR <pear-group@php.net>
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or
	* without modification, are permitted provided that the following
	* conditions are met:
	*
	* - Redistributions of source code must retain the above copyright
	* notice, this list of conditions and the following disclaimer.
	* - Redistributions in binary form must reproduce the above copyright
	* notice, this list of conditions and the following disclaimer in the
	* documentation and/or other materials provided with the distribution.
	* - Neither the name of the authors, nor the names of its contributors
	* may be used to endorse or promote products derived from this
	* software without specific prior written permission.
	*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	* THE POSSIBILITY OF SUCH DAMAGE.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Tomas V.V. Cox <cox@idecnet.com>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.7
	+ * @version CVS: $Id$
	* @link http://pear.php.net/package/Mail_mime
	*
	* This class is based on HTML Mime Mail class from
	* Richard Heyes <richard@phpguru.org> which was based also
	* in the mime_mail.class by Tobias Ratschiller <tobias@dnet.it>
	* and Sascha Schumann <sascha@schumann.cx>
	*/


	/**
	* require PEAR
	*
	* This package depends on PEAR to raise errors.
	*/
	require_once 'PEAR.php';

	/**
	* require Mail_mimePart
	*
	* Mail_mimePart contains the code required to
	* create all the different parts a mail can
	* consist of.
	*/
	require_once 'Mail/mimePart.php';


	/**
	* The Mail_Mime class provides an OO interface to create MIME
	* enabled email messages. This way you can create emails that
	* contain plain-text bodies, HTML bodies, attachments, inline
	* images and specific headers.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Tomas V.V. Cox <cox@idecnet.com>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.7
	+ * @version Release: @package_version@
	* @link http://pear.php.net/package/Mail_mime
	*/
	class Mail_mime
	{
	/**
	* Contains the plain text part of the email
	*
	* @var string
	* @access private
	*/
	var $_txtbody;

	/**
	* Contains the html part of the email
	*
	* @var string
	* @access private
	*/
	var $_htmlbody;

	/**
	* list of the attached images
	*
	* @var array
	* @access private
	*/
	var $_html_images = array();

	/**
	* list of the attachements
	*
	* @var array
	* @access private
	*/
	var $_parts = array();

	/**
	* Headers for the mail
	*
	* @var array
	* @access private
	*/
	var $_headers = array();

	/**
	* Build parameters
	*
	* @var array
	* @access private
	*/
	var $_build_params = array(
	// What encoding to use for the headers
	// Options: quoted-printable or base64
	'head_encoding' => 'quoted-printable',
	// What encoding to use for plain text
	// Options: 7bit, 8bit, base64, or quoted-printable
	'text_encoding' => 'quoted-printable',
	// What encoding to use for html
	// Options: 7bit, 8bit, base64, or quoted-printable
	'html_encoding' => 'quoted-printable',
	// The character set to use for html
	'html_charset' => 'ISO-8859-1',
	// The character set to use for text
	'text_charset' => 'ISO-8859-1',
	// The character set to use for headers
	'head_charset' => 'ISO-8859-1',
	// End-of-line sequence
	'eol' => "\r\n",
	// Delay attachment files IO until building the message
	'delay_file_io' => false
	);

	/**
	* Constructor function
	*
	* @param mixed $params Build parameters that change the way the email
	* is built. Should be an associative array.
	* See $_build_params.
	*
	* @return void
	* @access public
	*/
	function Mail_mime($params = array())
	{
	// Backward-compatible EOL setting
	if (is_string($params)) {
	$this->_build_params['eol'] = $params;
	} else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
	$this->_build_params['eol'] = MAIL_MIME_CRLF;
	}

	// Update build parameters
	if (!empty($params) && is_array($params)) {
	while (list($key, $value) = each($params)) {
	$this->_build_params[$key] = $value;
	}
	}
	}

	/**
	* Set build parameter value
	*
	* @param string $name Parameter name
	* @param string $value Parameter value
	*
	* @return void
	* @access public
	* @since 1.6.0
	*/
	function setParam($name, $value)
	{
	$this->_build_params[$name] = $value;
	}

	/**
	* Get build parameter value
	*
	* @param string $name Parameter name
	*
	* @return mixed Parameter value
	* @access public
	* @since 1.6.0
	*/
	function getParam($name)
	{
	return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
	}

	/**
	* Accessor function to set the body text. Body text is used if
	* it's not an html mail being sent or else is used to fill the
	* text/plain part that emails clients who don't support
	* html should show.
	*
	* @param string $data Either a string or
	* the file name with the contents
	* @param bool $isfile If true the first param should be treated
	* as a file name, else as a string (default)
	* @param bool $append If true the text or file is appended to
	* the existing body, else the old body is
	* overwritten
	*
	* @return mixed True on success or PEAR_Error object
	* @access public
	*/
	function setTXTBody($data, $isfile = false, $append = false)
	{
	if (!$isfile) {
	if (!$append) {
	$this->_txtbody = $data;
	} else {
	$this->_txtbody .= $data;
	}
	} else {
	$cont = $this->_file2str($data);
	if ($this->_isError($cont)) {
	return $cont;
	}
	if (!$append) {
	$this->_txtbody = $cont;
	} else {
	$this->_txtbody .= $cont;
	}
	}
	+
	return true;
	}

	/**
	* Get message text body
	*
	* @return string Text body
	* @access public
	* @since 1.6.0
	*/
	function getTXTBody()
	{
	return $this->_txtbody;
	}

	/**
	* Adds a html part to the mail.
	*
	* @param string $data Either a string or the file name with the
	* contents
	* @param bool $isfile A flag that determines whether $data is a
	* filename, or a string(false, default)
	*
	* @return bool True on success
	* @access public
	*/
	function setHTMLBody($data, $isfile = false)
	{
	if (!$isfile) {
	$this->_htmlbody = $data;
	} else {
	$cont = $this->_file2str($data);
	if ($this->_isError($cont)) {
	return $cont;
	}
	$this->_htmlbody = $cont;
	}

	return true;
	}

	/**
	* Get message HTML body
	*
	* @return string HTML body
	* @access public
	* @since 1.6.0
	*/
	function getHTMLBody()
	{
	return $this->_htmlbody;
	}

	/**
	* Adds an image to the list of embedded images.
	*
	* @param string $file The image file name OR image data itself
	* @param string $c_type The content type
	* @param string $name The filename of the image.
	* Only used if $file is the image data.
	* @param bool $isfile Whether $file is a filename or not.
	* Defaults to true
	* @param string $content_id Desired Content-ID of MIME part
	* Defaults to generated unique ID
	*
	* @return bool True on success
	* @access public
	*/
	function addHTMLImage($file,
	$c_type='application/octet-stream',
	$name = '',
	$isfile = true,
	$content_id = null
	) {
	$bodyfile = null;

	if ($isfile) {
	// Don't load file into memory
	if ($this->_build_params['delay_file_io']) {
	$filedata = null;
	$bodyfile = $file;
	} else {
	if ($this->_isError($filedata = $this->_file2str($file))) {
	return $filedata;
	}
	}
	$filename = ($name ? $name : $file);
	} else {
	$filedata = $file;
	$filename = $name;
	}

	if (!$content_id) {
	- $content_id = md5(uniqid(time()));
	+ $content_id = preg_replace('/[^0-9a-zA-Z]/', '', uniqid(time(), true));
	}

	$this->_html_images[] = array(
	'body' => $filedata,
	'body_file' => $bodyfile,
	'name' => $filename,
	'c_type' => $c_type,
	'cid' => $content_id
	);

	return true;
	}

	/**
	* Adds a file to the list of attachments.
	*
	* @param string $file The file name of the file to attach
	* or the file contents itself
	* @param string $c_type The content type
	* @param string $name The filename of the attachment
	* Only use if $file is the contents
	* @param bool $isfile Whether $file is a filename or not. Defaults to true
	* @param string $encoding The type of encoding to use. Defaults to base64.
	* Possible values: 7bit, 8bit, base64 or quoted-printable.
	* @param string $disposition The content-disposition of this file
	* Defaults to attachment.
	* Possible values: attachment, inline.
	* @param string $charset The character set of attachment's content.
	* @param string $language The language of the attachment
	* @param string $location The RFC 2557.4 location of the attachment
	* @param string $n_encoding Encoding of the attachment's name in Content-Type
	* By default filenames are encoded using RFC2231 method
	* Here you can set RFC2047 encoding (quoted-printable
	* or base64) instead
	* @param string $f_encoding Encoding of the attachment's filename
	* in Content-Disposition header.
	* @param string $description Content-Description header
	* @param string $h_charset The character set of the headers e.g. filename
	* If not specified, $charset will be used
	* @param array $add_headers Additional part headers. Array keys can be in form
	* of <header_name>:<parameter_name>
	*
	* @return mixed True on success or PEAR_Error object
	* @access public
	*/
	function addAttachment($file,
	$c_type = 'application/octet-stream',
	$name = '',
	$isfile = true,
	$encoding = 'base64',
	$disposition = 'attachment',
	$charset = '',
	$language = '',
	$location = '',
	$n_encoding = null,
	$f_encoding = null,
	$description = '',
	$h_charset = null,
	$add_headers = array()
	) {
	$bodyfile = null;

	if ($isfile) {
	// Don't load file into memory
	if ($this->_build_params['delay_file_io']) {
	$filedata = null;
	$bodyfile = $file;
	} else {
	if ($this->_isError($filedata = $this->_file2str($file))) {
	return $filedata;
	}
	}
	// Force the name the user supplied, otherwise use $file
	$filename = ($name ? $name : $this->_basename($file));
	} else {
	$filedata = $file;
	$filename = $name;
	}

	if (!strlen($filename)) {
	$msg = "The supplied filename for the attachment can't be empty";
	- $err = PEAR::raiseError($msg);
	- return $err;
	+ return $this->_raiseError($msg);
	}

	$this->_parts[] = array(
	'body' => $filedata,
	'body_file' => $bodyfile,
	'name' => $filename,
	'c_type' => $c_type,
	'charset' => $charset,
	'encoding' => $encoding,
	'language' => $language,
	'location' => $location,
	'disposition' => $disposition,
	'description' => $description,
	'add_headers' => $add_headers,
	'name_encoding' => $n_encoding,
	'filename_encoding' => $f_encoding,
	'headers_charset' => $h_charset,
	);

	return true;
	}

	/**
	* Get the contents of the given file name as string
	*
	* @param string $file_name Path of file to process
	*
	* @return string Contents of $file_name
	* @access private
	*/
	function _file2str($file_name)
	{
	// Check state of file and raise an error properly
	if (!file_exists($file_name)) {
	- $err = PEAR::raiseError('File not found: ' . $file_name);
	- return $err;
	+ return $this->_raiseError('File not found: ' . $file_name);
	}
	if (!is_file($file_name)) {
	- $err = PEAR::raiseError('Not a regular file: ' . $file_name);
	- return $err;
	+ return $this->_raiseError('Not a regular file: ' . $file_name);
	}
	if (!is_readable($file_name)) {
	- $err = PEAR::raiseError('File is not readable: ' . $file_name);
	- return $err;
	+ return $this->_raiseError('File is not readable: ' . $file_name);
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}
	$cont = file_get_contents($file_name);
	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	return $cont;
	}

	/**
	* Adds a text subpart to the mimePart object and
	* returns it during the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	* @param string $text The text to add.
	*
	* @return object The text mimePart object
	* @access private
	*/
	- function _addTextPart(&$obj, $text)
	+ function &_addTextPart(&$obj = null, $text = '')
	{
	$params['content_type'] = 'text/plain';
	$params['encoding'] = $this->_build_params['text_encoding'];
	$params['charset'] = $this->_build_params['text_charset'];
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	$ret = $obj->addSubpart($text, $params);
	- return $ret;
	} else {
	$ret = new Mail_mimePart($text, $params);
	- return $ret;
	}
	+
	+ return $ret;
	}

	/**
	* Adds a html subpart to the mimePart object and
	* returns it during the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	*
	* @return object The html mimePart object
	* @access private
	*/
	- function _addHtmlPart(&$obj)
	+ function &_addHtmlPart(&$obj = null)
	{
	$params['content_type'] = 'text/html';
	$params['encoding'] = $this->_build_params['html_encoding'];
	$params['charset'] = $this->_build_params['html_charset'];
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	$ret = $obj->addSubpart($this->_htmlbody, $params);
	- return $ret;
	} else {
	$ret = new Mail_mimePart($this->_htmlbody, $params);
	- return $ret;
	}
	+
	+ return $ret;
	}

	/**
	* Creates a new mimePart object, using multipart/mixed as
	* the initial content-type and returns it during the
	* build process.
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	- function _addMixedPart()
	+ function &_addMixedPart()
	{
	- $params = array();
	$params['content_type'] = 'multipart/mixed';
	$params['eol'] = $this->_build_params['eol'];

	// Create empty multipart/mixed Mail_mimePart object to return
	$ret = new Mail_mimePart('', $params);
	return $ret;
	}

	/**
	* Adds a multipart/alternative part to a mimePart
	* object (or creates one), and returns it during
	* the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created.
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	- function _addAlternativePart(&$obj)
	+ function &_addAlternativePart(&$obj = null)
	{
	$params['content_type'] = 'multipart/alternative';
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	- return $obj->addSubpart('', $params);
	+ $ret = $obj->addSubpart('', $params);
	} else {
	$ret = new Mail_mimePart('', $params);
	- return $ret;
	}
	+
	+ return $ret;
	}

	/**
	* Adds a multipart/related part to a mimePart
	* object (or creates one), and returns it during
	* the build process.
	*
	* @param mixed &$obj The object to add the part to, or
	* null if a new object is to be created
	*
	* @return object The multipart/mixed mimePart object
	* @access private
	*/
	- function _addRelatedPart(&$obj)
	+ function &_addRelatedPart(&$obj = null)
	{
	$params['content_type'] = 'multipart/related';
	$params['eol'] = $this->_build_params['eol'];

	if (is_object($obj)) {
	- return $obj->addSubpart('', $params);
	+ $ret = $obj->addSubpart('', $params);
	} else {
	$ret = new Mail_mimePart('', $params);
	- return $ret;
	}
	+
	+ return $ret;
	}

	/**
	* Adds an html image subpart to a mimePart object
	* and returns it during the build process.
	*
	* @param object &$obj The mimePart to add the image to
	* @param array $value The image information
	*
	* @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';
	$params['disposition'] = 'inline';
	$params['filename'] = $value['name'];
	$params['cid'] = $value['cid'];
	$params['body_file'] = $value['body_file'];
	$params['eol'] = $this->_build_params['eol'];

	if (!empty($value['name_encoding'])) {
	$params['name_encoding'] = $value['name_encoding'];
	}
	if (!empty($value['filename_encoding'])) {
	$params['filename_encoding'] = $value['filename_encoding'];
	}

	$ret = $obj->addSubpart($value['body'], $params);
	return $ret;
	}

	/**
	* Adds an attachment subpart to a mimePart object
	* and returns it during the build process.
	*
	* @param object &$obj The mimePart to add the image to
	* @param array $value The attachment information
	*
	* @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'];
	$params['encoding'] = $value['encoding'];
	$params['content_type'] = $value['c_type'];
	$params['body_file'] = $value['body_file'];
	$params['disposition'] = isset($value['disposition']) ?
	$value['disposition'] : 'attachment';

	// content charset
	if (!empty($value['charset'])) {
	$params['charset'] = $value['charset'];
	}
	// headers charset (filename, description)
	if (!empty($value['headers_charset'])) {
	$params['headers_charset'] = $value['headers_charset'];
	}
	if (!empty($value['language'])) {
	$params['language'] = $value['language'];
	}
	if (!empty($value['location'])) {
	$params['location'] = $value['location'];
	}
	if (!empty($value['name_encoding'])) {
	$params['name_encoding'] = $value['name_encoding'];
	}
	if (!empty($value['filename_encoding'])) {
	$params['filename_encoding'] = $value['filename_encoding'];
	}
	if (!empty($value['description'])) {
	$params['description'] = $value['description'];
	}
	if (is_array($value['add_headers'])) {
	$params['headers'] = $value['add_headers'];
	}

	$ret = $obj->addSubpart($value['body'], $params);
	return $ret;
	}

	/**
	* Returns the complete e-mail, ready to send using an alternative
	* mail delivery method. Note that only the mailpart that is made
	* with Mail_Mime is created. This means that,
	* YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF
	* using the $headers parameter!
	*
	* @param string $separation The separation between these two parts.
	* @param array $params The Build parameters passed to the
	- * &get() function. See &get for more info.
	+ * get() function. See get() for more info.
	* @param array $headers The extra headers that should be passed
	- * to the &headers() function.
	+ * to the headers() method.
	* See that function for more info.
	* @param bool $overwrite Overwrite the existing headers with new.
	*
	* @return mixed The complete e-mail or PEAR error object
	* @access public
	*/
	function getMessage($separation = null, $params = null, $headers = null,
	$overwrite = false
	) {
	if ($separation === null) {
	$separation = $this->_build_params['eol'];
	}

	$body = $this->get($params);

	if ($this->_isError($body)) {
	return $body;
	}

	- $head = $this->txtHeaders($headers, $overwrite);
	- $mail = $head . $separation . $body;
	- return $mail;
	+ return $this->txtHeaders($headers, $overwrite) . $separation . $body;
	}

	/**
	* Returns the complete e-mail body, ready to send using an alternative
	* mail delivery method.
	*
	* @param array $params The Build parameters passed to the
	- * &get() function. See &get for more info.
	+ * get() method. See get() for more info.
	*
	* @return mixed The e-mail body or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function getMessageBody($params = null)
	{
	return $this->get($params, null, true);
	}

	/**
	* Writes (appends) the complete e-mail into file.
	*
	* @param string $filename Output file location
	* @param array $params The Build parameters passed to the
	- * &get() function. See &get for more info.
	+ * get() method. See get() for more info.
	* @param array $headers The extra headers that should be passed
	- * to the &headers() function.
	+ * to the headers() function.
	* See that function for more info.
	* @param bool $overwrite Overwrite the existing headers with new.
	*
	* @return mixed True or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
	{
	// Check state of file and raise an error properly
	if (file_exists($filename) && !is_writable($filename)) {
	- $err = PEAR::raiseError('File is not writable: ' . $filename);
	- return $err;
	+ return $this->_raiseError('File is not writable: ' . $filename);
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	if (!($fh = fopen($filename, 'ab'))) {
	- $err = PEAR::raiseError('Unable to open file: ' . $filename);
	- return $err;
	+ return $this->_raiseError('Unable to open file: ' . $filename);
	}

	// Write message headers into file (skipping Content-* headers)
	$head = $this->txtHeaders($headers, $overwrite, true);
	if (fwrite($fh, $head) === false) {
	- $err = PEAR::raiseError('Error writing to file: ' . $filename);
	- return $err;
	+ return $this->_raiseError('Error writing to file: ' . $filename);
	}

	fclose($fh);

	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	// Write the rest of the message into file
	$res = $this->get($params, $filename);

	return $res ? $res : true;
	}

	/**
	* Writes (appends) the complete e-mail body into file.
	- *
	+ *
	* @param string $filename Output file location
	* @param array $params The Build parameters passed to the
	- * &get() function. See &get for more info.
	+ * get() method. See get() for more info.
	*
	* @return mixed True or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function saveMessageBody($filename, $params = null)
	{
	// Check state of file and raise an error properly
	if (file_exists($filename) && !is_writable($filename)) {
	- $err = PEAR::raiseError('File is not writable: ' . $filename);
	- return $err;
	+ return $this->_raiseError('File is not writable: ' . $filename);
	}

	// Temporarily reset magic_quotes_runtime and read file contents
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	if (!($fh = fopen($filename, 'ab'))) {
	- $err = PEAR::raiseError('Unable to open file: ' . $filename);
	- return $err;
	+ return $this->_raiseError('Unable to open file: ' . $filename);
	}

	// Write the rest of the message into file
	$res = $this->get($params, $filename, true);

	return $res ? $res : true;
	}

	/**
	* Builds the multipart message from the list ($this->_parts) and
	* returns the mime content.
	*
	* @param array $params Build parameters that change the way the email
	* is built. Should be associative. See $_build_params.
	* @param resource $filename Output file where to save the message instead of
	* returning it
	* @param boolean $skip_head True if you want to return/save only the message
	* without headers
	*
	* @return mixed The MIME message content string, null or PEAR error object
	* @access public
	*/
	- function &get($params = null, $filename = null, $skip_head = false)
	+ function get($params = null, $filename = null, $skip_head = false)
	{
	if (isset($params)) {
	while (list($key, $value) = each($params)) {
	$this->_build_params[$key] = $value;
	}
	}

	if (isset($this->_headers['From'])) {
	// Bug #11381: Illegal characters in domain ID
	if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
	$domainID = $matches[1];
	} else {
	$domainID = '@localhost';
	}
	foreach ($this->_html_images as $i => $img) {
	$cid = $this->_html_images[$i]['cid'];
	if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
	$this->_html_images[$i]['cid'] = $cid . $domainID;
	}
	}
	}

	if (count($this->_html_images) && isset($this->_htmlbody)) {
	foreach ($this->_html_images as $key => $value) {
	$regex = array();
	$regex[] = '#(\s)((?i)src\|background\|href(?-i))\s=\s(["\']?)' .
	preg_quote($value['name'], '#') . '\3#';
	$regex[] = '#(?i)url(?-i)\(\s*(["\']?)' .
	preg_quote($value['name'], '#') . '\1\s*\)#';

	$rep = array();
	$rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
	$rep[] = 'url(\1cid:' . $value['cid'] . '\1)';

	$this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
	$this->_html_images[$key]['name']
	= $this->_basename($this->_html_images[$key]['name']);
	}
	}

	$this->_checkParams();

	$null = null;
	$attachments = count($this->_parts) ? true : false;
	$html_images = count($this->_html_images) ? true : false;
	$html = strlen($this->_htmlbody) ? true : false;
	$text = (!$html && strlen($this->_txtbody)) ? true : false;

	switch (true) {
	case $text && !$attachments:
	$message =& $this->_addTextPart($null, $this->_txtbody);
	break;

	case !$text && !$html && $attachments:
	$message =& $this->_addMixedPart();
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $text && $attachments:
	$message =& $this->_addMixedPart();
	$this->_addTextPart($message, $this->_txtbody);
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $html && !$attachments && !$html_images:
	if (isset($this->_txtbody)) {
	$message =& $this->_addAlternativePart($null);
	$this->_addTextPart($message, $this->_txtbody);
	$this->_addHtmlPart($message);
	} else {
	$message =& $this->_addHtmlPart($null);
	}
	break;

	case $html && !$attachments && $html_images:
	// * Content-Type: multipart/alternative;
	// * text
	// * Content-Type: multipart/related;
	// * html
	// * image...
	if (isset($this->_txtbody)) {
	$message =& $this->_addAlternativePart($null);
	$this->_addTextPart($message, $this->_txtbody);

	$ht =& $this->_addRelatedPart($message);
	$this->_addHtmlPart($ht);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($ht, $this->_html_images[$i]);
	}
	} else {
	// * Content-Type: multipart/related;
	// * html
	// * image...
	$message =& $this->_addRelatedPart($null);
	$this->_addHtmlPart($message);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($message, $this->_html_images[$i]);
	}
	}
	/*
	// #13444, #9725: the code below was a non-RFC compliant hack
	// * Content-Type: multipart/related;
	// * Content-Type: multipart/alternative;
	// * text
	// * html
	// * image...
	$message =& $this->_addRelatedPart($null);
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$this->_addHtmlPart($alt);
	} else {
	$this->_addHtmlPart($message);
	}
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($message, $this->_html_images[$i]);
	}
	*/
	break;

	case $html && $attachments && !$html_images:
	$message =& $this->_addMixedPart();
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$this->_addHtmlPart($alt);
	} else {
	$this->_addHtmlPart($message);
	}
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	case $html && $attachments && $html_images:
	$message =& $this->_addMixedPart();
	if (isset($this->_txtbody)) {
	$alt =& $this->_addAlternativePart($message);
	$this->_addTextPart($alt, $this->_txtbody);
	$rel =& $this->_addRelatedPart($alt);
	} else {
	$rel =& $this->_addRelatedPart($message);
	}
	$this->_addHtmlPart($rel);
	for ($i = 0; $i < count($this->_html_images); $i++) {
	$this->_addHtmlImagePart($rel, $this->_html_images[$i]);
	}
	for ($i = 0; $i < count($this->_parts); $i++) {
	$this->_addAttachmentPart($message, $this->_parts[$i]);
	}
	break;

	}

	if (!isset($message)) {
	- $ret = null;
	- return $ret;
	+ return null;
	}

	// Use saved boundary
	if (!empty($this->_build_params['boundary'])) {
	$boundary = $this->_build_params['boundary'];
	} else {
	$boundary = null;
	}

	// Write output to file
	if ($filename) {
	// Append mimePart message headers and body into file
	$headers = $message->encodeToFile($filename, $boundary, $skip_head);
	if ($this->_isError($headers)) {
	return $headers;
	}
	$this->_headers = array_merge($this->_headers, $headers);
	- $ret = null;
	- return $ret;
	+ return null;
	} else {
	$output = $message->encode($boundary, $skip_head);
	if ($this->_isError($output)) {
	return $output;
	}
	$this->_headers = array_merge($this->_headers, $output['headers']);
	- $body = $output['body'];
	- return $body;
	+ return $output['body'];
	}
	}

	/**
	* Returns an array with the headers needed to prepend to the email
	* (MIME-Version and Content-Type). Format of argument is:
	* $array['header-name'] = 'header-value';
	*
	* @param array $xtra_headers Assoc array with any extra headers (optional)
	* (Don't set Content-Type for multipart messages here!)
	* @param bool $overwrite Overwrite already existing headers.
	* @param bool $skip_content Don't return content headers: Content-Type,
	* Content-Disposition and Content-Transfer-Encoding
	*
	* @return array Assoc array with the mime headers
	* @access public
	*/
	- function &headers($xtra_headers = null, $overwrite = false, $skip_content = false)
	+ function headers($xtra_headers = null, $overwrite = false, $skip_content = false)
	{
	// Add mime version header
	$headers['MIME-Version'] = '1.0';

	// Content-Type and Content-Transfer-Encoding headers should already
	// be present if get() was called, but we'll re-set them to make sure
	// we got them when called before get() or something in the message
	// has been changed after get() [#14780]
	if (!$skip_content) {
	$headers += $this->_contentHeaders();
	}

	if (!empty($xtra_headers)) {
	$headers = array_merge($headers, $xtra_headers);
	}

	if ($overwrite) {
	$this->_headers = array_merge($this->_headers, $headers);
	} else {
	$this->_headers = array_merge($headers, $this->_headers);
	}

	$headers = $this->_headers;

	if ($skip_content) {
	unset($headers['Content-Type']);
	unset($headers['Content-Transfer-Encoding']);
	unset($headers['Content-Disposition']);
	} else if (!empty($this->_build_params['ctype'])) {
	$headers['Content-Type'] = $this->_build_params['ctype'];
	}

	$encodedHeaders = $this->_encodeHeaders($headers);
	return $encodedHeaders;
	}

	/**
	* Get the text version of the headers
	* (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!)
	* @param bool $overwrite Overwrite the existing headers with new.
	* @param bool $skip_content Don't return content headers: Content-Type,
	* Content-Disposition and Content-Transfer-Encoding
	*
	* @return string Plain text headers
	* @access public
	*/
	function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
	{
	$headers = $this->headers($xtra_headers, $overwrite, $skip_content);

	// Place Received: headers at the beginning of the message
	// Spam detectors often flag messages with it after the Subject: as spam
	if (isset($headers['Received'])) {
	$received = $headers['Received'];
	unset($headers['Received']);
	$headers = array('Received' => $received) + $headers;
	}

	$ret = '';
	$eol = $this->_build_params['eol'];

	foreach ($headers as $key => $val) {
	if (is_array($val)) {
	foreach ($val as $value) {
	$ret .= "$key: $value" . $eol;
	}
	} else {
	$ret .= "$key: $val" . $eol;
	}
	}

	return $ret;
	}

	/**
	* Sets message Content-Type header.
	* Use it to build messages with various content-types e.g. miltipart/raport
	* not supported by _contentHeaders() function.
	*
	* @param string $type Type name
	* @param array $params Hash array of header parameters
	*
	* @return void
	* @access public
	* @since 1.7.0
	*/
	function setContentType($type, $params = array())
	{
	$header = $type;

	$eol = !empty($this->_build_params['eol'])
	? $this->_build_params['eol'] : "\r\n";

	// add parameters
	$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
	. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
	if (is_array($params)) {
	foreach ($params as $name => $value) {
	if ($name == 'boundary') {
	$this->_build_params['boundary'] = $value;
	}
	if (!preg_match($token_regexp, $value)) {
	$header .= ";$eol $name=$value";
	} else {
	$value = addcslashes($value, '\\"');
	$header .= ";$eol $name=\"$value\"";
	}
	}
	}

	// add required boundary parameter if not defined
	if (preg_match('/^multipart\//i', $type)) {
	if (empty($this->_build_params['boundary'])) {
	$this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
	}

	$header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
	}

	$this->_build_params['ctype'] = $header;
	}

	/**
	* Sets the Subject header
	*
	* @param string $subject String to set the subject to.
	*
	* @return void
	* @access public
	*/
	function setSubject($subject)
	{
	$this->_headers['Subject'] = $subject;
	}

	/**
	* Set an email to the From (the sender) header
	*
	* @param string $email The email address to use
	*
	* @return void
	* @access public
	*/
	function setFrom($email)
	{
	$this->_headers['From'] = $email;
	}

	/**
	* Add an email to the To header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addTo($email)
	{
	if (isset($this->_headers['To'])) {
	$this->_headers['To'] .= ", $email";
	} else {
	$this->_headers['To'] = $email;
	}
	}

	/**
	* Add an email to the Cc (carbon copy) header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addCc($email)
	{
	if (isset($this->_headers['Cc'])) {
	$this->_headers['Cc'] .= ", $email";
	} else {
	$this->_headers['Cc'] = $email;
	}
	}

	/**
	* Add an email to the Bcc (blank carbon copy) header
	* (multiple calls to this method are allowed)
	*
	* @param string $email The email direction to add
	*
	* @return void
	* @access public
	*/
	function addBcc($email)
	{
	if (isset($this->_headers['Bcc'])) {
	$this->_headers['Bcc'] .= ", $email";
	} else {
	$this->_headers['Bcc'] = $email;
	}
	}

	/**
	* Since the PHP send function requires you to specify
	* recipients (To: header) separately from the other
	* headers, the To: header is not properly encoded.
	* To fix this, you can use this public method to
	* encode your recipients before sending to the send
	* function
	*
	* @param string $recipients A comma-delimited list of recipients
	*
	* @return string Encoded data
	* @access public
	*/
	function encodeRecipients($recipients)
	{
	$input = array("To" => $recipients);
	$retval = $this->_encodeHeaders($input);
	return $retval["To"] ;
	}

	/**
	* Encodes headers as per RFC2047
	*
	* @param array $input The header data to encode
	* @param array $params Extra build parameters
	*
	* @return array Encoded data
	* @access private
	*/
	function _encodeHeaders($input, $params = array())
	{
	$build_params = $this->_build_params;
	while (list($key, $value) = each($params)) {
	$build_params[$key] = $value;
	}

	foreach ($input as $hdr_name => $hdr_value) {
	if (is_array($hdr_value)) {
	foreach ($hdr_value as $idx => $value) {
	$input[$hdr_name][$idx] = $this->encodeHeader(
	$hdr_name, $value,
	$build_params['head_charset'], $build_params['head_encoding']
	);
	}
	} else {
	$input[$hdr_name] = $this->encodeHeader(
	$hdr_name, $hdr_value,
	$build_params['head_charset'], $build_params['head_encoding']
	);
	}
	}

	return $input;
	}

	/**
	* Encodes a header as per RFC2047
	*
	* @param string $name The header name
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	*
	* @return string Encoded header data (without a name)
	* @access public
	* @since 1.5.3
	*/
	function encodeHeader($name, $value, $charset, $encoding)
	{
	$mime_part = new Mail_mimePart;
	return $mime_part->encodeHeader(
	$name, $value, $charset, $encoding, $this->_build_params['eol']
	);
	}

	/**
	* Get file's basename (locale independent)
	*
	* @param string $filename Filename
	*
	* @return string Basename
	* @access private
	*/
	function _basename($filename)
	{
	// basename() is not unicode safe and locale dependent
	if (stristr(PHP_OS, 'win') \|\| stristr(PHP_OS, 'netware')) {
	return preg_replace('/^.*[\\\\\\/]/', '', $filename);
	} else {
	return preg_replace('/^.*[\/]/', '', $filename);
	}
	}

	/**
	* Get Content-Type and Content-Transfer-Encoding headers of the message
	*
	* @return array Headers array
	* @access private
	*/
	function _contentHeaders()
	{
	$attachments = count($this->_parts) ? true : false;
	$html_images = count($this->_html_images) ? true : false;
	$html = strlen($this->_htmlbody) ? true : false;
	$text = (!$html && strlen($this->_txtbody)) ? true : false;
	$headers = array();

	// See get()
	switch (true) {
	case $text && !$attachments:
	$headers['Content-Type'] = 'text/plain';
	break;

	case !$text && !$html && $attachments:
	case $text && $attachments:
	case $html && $attachments && !$html_images:
	case $html && $attachments && $html_images:
	$headers['Content-Type'] = 'multipart/mixed';
	break;

	case $html && !$attachments && !$html_images && isset($this->_txtbody):
	case $html && !$attachments && $html_images && isset($this->_txtbody):
	$headers['Content-Type'] = 'multipart/alternative';
	break;

	case $html && !$attachments && !$html_images && !isset($this->_txtbody):
	$headers['Content-Type'] = 'text/html';
	break;

	case $html && !$attachments && $html_images && !isset($this->_txtbody):
	$headers['Content-Type'] = 'multipart/related';
	break;

	default:
	return $headers;
	}

	$this->_checkParams();

	$eol = !empty($this->_build_params['eol'])
	? $this->_build_params['eol'] : "\r\n";

	if ($headers['Content-Type'] == 'text/plain') {
	// single-part message: add charset and encoding
	$charset = 'charset=' . $this->_build_params['text_charset'];
	// place charset parameter in the same line, if possible
	// 26 = strlen("Content-Type: text/plain; ")
	$headers['Content-Type']
	.= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
	$headers['Content-Transfer-Encoding']
	= $this->_build_params['text_encoding'];
	} else if ($headers['Content-Type'] == 'text/html') {
	// single-part message: add charset and encoding
	$charset = 'charset=' . $this->_build_params['html_charset'];
	// place charset parameter in the same line, if possible
	$headers['Content-Type']
	.= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
	$headers['Content-Transfer-Encoding']
	= $this->_build_params['html_encoding'];
	} else {
	// multipart message: and boundary
	if (!empty($this->_build_params['boundary'])) {
	$boundary = $this->_build_params['boundary'];
	} else if (!empty($this->_headers['Content-Type'])
	&& preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
	) {
	$boundary = $m[1];
	} else {
	$boundary = '=_' . md5(rand() . microtime());
	}

	$this->_build_params['boundary'] = $boundary;
	$headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
	}

	return $headers;
	}

	/**
	* Validate and set build parameters
	*
	* @return void
	* @access private
	*/
	function _checkParams()
	{
	$encodings = array('7bit', '8bit', 'base64', 'quoted-printable');

	$this->_build_params['text_encoding']
	= strtolower($this->_build_params['text_encoding']);
	$this->_build_params['html_encoding']
	= strtolower($this->_build_params['html_encoding']);

	if (!in_array($this->_build_params['text_encoding'], $encodings)) {
	$this->_build_params['text_encoding'] = '7bit';
	}
	if (!in_array($this->_build_params['html_encoding'], $encodings)) {
	$this->_build_params['html_encoding'] = '7bit';
	}

	// text body
	if ($this->_build_params['text_encoding'] == '7bit'
	&& !preg_match('/ascii/i', $this->_build_params['text_charset'])
	&& preg_match('/[^\x00-\x7F]/', $this->_txtbody)
	) {
	$this->_build_params['text_encoding'] = 'quoted-printable';
	}
	// html body
	if ($this->_build_params['html_encoding'] == '7bit'
	&& !preg_match('/ascii/i', $this->_build_params['html_charset'])
	&& preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
	) {
	$this->_build_params['html_encoding'] = 'quoted-printable';
	}
	}

	/**
	- * PEAR::isError wrapper
	+ * PEAR::isError implementation
	*
	* @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;
	}

	+ /**
	+ * PEAR::raiseError implementation
	+ *
	+ * @param $message A text error message
	+ *
	+ * @return PEAR_Error Instance of PEAR_Error
	+ * @access private
	+ */
	+ function _raiseError($message)
	+ {
	+ // PEAR::raiseError() is not PHP 5.4 compatible
	+ return new PEAR_Error($message);
	+ }
	+
	} // End of class
	diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
	index f3e75dd10..c6e9f4aa8 100644
	--- a/program/lib/Mail/mimePart.php
	+++ b/program/lib/Mail/mimePart.php
	@@ -1,1247 +1,1261 @@
	<?php
	/**
	* The Mail_mimePart class is used to create MIME E-mail messages
	*
	* This class enables you to manipulate and build a mime email
	* from the ground up. The Mail_Mime class is a userfriendly api
	* to this class for people who aren't interested in the internals
	* of mime mail.
	* This class however allows full control over the email.
	*
	* Compatible with PHP versions 4 and 5
	*
	* LICENSE: This LICENSE is in the BSD license style.
	* Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
	* Copyright (c) 2003-2006, PEAR <pear-group@php.net>
	* All rights reserved.
	*
	* Redistribution and use in source and binary forms, with or
	* without modification, are permitted provided that the following
	* conditions are met:
	*
	* - Redistributions of source code must retain the above copyright
	* notice, this list of conditions and the following disclaimer.
	* - Redistributions in binary form must reproduce the above copyright
	* notice, this list of conditions and the following disclaimer in the
	* documentation and/or other materials provided with the distribution.
	* - Neither the name of the authors, nor the names of its contributors
	* may be used to endorse or promote products derived from this
	* software without specific prior written permission.
	*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
	* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	* THE POSSIBILITY OF SUCH DAMAGE.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.7
	+ * @version CVS: $Id$
	* @link http://pear.php.net/package/Mail_mime
	*/


	/**
	* The Mail_mimePart class is used to create MIME E-mail messages
	*
	* This class enables you to manipulate and build a mime email
	* from the ground up. The Mail_Mime class is a userfriendly api
	* to this class for people who aren't interested in the internals
	* of mime mail.
	* This class however allows full control over the email.
	*
	* @category Mail
	* @package Mail_Mime
	* @author Richard Heyes <richard@phpguru.org>
	* @author Cipriano Groenendal <cipri@php.net>
	* @author Sean Coates <sean@php.net>
	* @author Aleksander Machniak <alec@php.net>
	* @copyright 2003-2006 PEAR <pear-group@php.net>
	* @license http://www.opensource.org/licenses/bsd-license.php BSD License
	- * @version Release: 1.8.7
	+ * @version Release: @package_version@
	* @link http://pear.php.net/package/Mail_mime
	*/
	class Mail_mimePart
	{
	/**
	* The encoding type of this part
	*
	* @var string
	* @access private
	*/
	var $_encoding;

	/**
	* An array of subparts
	*
	* @var array
	* @access private
	*/
	var $_subparts;

	/**
	* The output of this part after being built
	*
	* @var string
	* @access private
	*/
	var $_encoded;

	/**
	* Headers for this part
	*
	* @var array
	* @access private
	*/
	var $_headers;

	/**
	* The body of this part (not encoded)
	*
	* @var string
	* @access private
	*/
	var $_body;

	/**
	* The location of file with body of this part (not encoded)
	*
	* @var string
	* @access private
	*/
	var $_body_file;

	/**
	* The end-of-line sequence
	*
	* @var string
	* @access private
	*/
	var $_eol = "\r\n";


	/**
	* Constructor.
	*
	* Sets up the object.
	*
	* @param string $body The body of the mime part if any.
	* @param array $params An associative array of optional parameters:
	* content_type - The content type for this part eg multipart/mixed
	* encoding - The encoding to use, 7bit, 8bit,
	* base64, or quoted-printable
	* charset - Content character set
	* cid - Content ID to apply
	* disposition - Content disposition, inline or attachment
	* filename - Filename parameter for content disposition
	* description - Content description
	* name_encoding - Encoding of the attachment name (Content-Type)
	* By default filenames are encoded using RFC2231
	* Here you can set RFC2047 encoding (quoted-printable
	* or base64) instead
	* filename_encoding - Encoding of the attachment filename (Content-Disposition)
	* See 'name_encoding'
	* headers_charset - Charset of the headers e.g. filename, description.
	* If not set, 'charset' will be used
	* eol - End of line sequence. Default: "\r\n"
	* headers - Hash array with additional part headers. Array keys can be
	* in form of <header_name>:<parameter_name>
	* body_file - Location of file with part's body (instead of $body)
	*
	* @access public
	*/
	function Mail_mimePart($body = '', $params = array())
	{
	if (!empty($params['eol'])) {
	$this->_eol = $params['eol'];
	} else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
	$this->_eol = MAIL_MIMEPART_CRLF;
	}

	// Additional part headers
	if (!empty($params['headers']) && is_array($params['headers'])) {
	$headers = $params['headers'];
	}

	foreach ($params as $key => $value) {
	switch ($key) {
	case 'encoding':
	$this->_encoding = $value;
	$headers['Content-Transfer-Encoding'] = $value;
	break;

	case 'cid':
	$headers['Content-ID'] = '<' . $value . '>';
	break;

	case 'location':
	$headers['Content-Location'] = $value;
	break;

	case 'body_file':
	$this->_body_file = $value;
	break;

	// for backward compatibility
	case 'dfilename':
	$params['filename'] = $value;
	break;
	}
	}

	// Default content-type
	if (empty($params['content_type'])) {
	$params['content_type'] = 'text/plain';
	}

	// Content-Type
	$headers['Content-Type'] = $params['content_type'];
	if (!empty($params['charset'])) {
	$charset = "charset={$params['charset']}";
	// place charset parameter in the same line, if possible
	if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
	$headers['Content-Type'] .= '; ';
	} else {
	$headers['Content-Type'] .= ';' . $this->_eol . ' ';
	}
	$headers['Content-Type'] .= $charset;

	// Default headers charset
	if (!isset($params['headers_charset'])) {
	$params['headers_charset'] = $params['charset'];
	}
	}

	// header values encoding parameters
	$h_charset = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
	$h_language = !empty($params['language']) ? $params['language'] : null;
	$h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;


	if (!empty($params['filename'])) {
	$headers['Content-Type'] .= ';' . $this->_eol;
	$headers['Content-Type'] .= $this->_buildHeaderParam(
	'name', $params['filename'], $h_charset, $h_language, $h_encoding
	);
	}

	// Content-Disposition
	if (!empty($params['disposition'])) {
	$headers['Content-Disposition'] = $params['disposition'];
	if (!empty($params['filename'])) {
	$headers['Content-Disposition'] .= ';' . $this->_eol;
	$headers['Content-Disposition'] .= $this->_buildHeaderParam(
	'filename', $params['filename'], $h_charset, $h_language,
	!empty($params['filename_encoding']) ? $params['filename_encoding'] : null
	);
	}

	// add attachment size
	$size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
	if ($size) {
	$headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
	}
	}

	if (!empty($params['description'])) {
	$headers['Content-Description'] = $this->encodeHeader(
	'Content-Description', $params['description'], $h_charset, $h_encoding,
	$this->_eol
	);
	}

	// Search and add existing headers' parameters
	foreach ($headers as $key => $value) {
	$items = explode(':', $key);
	if (count($items) == 2) {
	$header = $items[0];
	$param = $items[1];
	if (isset($headers[$header])) {
	$headers[$header] .= ';' . $this->_eol;
	}
	$headers[$header] .= $this->_buildHeaderParam(
	$param, $value, $h_charset, $h_language, $h_encoding
	);
	unset($headers[$key]);
	}
	}

	// Default encoding
	if (!isset($this->_encoding)) {
	$this->_encoding = '7bit';
	}

	// Assign stuff to member variables
	$this->_encoded = array();
	$this->_headers = $headers;
	$this->_body = $body;
	}

	/**
	* Encodes and returns the email. Also stores
	* it in the encoded member variable
	*
	* @param string $boundary Pre-defined boundary string
	*
	* @return An associative array containing two elements,
	* body and headers. The headers element is itself
	* an indexed array. On error returns PEAR error object.
	* @access public
	*/
	function encode($boundary=null)
	{
	$encoded =& $this->_encoded;

	if (count($this->_subparts)) {
	$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
	$eol = $this->_eol;

	$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";

	$encoded['body'] = '';

	for ($i = 0; $i < count($this->_subparts); $i++) {
	$encoded['body'] .= '--' . $boundary . $eol;
	$tmp = $this->_subparts[$i]->encode();
	if ($this->_isError($tmp)) {
	return $tmp;
	}
	foreach ($tmp['headers'] as $key => $value) {
	$encoded['body'] .= $key . ': ' . $value . $eol;
	}
	$encoded['body'] .= $eol . $tmp['body'] . $eol;
	}

	$encoded['body'] .= '--' . $boundary . '--' . $eol;

	} else if ($this->_body) {
	$encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
	} else if ($this->_body_file) {
	// Temporarily reset magic_quotes_runtime for file reads and writes
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}
	$body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	if ($this->_isError($body)) {
	return $body;
	}
	$encoded['body'] = $body;
	} else {
	$encoded['body'] = '';
	}

	// Add headers to $encoded
	$encoded['headers'] =& $this->_headers;

	return $encoded;
	}

	/**
	* Encodes and saves the email into file. File must exist.
	* Data will be appended to the file.
	*
	* @param string $filename Output file location
	* @param string $boundary Pre-defined boundary string
	* @param boolean $skip_head True if you don't want to save headers
	*
	* @return array An associative array containing message headers
	* or PEAR error object
	* @access public
	* @since 1.6.0
	*/
	function encodeToFile($filename, $boundary=null, $skip_head=false)
	{
	if (file_exists($filename) && !is_writable($filename)) {
	- $err = PEAR::raiseError('File is not writeable: ' . $filename);
	+ $err = $this->_raiseError('File is not writeable: ' . $filename);
	return $err;
	}

	if (!($fh = fopen($filename, 'ab'))) {
	- $err = PEAR::raiseError('Unable to open file: ' . $filename);
	+ $err = $this->_raiseError('Unable to open file: ' . $filename);
	return $err;
	}

	// Temporarily reset magic_quotes_runtime for file reads and writes
	if ($magic_quote_setting = get_magic_quotes_runtime()) {
	@ini_set('magic_quotes_runtime', 0);
	}

	$res = $this->_encodePartToFile($fh, $boundary, $skip_head);

	fclose($fh);

	if ($magic_quote_setting) {
	@ini_set('magic_quotes_runtime', $magic_quote_setting);
	}

	return $this->_isError($res) ? $res : $this->_headers;
	}

	/**
	* Encodes given email part into file
	*
	* @param string $fh Output file handle
	* @param string $boundary Pre-defined boundary string
	* @param boolean $skip_head True if you don't want to save headers
	*
	* @return array True on sucess or PEAR error object
	* @access private
	*/
	function _encodePartToFile($fh, $boundary=null, $skip_head=false)
	{
	$eol = $this->_eol;

	if (count($this->_subparts)) {
	$boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
	$this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
	}

	if (!$skip_head) {
	foreach ($this->_headers as $key => $value) {
	fwrite($fh, $key . ': ' . $value . $eol);
	}
	$f_eol = $eol;
	} else {
	$f_eol = '';
	}

	if (count($this->_subparts)) {
	for ($i = 0; $i < count($this->_subparts); $i++) {
	fwrite($fh, $f_eol . '--' . $boundary . $eol);
	$res = $this->_subparts[$i]->_encodePartToFile($fh);
	if ($this->_isError($res)) {
	return $res;
	}
	$f_eol = $eol;
	}

	fwrite($fh, $eol . '--' . $boundary . '--' . $eol);

	} else if ($this->_body) {
	fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
	} else if ($this->_body_file) {
	fwrite($fh, $f_eol);
	$res = $this->_getEncodedDataFromFile(
	$this->_body_file, $this->_encoding, $fh
	);
	if ($this->_isError($res)) {
	return $res;
	}
	}

	return true;
	}

	/**
	* Adds a subpart to current mime part and returns
	* a reference to it
	*
	* @param string $body The body of the subpart, if any.
	* @param array $params The parameters for the subpart, same
	* as the $params argument for constructor.
	*
	- * @return Mail_mimePart A reference to the part you just added. It is
	+ * @return Mail_mimePart A reference to the part you just added. In PHP4, it is
	* crucial if using multipart/* in your subparts that
	* you use =& in your script when calling this function,
	* otherwise you will not be able to add further subparts.
	* @access public
	*/
	function &addSubpart($body, $params)
	{
	- $this->_subparts[] = new Mail_mimePart($body, $params);
	- return $this->_subparts[count($this->_subparts) - 1];
	+ $this->_subparts[] = $part = new Mail_mimePart($body, $params);
	+ return $part;
	}

	/**
	* Returns encoded data based upon encoding passed to it
	*
	* @param string $data The data to encode.
	* @param string $encoding The encoding type to use, 7bit, base64,
	* or quoted-printable.
	*
	* @return string
	* @access private
	*/
	function _getEncodedData($data, $encoding)
	{
	switch ($encoding) {
	case 'quoted-printable':
	return $this->_quotedPrintableEncode($data);
	break;

	case 'base64':
	return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
	break;

	case '8bit':
	case '7bit':
	default:
	return $data;
	}
	}

	/**
	* Returns encoded data based upon encoding passed to it
	*
	* @param string $filename Data file location
	* @param string $encoding The encoding type to use, 7bit, base64,
	* or quoted-printable.
	* @param resource $fh Output file handle. If set, data will be
	* stored into it instead of returning it
	*
	* @return string Encoded data or PEAR error object
	* @access private
	*/
	function _getEncodedDataFromFile($filename, $encoding, $fh=null)
	{
	if (!is_readable($filename)) {
	- $err = PEAR::raiseError('Unable to read file: ' . $filename);
	+ $err = $this->_raiseError('Unable to read file: ' . $filename);
	return $err;
	}

	if (!($fd = fopen($filename, 'rb'))) {
	- $err = PEAR::raiseError('Could not open file: ' . $filename);
	+ $err = $this->_raiseError('Could not open file: ' . $filename);
	return $err;
	}

	$data = '';

	switch ($encoding) {
	case 'quoted-printable':
	while (!feof($fd)) {
	$buffer = $this->_quotedPrintableEncode(fgets($fd));
	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	break;

	case 'base64':
	while (!feof($fd)) {
	// Should read in a multiple of 57 bytes so that
	// the output is 76 bytes per line. Don't use big chunks
	// because base64 encoding is memory expensive
	$buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
	$buffer = base64_encode($buffer);
	$buffer = chunk_split($buffer, 76, $this->_eol);
	if (feof($fd)) {
	$buffer = rtrim($buffer);
	}

	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	break;

	case '8bit':
	case '7bit':
	default:
	while (!feof($fd)) {
	$buffer = fread($fd, 1048576); // 1 MB
	if ($fh) {
	fwrite($fh, $buffer);
	} else {
	$data .= $buffer;
	}
	}
	}

	fclose($fd);

	if (!$fh) {
	return $data;
	}
	}

	/**
	* Encodes data to quoted-printable standard.
	*
	* @param string $input The data to encode
	* @param int $line_max Optional max line length. Should
	* not be more than 76 chars
	*
	* @return string Encoded data
	*
	* @access private
	*/
	function _quotedPrintableEncode($input , $line_max = 76)
	{
	$eol = $this->_eol;
	/*
	// imap_8bit() is extremely fast, but doesn't handle properly some characters
	if (function_exists('imap_8bit') && $line_max == 76) {
	$input = preg_replace('/\r?\n/', "\r\n", $input);
	$input = imap_8bit($input);
	if ($eol != "\r\n") {
	$input = str_replace("\r\n", $eol, $input);
	}
	return $input;
	}
	*/
	$lines = preg_split("/\r?\n/", $input);
	$escape = '=';
	$output = '';

	while (list($idx, $line) = each($lines)) {
	$newline = '';
	$i = 0;

	while (isset($line[$i])) {
	$char = $line[$i];
	$dec = ord($char);
	$i++;

	if (($dec == 32) && (!isset($line[$i]))) {
	// convert space at eol only
	$char = '=20';
	} elseif ($dec == 9 && isset($line[$i])) {
	; // Do nothing if a TAB is not on eol
	} elseif (($dec == 61) \|\| ($dec < 32) \|\| ($dec > 126)) {
	$char = $escape . sprintf('%02X', $dec);
	} elseif (($dec == 46) && (($newline == '')
	\|\| ((strlen($newline) + strlen("=2E")) >= $line_max))
	) {
	// Bug #9722: convert full-stop at bol,
	// some Windows servers need this, won't break anything (cipri)
	// Bug #11731: full-stop at bol also needs to be encoded
	// if this line would push us over the line_max limit.
	$char = '=2E';
	}

	// Note, when changing this line, also change the ($dec == 46)
	// check line, as it mimics this line due to Bug #11731
	// EOL is not counted
	if ((strlen($newline) + strlen($char)) >= $line_max) {
	// soft line break; " =\r\n" is okay
	$output .= $newline . $escape . $eol;
	$newline = '';
	}
	$newline .= $char;
	} // end of for
	$output .= $newline . $eol;
	unset($lines[$idx]);
	}
	// Don't want last crlf
	$output = substr($output, 0, -1 * strlen($eol));
	return $output;
	}

	/**
	- * Encodes the paramater of a header.
	+ * Encodes the parameter of a header.
	*
	* @param string $name The name of the header-parameter
	* @param string $value The value of the paramter
	* @param string $charset The characterset of $value
	* @param string $language The language used in $value
	* @param string $encoding Parameter encoding. If not set, parameter value
	* is encoded according to RFC2231
	* @param int $maxLength The maximum length of a line. Defauls to 75
	*
	* @return string
	*
	* @access private
	*/
	function _buildHeaderParam($name, $value, $charset=null, $language=null,
	$encoding=null, $maxLength=75
	) {
	// RFC 2045:
	// value needs encoding if contains non-ASCII chars or is longer than 78 chars
	if (!preg_match('#[^\x20-\x7E]#', $value)) {
	$token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
	. '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
	if (!preg_match($token_regexp, $value)) {
	// token
	if (strlen($name) + strlen($value) + 3 <= $maxLength) {
	return " {$name}={$value}";
	}
	} else {
	// quoted-string
	$quoted = addcslashes($value, '\\"');
	if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
	return " {$name}=\"{$quoted}\"";
	}
	}
	}

	// RFC2047: use quoted-printable/base64 encoding
	if ($encoding == 'quoted-printable' \|\| $encoding == 'base64') {
	return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
	}

	// RFC2231:
	$encValue = preg_replace_callback(
	'/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
	array($this, '_encodeReplaceCallback'), $value
	);
	$value = "$charset'$language'$encValue";

	$header = " {$name}*={$value}";
	if (strlen($header) <= $maxLength) {
	return $header;
	}

	$preLength = strlen(" {$name}0=");
	$maxLength = max(16, $maxLength - $preLength - 3);
	$maxLengthReg = "\|(.{0,$maxLength}[^\%][^\%])\|";

	$headers = array();
	$headCount = 0;
	while ($value) {
	$matches = array();
	$found = preg_match($maxLengthReg, $value, $matches);
	if ($found) {
	$headers[] = " {$name}{$headCount}={$matches[0]}";
	$value = substr($value, strlen($matches[0]));
	} else {
	$headers[] = " {$name}{$headCount}={$value}";
	$value = '';
	}
	$headCount++;
	}

	$headers = implode(';' . $this->_eol, $headers);
	return $headers;
	}

	/**
	* Encodes header parameter as per RFC2047 if needed
	*
	* @param string $name The parameter name
	* @param string $value The parameter value
	* @param string $charset The parameter charset
	* @param string $encoding Encoding type (quoted-printable or base64)
	* @param int $maxLength Encoded parameter max length. Default: 76
	*
	* @return string Parameter line
	* @access private
	*/
	function _buildRFC2047Param($name, $value, $charset,
	$encoding='quoted-printable', $maxLength=76
	) {
	// WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
	// parameter of a MIME Content-Type or Content-Disposition field",
	// but... it's supported by many clients/servers
	$quoted = '';

	if ($encoding == 'base64') {
	$value = base64_encode($value);
	$prefix = '=?' . $charset . '?B?';
	$suffix = '?=';

	// 2 x SPACE, 2 x '"', '=', ';'
	$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
	$len = $add_len + strlen($value);

	while ($len > $maxLength) {
	// We can cut base64-encoded string every 4 characters
	$real_len = floor(($maxLength - $add_len) / 4) * 4;
	$_quote = substr($value, 0, $real_len);
	$value = substr($value, $real_len);

	$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
	$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
	$len = strlen($value) + $add_len;
	}
	$quoted .= $prefix . $value . $suffix;

	} else {
	// quoted-printable
	$value = $this->encodeQP($value);
	$prefix = '=?' . $charset . '?Q?';
	$suffix = '?=';

	// 2 x SPACE, 2 x '"', '=', ';'
	$add_len = strlen($prefix . $suffix) + strlen($name) + 6;
	$len = $add_len + strlen($value);

	while ($len > $maxLength) {
	$length = $maxLength - $add_len;
	// don't break any encoded letters
	if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
	$_quote = $matches[1];
	}

	$quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
	$value = substr($value, strlen($_quote));
	$add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
	$len = strlen($value) + $add_len;
	}

	$quoted .= $prefix . $value . $suffix;
	}

	return " {$name}=\"{$quoted}\"";
	}

	/**
	* Encodes a header as per RFC2047
	*
	* @param string $name The header name
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded header data (without a name)
	* @access public
	* @since 1.6.1
	*/
	function encodeHeader($name, $value, $charset='ISO-8859-1',
	$encoding='quoted-printable', $eol="\r\n"
	) {
	// Structured headers
	$comma_headers = array(
	'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(
	'references', 'in-reply-to', 'message-id', 'resent-message-id',
	);

	$name = strtolower($name);

	if (in_array($name, $comma_headers)) {
	$separator = ',';
	} else if (in_array($name, $other_headers)) {
	$separator = ' ';
	}

	if (!$charset) {
	$charset = 'ISO-8859-1';
	}

	// Structured header (make sure addr-spec inside is not encoded)
	if (!empty($separator)) {
	// Simple e-mail address regexp
	$email_regexp = '([^\s<]+\|("[^\r\n"]+"))@\S+';

	$parts = Mail_mimePart::_explodeQuotedString($separator, $value);
	$value = '';

	foreach ($parts as $part) {
	$part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
	$part = trim($part);

	if (!$part) {
	continue;
	}
	if ($value) {
	$value .= $separator==',' ? $separator.' ' : ' ';
	} else {
	$value = $name . ': ';
	}

	// let's find phrase (name) and/or addr-spec
	if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
	$value .= $part;
	} else if (preg_match('/^' . $email_regexp . '$/', $part)) {
	// address without brackets and without name
	$value .= $part;
	} else if (preg_match('/<' . $email_regexp . '>$/', $part, $matches)) {
	// address with name (handle name)
	$address = $matches[0];
	$word = str_replace($address, '', $part);
	$word = trim($word);
	// check if phrase requires quoting
	if ($word) {
	// non-ASCII: require encoding
	if (preg_match('#([\x80-\xFF]){1}#', $word)) {
	if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
	// de-quote quoted-string, encoding changes
	// string to atom
	$search = array("\\\"", "\\\\");
	$replace = array("\"", "\\");
	$word = str_replace($search, $replace, $word);
	$word = substr($word, 1, -1);
	}
	// find length of last line
	if (($pos = strrpos($value, $eol)) !== false) {
	$last_len = strlen($value) - $pos;
	} else {
	$last_len = strlen($value);
	}
	$word = Mail_mimePart::encodeHeaderValue(
	$word, $charset, $encoding, $last_len, $eol
	);
	} else if (($word[0] != '"' \|\| $word[strlen($word)-1] != '"')
	&& preg_match('/[\<\>\\\.\[\]@,;:"]/', $word)
	) {
	// ASCII: quote string if needed
	$word = '"'.addcslashes($word, '\\"').'"';
	}
	}
	$value .= $word.' '.$address;
	} else {
	// addr-spec not found, don't encode (?)
	$value .= $part;
	}

	// RFC2822 recommends 78 characters limit, use 76 from RFC2047
	$value = wordwrap($value, 76, $eol . ' ');
	}

	// remove header name prefix (there could be EOL too)
	$value = preg_replace(
	'/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
	);

	} else {
	// Unstructured header
	// non-ASCII: require encoding
	if (preg_match('#([\x80-\xFF]){1}#', $value)) {
	if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
	// de-quote quoted-string, encoding changes
	// string to atom
	$search = array("\\\"", "\\\\");
	$replace = array("\"", "\\");
	$value = str_replace($search, $replace, $value);
	$value = substr($value, 1, -1);
	}
	$value = Mail_mimePart::encodeHeaderValue(
	$value, $charset, $encoding, strlen($name) + 2, $eol
	);
	} else if (strlen($name.': '.$value) > 78) {
	// ASCII: check if header line isn't too long and use folding
	$value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
	$tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
	$value = preg_replace('/^'.$name.':\s*/', '', $tmp);
	// hard limit 998 (RFC2822)
	$value = wordwrap($value, 998, $eol . ' ', true);
	}
	}

	return $value;
	}

	/**
	* Explode quoted string
	*
	* @param string $delimiter Delimiter expression string for preg_match()
	* @param string $string Input string
	*
	* @return array String tokens array
	* @access private
	*/
	function _explodeQuotedString($delimiter, $string)
	{
	$result = array();
	$strlen = strlen($string);

	for ($q=$p=$i=0; $i < $strlen; $i++) {
	if ($string[$i] == "\""
	&& (empty($string[$i-1]) \|\| $string[$i-1] != "\\")
	) {
	$q = $q ? false : true;
	} else if (!$q && preg_match("/$delimiter/", $string[$i])) {
	$result[] = substr($string, $p, $i - $p);
	$p = $i + 1;
	}
	}

	$result[] = substr($string, $p);
	return $result;
	}

	/**
	* Encodes a header value as per RFC2047
	*
	* @param string $value The header data to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param int $prefix_len Prefix length. Default: 0
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded header data
	* @access public
	* @since 1.6.1
	*/
	function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
	{
	// #17311: Use multibyte aware method (requires mbstring extension)
	if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
	return $result;
	}

	// Generate the header using the specified params and dynamicly
	// determine the maximum length of such strings.
	// 75 is the value specified in the RFC.
	$encoding = $encoding == 'base64' ? 'B' : 'Q';
	$prefix = '=?' . $charset . '?' . $encoding .'?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix);
	$maxLength1stLine = $maxLength - $prefix_len;

	if ($encoding == 'B') {
	// Base64 encode the entire string
	$value = base64_encode($value);

	// We can cut base64 every 4 characters, so the real max
	// we can get must be rounded down.
	$maxLength = $maxLength - ($maxLength % 4);
	$maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);

	$cutpoint = $maxLength1stLine;
	$output = '';

	while ($value) {
	// Split translated string at every $maxLength
	$part = substr($value, 0, $cutpoint);
	$value = substr($value, $cutpoint);
	$cutpoint = $maxLength;
	// RFC 2047 specifies that any split header should
	- // be seperated by a CRLF SPACE.
	+ // be separated by a CRLF SPACE.
	if ($output) {
	$output .= $eol . ' ';
	}
	$output .= $prefix . $part . $suffix;
	}
	$value = $output;
	} else {
	// quoted-printable encoding has been selected
	$value = Mail_mimePart::encodeQP($value);

	// This regexp will break QP-encoded text at every $maxLength
	// but will not break any encoded letters.
	$reg1st = "\|(.{0,$maxLength1stLine}[^\=][^\=])\|";
	$reg2nd = "\|(.{0,$maxLength}[^\=][^\=])\|";

	if (strlen($value) > $maxLength1stLine) {
	// Begin with the regexp for the first line.
	$reg = $reg1st;
	$output = '';
	while ($value) {
	// Split translated string at every $maxLength
	// But make sure not to break any translated chars.
	$found = preg_match($reg, $value, $matches);

	// After this first line, we need to use a different
	// regexp for the first line.
	$reg = $reg2nd;

	// Save the found part and encapsulate it in the
	// prefix & suffix. Then remove the part from the
	// $value_out variable.
	if ($found) {
	$part = $matches[0];
	$len = strlen($matches[0]);
	$value = substr($value, $len);
	} else {
	$part = $value;
	$value = '';
	}

	// RFC 2047 specifies that any split header should
	- // be seperated by a CRLF SPACE
	+ // be separated by a CRLF SPACE
	if ($output) {
	$output .= $eol . ' ';
	}
	$output .= $prefix . $part . $suffix;
	}
	$value = $output;
	} else {
	$value = $prefix . $value . $suffix;
	}
	}

	return $value;
	}

	/**
	* Encodes the given string using quoted-printable
	*
	* @param string $str String to encode
	*
	* @return string Encoded string
	* @access public
	* @since 1.6.0
	*/
	function encodeQP($str)
	{
	// Bug #17226 RFC 2047 restricts some characters
	// if the word is inside a phrase, permitted chars are only:
	// ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"

	// "=", "_", "?" must be encoded
	$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
	$str = preg_replace_callback(
	$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
	);

	return str_replace(' ', '_', $str);
	}

	/**
	* Encodes the given string using base64 or quoted-printable.
	* This method makes sure that encoded-word represents an integral
	* number of characters as per RFC2047.
	*
	* @param string $str String to encode
	* @param string $charset Character set name
	* @param string $encoding Encoding name (base64 or quoted-printable)
	* @param int $prefix_len Prefix length. Default: 0
	* @param string $eol End-of-line sequence. Default: "\r\n"
	*
	* @return string Encoded string
	* @access public
	* @since 1.8.0
	*/
	function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
	{
	if (!function_exists('mb_substr') \|\| !function_exists('mb_strlen')) {
	return;
	}

	$encoding = $encoding == 'base64' ? 'B' : 'Q';
	// 75 is the value specified in the RFC
	$prefix = '=?' . $charset . '?'.$encoding.'?';
	$suffix = '?=';
	$maxLength = 75 - strlen($prefix . $suffix);

	// A multi-octet character may not be split across adjacent encoded-words
	// So, we'll loop over each character
	// mb_stlen() with wrong charset will generate a warning here and return null
	$length = mb_strlen($str, $charset);
	$result = '';
	$line_length = $prefix_len;

	if ($encoding == 'B') {
	// base64
	$start = 0;
	$prev = '';

	for ($i=1; $i<=$length; $i++) {
	// See #17311
	$chunk = mb_substr($str, $start, $i-$start, $charset);
	$chunk = base64_encode($chunk);
	$chunk_len = strlen($chunk);

	if ($line_length + $chunk_len == $maxLength \|\| $i == $length) {
	if ($result) {
	$result .= "\n";
	}
	$result .= $chunk;
	$line_length = 0;
	$start = $i;
	} else if ($line_length + $chunk_len > $maxLength) {
	if ($result) {
	$result .= "\n";
	}
	if ($prev) {
	$result .= $prev;
	}
	$line_length = 0;
	$start = $i - 1;
	} else {
	$prev = $chunk;
	}
	}
	} else {
	// quoted-printable
	// see encodeQP()
	$regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';

	for ($i=0; $i<=$length; $i++) {
	$char = mb_substr($str, $i, 1, $charset);
	// RFC recommends underline (instead of =20) in place of the space
	// that's one of the reasons why we're not using iconv_mime_encode()
	if ($char == ' ') {
	$char = '_';
	$char_len = 1;
	} else {
	$char = preg_replace_callback(
	$regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
	);
	$char_len = strlen($char);
	}

	if ($line_length + $char_len > $maxLength) {
	if ($result) {
	$result .= "\n";
	}
	$line_length = 0;
	}

	$result .= $char;
	$line_length += $char_len;
	}
	}

	if ($result) {
	$result = $prefix
	.str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
	}

	return $result;
	}

	/**
	* Callback function to replace extended characters (\x80-xFF) with their
	* ASCII values (RFC2047: quoted-printable)
	*
	* @param array $matches Preg_replace's matches array
	*
	* @return string Encoded character string
	* @access private
	*/
	function _qpReplaceCallback($matches)
	{
	return sprintf('=%02X', ord($matches[1]));
	}

	/**
	* Callback function to replace extended characters (\x80-xFF) with their
	* ASCII values (RFC2231)
	*
	* @param array $matches Preg_replace's matches array
	*
	* @return string Encoded character string
	* @access private
	*/
	function _encodeReplaceCallback($matches)
	{
	return sprintf('%%%02X', ord($matches[1]));
	}

	/**
	- * PEAR::isError wrapper
	+ * PEAR::isError implementation
	*
	* @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;
	}

	+ /**
	+ * PEAR::raiseError implementation
	+ *
	+ * @param $message A text error message
	+ *
	+ * @return PEAR_Error Instance of PEAR_Error
	+ * @access private
	+ */
	+ function _raiseError($message)
	+ {
	+ // PEAR::raiseError() is not PHP 5.4 compatible
	+ return new PEAR_Error($message);
	+ }
	+
	} // End of class

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 5:25 AM (1 d, 20 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 165989
Default Alt Text: (99 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions