diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/Mail/mime.php php-mail-mime-1.10.12/Mail_Mime-1.10.11/Mail/mime.php --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/Mail/mime.php 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/Mail/mime.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,1590 +0,0 @@ - - * Copyright (c) 2003-2006, PEAR - * 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 - * @author Tomas V.V. Cox - * @author Cipriano Groenendal - * @author Sean Coates - * @author Aleksander Machniak - * @copyright 2003-2006 PEAR - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: @package_version@ - * @link http://pear.php.net/package/Mail_mime - * - * This class is based on HTML Mime Mail class from - * Richard Heyes which was based also - * in the mime_mail.class by Tobias Ratschiller - * and Sascha Schumann - */ - - -require_once 'PEAR.php'; -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 - * @author Tomas V.V. Cox - * @author Cipriano Groenendal - * @author Sean Coates - * @copyright 2003-2006 PEAR - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @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 - */ - protected $txtbody = ''; - - /** - * Contains the html part of the email - * - * @var string - */ - protected $htmlbody = ''; - - /** - * Contains the text/calendar part of the email - * - * @var string - */ - protected $calbody = ''; - - /** - * List of the attached images - * - * @var array - */ - protected $html_images = array(); - - /** - * List of the attachements - * - * @var array - */ - protected $parts = array(); - - /** - * Headers for the mail - * - * @var array - */ - protected $headers = array(); - - /** - * Build parameters - * - * @var array - */ - protected $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', - // What encoding to use for calendar part - // Options: 7bit, 8bit, base64, or quoted-printable - 'calendar_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 calendar part - 'calendar_charset' => 'UTF-8', - // 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, - // Default calendar method - 'calendar_method' => 'request', - // multipart part preamble (RFC2046 5.1.1) - 'preamble' => '', - ); - - - /** - * 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 - */ - public function __construct($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)) { - $this->build_params = array_merge($this->build_params, $params); - } - } - - /** - * Set build parameter value - * - * @param string $name Parameter name - * @param string $value Parameter value - * - * @return void - * @since 1.6.0 - */ - public function setParam($name, $value) - { - $this->build_params[$name] = $value; - } - - /** - * Get build parameter value - * - * @param string $name Parameter name - * - * @return mixed Parameter value - * @since 1.6.0 - */ - public 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 - */ - public function setTXTBody($data, $isfile = false, $append = false) - { - return $this->setBody('txtbody', $data, $isfile, $append); - } - - /** - * Get message text body - * - * @return string Text body - * @since 1.6.0 - */ - public 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 or PEAR_Error object - */ - public function setHTMLBody($data, $isfile = false) - { - return $this->setBody('htmlbody', $data, $isfile); - } - - /** - * Get message HTML body - * - * @return string HTML body - * @since 1.6.0 - */ - public function getHTMLBody() - { - return $this->htmlbody; - } - - /** - * Function to set a body of text/calendar part (not attachment) - * - * @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 - * @param string $method iCalendar object method - * @param string $charset iCalendar character set - * @param string $encoding Transfer encoding - * - * @return mixed True on success or PEAR_Error object - * @since 1.9.0 - */ - public function setCalendarBody($data, $isfile = false, $append = false, - $method = 'request', $charset = 'UTF-8', $encoding = 'quoted-printable' - ) { - $result = $this->setBody('calbody', $data, $isfile, $append); - - if ($result === true) { - $this->build_params['calendar_method'] = $method; - $this->build_params['calendar_charset'] = $charset; - $this->build_params['calendar_encoding'] = $encoding; - } - } - - /** - * Get body of calendar part - * - * @return string Calendar part body - * @since 1.9.0 - */ - public function getCalendarBody() - { - return $this->calbody; - } - - /** - * Adds an image to the list of embedded images. - * Images added this way will be added as related parts of the HTML message. - * - * To correctly match the HTML image with the related attachment - * HTML should refer to it by a filename (specified in $file or $name - * arguments) or by cid: (specified in $content_id arg). - * - * @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. Used to find - * the image in HTML content. - * @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 - */ - 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 (self::isError($filedata = $this->file2str($file))) { - return $filedata; - } - } - - $filename = $name ? $name : $file; - } else { - $filedata = $file; - $filename = $name; - } - - if (!$content_id) { - $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 mixed $file The file name or the file contents itself, - * it can be also Mail_mimePart object - * @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 : - * - * @return mixed True on success or PEAR_Error object - */ - 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() - ) { - if ($file instanceof Mail_mimePart) { - $this->parts[] = $file; - return true; - } - - $bodyfile = null; - - if ($isfile) { - // Don't load file into memory - if ($this->build_params['delay_file_io']) { - $filedata = null; - $bodyfile = $file; - } else { - if (self::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"; - return self::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; - } - - /** - * Checks if the current message has many parts - * - * @return bool True if the message has many parts, False otherwise. - * @since 1.9.0 - */ - public function isMultipart() - { - return count($this->parts) > 0 || count($this->html_images) > 0 - || (strlen($this->htmlbody) > 0 && strlen($this->txtbody) > 0); - } - - /** - * 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 - */ - protected function file2str($file_name) - { - // Check state of file and raise an error properly - if (!file_exists($file_name)) { - return self::raiseError('File not found: ' . $file_name); - } - if (!is_file($file_name)) { - return self::raiseError('Not a regular file: ' . $file_name); - } - if (!is_readable($file_name)) { - return self::raiseError('File is not readable: ' . $file_name); - } - - // Temporarily reset magic_quotes_runtime and read file contents - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $magic_quotes = @ini_set('magic_quotes_runtime', 0); - } - - $cont = file_get_contents($file_name); - - if (isset($magic_quotes)) { - @ini_set('magic_quotes_runtime', $magic_quotes); - } - - 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 - * anything else if a new object is to be created. - * - * @return object The text mimePart object - */ - protected function addTextPart($obj = null) - { - return $this->addBodyPart($obj, $this->txtbody, 'text/plain', 'text'); - } - - /** - * 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 - * anything else if a new object is to be created. - * - * @return object The html mimePart object - */ - protected function addHtmlPart($obj = null) - { - return $this->addBodyPart($obj, $this->htmlbody, 'text/html', 'html'); - } - - /** - * Adds a calendar subpart to the mimePart object and - * returns it during the build process. - * - * @param mixed $obj The object to add the part to, or - * anything else if a new object is to be created. - * - * @return object The text mimePart object - */ - protected function addCalendarPart($obj = null) - { - $ctype = 'text/calendar; method='. $this->build_params['calendar_method']; - - return $this->addBodyPart($obj, $this->calbody, $ctype, 'calendar'); - } - - /** - * Creates a new mimePart object, using multipart/mixed as - * the initial content-type and returns it during the - * build process. - * - * @param array $params Additional part parameters - * - * @return object The multipart/mixed mimePart object - */ - protected function addMixedPart($params = array()) - { - $params['content_type'] = 'multipart/mixed'; - $params['eol'] = $this->build_params['eol']; - - // Create empty multipart/mixed Mail_mimePart object to return - return new Mail_mimePart('', $params); - } - - /** - * 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 - * anything else if a new object is to be created. - * - * @return object The multipart/mixed mimePart object - */ - protected function addAlternativePart($obj = null) - { - $params['content_type'] = 'multipart/alternative'; - $params['eol'] = $this->build_params['eol']; - - if (is_object($obj)) { - $ret = $obj->addSubpart('', $params); - } else { - $ret = new Mail_mimePart('', $params); - } - - 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 - * anything else if a new object is to be created - * - * @return object The multipart/mixed mimePart object - */ - protected function addRelatedPart($obj = null) - { - $params['content_type'] = 'multipart/related'; - $params['eol'] = $this->build_params['eol']; - - if (is_object($obj)) { - $ret = $obj->addSubpart('', $params); - } else { - $ret = new Mail_mimePart('', $params); - } - - 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 - */ - protected 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']; - } - - return $obj->addSubpart($value['body'], $params); - } - - /** - * 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 mixed $value The attachment information array or Mail_mimePart object - * - * @return object The image mimePart object - */ - protected function addAttachmentPart($obj, $value) - { - if ($value instanceof Mail_mimePart) { - return $obj->addSubpart($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']; - } - - return $obj->addSubpart($value['body'], $params); - } - - /** - * 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. - * @param array $headers The extra headers that should be passed - * 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 - */ - public function getMessage($separation = null, $params = null, $headers = null, - $overwrite = false - ) { - if ($separation === null) { - $separation = $this->build_params['eol']; - } - - $body = $this->get($params); - - if (self::isError($body)) { - return $body; - } - - 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() method. See get() for more info. - * - * @return mixed The e-mail body or PEAR error object - * @since 1.6.0 - */ - public 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() method. See get() for more info. - * @param array $headers The extra headers that should be passed - * 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 - * @since 1.6.0 - */ - public 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)) { - return self::raiseError('File is not writable: ' . $filename); - } - - // Temporarily reset magic_quotes_runtime and read file contents - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $magic_quotes = @ini_set('magic_quotes_runtime', 0); - } - - if (!($fh = fopen($filename, 'ab'))) { - return self::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) { - return self::raiseError('Error writing to file: ' . $filename); - } - - fclose($fh); - - if (isset($magic_quotes)) { - @ini_set('magic_quotes_runtime', $magic_quotes); - } - - // 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 or stream. - * - * @param mixed $filename Output filename or file pointer where to save - * the message instead of returning it - * @param array $params The Build parameters passed to the - * get() method. See get() for more info. - * - * @return mixed True or PEAR error object - * @since 1.6.0 - */ - public function saveMessageBody($filename, $params = null) - { - if (!is_resource($filename)) { - // Check state of file and raise an error properly - if (!file_exists($filename) || !is_writable($filename)) { - return self::raiseError('File is not writable: ' . $filename); - } - - if (!($fh = fopen($filename, 'ab'))) { - return self::raiseError('Unable to open file: ' . $filename); - } - } else { - $fh = $filename; - } - - // Temporarily reset magic_quotes_runtime and read file contents - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $magic_quotes = @ini_set('magic_quotes_runtime', 0); - } - - // Write the rest of the message into file - $res = $this->get($params, $fh, true); - - if (!is_resource($filename)) { - fclose($fh); - } - - if (isset($magic_quotes)) { - @ini_set('magic_quotes_runtime', $magic_quotes); - } - - 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 mixed $filename Output filename or file pointer 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 - */ - public function get($params = null, $filename = null, $skip_head = false) - { - if (!empty($params) && is_array($params)) { - $this->build_params = array_merge($this->build_params, $params); - } - - 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) && strlen($this->htmlbody) > 0) { - foreach ($this->html_images as $key => $value) { - $rval = preg_quote($value['name'], '#'); - $regex = array( - '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' . $rval . '\3#', - '#(?i)url(?-i)\(\s*(["\']?)' . $rval . '\1\s*\)#', - ); - - $rep = array( - '\1\2=\3cid:' . $value['cid'] .'\3', - '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(); - - $message = $this->buildBodyPart(); - - if (!isset($message)) { - 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 (self::isError($headers)) { - return $headers; - } - $this->headers = array_merge($this->headers, $headers); - } else { - $output = $message->encode($boundary, $skip_head); - if (self::isError($output)) { - return $output; - } - $this->headers = array_merge($this->headers, $output['headers']); - } - - // remember the boundary used, in case we'd handle headers() call later - if (empty($boundary) && !empty($this->headers['Content-Type'])) { - if (preg_match('/boundary="([^"]+)/', $this->headers['Content-Type'], $m)) { - $this->build_params['boundary'] = $m[1]; - } - } - - return $filename ? null : $output['body']; - } - - /** - * Builds the main body MIME part for the email body. It will add a mixed part - * if attachments are found. If no attachments are found it will return an - * alternative part if several body texts are found (text, html, calendar), - * or a single part if only one body text is found. - * - * @return Mail_mimePart|null The corresponding part for the body or null. - * - * @see buildAlternativeParts - * @see buildHtmlParts - */ - protected function buildBodyPart() - { - $parts_count = count($this->parts); - $mixed_params = array('preamble' => $this->build_params['preamble']); - $message = null; - - if ($parts_count > 0) { - $message = $this->addMixedPart($mixed_params); - $this->buildAlternativeParts($message, null); - for ($i = 0; $i < $parts_count; $i++) { - $this->addAttachmentPart($message, $this->parts[$i]); - } - } else { - $message = $this->buildAlternativeParts(null, $mixed_params); - } - - return $message; - } - - /** - * Builds a single text, html, or calendar part only if one of them is found. - * If two or more parts are found, then an alternative part containing them is built. - * - * @param Mail_mimePart|null $parent_part The parent mime part to add - * the part or null - * @param array $mixed_params The needed params to create the - * part when no parent_part is - * received. - * - * @return null|object The main part built inside the method. It will be an - * alternative part or text, html, or calendar part. - * Null if no body texts are found. - */ - protected function buildAlternativeParts($parent_part, $mixed_params = null) - { - $html = strlen($this->htmlbody) > 0; - $calendar = strlen($this->calbody) > 0; - $has_text = strlen($this->txtbody) > 0; - $alternatives_count = $html + $calendar + $has_text; - - if ($alternatives_count > 1) { - $alt_part = $this->addAlternativePart($parent_part ? $parent_part : $mixed_params); - } else { - $alt_part = null; - } - - $dest_part = $alt_part ? $alt_part : $parent_part; - $part = null; - - if ($has_text) { - $part = $this->addTextPart($dest_part); - } - - if ($html) { - $part = $this->buildHtmlParts($dest_part); - } - - if ($calendar) { - $part = $this->addCalendarPart($dest_part); - } - - return $dest_part ? $dest_part : $part; - } - - /** - * Builds html part as a single part or inside a related part with the html - * images thar were found. - * - * @param Mail_mimePart|null $parent_part The object to add the part to, - * or anything else if a new object - * is to be created. - * - * @return Mail_mimePart|null The created part or null if no htmlbody found. - */ - protected function buildHtmlParts($parent_part) - { - if (!strlen($this->htmlbody)) { - return null; - } - - $count_html_images = count($this->html_images); - - if ($count_html_images > 0) { - $part = $this->addRelatedPart($parent_part); - $this->addHtmlPart($part); - } else { - $part = $this->addHtmlPart($parent_part); - } - - for ($i = 0; $i < $count_html_images; $i++) { - $this->addHtmlImagePart($part, $this->html_images[$i]); - } - - return $part; - } - - /** - * 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 - */ - public function headers($xtra_headers = null, $overwrite = false, $skip_content = false) - { - // Add mime version header - $headers['MIME-Version'] = '1.0'; - - 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); - } - - // Always reset Content-Type/Content-Transfer-Encoding headers - // In case the message structure changed in meantime - unset($this->headers['Content-Type']); - unset($this->headers['Content-Transfer-Encoding']); - unset($this->headers['Content-Disposition']); - - $this->headers = array_merge($this->headers, $this->contentHeaders()); - - $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']; - } - - return $this->encodeHeaders($headers); - } - - /** - * 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 - */ - 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 - * @since 1.7.0 - */ - public 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; - } else 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 (stripos($type, 'multipart/') === 0) { - 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 - */ - 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 - */ - 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 - */ - 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 - */ - 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 - */ - 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 - */ - 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 - */ - protected function encodeHeaders($input, $params = array()) - { - $build_params = $this->build_params; - - if (!empty($params)) { - $build_params = array_merge($build_params, $params); - } - - 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 if ($hdr_value !== null) { - $input[$hdr_name] = $this->encodeHeader( - $hdr_name, $hdr_value, - $build_params['head_charset'], $build_params['head_encoding'] - ); - } else { - unset($input[$hdr_name]); - } - } - - 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) - * @since 1.5.3 - */ - public function encodeHeader($name, $value, $charset, $encoding) - { - return Mail_mimePart::encodeHeader( - $name, $value, $charset, $encoding, $this->build_params['eol'] - ); - } - - /** - * Get file's basename (locale independent) - * - * @param string $filename Filename - * - * @return string Basename - */ - protected 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 - */ - protected function contentHeaders() - { - $attachments = count($this->parts) > 0; - $html_images = count($this->html_images) > 0; - $html = strlen($this->htmlbody) > 0; - $calendar = strlen($this->calbody) > 0; - $has_text = strlen($this->txtbody) > 0; - $has_alternatives = ($html + $calendar + $has_text) > 1; - $headers = array(); - - // See get() - switch (true) { - case $has_text && !$attachments && !$has_alternatives: - $headers['Content-Type'] = 'text/plain'; - break; - - case $html && !$html_images && !$attachments && !$has_alternatives: - $headers['Content-Type'] = 'text/html'; - break; - - case $html && $html_images && !$attachments && !$has_alternatives: - $headers['Content-Type'] = 'multipart/related'; - break; - - case $calendar && !$attachments && !$has_alternatives: - $headers['Content-Type'] = 'text/calendar'; - break; - - case $has_alternatives && !$attachments: - $headers['Content-Type'] = 'multipart/alternative'; - break; - - case $attachments: - $headers['Content-Type'] = 'multipart/mixed'; - break; - } - - // Note: This is outside of the above switch construct to workaround - // opcache bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1166235 - if (empty($headers)) { - 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 - if ($this->build_params['text_charset']) { - $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 - if ($this->build_params['html_charset']) { - $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 if ($headers['Content-Type'] == 'text/calendar') { - // single-part message: add charset and encoding - if ($this->build_params['calendar_charset']) { - $charset = 'charset=' . $this->build_params['calendar_charset']; - $headers['Content-Type'] .= "; $charset"; - } - - if ($this->build_params['calendar_method']) { - $method = 'method=' . $this->build_params['calendar_method']; - $headers['Content-Type'] .= "; $method"; - } - - $headers['Content-Transfer-Encoding'] - = $this->build_params['calendar_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 - */ - protected 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']); - $this->build_params['calendar_encoding'] - = strtolower($this->build_params['calendar_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'; - } - if (!in_array($this->build_params['calendar_encoding'], $encodings)) { - $this->build_params['calendar_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'; - } - // calendar body - if ($this->build_params['calendar_encoding'] == '7bit' - && !preg_match('/ascii/i', $this->build_params['calendar_charset']) - && preg_match('/[^\x00-\x7F]/', $this->calbody) - ) { - $this->build_params['calendar_encoding'] = 'quoted-printable'; - } - } - - /** - * Set body of specified message part - * - * @param string $type One of: txtbody, calbody, htmlbody - * @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 - */ - protected function setBody($type, $data, $isfile = false, $append = false) - { - if ($isfile) { - $data = $this->file2str($data); - if (self::isError($data)) { - return $data; - } - } - - if (!$append) { - $this->{$type} = $data; - } else { - $this->{$type} .= $data; - } - - return true; - } - - /** - * Adds a subpart to the mimePart object and - * returns it during the build process. - * - * @param mixed $obj The object to add the part to, or - * anything else if a new object is to be created. - * @param string $body Part body - * @param string $ctype Part content type - * @param string $type Internal part type - * - * @return object The mimePart object - */ - protected function addBodyPart($obj, $body, $ctype, $type) - { - $params['content_type'] = $ctype; - $params['encoding'] = $this->build_params[$type . '_encoding']; - $params['charset'] = $this->build_params[$type . '_charset']; - $params['eol'] = $this->build_params['eol']; - - if (is_object($obj)) { - $ret = $obj->addSubpart($body, $params); - } else { - $ret = new Mail_mimePart($body, $params); - } - - return $ret; - } - - /** - * PEAR::isError implementation - * - * @param mixed $data Object - * - * @return bool True if object is an instance of PEAR_Error - */ - public static function isError($data) - { - // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473) - if (is_a($data, 'PEAR_Error')) { - return true; - } - - return false; - } - - /** - * PEAR::raiseError implementation - * - * @param string $message A text error message - * - * @return PEAR_Error Instance of PEAR_Error - */ - public static function raiseError($message) - { - // PEAR::raiseError() is not PHP 5.4 compatible - return new PEAR_Error($message); - } -} diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/Mail/mimePart.php php-mail-mime-1.10.12/Mail_Mime-1.10.11/Mail/mimePart.php --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/Mail/mimePart.php 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/Mail/mimePart.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,1302 +0,0 @@ - - * Copyright (c) 2003-2006, PEAR - * 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 - * @author Cipriano Groenendal - * @author Sean Coates - * @author Aleksander Machniak - * @copyright 2003-2006 PEAR - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: @package_version@ - * @link http://pear.php.net/package/Mail_mime - */ - -/** - * Require PEAR - * - * This package depends on PEAR to raise errors. - */ -require_once 'PEAR.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. - * - * @category Mail - * @package Mail_Mime - * @author Richard Heyes - * @author Cipriano Groenendal - * @author Sean Coates - * @author Aleksander Machniak - * @copyright 2003-2006 PEAR - * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: @package_version@ - * @link http://pear.php.net/package/Mail_mime - */ -class Mail_mimePart -{ - /** - * The encoding type of this part - * - * @var string - */ - protected $encoding; - - /** - * An array of subparts - * - * @var array - */ - protected $subparts = array(); - - /** - * The output of this part after being built - * - * @var string - */ - protected $encoded; - - /** - * Headers for this part - * - * @var array - */ - protected $headers = array(); - - /** - * The body of this part (not encoded) - * - * @var string - */ - protected $body; - - /** - * The location of file with body of this part (not encoded) - * - * @var string - */ - protected $body_file; - - /** - * The short text of multipart part preamble (RFC2046 5.1.1) - * - * @var string - */ - protected $preamble; - - /** - * The end-of-line sequence - * - * @var string - */ - protected $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 : - * - body_file: Location of file with part's body (instead of $body) - * - preamble: short text of multipart part preamble (RFC2046 5.1.1) - */ - public function __construct($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; - - case 'preamble': - $this->preamble = $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. - */ - 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'] = ''; - - if ($this->preamble) { - $encoded['body'] .= $this->preamble . $eol . $eol; - } - - for ($i = 0; $i < count($this->subparts); $i++) { - $encoded['body'] .= '--' . $boundary . $eol; - $tmp = $this->subparts[$i]->encode(); - if (is_a($tmp, 'PEAR_Error')) { - 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 (version_compare(PHP_VERSION, '5.4.0', '<')) { - $magic_quotes = @ini_set('magic_quotes_runtime', 0); - } - $body = $this->getEncodedDataFromFile($this->body_file, $this->encoding); - if (isset($magic_quotes)) { - @ini_set('magic_quotes_runtime', $magic_quotes); - } - - if (is_a($body, 'PEAR_Error')) { - 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 or stream. - * Data will be appended to the file/stream. - * - * @param mixed $filename Existing file location - * or file pointer resource - * @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 - * @since 1.6.0 - */ - public function encodeToFile($filename, $boundary = null, $skip_head = false) - { - if (!is_resource($filename)) { - if (file_exists($filename) && !is_writable($filename)) { - $err = self::raiseError('File is not writeable: ' . $filename); - return $err; - } - - if (!($fh = fopen($filename, 'ab'))) { - $err = self::raiseError('Unable to open file: ' . $filename); - return $err; - } - } else { - $fh = $filename; - } - - // Temporarily reset magic_quotes_runtime for file reads and writes - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - $magic_quotes = @ini_set('magic_quotes_runtime', 0); - } - - $res = $this->encodePartToFile($fh, $boundary, $skip_head); - - if (!is_resource($filename)) { - fclose($fh); - } - - if (isset($magic_quotes)) { - @ini_set('magic_quotes_runtime', $magic_quotes); - } - - return is_a($res, 'PEAR_Error') ? $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 - */ - protected 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)) { - if ($this->preamble) { - fwrite($fh, $f_eol . $this->preamble . $eol); - $f_eol = $eol; - } - - for ($i = 0; $i < count($this->subparts); $i++) { - fwrite($fh, $f_eol . '--' . $boundary . $eol); - $res = $this->subparts[$i]->encodePartToFile($fh); - if (is_a($res, 'PEAR_Error')) { - return $res; - } - $f_eol = $eol; - } - - fwrite($fh, $eol . '--' . $boundary . '--' . $eol); - } else if ($this->body) { - fwrite($fh, $f_eol); - fwrite($fh, $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 (is_a($res, 'PEAR_Error')) { - return $res; - } - } - - return true; - } - - /** - * Adds a subpart to current mime part and returns - * a reference to it - * - * @param mixed $body The body of the subpart or Mail_mimePart object - * @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. - */ - public function addSubpart($body, $params = null) - { - if ($body instanceof Mail_mimePart) { - $part = $body; - } else { - $part = new Mail_mimePart($body, $params); - } - - $this->subparts[] = $part; - - 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 Encoded data string - */ - protected function getEncodedData($data, $encoding) - { - switch ($encoding) { - case 'quoted-printable': - return self::quotedPrintableEncode($data, 76, $this->eol); - 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 - */ - protected function getEncodedDataFromFile($filename, $encoding, $fh = null) - { - if (!is_readable($filename)) { - $err = self::raiseError('Unable to read file: ' . $filename); - return $err; - } - - if (!($fd = fopen($filename, 'rb'))) { - $err = self::raiseError('Could not open file: ' . $filename); - return $err; - } - - $data = ''; - - switch ($encoding) { - case 'quoted-printable': - while (!feof($fd)) { - $buffer = self::quotedPrintableEncode(fgets($fd), 76, $this->eol); - 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 - * @param string $eol End-of-line sequence. Default: "\r\n" - * - * @return string Encoded data - */ - public static function quotedPrintableEncode($input , $line_max = 76, $eol = "\r\n") - { - /* - // 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 = ''; - - foreach ($lines as $idx => $line) { - $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)) { - // Escape unprintable chars - $char = $escape . sprintf('%02X', $dec); - } elseif (($dec == 46) && (($newline == '') - || ((strlen($newline) + strlen(".=")) > $line_max - && isset($line[$i]))) - ) { - // 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'; - } - - // EOL is not counted - if ((strlen($newline) + strlen($char) == $line_max) - && !isset($line[$i]) - ) { - ; // no soft break is needed if we're the last char - } elseif ((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 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 - */ - protected 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 - */ - protected 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}\""; - } - - /** - * Return charset for mbstring functions. - * Replace ISO-2022-JP with ISO-2022-JP-MS to convert Windows dependent - * characters. - * - * @param string $charset A original charset - * - * @return string A charset for mbstring - * @since 1.10.8 - */ - protected static function mbstringCharset($charset) - { - $mb_charset = $charset; - - if ($charset == 'ISO-2022-JP') { - $mb_charset = 'ISO-2022-JP-MS'; - } - - return $mb_charset; - } - - /** - * 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) - * @since 1.6.1 - */ - public static 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'; - } - - // exploding quoted strings as well as some regexes below do not - // work properly with some charset e.g. ISO-2022-JP, we'll use UTF-8 - $mb = $charset != 'UTF-8' && function_exists('mb_convert_encoding'); - $mb_charset = Mail_mimePart::mbstringCharset($charset); - - // Structured header (make sure addr-spec inside is not encoded) - if (!empty($separator)) { - // Simple e-mail address regexp - $email_regexp = '([^\s<]+|("[^\r\n"]+"))@[^\s"]+'; - - if ($mb) { - $value = mb_convert_encoding($value, 'UTF-8', $mb_charset); - } - - $parts = Mail_mimePart::explodeQuotedString("[\t$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('#([^\s\x21-\x7E]){1}#', $word)) { - if ($word[0] == '"' && $word[strlen($word)-1] == '"') { - // de-quote quoted-string, encoding changes - // string to atom - $word = substr($word, 1, -1); - $word = preg_replace('/\\\\([\\\\"])/', '$1', $word); - } - if ($mb) { - $word = mb_convert_encoding($word, $mb_charset, 'UTF-8'); - } - - // 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 { - if ($mb) { - $part = mb_convert_encoding($part, $mb_charset, 'UTF-8'); - } - // 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('#([^\s\x21-\x7E]){1}#', $value)) { - if ($value[0] == '"' && $value[strlen($value)-1] == '"') { - if ($mb) { - $value = mb_convert_encoding($value, 'UTF-8', $mb_charset); - } - // de-quote quoted-string, encoding changes - // string to atom - $value = substr($value, 1, -1); - $value = preg_replace('/\\\\([\\\\"])/', '$1', $value); - if ($mb) { - $value = mb_convert_encoding($value, $mb_charset, 'UTF-8'); - } - } - - $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 - */ - protected static function explodeQuotedString($delimiter, $string) - { - $result = array(); - $strlen = strlen($string); - $quoted_string = '"(?:[^"\\\\]|\\\\.)*"'; - - for ($p=$i=0; $i < $strlen; $i++) { - if ($string[$i] === '"') { - $r = preg_match("/$quoted_string/", $string, $matches, 0, $i); - if (!$r || empty($matches[0])) { - break; - } - $i += strlen($matches[0]) - 1; - } else if (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 - * @since 1.6.1 - */ - public static 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 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 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 - * @since 1.6.0 - */ - public static 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 - * @since 1.8.0 - */ - public static 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); - $mb_charset = Mail_mimePart::mbstringCharset($charset); - - // 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, $mb_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, $mb_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, $mb_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 - */ - protected static 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 - */ - protected static function encodeReplaceCallback($matches) - { - return sprintf('%%%02X', ord($matches[1])); - } - - /** - * PEAR::raiseError implementation - * - * @param string $message A text error message - * - * @return PEAR_Error Instance of PEAR_Error - */ - public static function raiseError($message) - { - // PEAR::raiseError() is not PHP 5.4 compatible - return new PEAR_Error($message); - } -} diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/class-filename.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/class-filename.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/class-filename.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/class-filename.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---TEST-- -Test class filename (bug #24) ---SKIPIF-- - ---FILE-- - ---EXPECT-- -Include OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/content_transfer_encoding.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/content_transfer_encoding.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/content_transfer_encoding.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/content_transfer_encoding.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ ---TEST-- -Test empty Content-Transfer-Encoding on multipart messages ---SKIPIF-- ---FILE-- -setParam('text_encoding', 'quoted-printable'); -$mime->setParam('html_encoding', 'quoted-printable'); -$mime->setParam('head_encoding', 'quoted-printable'); - -// This specific order used to set Content-Transfer-Encoding: quoted-printable -// which is invalid according to RFC 2045 on multipart messages -$mime->setTXTBody('text'); -$mime->headers(array('From' => 'from@domain.tld')); -$mime->addAttachment('file.pdf', 'application/pdf', 'file.pdf', false, 'base64', 'inline'); -echo $mime->txtHeaders(); -list ($header, $body) = explode("\r\n\r\n", $mime->getMessage()); -echo $header; -?> ---EXPECTF-- -MIME-Version: 1.0 -From: from@domain.tld -Content-Type: multipart/mixed; - boundary="=_%x" -MIME-Version: 1.0 -From: from@domain.tld -Content-Type: multipart/mixed; - boundary="=_%x" diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/encoding_case.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/encoding_case.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/encoding_case.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/encoding_case.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---TEST-- -Bug #2364 Tabs in Mail_mimePart::quotedPrintableEncode() ---SKIPIF-- ---FILE-- - ---EXPECT-- -Here's= -=09 -a tab diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/headers_with_mbstring.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/headers_with_mbstring.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/headers_with_mbstring.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/headers_with_mbstring.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,153 +0,0 @@ ---TEST-- -Multi-test for headers encoding using base64 and quoted-printable ---SKIPIF-- - ---FILE-- -'), -array('From', 'adresse@adresse.de'), -array('From', 'Frank Do '), -array('To', 'Frank Do , James Clark '), -array('From', '"Frank Do" '), -array('Cc', '"Frank Do" , "James Clark" '), -array('Cc', ' , "Kuśmiderski Jan Krzysztof Janusz Długa nazwa" '), -array('From', '"adresse@adresse.de" '), -array('From', 'adresse@adresse.de '), -array('From', '"German Umlauts öäü" '), -array('Subject', 'German Umlauts öäü '), -array('Subject', 'Short ASCII subject'), -array('Subject', 'Long ASCII subject - multiline space separated words - too long for one line'), -array('Subject', 'Short Unicode ż subject'), -array('Subject', 'Long Unicode subject - zażółć gęślą jaźń - too long for one line'), -array('References', ' <4b2e87ac$1@news.home.net.pl> '), -array('To', '"Frank Do" ,, "James Clark" '), -array('To', '"Frank \\" \\\\Do" '), -array('To', 'Frank " \\Do '), -array('Subject', "A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test"), -array('Subject', "TEST Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir!!!?"), -array('Subject', "Update: Microsoft Windows-Tool zum Entfernen bösartiger Software 3.6"), -array('From', "test@nàme "), -array('From', "Test <\"test test\"@domain.com>"), -array('From', "\"test test\"@domain.com"), -array('From', "<\"test test\"@domain.com>"), -array('From', "Doe"), -array('From', "\"John Doe\""), -array('Mail-Reply-To', 'adresse@adresse.de '), -array('Mail-Reply-To', '"öäü" '), -array('Subject', mb_convert_encoding('㈱山﨑工業', 'ISO-2022-JP-MS', 'UTF-8'), 'ISO-2022-JP'), -); - -$i = 1; -foreach ($headers as $header) { - $charset = isset($header[2]) ? $header[2] : 'UTF-8'; - $hdr = $mime->encodeHeader($header[0], $header[1], $charset, 'base64'); - printf("[%02d] %s: %s\n", $i, $header[0], $hdr); - $hdr = $mime->encodeHeader($header[0], $header[1], $charset, 'quoted-printable'); - printf("[%02d] %s: %s\n", $i, $header[0], $hdr); - $i++; -} -?> ---EXPECT-- -[01] From: -[01] From: -[02] From: adresse@adresse.de -[02] From: adresse@adresse.de -[03] From: Frank Do -[03] From: Frank Do -[04] To: Frank Do , James Clark -[04] To: Frank Do , James Clark -[05] From: "Frank Do" -[05] From: "Frank Do" -[06] Cc: "Frank Do" , "James Clark" -[06] Cc: "Frank Do" , "James Clark" -[07] Cc: , =?UTF-8?B?S3XFm21pZGVyc2tpIEphbiBLcnp5c3p0b2Yg?= - =?UTF-8?B?SmFudXN6IETFgnVnYSBuYXp3YQ==?= -[07] Cc: , =?UTF-8?Q?Ku=C5=9Bmiderski_Jan_Krzysztof_Janusz?= - =?UTF-8?Q?_D=C5=82uga_nazwa?= -[08] From: "adresse@adresse.de" -[08] From: "adresse@adresse.de" -[09] From: "adresse@adresse.de" -[09] From: "adresse@adresse.de" -[10] From: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8?= -[10] From: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC?= -[11] Subject: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8IDxhZHJlc3NlQGFkcmVzc2Uu?= - =?UTF-8?B?ZGU+?= -[11] Subject: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC_=3Cadresse=40adresse?= - =?UTF-8?Q?=2Ede=3E?= -[12] Subject: Short ASCII subject -[12] Subject: Short ASCII subject -[13] Subject: Long ASCII subject - multiline space separated words - too long for - one line -[13] Subject: Long ASCII subject - multiline space separated words - too long for - one line -[14] Subject: =?UTF-8?B?U2hvcnQgVW5pY29kZSDFvCBzdWJqZWN0?= -[14] Subject: =?UTF-8?Q?Short_Unicode_=C5=BC_subject?= -[15] Subject: =?UTF-8?B?TG9uZyBVbmljb2RlIHN1YmplY3QgLSB6YcW8w7PFgsSHIGfEmcWb?= - =?UTF-8?B?bMSFIGphxbrFhCAtIHRvbyBsb25nIGZvciBvbmUgbGluZQ==?= -[15] Subject: =?UTF-8?Q?Long_Unicode_subject_-_za=C5=BC=C3=B3=C5=82=C4=87_g?= - =?UTF-8?Q?=C4=99=C5=9Bl=C4=85_ja=C5=BA=C5=84_-_too_long_for_one_line?= -[16] References: - <4b2e87ac$1@news.home.net.pl> -[16] References: - <4b2e87ac$1@news.home.net.pl> -[17] To: "Frank Do" , "James Clark" -[17] To: "Frank Do" , "James Clark" -[18] To: "Frank \" \\Do" -[18] To: "Frank \" \\Do" -[19] To: "Frank \" \\Do" -[19] To: "Frank \" \\Do" -[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test -[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test -[21] Subject: =?UTF-8?B?VEVTVCBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= - =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= - =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= - =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7w=?= - =?UTF-8?B?w59lIHZvbiBtaXIgU8O8cGVyIGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBt?= - =?UTF-8?B?aXIgU8O8cGVyIGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBtaXIgU8O8cGVy?= - =?UTF-8?B?IGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBtaXIgU8O8cGVyIGdyw7ZzZSB0?= - =?UTF-8?B?b2xsZSBncsO8w59lIHZvbiBtaXIhISE/?= -[21] Subject: =?UTF-8?Q?TEST_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_m?= - =?UTF-8?Q?ir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCp?= - =?UTF-8?Q?er_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6?= - =?UTF-8?Q?se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr?= - =?UTF-8?Q?=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC?= - =?UTF-8?Q?=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von?= - =?UTF-8?Q?_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S?= - =?UTF-8?Q?=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir!!!=3F?= -[22] Subject: =?UTF-8?B?VXBkYXRlOiBNaWNyb3NvZnQgV2luZG93cy1Ub29sIHp1bSBFbnRm?= - =?UTF-8?B?ZXJuZW4gYsO2c2FydGlnZXIgU29mdHdhcmUgMy42?= -[22] Subject: =?UTF-8?Q?Update=3A_Microsoft_Windows-Tool_zum_Entfernen_b=C3=B6?= - =?UTF-8?Q?sartiger_Software_3=2E6?= -[23] From: =?UTF-8?B?dGVzdEBuw6BtZQ==?= -[23] From: =?UTF-8?Q?test=40n=C3=A0me?= -[24] From: Test <"test test"@domain.com> -[24] From: Test <"test test"@domain.com> -[25] From: "test test"@domain.com -[25] From: "test test"@domain.com -[26] From: <"test test"@domain.com> -[26] From: <"test test"@domain.com> -[27] From: Doe -[27] From: Doe -[28] From: "John Doe" -[28] From: "John Doe" -[29] Mail-Reply-To: "adresse@adresse.de" -[29] Mail-Reply-To: "adresse@adresse.de" -[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= -[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= -[31] Subject: =?ISO-2022-JP?B?GyRCLWo7M3l1OSk2SBsoQg==?= -[31] Subject: =?ISO-2022-JP?Q?=24B-j=28B=24B=3B3=28B=24Byu=28B?= - =?ISO-2022-JP?Q?=24B9=29=28B=24B6H=28B?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/headers_without_mbstring.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/headers_without_mbstring.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/headers_without_mbstring.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/headers_without_mbstring.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ ---TEST-- -Multi-test for headers encoding using base64 and quoted-printable ---SKIPIF-- - ---FILE-- -'), -array('From', 'adresse@adresse.de'), -array('From', 'Frank Do '), -array('To', 'Frank Do , James Clark '), -array('From', '"Frank Do" '), -array('Cc', '"Frank Do" , "James Clark" '), -array('Cc', ' , "Kuśmiderski Jan Krzysztof Janusz Długa nazwa" '), -array('From', '"adresse@adresse.de" '), -array('From', 'adresse@adresse.de '), -array('From', '"German Umlauts öäü" '), -array('Subject', 'German Umlauts öäü '), -array('Subject', 'Short ASCII subject'), -array('Subject', 'Long ASCII subject - multiline space separated words - too long for one line'), -array('Subject', 'Short Unicode ż subject'), -array('Subject', 'Long Unicode subject - zażółć gęślą jaźń - too long for one line'), -array('References', ' <4b2e87ac$1@news.home.net.pl> '), -array('To', '"Frank Do" ,, "James Clark" '), -array('To', '"Frank \\" \\\\Do" '), -array('To', 'Frank " \\Do '), -array('Subject', "A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test"), -array('Subject', "TEST Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir!!!?"), -array('Subject', "Update: Microsoft Windows-Tool zum Entfernen bösartiger Software 3.6"), -array('From', "test@nàme "), -array('From', "Test <\"test test\"@domain.com>"), -array('From', "\"test test\"@domain.com"), -array('From', "<\"test test\"@domain.com>"), -array('From', "Doe"), -array('From', "\"John Doe\""), -array('Mail-Reply-To', 'adresse@adresse.de '), -array('Mail-Reply-To', '"öäü" '), -); - -$i = 1; -foreach ($headers as $header) { - $hdr = $mime->encodeHeader($header[0], $header[1], 'UTF-8', 'base64'); - printf("[%02d] %s: %s\n", $i, $header[0], $hdr); - $hdr = $mime->encodeHeader($header[0], $header[1], 'UTF-8', 'quoted-printable'); - printf("[%02d] %s: %s\n", $i, $header[0], $hdr); - $i++; -} -?> ---EXPECT-- -[01] From: -[01] From: -[02] From: adresse@adresse.de -[02] From: adresse@adresse.de -[03] From: Frank Do -[03] From: Frank Do -[04] To: Frank Do , James Clark -[04] To: Frank Do , James Clark -[05] From: "Frank Do" -[05] From: "Frank Do" -[06] Cc: "Frank Do" , "James Clark" -[06] Cc: "Frank Do" , "James Clark" -[07] Cc: , =?UTF-8?B?S3XFm21pZGVyc2tpIEphbiBLcnp5c3p0b2Yg?= - =?UTF-8?B?SmFudXN6IETFgnVnYSBuYXp3YQ==?= -[07] Cc: , - =?UTF-8?Q?Ku=C5=9Bmiderski_Jan_Krzysztof_Janusz_D?= - =?UTF-8?Q?=C5=82uga_nazwa?= -[08] From: "adresse@adresse.de" -[08] From: "adresse@adresse.de" -[09] From: "adresse@adresse.de" -[09] From: "adresse@adresse.de" -[10] From: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8?= -[10] From: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC?= -[11] Subject: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8IDxhZHJlc3NlQGFkcmVzc2Uu?= - =?UTF-8?B?ZGU+?= -[11] Subject: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC_=3Cadresse=40adresse?= - =?UTF-8?Q?=2Ede=3E?= -[12] Subject: Short ASCII subject -[12] Subject: Short ASCII subject -[13] Subject: Long ASCII subject - multiline space separated words - too long for - one line -[13] Subject: Long ASCII subject - multiline space separated words - too long for - one line -[14] Subject: =?UTF-8?B?U2hvcnQgVW5pY29kZSDFvCBzdWJqZWN0?= -[14] Subject: =?UTF-8?Q?Short_Unicode_=C5=BC_subject?= -[15] Subject: =?UTF-8?B?TG9uZyBVbmljb2RlIHN1YmplY3QgLSB6YcW8w7PFgsSHIGfEmcWb?= - =?UTF-8?B?bMSFIGphxbrFhCAtIHRvbyBsb25nIGZvciBvbmUgbGluZQ==?= -[15] Subject: =?UTF-8?Q?Long_Unicode_subject_-_za=C5=BC=C3=B3=C5=82=C4=87_g=C4?= - =?UTF-8?Q?=99=C5=9Bl=C4=85_ja=C5=BA=C5=84_-_too_long_for_one_line?= -[16] References: - <4b2e87ac$1@news.home.net.pl> -[16] References: - <4b2e87ac$1@news.home.net.pl> -[17] To: "Frank Do" , "James Clark" -[17] To: "Frank Do" , "James Clark" -[18] To: "Frank \" \\Do" -[18] To: "Frank \" \\Do" -[19] To: "Frank \" \\Do" -[19] To: "Frank \" \\Do" -[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test -[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY - REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test -[21] Subject: =?UTF-8?B?VEVTVCBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= - =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= - =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= - =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zD?= - =?UTF-8?B?n2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= - =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= - =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= - =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciEhIT8=?= -[21] Subject: =?UTF-8?Q?TEST_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir?= - =?UTF-8?Q?_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_g?= - =?UTF-8?Q?r=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tol?= - =?UTF-8?Q?le_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC?= - =?UTF-8?Q?=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_m?= - =?UTF-8?Q?ir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper?= - =?UTF-8?Q?_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_t?= - =?UTF-8?Q?olle_gr=C3=BC=C3=9Fe_von_mir!!!=3F?= -[22] Subject: =?UTF-8?B?VXBkYXRlOiBNaWNyb3NvZnQgV2luZG93cy1Ub29sIHp1bSBFbnRm?= - =?UTF-8?B?ZXJuZW4gYsO2c2FydGlnZXIgU29mdHdhcmUgMy42?= -[22] Subject: =?UTF-8?Q?Update=3A_Microsoft_Windows-Tool_zum_Entfernen_b=C3=B6sa?= - =?UTF-8?Q?rtiger_Software_3=2E6?= -[23] From: =?UTF-8?B?dGVzdEBuw6BtZQ==?= -[23] From: =?UTF-8?Q?test=40n=C3=A0me?= -[24] From: Test <"test test"@domain.com> -[24] From: Test <"test test"@domain.com> -[25] From: "test test"@domain.com -[25] From: "test test"@domain.com -[26] From: <"test test"@domain.com> -[26] From: <"test test"@domain.com> -[27] From: Doe -[27] From: Doe -[28] From: "John Doe" -[28] From: "John Doe" -[29] Mail-Reply-To: "adresse@adresse.de" -[29] Mail-Reply-To: "adresse@adresse.de" -[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= -[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/qp_encoding_test.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/qp_encoding_test.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/qp_encoding_test.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/qp_encoding_test.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ ---TEST-- -qp comprehensive test ---SKIPIF-- ---FILE-- -setHTMLBody(''); -$mm->setTxtBody('Blah blah'); - -if (version_compare(phpversion(), "5.0.0", '<')) { - $mmCopy = $mm; -} else { - $mmCopy = clone($mm); -} - -$mm->get(); -$x = $mm->headers(); - -$smm = serialize(array('mm' => $mmCopy, 'header' => $x['Content-Type'])); -$fp = fopen('sleep_wakeup_data', 'w'); -fwrite($fp, $smm); -fclose($fp); - -echo "Data written"; -?> ---EXPECT-- -Data written diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/sleep_wakeup_EOL-bug3488-part2.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/sleep_wakeup_EOL-bug3488-part2.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/sleep_wakeup_EOL-bug3488-part2.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/sleep_wakeup_EOL-bug3488-part2.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---TEST-- -Bug #3488 Sleep/Wakeup EOL Consistency - Part 2 ---SKIPIF-- -if (!is_readable('sleep_wakeup_data')) { - echo "skip No data. Part 1 must run first.\n"; -} ---FILE-- -get(); -$x = $mmData['mm']->headers(); - -list($h1) = explode("\n", $mmData['header']); -list($h2) = explode("\n", $x['Content-Type']); - -echo ($h1 == $h2) ? "Match" : "No Match"; - -?> ---EXPECT-- -Match diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10596_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10596_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10596_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10596_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ ---TEST-- -Bug #10596 Incorrect handling of text and html '0' bodies ---SKIPIF-- ---FILE-- -setTxtBody('0'); -$mime->setHTMLBody('0'); -$body = $mime->get(); -if ($body){ - print("OK"); -}else{ - print("NO BODY FOUND"); -} ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10816_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10816_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10816_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10816_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---TEST-- -Bug #10816 Unwanted linebreak at the end of output ---SKIPIF-- ---FILE-- -$eol)); -$encoder->setTXTBody('test'); -$encoder->setHTMLBody('test'); -$encoder->addAttachment('Just a test', 'application/octet-stream', 'test.txt', false); -$body = $encoder->get(); -$taillength = -1 * strlen($eol) * 2; -if (substr($body, $taillength) == ($eol.$eol)){ - print("FAILED\n"); - print("Body:\n"); - print("..." . substr($body, -10) . "\n"); -}else{ - print("OK\n"); -} ---EXPECT-- -OK - diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10999_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10999_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_10999_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_10999_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---TEST-- -Bug #10999 Bad Content-ID(cid) format ---SKIPIF-- ---FILE-- -'; - -$mime->setHTMLBody($body); -$mime->setFrom($from); -$mime->addHTMLImage('','image/gif', 'test.gif', false); -$msg=$mime->get(); - -$header = preg_match('|Content-ID: <[0-9a-fA-F]+@from.example.com>|', $msg); -if (!$header){ - print("FAIL:\n"); - print($msg); -}else{ - print("OK"); -} ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_11381.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_11381.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_11381.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_11381.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ ---TEST-- -Bug #11381 Domain name is attached to content-id, trailing greater-than sign is not removed ---SKIPIF-- ---FILE-- -'; - -require_once('Mail/mime.php'); - -$mime=new Mail_mime(); - -$body=''; - -$mime->setHTMLBody($body); -$mime->setFrom($from); -$mime->addHTMLImage('','image/gif', 'test.gif', false); -$msg=$mime->get(); - -$header = preg_match('|Content-ID: <[0-9a-fA-F]+@from.example.com>|', $msg); -if (!$header){ - print("FAIL:\n"); - print($msg); -}else{ - print("OK"); -} ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_11731.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_11731.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_11731.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_11731.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---TEST-- -Bug #11731 Full stops after soft line breaks are not encoded ---SKIPIF-- ---FILE-- - 'text/plain', - 'encoding' => 'quoted-printable', -); -$mimePart = new Mail_mimePart($text, $params); -$encoded = $mimePart->encode(); -echo $encoded['body']; - ---EXPECT-- -=2E123456789012345678901234567890123456789012345678901234567890123456789012= -=2E3456 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12165.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12165.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12165.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12165.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ ---TEST-- -Bug #12165 Dot at the end of the line disappeared ---SKIPIF-- ---FILE-- -setHTMLBody($string); -print_r($mime->get()); - ---EXPECT-- -http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa= -=2Ecom diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12385_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12385_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12385_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12385_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ ---TEST-- -Bug #12385 Bad regex when replacing css style attachments ---SKIPIF-- ---FILE-- - -className { - background-image: url('test.gif'); -} - -"; - -$mime->setHTMLBody($body); -$mime->setFrom($from); -$mime->addHTMLImage('','image/gif', 'test.gif', false); -$msg = $mime->get(); - -$cidtag = preg_match("|url\('cid:[^']*'\);|", $msg); -if (!$cidtag){ - print("FAIL:\n"); - print($msg); -}else{ - print("OK"); -} ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12411.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12411.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12411.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12411.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ ---TEST-- -Bug #12411 RFC2047 encoded attachment filenames ---SKIPIF-- ---FILE-- -addAttachment('testfile', "text/plain", $filename, FALSE, - 'base64', 'attachment', 'ISO-8859-1', 'pl', '', - 'quoted-printable', 'base64'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { - echo implode("\n", $matches[2]); -} - -?> ---EXPECT-- -"=?ISO-8859-1?Q?=C5=9Bciema?=" -"=?ISO-8859-1?B?xZtjaWVtYQ==?="; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12466.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12466.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_12466.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_12466.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---TEST-- -Bug #12466 Content-Transfer-Encoding checking ---SKIPIF-- ---FILE-- - '7bit', - 'html_encoding' => '7bit', -); -$mime = new Mail_mime($params); -$mime->setTXTBody("ż"); -$mime->setHTMLBody("z"); -$body = $mime->getMessage(); - -preg_match_all('/Content-Transfer-Encoding: (.*)/', $body, $m); -echo trim($m[1][0])."\n".trim($m[1][1]); - -?> ---EXPECT-- -quoted-printable -7bit diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13032.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13032.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13032.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13032.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---TEST-- -Bug #13032 Proper (different) boundary for nested parts ---SKIPIF-- ---FILE-- -setHTMLBody('html'); -$mime->setTXTBody('text'); -$mime->addAttachment('file.pdf', 'application/pdf', 'file.pdf', false, 'base64', 'inline'); -$msg = $mime->getMessage(); - -if (preg_match_all('/boundary="([^"]+)"/', $msg, $matches)) { - if (count($matches) == 2 && count($matches[1]) == 2 && - $matches[1][0] != $matches[1][1]) { - print('OK'); - } -} -?> ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13444.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13444.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13444.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13444.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ ---TEST-- -Bug #9725 multipart/related & alternative wrong order ---SKIPIF-- ---FILE-- -setTXTBody("test"); -$mime->setHTMLBody("test"); -$mime->addHTMLImage("test", 'application/octet-stream', '', false); -$body = $mime->get(); -$head = $mime->headers(); -$headCT = $head['Content-Type']; -$headCT = explode(";", $headCT); -$headCT = $headCT[0]; - -$ct = preg_match_all('|Content-Type: ([^;\r\n]+)|', $body, $matches); -print($headCT); -print("\n"); -foreach ($matches[1] as $match){ - print($match); - print("\n"); -} ---EXPECT-- -multipart/alternative -text/plain -multipart/related -text/html -application/octet-stream diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13962.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13962.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_13962.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_13962.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---TEST-- -Bug #13962 Multiple header support ---SKIPIF-- ---FILE-- -setFrom('user@from.example.com'); -$r = $mime->txtHeaders(array('Received' => array('Received 1', 'Received 2'))); - -print_r($r); -?> ---EXPECT-- -Received: Received 1 -Received: Received 2 -MIME-Version: 1.0 -From: user@from.example.com diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14529.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14529.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14529.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14529.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---TEST-- -Bug #14529 basename() workaround ---SKIPIF-- ---FILE-- -addAttachment('testfile', "text/plain", $filename, FALSE, 'base64', 'attachment', 'ISO-8859-1'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match('/filename([^\s]+)/i', $content, $matches)) { - echo $matches[1]; -} -?> ---EXPECT-- -*=ISO-8859-1''%C5%9Bciema; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14779.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14779.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14779.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14779.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ ---TEST-- -Bug #14779 Proper header-body separator for empty attachment ---SKIPIF-- ---FILE-- -addAttachment('', "text/plain", 'file.txt', FALSE, 'base64', 'attachment'); -$result = $m->get(); - -if (preg_match('/(Content.*)--=.*/s', $result, $matches)) { - print_r($matches[1]."END"); -} - -?> ---EXPECT-- -Content-Transfer-Encoding: base64 -Content-Type: text/plain; - name=file.txt -Content-Disposition: attachment; - filename=file.txt - - -END diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14780.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14780.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_14780.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_14780.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ ---TEST-- -Bug #14780 Invalid Content-Type when headers() is called before get() ---SKIPIF-- ---FILE-- -setTXTBody("test"); -$mime->setHTMLBody("test"); - -$head1 = $mime->headers(); -$body = $mime->get(); -$head2 = $mime->headers(); - -if ($head1 === $head2) { - echo "OK"; -} - -?> ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_15320.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_15320.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_15320.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_15320.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---TEST-- -Bug #15320 Charset parameter in Content-Type of mail parts ---SKIPIF-- ---FILE-- -addAttachment('testfile', "text/plain", 'file.txt', FALSE, 'base64', 'attachment', 'ISO-8859-1'); - -$content = $Mime->get(); -//$content = str_replace("\n", '', $content); - -if (preg_match('/Content-type:([^\n]+)/i', $content, $matches)) { - echo $matches[1]; -} - -?> ---EXPECT-- -text/plain; charset=ISO-8859-1; - diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_16539.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_16539.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_16539.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_16539.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ ---TEST-- -Bug #16539 Headers longer than 998 characters ---SKIPIF-- ---FILE-- - 'jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com', -'Subject' => 'jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com', -); - -echo $mime->txtHeaders($headers, true, true); -?> ---EXPECT-- -MIME-Version: 1.0 -To: jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, - jskibbie@schawk.com, jskibbie@schawk.com -Subject: jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.co - m,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_17025.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_17025.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_17025.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_17025.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ ---TEST-- -Bug #16539 Headers longer than 998 characters ---SKIPIF-- ---FILE-- -headers($headers); -print_r($hdrs['From']); -?> ---EXPECT-- -aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhh diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_17175.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_17175.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_17175.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_17175.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ ---TEST-- -Bug #17175 Content-Description support+ecoding ---SKIPIF-- ---FILE-- -setTXTBody('Test message.'); -$Mime->addAttachment('test file contents', "text/plain", - 'test.txt', FALSE, 'base64', NULL, 'UTF-8', NULL, NULL, NULL, NULL, - 'desc'); -$Mime->addAttachment('test file contents', "text/plain", - 'test2.txt', FALSE, 'base64', NULL, 'UTF-8', NULL, NULL, NULL, NULL, - 'test unicode żąśź'); - -$body = $Mime->getMessage(); -preg_match_all('/Content-Description: (.*)/', $body, $matches); -foreach ($matches[1] as $value) - echo $value."\n"; -?> ---EXPECT-- -desc -=?UTF-8?Q?test_unicode_=C5=BC=C4=85=C5=9B=C5=BA?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_18083.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_18083.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_18083.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_18083.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---TEST-- -Bug #18083 Separate charset for attachment's content and headers ---SKIPIF-- ---FILE-- -addAttachment('testfile', "text/plain", - base64_decode("xZtjaWVtYQ=="), FALSE, - 'base64', 'attachment', 'ISO-8859-1', 'pl', '', - 'quoted-printable', 'base64', '', 'UTF-8'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { - echo implode("\n", $matches[2]); -} -?> ---EXPECT-- -"=?UTF-8?Q?=C5=9Bciema?=" -"=?UTF-8?B?xZtjaWVtYQ==?="; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_18772.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_18772.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_18772.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_18772.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ ---TEST-- -Bug #18772 Text/calendar message ---SKIPIF-- ---FILE-- -setSubject('test'); - -// A message with text/calendar only -$mime->setCalendarBody('VCALENDAR'); - -echo $mime->getMessage(); -echo "\n---\n"; - -// A message with alternative text -$mime->setTXTBody('vcalendar'); -$msg = $mime->getMessage(); - -echo preg_replace('/=_[0-9a-z]+/', '*', $msg); ---EXPECT-- -MIME-Version: 1.0 -Subject: test -Content-Type: text/calendar; charset=UTF-8; method=request -Content-Transfer-Encoding: quoted-printable - -VCALENDAR ---- -MIME-Version: 1.0 -Subject: test -Content-Type: multipart/alternative; - boundary="*" - ---* -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain; charset=ISO-8859-1 - -vcalendar ---* -Content-Transfer-Encoding: quoted-printable -Content-Type: text/calendar; method=request; charset=UTF-8 - -VCALENDAR ---*-- diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_19497.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_19497.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_19497.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_19497.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ ---TEST-- -Bug #19497 Attachment filenames with a slash character ---SKIPIF-- ---FILE-- -addAttachment('testfile', "text/plain", $filename, FALSE, - 'base64', 'attachment', 'ISO-8859-1', '', '', 'quoted-printable', 'base64'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { - echo implode("\n", $matches[2]); -} -?> ---EXPECT-- -"test/file.txt" -"test/file.txt"; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20226.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20226.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20226.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20226.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ ---TEST-- -Bug #20226 Mail_mimePart::encodeHeader() and ISO-2022-JP encoding ---SKIPIF-- ---FILE-- -encodeHeader('subject', $subject, 'ISO-2022-JP', 'base64'); -?> ---EXPECT-- -=?ISO-2022-JP?B?GyRCJT8lJCVIJWsbKEI=?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20273.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20273.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20273.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20273.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ ---TEST-- -Bug #20273 Mail_mimePart::encodeHeader() and TAB character ---SKIPIF-- ---FILE-- -\t"; -$mime = new Mail_mimePart(); -echo $mime->encodeHeader('References', $refs); -?> ---EXPECT-- - diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20563.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20563.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20563.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20563.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---TEST-- -Bug #20563 isMultipart() method tests ---SKIPIF-- ---FILE-- -isMultipart() ? 'TRUE' : 'FALSE') . "\n"; - -$mime->setTXTBody('test'); - -echo ($mime->isMultipart() ? 'TRUE' : 'FALSE') . "\n"; - -$mime->setHTMLBody('test'); - -echo ($mime->isMultipart() ? 'TRUE' : 'FALSE') . "\n"; - ---EXPECT-- -FALSE -FALSE -TRUE diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20564.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20564.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_20564.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_20564.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ ---TEST-- -Bug #20564 Unsetting headers ---SKIPIF-- ---FILE-- -setSubject('test'); - -$headers = $mime->headers(array('Subject' => null), true); -echo array_key_exists('Subject', $headers) ? '1' : '0'; ---EXPECT-- -0 \ No newline at end of file diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21027.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21027.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21027.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21027.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ ---TEST-- -Bug #21027 Calendar support along with attachments and html images ---SKIPIF-- ---FILE-- -This is HTML body.'; -$icsText = 'BEGIN:VCALENDAR -VERSION:2.0 -PRODID:-//icalcreator//NONSGML iCalcreator 2.22// -METHOD:REQUEST -BEGIN:VEVENT -UID:77@localhost -DTSTAMP:20160208T170811Z -ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP= - TRUE;CN=Jacob Alvarez:MAILTO:fake1@mailinator.com -CREATED:20160208T170810Z -DTSTART:20160215T180000Z -DTEND:20160215T190000Z -ORGANIZER;CN=-:MAILTO:fake2@mailinator.com -SEQUENCE:1 -STATUS:CONFIRMED -SUMMARY:Prueba 69 -TRANSP:OPAQUE -URL:http://localhost/event/77 -END:VEVENT -END:VCALENDAR'; - -function printPartsStartAndEnd($body) { - $matches = array(); - preg_match_all('/--(=_[a-z0-9]+)--|Content-Type: ([^;\r\n]+)/', $body, $matches); - $tab = " "; - foreach ($matches[0] as $match){ - if (strpos($match, '--') === false) { - printf("%s%s\n", $tab, $match); - if (stripos($match, "multipart")) { - $tab .= " "; - } - } else { - $tab = substr($tab, 0, -4); - printf("%sEnd part\n", $tab); - } - } -} - -function printHeaderContentType($headers) { - $headerContentType = array(); - preg_match('/([^;\r\n]+)/', $headers['Content-Type'], $headerContentType); - printf("Content-Type: %s\n", $headerContentType[0]); -} - -print "TEST: text\n"; -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: html\n"; -$mime = new Mail_mime(); -$mime->setHTMLBody($htmlBody); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: attachments\n"; -$mime = new Mail_mime(); -$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: text + attachments\n"; -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: html + attachments\n"; -$mime = new Mail_mime(); -$mime->setHTMLBody($htmlBody); -$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: html + inline images\n"; -$mime = new Mail_mime(); -$mime->setHTMLBody($htmlBody); -$mime->addHTMLImage("aaaaaaaaaa", 'image/gif', 'image.gif', false, 'contentid'); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print("TEST: txt, html and attachment\n"); -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->setHTMLBody($htmlBody); -$mime->addAttachment("test", 'application/octet-stream', 'attachment', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: calendar\n"; -$mime = new Mail_mime(); -$mime->setCalendarBody($icsText); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: txt + calendar\n"; -$mime->setTXTBody($txtBody); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: txt, html, calendar\n"; -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->setHTMLBody($htmlBody); -$mime->setCalendarBody($icsText); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: txt, html + html images, and calendar\n"; -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->setHTMLBody($htmlBody); -$mime->addHTMLImage('testimage', 'image/gif', "bus.gif", false); -$mime->setCalendarBody($icsText); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print("TEST: txt, html, calendar and attachment\n"); -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->setHTMLBody($htmlBody); -$mime->setCalendarBody($icsText); -$mime->addAttachment("test", 'application/octet-stream', 'attachment', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); - -print "TEST: txt, html + html images, calendar, and attachment\n"; -$mime = new Mail_mime(); -$mime->setTXTBody($txtBody); -$mime->setHTMLBody($htmlBody); -$mime->addHTMLImage('testimage', 'image/gif', "bus.gif", false); -$mime->setCalendarBody($icsText); -$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); -$headers = $mime->headers(); -$body = $mime->get(); -printHeaderContentType($headers); -printPartsStartAndEnd($body); -print("\n"); -?> ---EXPECT-- -TEST: text -Content-Type: text/plain - -TEST: html -Content-Type: text/html - -TEST: attachments -Content-Type: multipart/mixed - Content-Type: application/ics -End part - -TEST: text + attachments -Content-Type: multipart/mixed - Content-Type: text/plain - Content-Type: application/ics -End part - -TEST: html + attachments -Content-Type: multipart/mixed - Content-Type: text/html - Content-Type: application/ics -End part - -TEST: html + inline images -Content-Type: multipart/related - Content-Type: text/html - Content-Type: image/gif -End part - -TEST: txt, html and attachment -Content-Type: multipart/mixed - Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: text/html - End part - Content-Type: application/octet-stream -End part - -TEST: calendar -Content-Type: text/calendar - -TEST: txt + calendar -Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: text/calendar -End part - -TEST: txt, html, calendar -Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: text/html - Content-Type: text/calendar -End part - -TEST: txt, html + html images, and calendar -Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: multipart/related - Content-Type: text/html - Content-Type: image/gif - End part - Content-Type: text/calendar -End part - -TEST: txt, html, calendar and attachment -Content-Type: multipart/mixed - Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: text/html - Content-Type: text/calendar - End part - Content-Type: application/octet-stream -End part - -TEST: txt, html + html images, calendar, and attachment -Content-Type: multipart/mixed - Content-Type: multipart/alternative - Content-Type: text/plain - Content-Type: multipart/related - Content-Type: text/html - Content-Type: image/gif - End part - Content-Type: text/calendar - End part - Content-Type: application/ics -End part diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21098.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21098.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21098.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21098.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ ---TEST-- -Bug #21098 Handling of empty plain text parts ---SKIPIF-- ---FILE-- -setTxtBody(''); -$mime->setHTMLBody(''); - -$headers1 = $mime->txtHeaders(); -$body = $mime->get(); -$headers2 = $mime->txtHeaders(); -print strpos($headers1, 'text/html') && strpos($headers2, 'text/html') ? 'OK' : 'NOT OK'; ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21205.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21205.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21205.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21205.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ ---TEST-- -Bug #21205 Handling ISO-2022-JP headers ---SKIPIF-- -'; -$charset = 'ISO-2022-JP'; -$encoding = 'base64'; -foreach ($tests as $test) { - $test = mb_convert_encoding($test, $charset, 'UTF-8'); - print Mail_mimePart::encodeHeader("subject", $test, $charset, $encoding) . PHP_EOL; - print Mail_mimePart::encodeHeader("to", $test.$addr, $charset, $encoding) . PHP_EOL; - $test = '"' . $test . '"'; - print Mail_mimePart::encodeHeader("subject", $test, $charset, $encoding) . PHP_EOL; - print Mail_mimePart::encodeHeader("to", $test.$addr, $charset, $encoding) . PHP_EOL; -} -?> ---EXPECT-- -=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= -=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= -=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= -=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= -=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= -=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= -=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= -=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21206.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21206.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21206.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21206.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ ---TEST-- -Bug #21206 Handling quoted strings ---SKIPIF-- ---FILE-- -, b ', - '"c\\\\" , d ', -); -foreach ($tests as $test) { - $addrs = X::explodeQuotedString('[\t,]', $test); - foreach ($addrs as $addr) { - print trim($addr) . PHP_EOL; - } -} -?> ---EXPECT-- -"a" -b -"c\\" -d diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21255.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21255.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_21255.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_21255.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---TEST-- -Bug #21255 Boundary gets added twice ---SKIPIF-- ---FILE-- -setHTMLBody('html'); -$mime->setTXTBody('text'); -$mime->setContentType('multipart/alternative', array('boundary' => 'something')); - -$msg = $mime->getMessage(); - -echo substr_count($msg, 'boundary='); - -?> ---EXPECT-- -1 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---TEST-- -Bug #3513 Support of RFC2231 in header fields. (ISO-8859-1) ---SKIPIF-- ---FILE-- -addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'ISO-8859-1'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match('/filename([^\s]+)/i', $content, $matches)) { - echo $matches[1]; -} - ---EXPECT-- -*=ISO-8859-1''F%F3%F3b%E6r.txt; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_2.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_2.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_2.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_2.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ ---TEST-- -Bug #3513 Support of RFC2231 in header fields. (UTF-8) ---SKIPIF-- ---FILE-- -addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'UTF-8', 'de'); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match_all('/filename([^\s]+)/i', $content, $matches)) { - echo implode("\n", $matches[1]); -} - ---EXPECT-- -*0*=UTF-8'de'S%C3%BCper%20gr%C3%B6se%20tolle%20tolle%20gr%C3%BC; -*1*=%C3%9Fe.txt; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_3.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_3.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_3513_3.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_3513_3.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ ---TEST-- -Bug #3513 Support of RFC2231 in header fields. (ISO-2022-JP) ---SKIPIF-- ---FILE-- -addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'iso-2022-jp', ''); - -$content = $Mime->get(); -$content = str_replace("\n", '', $content); - -if (preg_match('/filename([^\s]+)/i', $content, $matches)) { - echo $matches[1]; -} -?> ---EXPECT-- -*=iso-2022-jp''%1B$BF|K%5C8l%1B%28B.txt; - diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_7561_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_7561_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_7561_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_7561_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ ---TEST-- -Bug #7561 Mail_mimePart::quotedPrintableEncode() misbehavior with mbstring overload ---INI-- -mbstring.language=Neutral -mbstring.func_overload=6 -mbstring.internal_encoding=UTF-8 -mbstring.http_output=UTF-8 ---SKIPIF-- -$eol)); -$encoder->setTXTBody('test'); -$encoder->setHTMLBody('test'); -$encoder->addAttachment('Just a test', 'application/octet-stream', 'test.txt', false); -$body = $encoder->get(); -if (strpos($body, '--' . $eol . '--=')){ - print("FAILED\n"); - print("Single delimiter() between 2 parts found.\n"); - print($body); -}else{ - print("OK"); -} -?> ---EXPECT-- -OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_8541_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_8541_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_8541_1.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_8541_1.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ ---TEST-- -Bug #8541 mimePart.php line delimiter is \r ---SKIPIF-- ---FILE-- -setHTMLBody('html'); -$mime->setTXTBody('text'); -$mime->setContentType('multipart/alternative', array('boundary' => 'something')); - -$temp_filename = dirname(__FILE__) . "/output1.tmp"; -touch($temp_filename); -$msg = $mime->saveMessageBody($temp_filename); -echo file_get_contents($temp_filename); - -$temp_filename = dirname(__FILE__) . "/output2.tmp"; -touch($temp_filename); -$msg = $mime->saveMessage($temp_filename); -echo file_get_contents($temp_filename); - -$temp_filename = dirname(__FILE__) . "/output3.tmp"; -$mimePart = new Mail_mimePart('abc', array( - 'content_type' => 'text/plain', - 'encoding' => 'quoted-printable', -)); -$mimePart->encodeToFile($temp_filename); -echo file_get_contents($temp_filename); - -?> ---CLEAN-- - ---EXPECT-- ---something -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain; charset=ISO-8859-1 - -text ---something -Content-Transfer-Encoding: quoted-printable -Content-Type: text/html; charset=ISO-8859-1 - -html ---something-- -MIME-Version: 1.0 -Content-Type: multipart/alternative; - boundary="something" - ---something -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain; charset=ISO-8859-1 - -text ---something -Content-Transfer-Encoding: quoted-printable -Content-Type: text/html; charset=ISO-8859-1 - -html ---something-- -Content-Transfer-Encoding: quoted-printable -Content-Type: text/plain - -abc diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_GH19.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_GH19.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_GH19.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_GH19.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ ---TEST-- -Bug GH-19 Test boundary value with different headers()/get() call order ---SKIPIF-- ---FILE-- -setHTMLBody('html'); -$mime->setTXTBody('text'); - -$body = $mime->get(); -$hdrs = $mime->headers(array( - 'From' => 'test@domain.tld', - 'Subject' => 'Subject', - 'To' => 'to@domain.tld' -)); - -preg_match('/boundary="([^"]+)/', $hdrs['Content-Type'], $matches); -$boundary = $matches[1]; - -echo substr_count($body, "--$boundary") . "\n"; - -// Test headers() before get() - -$mime = new Mail_mime("\r\n"); -$mime->setHTMLBody('html'); -$mime->setTXTBody('text'); - -$hdrs = $mime->headers(array( - 'From' => 'test@domain.tld', - 'Subject' => 'Subject', - 'To' => 'to@domain.tld' -)); -$body = $mime->get(); - -preg_match('/boundary="([^"]+)/', $hdrs['Content-Type'], $matches); -$boundary = $matches[1]; - -echo substr_count($body, "--$boundary"); ---EXPECT-- -3 -3 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_GH26.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_GH26.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_Bug_GH26.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_Bug_GH26.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ ---TEST-- -Bug GH-26 Backward slash is getting added in headers ---SKIPIF-- ---FILE-- -'; -$to = <<,,t@mail.com -EOT; -$subject = "Test mime"; -$mailbody = "hello world"; - -$mail_mime->setTxtBody($mailbody); -$mail_mime->setHTMLBody($mailbody); -$mail_mime->setSubject($subject); -$mail_mime->setFrom($from); - -$body = $mail_mime->get(); - -$extra_headers = array(); -$extra_headers["To"] = $to; - -$arr_hdrs = $mail_mime->headers($extra_headers); - -echo $arr_hdrs['From'] . "\n" . $arr_hdrs['To']; - ---EXPECT-- -"George B@@Z" -"austin test" , , t@mail.com \ No newline at end of file diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_linebreak_dot.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_linebreak_dot.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_linebreak_dot.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_linebreak_dot.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ ---TEST-- -Test for correct "." encoding when doing linebreaks ---SKIPIF-- ---FILE-- - 'text/plain', - 'encoding' => 'quoted-printable', -); - -for ($i=74; $i <= strlen($text); $i++) { - $input = substr($text, 0, $i); - $mimePart = new Mail_mimePart($input, $params); - $encoded = $mimePart->encode(); - $output = $encoded['body']; - printf("input: %02d: %s\n", strlen($input), $input); - - $lines = explode("\r\n", $output); - for($j=0; $j < count($lines); $j++) { - $line = $lines[$j]; - if ($j + 1 < count($lines)) { - $line_vis = $line.'\r\n'; - } else { - $line_vis = $line; - } - printf("output:%02d: %s\n", strlen($line), $line_vis); - } - - print("---\n"); - -} ---EXPECT-- -input: 74: 0123456789012345678901234567890123456789012345678901234567890123456789012. -output:74: 0123456789012345678901234567890123456789012345678901234567890123456789012. ---- -input: 75: 0123456789012345678901234567890123456789012345678901234567890123456789012.. -output:75: 0123456789012345678901234567890123456789012345678901234567890123456789012.. ---- -input: 76: 0123456789012345678901234567890123456789012345678901234567890123456789012... -output:76: 0123456789012345678901234567890123456789012345678901234567890123456789012... ---- -input: 77: 0123456789012345678901234567890123456789012345678901234567890123456789012...6 -output:76: 0123456789012345678901234567890123456789012345678901234567890123456789012..=\r\n -output:04: =2E6 ---- diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_linebreak_larger_76.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_linebreak_larger_76.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.11/tests/test_linebreak_larger_76.phpt 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.11/tests/test_linebreak_larger_76.phpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ ---TEST-- -Test for correct linebreaks for lines _longer_ than 76 chars. ---SKIPIF-- ---FILE-- - 'text/plain', - 'encoding' => 'quoted-printable', -); - -for ($i=74; $i <= strlen($text); $i++) { - $input = substr($text, 0, $i); - $mimePart = new Mail_mimePart($input, $params); - $encoded = $mimePart->encode(); - $output = $encoded['body']; - printf("input: %02d: %s\n", strlen($input), $input); - - $lines = explode("\r\n", $output); - for($j=0; $j < count($lines); $j++) { - $line = $lines[$j]; - if ($j + 1 < count($lines)) { - $line_vis = $line.'\r\n'; - } else { - $line_vis = $line; - } - printf("output:%02d: %s\n", strlen($line), $line_vis); - } - print("---\n"); -} ---EXPECT-- -input: 74: 12345678901234567890123456789012345678901234567890123456789012345678901234 -output:74: 12345678901234567890123456789012345678901234567890123456789012345678901234 ---- -input: 75: 123456789012345678901234567890123456789012345678901234567890123456789012345 -output:75: 123456789012345678901234567890123456789012345678901234567890123456789012345 ---- -input: 76: 1234567890123456789012345678901234567890123456789012345678901234567890123456 -output:76: 1234567890123456789012345678901234567890123456789012345678901234567890123456 ---- -input: 77: 12345678901234567890123456789012345678901234567890123456789012345678901234567 -output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n -output:02: 67 ---- -input: 78: 123456789012345678901234567890123456789012345678901234567890123456789012345678 -output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n -output:03: 678 ---- -input: 79: 1234567890123456789012345678901234567890123456789012345678901234567890123456789 -output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n -output:04: 6789 ---- -input: 80: 12345678901234567890123456789012345678901234567890123456789012345678901234567890 -output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n -output:05: 67890 ---- diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/Mail/mime.php php-mail-mime-1.10.12/Mail_Mime-1.10.12/Mail/mime.php --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/Mail/mime.php 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/Mail/mime.php 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,1593 @@ + + * Copyright (c) 2003-2006, PEAR + * 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 + * @author Tomas V.V. Cox + * @author Cipriano Groenendal + * @author Sean Coates + * @author Aleksander Machniak + * @copyright 2003-2006 PEAR + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: @package_version@ + * @link http://pear.php.net/package/Mail_mime + * + * This class is based on HTML Mime Mail class from + * Richard Heyes which was based also + * in the mime_mail.class by Tobias Ratschiller + * and Sascha Schumann + */ + + +require_once 'PEAR.php'; +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 + * @author Tomas V.V. Cox + * @author Cipriano Groenendal + * @author Sean Coates + * @copyright 2003-2006 PEAR + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @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 + */ + protected $txtbody = ''; + + /** + * Contains the html part of the email + * + * @var string + */ + protected $htmlbody = ''; + + /** + * Contains the text/calendar part of the email + * + * @var string + */ + protected $calbody = ''; + + /** + * List of the attached images + * + * @var array + */ + protected $html_images = array(); + + /** + * List of the attachements + * + * @var array + */ + protected $parts = array(); + + /** + * Headers for the mail + * + * @var array + */ + protected $headers = array(); + + /** + * Build parameters + * + * @var array + */ + protected $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', + // What encoding to use for calendar part + // Options: 7bit, 8bit, base64, or quoted-printable + 'calendar_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 calendar part + 'calendar_charset' => 'UTF-8', + // 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, + // Default calendar method + 'calendar_method' => 'request', + // multipart part preamble (RFC2046 5.1.1) + 'preamble' => '', + ); + + + /** + * 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 + */ + public function __construct($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)) { + $this->build_params = array_merge($this->build_params, $params); + } + } + + /** + * Set build parameter value + * + * @param string $name Parameter name + * @param string $value Parameter value + * + * @return void + * @since 1.6.0 + */ + public function setParam($name, $value) + { + $this->build_params[$name] = $value; + } + + /** + * Get build parameter value + * + * @param string $name Parameter name + * + * @return mixed Parameter value + * @since 1.6.0 + */ + public 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 + */ + public function setTXTBody($data, $isfile = false, $append = false) + { + return $this->setBody('txtbody', $data, $isfile, $append); + } + + /** + * Get message text body + * + * @return string Text body + * @since 1.6.0 + */ + public 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 or PEAR_Error object + */ + public function setHTMLBody($data, $isfile = false) + { + return $this->setBody('htmlbody', $data, $isfile); + } + + /** + * Get message HTML body + * + * @return string HTML body + * @since 1.6.0 + */ + public function getHTMLBody() + { + return $this->htmlbody; + } + + /** + * Function to set a body of text/calendar part (not attachment) + * + * @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 + * @param string $method iCalendar object method + * @param string $charset iCalendar character set + * @param string $encoding Transfer encoding + * + * @return mixed True on success or PEAR_Error object + * @since 1.9.0 + */ + public function setCalendarBody($data, $isfile = false, $append = false, + $method = 'request', $charset = 'UTF-8', $encoding = 'quoted-printable' + ) { + $result = $this->setBody('calbody', $data, $isfile, $append); + + if ($result === true) { + $this->build_params['calendar_method'] = $method; + $this->build_params['calendar_charset'] = $charset; + $this->build_params['calendar_encoding'] = $encoding; + } + } + + /** + * Get body of calendar part + * + * @return string Calendar part body + * @since 1.9.0 + */ + public function getCalendarBody() + { + return $this->calbody; + } + + /** + * Adds an image to the list of embedded images. + * Images added this way will be added as related parts of the HTML message. + * + * To correctly match the HTML image with the related attachment + * HTML should refer to it by a filename (specified in $file or $name + * arguments) or by cid: (specified in $content_id arg). + * + * @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. Used to find + * the image in HTML content. + * @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 + */ + 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 (self::isError($filedata = $this->file2str($file))) { + return $filedata; + } + } + + $filename = $name ? $name : $file; + } else { + $filedata = $file; + $filename = $name; + } + + if (!$content_id) { + $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 mixed $file The file name or the file contents itself, + * it can be also Mail_mimePart object + * @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 : + * + * @return mixed True on success or PEAR_Error object + */ + 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() + ) { + if ($file instanceof Mail_mimePart) { + $this->parts[] = $file; + return true; + } + + $bodyfile = null; + + if ($isfile) { + // Don't load file into memory + if ($this->build_params['delay_file_io']) { + $filedata = null; + $bodyfile = $file; + } else { + if (self::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"; + return self::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; + } + + /** + * Checks if the current message has many parts + * + * @return bool True if the message has many parts, False otherwise. + * @since 1.9.0 + */ + public function isMultipart() + { + return count($this->parts) > 0 || count($this->html_images) > 0 + || (strlen($this->htmlbody) > 0 && strlen($this->txtbody) > 0); + } + + /** + * 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 + */ + protected function file2str($file_name) + { + // Check state of file and raise an error properly + if (!is_string($file_name)) { + return self::raiseError('Invalid or empty file name'); + } + if (!file_exists($file_name)) { + return self::raiseError('File not found: ' . $file_name); + } + if (!is_file($file_name)) { + return self::raiseError('Not a regular file: ' . $file_name); + } + if (!is_readable($file_name)) { + return self::raiseError('File is not readable: ' . $file_name); + } + + // Temporarily reset magic_quotes_runtime and read file contents + if (version_compare(PHP_VERSION, '5.4.0', '<')) { + $magic_quotes = @ini_set('magic_quotes_runtime', 0); + } + + $cont = file_get_contents($file_name); + + if (isset($magic_quotes)) { + @ini_set('magic_quotes_runtime', $magic_quotes); + } + + 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 + * anything else if a new object is to be created. + * + * @return Mail_mimePart The text mimePart object + */ + protected function addTextPart($obj = null) + { + return $this->addBodyPart($obj, $this->txtbody, 'text/plain', 'text'); + } + + /** + * 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 + * anything else if a new object is to be created. + * + * @return Mail_mimePart The html mimePart object + */ + protected function addHtmlPart($obj = null) + { + return $this->addBodyPart($obj, $this->htmlbody, 'text/html', 'html'); + } + + /** + * Adds a calendar subpart to the mimePart object and + * returns it during the build process. + * + * @param mixed $obj The object to add the part to, or + * anything else if a new object is to be created. + * + * @return Mail_mimePart The text mimePart object + */ + protected function addCalendarPart($obj = null) + { + $ctype = 'text/calendar; method='. $this->build_params['calendar_method']; + + return $this->addBodyPart($obj, $this->calbody, $ctype, 'calendar'); + } + + /** + * Creates a new mimePart object, using multipart/mixed as + * the initial content-type and returns it during the + * build process. + * + * @param array $params Additional part parameters + * + * @return Mail_mimePart The multipart/mixed mimePart object + */ + protected function addMixedPart($params = array()) + { + $params['content_type'] = 'multipart/mixed'; + $params['eol'] = $this->build_params['eol']; + + // Create empty multipart/mixed Mail_mimePart object to return + return new Mail_mimePart('', $params); + } + + /** + * 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 + * anything else if a new object is to be created. + * + * @return Mail_mimePart The multipart/mixed mimePart object + */ + protected function addAlternativePart($obj = null) + { + $params['content_type'] = 'multipart/alternative'; + $params['eol'] = $this->build_params['eol']; + + if (is_object($obj)) { + $ret = $obj->addSubpart('', $params); + } else { + $ret = new Mail_mimePart('', $params); + } + + 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 + * anything else if a new object is to be created + * + * @return Mail_mimePart The multipart/mixed mimePart object + */ + protected function addRelatedPart($obj = null) + { + $params['content_type'] = 'multipart/related'; + $params['eol'] = $this->build_params['eol']; + + if (is_object($obj)) { + $ret = $obj->addSubpart('', $params); + } else { + $ret = new Mail_mimePart('', $params); + } + + 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 Mail_mimePart The image mimePart object + */ + protected 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']; + } + + return $obj->addSubpart($value['body'], $params); + } + + /** + * 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 mixed $value The attachment information array or Mail_mimePart object + * + * @return Mail_mimePart The image mimePart object + */ + protected function addAttachmentPart($obj, $value) + { + if ($value instanceof Mail_mimePart) { + return $obj->addSubpart($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']; + } + + return $obj->addSubpart($value['body'], $params); + } + + /** + * 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. + * @param array $headers The extra headers that should be passed + * 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 + */ + public function getMessage($separation = null, $params = null, $headers = null, + $overwrite = false + ) { + if ($separation === null) { + $separation = $this->build_params['eol']; + } + + $body = $this->get($params); + + if (self::isError($body)) { + return $body; + } + + 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() method. See get() for more info. + * + * @return mixed The e-mail body or PEAR error object + * @since 1.6.0 + */ + public 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() method. See get() for more info. + * @param array $headers The extra headers that should be passed + * 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 + * @since 1.6.0 + */ + public 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)) { + return self::raiseError('File is not writable: ' . $filename); + } + + // Temporarily reset magic_quotes_runtime and read file contents + if (version_compare(PHP_VERSION, '5.4.0', '<')) { + $magic_quotes = @ini_set('magic_quotes_runtime', 0); + } + + if (!($fh = fopen($filename, 'ab'))) { + return self::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) { + return self::raiseError('Error writing to file: ' . $filename); + } + + fclose($fh); + + if (isset($magic_quotes)) { + @ini_set('magic_quotes_runtime', $magic_quotes); + } + + // 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 or stream. + * + * @param mixed $filename Output filename or file pointer where to save + * the message instead of returning it + * @param array $params The Build parameters passed to the + * get() method. See get() for more info. + * + * @return mixed True or PEAR error object + * @since 1.6.0 + */ + public function saveMessageBody($filename, $params = null) + { + if (!is_resource($filename)) { + // Check state of file and raise an error properly + if (!file_exists($filename) || !is_writable($filename)) { + return self::raiseError('File is not writable: ' . $filename); + } + + if (!($fh = fopen($filename, 'ab'))) { + return self::raiseError('Unable to open file: ' . $filename); + } + } else { + $fh = $filename; + } + + // Temporarily reset magic_quotes_runtime and read file contents + if (version_compare(PHP_VERSION, '5.4.0', '<')) { + $magic_quotes = @ini_set('magic_quotes_runtime', 0); + } + + // Write the rest of the message into file + $res = $this->get($params, $fh, true); + + if (!is_resource($filename)) { + fclose($fh); + } + + if (isset($magic_quotes)) { + @ini_set('magic_quotes_runtime', $magic_quotes); + } + + 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 mixed $filename Output filename or file pointer where to save + * the message instead of returning it + * @param bool $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 + */ + public function get($params = null, $filename = null, $skip_head = false) + { + if (!empty($params) && is_array($params)) { + $this->build_params = array_merge($this->build_params, $params); + } + + 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) && strlen($this->htmlbody) > 0) { + foreach ($this->html_images as $key => $value) { + $rval = preg_quote($value['name'], '#'); + $regex = array( + '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' . $rval . '\3#', + '#(?i)url(?-i)\(\s*(["\']?)' . $rval . '\1\s*\)#', + ); + + $rep = array( + '\1\2=\3cid:' . $value['cid'] .'\3', + '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(); + + $message = $this->buildBodyPart(); + + if (!isset($message)) { + 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 (self::isError($headers)) { + return $headers; + } + $this->headers = array_merge($this->headers, $headers); + } else { + $output = $message->encode($boundary, $skip_head); + if (self::isError($output)) { + return $output; + } + $this->headers = array_merge($this->headers, $output['headers']); + } + + // remember the boundary used, in case we'd handle headers() call later + if (empty($boundary) && !empty($this->headers['Content-Type'])) { + if (preg_match('/boundary="([^"]+)/', $this->headers['Content-Type'], $m)) { + $this->build_params['boundary'] = $m[1]; + } + } + + return $filename ? null : $output['body']; + } + + /** + * Builds the main body MIME part for the email body. It will add a mixed part + * if attachments are found. If no attachments are found it will return an + * alternative part if several body texts are found (text, html, calendar), + * or a single part if only one body text is found. + * + * @return Mail_mimePart|null The corresponding part for the body or null. + * + * @see buildAlternativeParts + * @see buildHtmlParts + */ + protected function buildBodyPart() + { + $parts_count = count($this->parts); + $mixed_params = array('preamble' => $this->build_params['preamble']); + $message = null; + + if ($parts_count > 0) { + $message = $this->addMixedPart($mixed_params); + $this->buildAlternativeParts($message, null); + for ($i = 0; $i < $parts_count; $i++) { + $this->addAttachmentPart($message, $this->parts[$i]); + } + } else { + $message = $this->buildAlternativeParts(null, $mixed_params); + } + + return $message; + } + + /** + * Builds a single text, html, or calendar part only if one of them is found. + * If two or more parts are found, then an alternative part containing them is built. + * + * @param Mail_mimePart|null $parent_part The parent mime part to add + * the part or null + * @param array $mixed_params The needed params to create the + * part when no parent_part is + * received. + * + * @return null|Mail_mimePart The main part built inside the method. It will be an + * alternative part or text, html, or calendar part. + * Null if no body texts are found. + */ + protected function buildAlternativeParts($parent_part, $mixed_params = null) + { + $html = strlen($this->htmlbody) > 0; + $calendar = strlen($this->calbody) > 0; + $has_text = strlen($this->txtbody) > 0; + $alternatives_count = $html + $calendar + $has_text; + + if ($alternatives_count > 1) { + $alt_part = $this->addAlternativePart($parent_part ? $parent_part : $mixed_params); + } else { + $alt_part = null; + } + + $dest_part = $alt_part ? $alt_part : $parent_part; + $part = null; + + if ($has_text) { + $part = $this->addTextPart($dest_part); + } + + if ($html) { + $part = $this->buildHtmlParts($dest_part); + } + + if ($calendar) { + $part = $this->addCalendarPart($dest_part); + } + + return $dest_part ? $dest_part : $part; + } + + /** + * Builds html part as a single part or inside a related part with the html + * images thar were found. + * + * @param Mail_mimePart|null $parent_part The object to add the part to, + * or anything else if a new object + * is to be created. + * + * @return Mail_mimePart|null The created part or null if no htmlbody found. + */ + protected function buildHtmlParts($parent_part) + { + if (!strlen($this->htmlbody)) { + return null; + } + + $count_html_images = count($this->html_images); + + if ($count_html_images > 0) { + $part = $this->addRelatedPart($parent_part); + $this->addHtmlPart($part); + } else { + $part = $this->addHtmlPart($parent_part); + } + + for ($i = 0; $i < $count_html_images; $i++) { + $this->addHtmlImagePart($part, $this->html_images[$i]); + } + + return $part; + } + + /** + * 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 + */ + public function headers($xtra_headers = null, $overwrite = false, $skip_content = false) + { + // Add mime version header + $headers['MIME-Version'] = '1.0'; + + 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); + } + + // Always reset Content-Type/Content-Transfer-Encoding headers + // In case the message structure changed in meantime + unset($this->headers['Content-Type']); + unset($this->headers['Content-Transfer-Encoding']); + unset($this->headers['Content-Disposition']); + + $this->headers = array_merge($this->headers, $this->contentHeaders()); + + $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']; + } + + return $this->encodeHeaders($headers); + } + + /** + * 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 + */ + 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 + * @since 1.7.0 + */ + public 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; + } else 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 (stripos($type, 'multipart/') === 0) { + 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 + */ + 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 + */ + 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 + */ + 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 + */ + 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 + */ + 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 + */ + 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 + */ + protected function encodeHeaders($input, $params = array()) + { + $build_params = $this->build_params; + + if (!empty($params)) { + $build_params = array_merge($build_params, $params); + } + + 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 if ($hdr_value !== null) { + $input[$hdr_name] = $this->encodeHeader( + $hdr_name, $hdr_value, + $build_params['head_charset'], $build_params['head_encoding'] + ); + } else { + unset($input[$hdr_name]); + } + } + + 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) + * @since 1.5.3 + */ + public function encodeHeader($name, $value, $charset, $encoding) + { + return Mail_mimePart::encodeHeader( + $name, $value, $charset, $encoding, $this->build_params['eol'] + ); + } + + /** + * Get file's basename (locale independent) + * + * @param string $filename Filename + * + * @return string Basename + */ + protected 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 + */ + protected function contentHeaders() + { + $attachments = count($this->parts) > 0; + $html_images = count($this->html_images) > 0; + $html = strlen($this->htmlbody) > 0; + $calendar = strlen($this->calbody) > 0; + $has_text = strlen($this->txtbody) > 0; + $has_alternatives = ($html + $calendar + $has_text) > 1; + $headers = array(); + + // See get() + switch (true) { + case $has_text && !$attachments && !$has_alternatives: + $headers['Content-Type'] = 'text/plain'; + break; + + case $html && !$html_images && !$attachments && !$has_alternatives: + $headers['Content-Type'] = 'text/html'; + break; + + case $html && $html_images && !$attachments && !$has_alternatives: + $headers['Content-Type'] = 'multipart/related'; + break; + + case $calendar && !$attachments && !$has_alternatives: + $headers['Content-Type'] = 'text/calendar'; + break; + + case $has_alternatives && !$attachments: + $headers['Content-Type'] = 'multipart/alternative'; + break; + + case $attachments: + $headers['Content-Type'] = 'multipart/mixed'; + break; + } + + // Note: This is outside of the above switch construct to workaround + // opcache bug: https://bugzilla.opensuse.org/show_bug.cgi?id=1166235 + if (empty($headers)) { + 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 + if ($this->build_params['text_charset']) { + $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 + if ($this->build_params['html_charset']) { + $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 if ($headers['Content-Type'] == 'text/calendar') { + // single-part message: add charset and encoding + if ($this->build_params['calendar_charset']) { + $charset = 'charset=' . $this->build_params['calendar_charset']; + $headers['Content-Type'] .= "; $charset"; + } + + if ($this->build_params['calendar_method']) { + $method = 'method=' . $this->build_params['calendar_method']; + $headers['Content-Type'] .= "; $method"; + } + + $headers['Content-Transfer-Encoding'] + = $this->build_params['calendar_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 + */ + protected 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']); + $this->build_params['calendar_encoding'] + = strtolower($this->build_params['calendar_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'; + } + if (!in_array($this->build_params['calendar_encoding'], $encodings)) { + $this->build_params['calendar_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'; + } + // calendar body + if ($this->build_params['calendar_encoding'] == '7bit' + && !preg_match('/ascii/i', $this->build_params['calendar_charset']) + && preg_match('/[^\x00-\x7F]/', $this->calbody) + ) { + $this->build_params['calendar_encoding'] = 'quoted-printable'; + } + } + + /** + * Set body of specified message part + * + * @param string $type One of: txtbody, calbody, htmlbody + * @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 + */ + protected function setBody($type, $data, $isfile = false, $append = false) + { + if ($isfile) { + $data = $this->file2str($data); + if (self::isError($data)) { + return $data; + } + } + + if (!$append) { + $this->{$type} = $data; + } else { + $this->{$type} .= $data; + } + + return true; + } + + /** + * Adds a subpart to the mimePart object and + * returns it during the build process. + * + * @param mixed $obj The object to add the part to, or + * anything else if a new object is to be created. + * @param string $body Part body + * @param string $ctype Part content type + * @param string $type Internal part type + * + * @return Mail_mimePart The mimePart object + */ + protected function addBodyPart($obj, $body, $ctype, $type) + { + $params['content_type'] = $ctype; + $params['encoding'] = $this->build_params[$type . '_encoding']; + $params['charset'] = $this->build_params[$type . '_charset']; + $params['eol'] = $this->build_params['eol']; + + if (is_object($obj)) { + $ret = $obj->addSubpart($body, $params); + } else { + $ret = new Mail_mimePart($body, $params); + } + + return $ret; + } + + /** + * PEAR::isError implementation + * + * @param mixed $data Object + * + * @return bool True if object is an instance of PEAR_Error + */ + public static function isError($data) + { + // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473) + if (is_a($data, 'PEAR_Error')) { + return true; + } + + return false; + } + + /** + * PEAR::raiseError implementation + * + * @param string $message A text error message + * + * @return PEAR_Error Instance of PEAR_Error + */ + public static function raiseError($message) + { + // PEAR::raiseError() is not PHP 5.4 compatible + return new PEAR_Error($message); + } +} diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/Mail/mimePart.php php-mail-mime-1.10.12/Mail_Mime-1.10.12/Mail/mimePart.php --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/Mail/mimePart.php 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/Mail/mimePart.php 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,1302 @@ + + * Copyright (c) 2003-2006, PEAR + * 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 + * @author Cipriano Groenendal + * @author Sean Coates + * @author Aleksander Machniak + * @copyright 2003-2006 PEAR + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: @package_version@ + * @link http://pear.php.net/package/Mail_mime + */ + +/** + * Require PEAR + * + * This package depends on PEAR to raise errors. + */ +require_once 'PEAR.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. + * + * @category Mail + * @package Mail_Mime + * @author Richard Heyes + * @author Cipriano Groenendal + * @author Sean Coates + * @author Aleksander Machniak + * @copyright 2003-2006 PEAR + * @license http://www.opensource.org/licenses/bsd-license.php BSD License + * @version Release: @package_version@ + * @link http://pear.php.net/package/Mail_mime + */ +class Mail_mimePart +{ + /** + * The encoding type of this part + * + * @var string + */ + protected $encoding; + + /** + * An array of subparts + * + * @var array + */ + protected $subparts = array(); + + /** + * The output of this part after being built + * + * @var string + */ + protected $encoded; + + /** + * Headers for this part + * + * @var array + */ + protected $headers = array(); + + /** + * The body of this part (not encoded) + * + * @var string + */ + protected $body; + + /** + * The location of file with body of this part (not encoded) + * + * @var string + */ + protected $body_file; + + /** + * The short text of multipart part preamble (RFC2046 5.1.1) + * + * @var string + */ + protected $preamble; + + /** + * The end-of-line sequence + * + * @var string + */ + protected $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 : + * - body_file: Location of file with part's body (instead of $body) + * - preamble: short text of multipart part preamble (RFC2046 5.1.1) + */ + public function __construct($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; + + case 'preamble': + $this->preamble = $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 array An associative array containing two elements, + * body and headers. The headers element is itself + * an indexed array. On error returns PEAR error object. + */ + 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'] = ''; + + if ($this->preamble) { + $encoded['body'] .= $this->preamble . $eol . $eol; + } + + for ($i = 0; $i < count($this->subparts); $i++) { + $encoded['body'] .= '--' . $boundary . $eol; + $tmp = $this->subparts[$i]->encode(); + if (is_a($tmp, 'PEAR_Error')) { + 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 (version_compare(PHP_VERSION, '5.4.0', '<')) { + $magic_quotes = @ini_set('magic_quotes_runtime', 0); + } + $body = $this->getEncodedDataFromFile($this->body_file, $this->encoding); + if (isset($magic_quotes)) { + @ini_set('magic_quotes_runtime', $magic_quotes); + } + + if (is_a($body, 'PEAR_Error')) { + 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 or stream. + * Data will be appended to the file/stream. + * + * @param mixed $filename Existing file location + * or file pointer resource + * @param string $boundary Pre-defined boundary string + * @param bool $skip_head True if you don't want to save headers + * + * @return array An associative array containing message headers + * or PEAR error object + * @since 1.6.0 + */ + public function encodeToFile($filename, $boundary = null, $skip_head = false) + { + if (!is_resource($filename)) { + if (file_exists($filename) && !is_writable($filename)) { + $err = self::raiseError('File is not writeable: ' . $filename); + return $err; + } + + if (!($fh = fopen($filename, 'ab'))) { + $err = self::raiseError('Unable to open file: ' . $filename); + return $err; + } + } else { + $fh = $filename; + } + + // Temporarily reset magic_quotes_runtime for file reads and writes + if (version_compare(PHP_VERSION, '5.4.0', '<')) { + $magic_quotes = @ini_set('magic_quotes_runtime', 0); + } + + $res = $this->encodePartToFile($fh, $boundary, $skip_head); + + if (!is_resource($filename)) { + fclose($fh); + } + + if (isset($magic_quotes)) { + @ini_set('magic_quotes_runtime', $magic_quotes); + } + + return is_a($res, 'PEAR_Error') ? $res : $this->headers; + } + + /** + * Encodes given email part into file + * + * @param string $fh Output file handle + * @param string $boundary Pre-defined boundary string + * @param bool $skip_head True if you don't want to save headers + * + * @return array True on sucess or PEAR error object + */ + protected 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)) { + if ($this->preamble) { + fwrite($fh, $f_eol . $this->preamble . $eol); + $f_eol = $eol; + } + + for ($i = 0; $i < count($this->subparts); $i++) { + fwrite($fh, $f_eol . '--' . $boundary . $eol); + $res = $this->subparts[$i]->encodePartToFile($fh); + if (is_a($res, 'PEAR_Error')) { + return $res; + } + $f_eol = $eol; + } + + fwrite($fh, $eol . '--' . $boundary . '--' . $eol); + } else if ($this->body) { + fwrite($fh, $f_eol); + fwrite($fh, $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 (is_a($res, 'PEAR_Error')) { + return $res; + } + } + + return true; + } + + /** + * Adds a subpart to current mime part and returns + * a reference to it + * + * @param mixed $body The body of the subpart or Mail_mimePart object + * @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. + */ + public function addSubpart($body, $params = null) + { + if ($body instanceof Mail_mimePart) { + $part = $body; + } else { + $part = new Mail_mimePart($body, $params); + } + + $this->subparts[] = $part; + + 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 Encoded data string + */ + protected function getEncodedData($data, $encoding) + { + switch ($encoding) { + case 'quoted-printable': + return self::quotedPrintableEncode($data, 76, $this->eol); + 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 + */ + protected function getEncodedDataFromFile($filename, $encoding, $fh = null) + { + if (!is_readable($filename)) { + $err = self::raiseError('Unable to read file: ' . $filename); + return $err; + } + + if (!($fd = fopen($filename, 'rb'))) { + $err = self::raiseError('Could not open file: ' . $filename); + return $err; + } + + $data = ''; + + switch ($encoding) { + case 'quoted-printable': + while (!feof($fd)) { + $buffer = self::quotedPrintableEncode(fgets($fd), 76, $this->eol); + 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 + * @param string $eol End-of-line sequence. Default: "\r\n" + * + * @return string Encoded data + */ + public static function quotedPrintableEncode($input , $line_max = 76, $eol = "\r\n") + { + /* + // 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 = ''; + + foreach ($lines as $idx => $line) { + $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)) { + // Escape unprintable chars + $char = $escape . sprintf('%02X', $dec); + } elseif (($dec == 46) && (($newline == '') + || ((strlen($newline) + strlen(".=")) > $line_max + && isset($line[$i]))) + ) { + // 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'; + } + + // EOL is not counted + if ((strlen($newline) + strlen($char) == $line_max) + && !isset($line[$i]) + ) { + ; // no soft break is needed if we're the last char + } elseif ((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 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 + */ + protected 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 + */ + protected 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}\""; + } + + /** + * Return charset for mbstring functions. + * Replace ISO-2022-JP with ISO-2022-JP-MS to convert Windows dependent + * characters. + * + * @param string $charset A original charset + * + * @return string A charset for mbstring + * @since 1.10.8 + */ + protected static function mbstringCharset($charset) + { + $mb_charset = $charset; + + if ($charset == 'ISO-2022-JP') { + $mb_charset = 'ISO-2022-JP-MS'; + } + + return $mb_charset; + } + + /** + * 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) + * @since 1.6.1 + */ + public static 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'; + } + + // exploding quoted strings as well as some regexes below do not + // work properly with some charset e.g. ISO-2022-JP, we'll use UTF-8 + $mb = $charset != 'UTF-8' && function_exists('mb_convert_encoding'); + $mb_charset = Mail_mimePart::mbstringCharset($charset); + + // Structured header (make sure addr-spec inside is not encoded) + if (!empty($separator)) { + // Simple e-mail address regexp + $email_regexp = '([^\s<]+|("[^\r\n"]+"))@[^\s"]+'; + + if ($mb) { + $value = mb_convert_encoding($value, 'UTF-8', $mb_charset); + } + + $parts = Mail_mimePart::explodeQuotedString("[\t$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('#([^\s\x21-\x7E]){1}#', $word)) { + if ($word[0] == '"' && $word[strlen($word)-1] == '"') { + // de-quote quoted-string, encoding changes + // string to atom + $word = substr($word, 1, -1); + $word = preg_replace('/\\\\([\\\\"])/', '$1', $word); + } + if ($mb) { + $word = mb_convert_encoding($word, $mb_charset, 'UTF-8'); + } + + // 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 { + if ($mb) { + $part = mb_convert_encoding($part, $mb_charset, 'UTF-8'); + } + // 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('#([^\s\x21-\x7E]){1}#', $value)) { + if ($value[0] == '"' && $value[strlen($value)-1] == '"') { + if ($mb) { + $value = mb_convert_encoding($value, 'UTF-8', $mb_charset); + } + // de-quote quoted-string, encoding changes + // string to atom + $value = substr($value, 1, -1); + $value = preg_replace('/\\\\([\\\\"])/', '$1', $value); + if ($mb) { + $value = mb_convert_encoding($value, $mb_charset, 'UTF-8'); + } + } + + $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 + */ + protected static function explodeQuotedString($delimiter, $string) + { + $result = array(); + $strlen = strlen($string); + $quoted_string = '"(?:[^"\\\\]|\\\\.)*"'; + + for ($p=$i=0; $i < $strlen; $i++) { + if ($string[$i] === '"') { + $r = preg_match("/$quoted_string/", $string, $matches, 0, $i); + if (!$r || empty($matches[0])) { + break; + } + $i += strlen($matches[0]) - 1; + } else if (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 + * @since 1.6.1 + */ + public static 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 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 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 + * @since 1.6.0 + */ + public static 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 + * @since 1.8.0 + */ + public static 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); + $mb_charset = Mail_mimePart::mbstringCharset($charset); + + // 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, $mb_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, $mb_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, $mb_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 + */ + protected static 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 + */ + protected static function encodeReplaceCallback($matches) + { + return sprintf('%%%02X', ord($matches[1])); + } + + /** + * PEAR::raiseError implementation + * + * @param string $message A text error message + * + * @return PEAR_Error Instance of PEAR_Error + */ + public static function raiseError($message) + { + // PEAR::raiseError() is not PHP 5.4 compatible + return new PEAR_Error($message); + } +} diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/class-filename.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/class-filename.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/class-filename.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/class-filename.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,13 @@ +--TEST-- +Test class filename (bug #24) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +Include OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/content_transfer_encoding.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/content_transfer_encoding.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/content_transfer_encoding.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/content_transfer_encoding.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,29 @@ +--TEST-- +Test empty Content-Transfer-Encoding on multipart messages +--SKIPIF-- +--FILE-- +setParam('text_encoding', 'quoted-printable'); +$mime->setParam('html_encoding', 'quoted-printable'); +$mime->setParam('head_encoding', 'quoted-printable'); + +// This specific order used to set Content-Transfer-Encoding: quoted-printable +// which is invalid according to RFC 2045 on multipart messages +$mime->setTXTBody('text'); +$mime->headers(array('From' => 'from@domain.tld')); +$mime->addAttachment('file.pdf', 'application/pdf', 'file.pdf', false, 'base64', 'inline'); +echo $mime->txtHeaders(); +list ($header, $body) = explode("\r\n\r\n", $mime->getMessage()); +echo $header; +?> +--EXPECTF-- +MIME-Version: 1.0 +From: from@domain.tld +Content-Type: multipart/mixed; + boundary="=_%x" +MIME-Version: 1.0 +From: from@domain.tld +Content-Type: multipart/mixed; + boundary="=_%x" diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/encoding_case.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/encoding_case.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/encoding_case.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/encoding_case.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,13 @@ +--TEST-- +Bug #2364 Tabs in Mail_mimePart::quotedPrintableEncode() +--SKIPIF-- +--FILE-- + +--EXPECT-- +Here's= +=09 +a tab diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/headers_with_mbstring.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/headers_with_mbstring.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/headers_with_mbstring.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/headers_with_mbstring.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,153 @@ +--TEST-- +Multi-test for headers encoding using base64 and quoted-printable +--SKIPIF-- + +--FILE-- +'), +array('From', 'adresse@adresse.de'), +array('From', 'Frank Do '), +array('To', 'Frank Do , James Clark '), +array('From', '"Frank Do" '), +array('Cc', '"Frank Do" , "James Clark" '), +array('Cc', ' , "Kuśmiderski Jan Krzysztof Janusz Długa nazwa" '), +array('From', '"adresse@adresse.de" '), +array('From', 'adresse@adresse.de '), +array('From', '"German Umlauts öäü" '), +array('Subject', 'German Umlauts öäü '), +array('Subject', 'Short ASCII subject'), +array('Subject', 'Long ASCII subject - multiline space separated words - too long for one line'), +array('Subject', 'Short Unicode ż subject'), +array('Subject', 'Long Unicode subject - zażółć gęślą jaźń - too long for one line'), +array('References', ' <4b2e87ac$1@news.home.net.pl> '), +array('To', '"Frank Do" ,, "James Clark" '), +array('To', '"Frank \\" \\\\Do" '), +array('To', 'Frank " \\Do '), +array('Subject', "A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test"), +array('Subject', "TEST Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir!!!?"), +array('Subject', "Update: Microsoft Windows-Tool zum Entfernen bösartiger Software 3.6"), +array('From', "test@nàme "), +array('From', "Test <\"test test\"@domain.com>"), +array('From', "\"test test\"@domain.com"), +array('From', "<\"test test\"@domain.com>"), +array('From', "Doe"), +array('From', "\"John Doe\""), +array('Mail-Reply-To', 'adresse@adresse.de '), +array('Mail-Reply-To', '"öäü" '), +array('Subject', mb_convert_encoding('㈱山﨑工業', 'ISO-2022-JP-MS', 'UTF-8'), 'ISO-2022-JP'), +); + +$i = 1; +foreach ($headers as $header) { + $charset = isset($header[2]) ? $header[2] : 'UTF-8'; + $hdr = $mime->encodeHeader($header[0], $header[1], $charset, 'base64'); + printf("[%02d] %s: %s\n", $i, $header[0], $hdr); + $hdr = $mime->encodeHeader($header[0], $header[1], $charset, 'quoted-printable'); + printf("[%02d] %s: %s\n", $i, $header[0], $hdr); + $i++; +} +?> +--EXPECT-- +[01] From: +[01] From: +[02] From: adresse@adresse.de +[02] From: adresse@adresse.de +[03] From: Frank Do +[03] From: Frank Do +[04] To: Frank Do , James Clark +[04] To: Frank Do , James Clark +[05] From: "Frank Do" +[05] From: "Frank Do" +[06] Cc: "Frank Do" , "James Clark" +[06] Cc: "Frank Do" , "James Clark" +[07] Cc: , =?UTF-8?B?S3XFm21pZGVyc2tpIEphbiBLcnp5c3p0b2Yg?= + =?UTF-8?B?SmFudXN6IETFgnVnYSBuYXp3YQ==?= +[07] Cc: , =?UTF-8?Q?Ku=C5=9Bmiderski_Jan_Krzysztof_Janusz?= + =?UTF-8?Q?_D=C5=82uga_nazwa?= +[08] From: "adresse@adresse.de" +[08] From: "adresse@adresse.de" +[09] From: "adresse@adresse.de" +[09] From: "adresse@adresse.de" +[10] From: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8?= +[10] From: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC?= +[11] Subject: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8IDxhZHJlc3NlQGFkcmVzc2Uu?= + =?UTF-8?B?ZGU+?= +[11] Subject: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC_=3Cadresse=40adresse?= + =?UTF-8?Q?=2Ede=3E?= +[12] Subject: Short ASCII subject +[12] Subject: Short ASCII subject +[13] Subject: Long ASCII subject - multiline space separated words - too long for + one line +[13] Subject: Long ASCII subject - multiline space separated words - too long for + one line +[14] Subject: =?UTF-8?B?U2hvcnQgVW5pY29kZSDFvCBzdWJqZWN0?= +[14] Subject: =?UTF-8?Q?Short_Unicode_=C5=BC_subject?= +[15] Subject: =?UTF-8?B?TG9uZyBVbmljb2RlIHN1YmplY3QgLSB6YcW8w7PFgsSHIGfEmcWb?= + =?UTF-8?B?bMSFIGphxbrFhCAtIHRvbyBsb25nIGZvciBvbmUgbGluZQ==?= +[15] Subject: =?UTF-8?Q?Long_Unicode_subject_-_za=C5=BC=C3=B3=C5=82=C4=87_g?= + =?UTF-8?Q?=C4=99=C5=9Bl=C4=85_ja=C5=BA=C5=84_-_too_long_for_one_line?= +[16] References: + <4b2e87ac$1@news.home.net.pl> +[16] References: + <4b2e87ac$1@news.home.net.pl> +[17] To: "Frank Do" , "James Clark" +[17] To: "Frank Do" , "James Clark" +[18] To: "Frank \" \\Do" +[18] To: "Frank \" \\Do" +[19] To: "Frank \" \\Do" +[19] To: "Frank \" \\Do" +[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test +[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test +[21] Subject: =?UTF-8?B?VEVTVCBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= + =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= + =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= + =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7w=?= + =?UTF-8?B?w59lIHZvbiBtaXIgU8O8cGVyIGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBt?= + =?UTF-8?B?aXIgU8O8cGVyIGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBtaXIgU8O8cGVy?= + =?UTF-8?B?IGdyw7ZzZSB0b2xsZSBncsO8w59lIHZvbiBtaXIgU8O8cGVyIGdyw7ZzZSB0?= + =?UTF-8?B?b2xsZSBncsO8w59lIHZvbiBtaXIhISE/?= +[21] Subject: =?UTF-8?Q?TEST_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_m?= + =?UTF-8?Q?ir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCp?= + =?UTF-8?Q?er_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6?= + =?UTF-8?Q?se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr?= + =?UTF-8?Q?=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC?= + =?UTF-8?Q?=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von?= + =?UTF-8?Q?_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S?= + =?UTF-8?Q?=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir!!!=3F?= +[22] Subject: =?UTF-8?B?VXBkYXRlOiBNaWNyb3NvZnQgV2luZG93cy1Ub29sIHp1bSBFbnRm?= + =?UTF-8?B?ZXJuZW4gYsO2c2FydGlnZXIgU29mdHdhcmUgMy42?= +[22] Subject: =?UTF-8?Q?Update=3A_Microsoft_Windows-Tool_zum_Entfernen_b=C3=B6?= + =?UTF-8?Q?sartiger_Software_3=2E6?= +[23] From: =?UTF-8?B?dGVzdEBuw6BtZQ==?= +[23] From: =?UTF-8?Q?test=40n=C3=A0me?= +[24] From: Test <"test test"@domain.com> +[24] From: Test <"test test"@domain.com> +[25] From: "test test"@domain.com +[25] From: "test test"@domain.com +[26] From: <"test test"@domain.com> +[26] From: <"test test"@domain.com> +[27] From: Doe +[27] From: Doe +[28] From: "John Doe" +[28] From: "John Doe" +[29] Mail-Reply-To: "adresse@adresse.de" +[29] Mail-Reply-To: "adresse@adresse.de" +[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= +[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= +[31] Subject: =?ISO-2022-JP?B?GyRCLWo7M3l1OSk2SBsoQg==?= +[31] Subject: =?ISO-2022-JP?Q?=24B-j=28B=24B=3B3=28B=24Byu=28B?= + =?ISO-2022-JP?Q?=24B9=29=28B=24B6H=28B?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/headers_without_mbstring.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/headers_without_mbstring.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/headers_without_mbstring.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/headers_without_mbstring.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,149 @@ +--TEST-- +Multi-test for headers encoding using base64 and quoted-printable +--SKIPIF-- + +--FILE-- +'), +array('From', 'adresse@adresse.de'), +array('From', 'Frank Do '), +array('To', 'Frank Do , James Clark '), +array('From', '"Frank Do" '), +array('Cc', '"Frank Do" , "James Clark" '), +array('Cc', ' , "Kuśmiderski Jan Krzysztof Janusz Długa nazwa" '), +array('From', '"adresse@adresse.de" '), +array('From', 'adresse@adresse.de '), +array('From', '"German Umlauts öäü" '), +array('Subject', 'German Umlauts öäü '), +array('Subject', 'Short ASCII subject'), +array('Subject', 'Long ASCII subject - multiline space separated words - too long for one line'), +array('Subject', 'Short Unicode ż subject'), +array('Subject', 'Long Unicode subject - zażółć gęślą jaźń - too long for one line'), +array('References', ' <4b2e87ac$1@news.home.net.pl> '), +array('To', '"Frank Do" ,, "James Clark" '), +array('To', '"Frank \\" \\\\Do" '), +array('To', 'Frank " \\Do '), +array('Subject', "A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test"), +array('Subject', "TEST Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir Süper gröse tolle grüße von mir!!!?"), +array('Subject', "Update: Microsoft Windows-Tool zum Entfernen bösartiger Software 3.6"), +array('From', "test@nàme "), +array('From', "Test <\"test test\"@domain.com>"), +array('From', "\"test test\"@domain.com"), +array('From', "<\"test test\"@domain.com>"), +array('From', "Doe"), +array('From', "\"John Doe\""), +array('Mail-Reply-To', 'adresse@adresse.de '), +array('Mail-Reply-To', '"öäü" '), +); + +$i = 1; +foreach ($headers as $header) { + $hdr = $mime->encodeHeader($header[0], $header[1], 'UTF-8', 'base64'); + printf("[%02d] %s: %s\n", $i, $header[0], $hdr); + $hdr = $mime->encodeHeader($header[0], $header[1], 'UTF-8', 'quoted-printable'); + printf("[%02d] %s: %s\n", $i, $header[0], $hdr); + $i++; +} +?> +--EXPECT-- +[01] From: +[01] From: +[02] From: adresse@adresse.de +[02] From: adresse@adresse.de +[03] From: Frank Do +[03] From: Frank Do +[04] To: Frank Do , James Clark +[04] To: Frank Do , James Clark +[05] From: "Frank Do" +[05] From: "Frank Do" +[06] Cc: "Frank Do" , "James Clark" +[06] Cc: "Frank Do" , "James Clark" +[07] Cc: , =?UTF-8?B?S3XFm21pZGVyc2tpIEphbiBLcnp5c3p0b2Yg?= + =?UTF-8?B?SmFudXN6IETFgnVnYSBuYXp3YQ==?= +[07] Cc: , + =?UTF-8?Q?Ku=C5=9Bmiderski_Jan_Krzysztof_Janusz_D?= + =?UTF-8?Q?=C5=82uga_nazwa?= +[08] From: "adresse@adresse.de" +[08] From: "adresse@adresse.de" +[09] From: "adresse@adresse.de" +[09] From: "adresse@adresse.de" +[10] From: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8?= +[10] From: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC?= +[11] Subject: =?UTF-8?B?R2VybWFuIFVtbGF1dHMgw7bDpMO8IDxhZHJlc3NlQGFkcmVzc2Uu?= + =?UTF-8?B?ZGU+?= +[11] Subject: =?UTF-8?Q?German_Umlauts_=C3=B6=C3=A4=C3=BC_=3Cadresse=40adresse?= + =?UTF-8?Q?=2Ede=3E?= +[12] Subject: Short ASCII subject +[12] Subject: Short ASCII subject +[13] Subject: Long ASCII subject - multiline space separated words - too long for + one line +[13] Subject: Long ASCII subject - multiline space separated words - too long for + one line +[14] Subject: =?UTF-8?B?U2hvcnQgVW5pY29kZSDFvCBzdWJqZWN0?= +[14] Subject: =?UTF-8?Q?Short_Unicode_=C5=BC_subject?= +[15] Subject: =?UTF-8?B?TG9uZyBVbmljb2RlIHN1YmplY3QgLSB6YcW8w7PFgsSHIGfEmcWb?= + =?UTF-8?B?bMSFIGphxbrFhCAtIHRvbyBsb25nIGZvciBvbmUgbGluZQ==?= +[15] Subject: =?UTF-8?Q?Long_Unicode_subject_-_za=C5=BC=C3=B3=C5=82=C4=87_g=C4?= + =?UTF-8?Q?=99=C5=9Bl=C4=85_ja=C5=BA=C5=84_-_too_long_for_one_line?= +[16] References: + <4b2e87ac$1@news.home.net.pl> +[16] References: + <4b2e87ac$1@news.home.net.pl> +[17] To: "Frank Do" , "James Clark" +[17] To: "Frank Do" , "James Clark" +[18] To: "Frank \" \\Do" +[18] To: "Frank \" \\Do" +[19] To: "Frank \" \\Do" +[19] To: "Frank \" \\Do" +[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test +[20] Subject: A REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY + REALLY REALLY REALLY REALLY REALLY REALLY REALLY REALLY /REALLY/ LONG test +[21] Subject: =?UTF-8?B?VEVTVCBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= + =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= + =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= + =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zD?= + =?UTF-8?B?n2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1p?= + =?UTF-8?B?ciBTw7xwZXIgZ3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIg?= + =?UTF-8?B?Z3LDtnNlIHRvbGxlIGdyw7zDn2Ugdm9uIG1pciBTw7xwZXIgZ3LDtnNlIHRv?= + =?UTF-8?B?bGxlIGdyw7zDn2Ugdm9uIG1pciEhIT8=?= +[21] Subject: =?UTF-8?Q?TEST_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir?= + =?UTF-8?Q?_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_g?= + =?UTF-8?Q?r=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tol?= + =?UTF-8?Q?le_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC?= + =?UTF-8?Q?=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_m?= + =?UTF-8?Q?ir_S=C3=BCper_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper?= + =?UTF-8?Q?_gr=C3=B6se_tolle_gr=C3=BC=C3=9Fe_von_mir_S=C3=BCper_gr=C3=B6se_t?= + =?UTF-8?Q?olle_gr=C3=BC=C3=9Fe_von_mir!!!=3F?= +[22] Subject: =?UTF-8?B?VXBkYXRlOiBNaWNyb3NvZnQgV2luZG93cy1Ub29sIHp1bSBFbnRm?= + =?UTF-8?B?ZXJuZW4gYsO2c2FydGlnZXIgU29mdHdhcmUgMy42?= +[22] Subject: =?UTF-8?Q?Update=3A_Microsoft_Windows-Tool_zum_Entfernen_b=C3=B6sa?= + =?UTF-8?Q?rtiger_Software_3=2E6?= +[23] From: =?UTF-8?B?dGVzdEBuw6BtZQ==?= +[23] From: =?UTF-8?Q?test=40n=C3=A0me?= +[24] From: Test <"test test"@domain.com> +[24] From: Test <"test test"@domain.com> +[25] From: "test test"@domain.com +[25] From: "test test"@domain.com +[26] From: <"test test"@domain.com> +[26] From: <"test test"@domain.com> +[27] From: Doe +[27] From: Doe +[28] From: "John Doe" +[28] From: "John Doe" +[29] Mail-Reply-To: "adresse@adresse.de" +[29] Mail-Reply-To: "adresse@adresse.de" +[30] Mail-Reply-To: =?UTF-8?B?w7bDpMO8?= +[30] Mail-Reply-To: =?UTF-8?Q?=C3=B6=C3=A4=C3=BC?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/qp_encoding_test.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/qp_encoding_test.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/qp_encoding_test.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/qp_encoding_test.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,103 @@ +--TEST-- +qp comprehensive test +--SKIPIF-- +--FILE-- +setHTMLBody(''); +$mm->setTxtBody('Blah blah'); + +if (version_compare(phpversion(), "5.0.0", '<')) { + $mmCopy = $mm; +} else { + $mmCopy = clone($mm); +} + +$mm->get(); +$x = $mm->headers(); + +$smm = serialize(array('mm' => $mmCopy, 'header' => $x['Content-Type'])); +$fp = fopen('sleep_wakeup_data', 'w'); +fwrite($fp, $smm); +fclose($fp); + +echo "Data written"; +?> +--EXPECT-- +Data written diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/sleep_wakeup_EOL-bug3488-part2.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/sleep_wakeup_EOL-bug3488-part2.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/sleep_wakeup_EOL-bug3488-part2.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/sleep_wakeup_EOL-bug3488-part2.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Bug #3488 Sleep/Wakeup EOL Consistency - Part 2 +--SKIPIF-- +if (!is_readable('sleep_wakeup_data')) { + echo "skip No data. Part 1 must run first.\n"; +} +--FILE-- +get(); +$x = $mmData['mm']->headers(); + +list($h1) = explode("\n", $mmData['header']); +list($h2) = explode("\n", $x['Content-Type']); + +echo ($h1 == $h2) ? "Match" : "No Match"; + +?> +--EXPECT-- +Match diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10596_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10596_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10596_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10596_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +Bug #10596 Incorrect handling of text and html '0' bodies +--SKIPIF-- +--FILE-- +setTxtBody('0'); +$mime->setHTMLBody('0'); +$body = $mime->get(); +if ($body){ + print("OK"); +}else{ + print("NO BODY FOUND"); +} +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10816_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10816_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10816_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10816_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #10816 Unwanted linebreak at the end of output +--SKIPIF-- +--FILE-- +$eol)); +$encoder->setTXTBody('test'); +$encoder->setHTMLBody('test'); +$encoder->addAttachment('Just a test', 'application/octet-stream', 'test.txt', false); +$body = $encoder->get(); +$taillength = -1 * strlen($eol) * 2; +if (substr($body, $taillength) == ($eol.$eol)){ + print("FAILED\n"); + print("Body:\n"); + print("..." . substr($body, -10) . "\n"); +}else{ + print("OK\n"); +} +--EXPECT-- +OK + diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10999_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10999_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_10999_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_10999_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Bug #10999 Bad Content-ID(cid) format +--SKIPIF-- +--FILE-- +'; + +$mime->setHTMLBody($body); +$mime->setFrom($from); +$mime->addHTMLImage('','image/gif', 'test.gif', false); +$msg=$mime->get(); + +$header = preg_match('|Content-ID: <[0-9a-fA-F]+@from.example.com>|', $msg); +if (!$header){ + print("FAIL:\n"); + print($msg); +}else{ + print("OK"); +} +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_11381.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_11381.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_11381.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_11381.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,27 @@ +--TEST-- +Bug #11381 Domain name is attached to content-id, trailing greater-than sign is not removed +--SKIPIF-- +--FILE-- +'; + +require_once('Mail/mime.php'); + +$mime=new Mail_mime(); + +$body=''; + +$mime->setHTMLBody($body); +$mime->setFrom($from); +$mime->addHTMLImage('','image/gif', 'test.gif', false); +$msg=$mime->get(); + +$header = preg_match('|Content-ID: <[0-9a-fA-F]+@from.example.com>|', $msg); +if (!$header){ + print("FAIL:\n"); + print($msg); +}else{ + print("OK"); +} +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_11731.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_11731.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_11731.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_11731.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +Bug #11731 Full stops after soft line breaks are not encoded +--SKIPIF-- +--FILE-- + 'text/plain', + 'encoding' => 'quoted-printable', +); +$mimePart = new Mail_mimePart($text, $params); +$encoded = $mimePart->encode(); +echo $encoded['body']; + +--EXPECT-- +=2E123456789012345678901234567890123456789012345678901234567890123456789012= +=2E3456 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12165.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12165.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12165.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12165.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,14 @@ +--TEST-- +Bug #12165 Dot at the end of the line disappeared +--SKIPIF-- +--FILE-- +setHTMLBody($string); +print_r($mime->get()); + +--EXPECT-- +http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa= +=2Ecom diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12385_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12385_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12385_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12385_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,32 @@ +--TEST-- +Bug #12385 Bad regex when replacing css style attachments +--SKIPIF-- +--FILE-- + +className { + background-image: url('test.gif'); +} + +"; + +$mime->setHTMLBody($body); +$mime->setFrom($from); +$mime->addHTMLImage('','image/gif', 'test.gif', false); +$msg = $mime->get(); + +$cidtag = preg_match("|url\('cid:[^']*'\);|", $msg); +if (!$cidtag){ + print("FAIL:\n"); + print($msg); +}else{ + print("OK"); +} +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12411.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12411.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12411.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12411.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #12411 RFC2047 encoded attachment filenames +--SKIPIF-- +--FILE-- +addAttachment('testfile', "text/plain", $filename, FALSE, + 'base64', 'attachment', 'ISO-8859-1', 'pl', '', + 'quoted-printable', 'base64'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { + echo implode("\n", $matches[2]); +} + +?> +--EXPECT-- +"=?ISO-8859-1?Q?=C5=9Bciema?=" +"=?ISO-8859-1?B?xZtjaWVtYQ==?="; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12466.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12466.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_12466.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_12466.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #12466 Content-Transfer-Encoding checking +--SKIPIF-- +--FILE-- + '7bit', + 'html_encoding' => '7bit', +); +$mime = new Mail_mime($params); +$mime->setTXTBody("ż"); +$mime->setHTMLBody("z"); +$body = $mime->getMessage(); + +preg_match_all('/Content-Transfer-Encoding: (.*)/', $body, $m); +echo trim($m[1][0])."\n".trim($m[1][1]); + +?> +--EXPECT-- +quoted-printable +7bit diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13032.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13032.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13032.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13032.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Bug #13032 Proper (different) boundary for nested parts +--SKIPIF-- +--FILE-- +setHTMLBody('html'); +$mime->setTXTBody('text'); +$mime->addAttachment('file.pdf', 'application/pdf', 'file.pdf', false, 'base64', 'inline'); +$msg = $mime->getMessage(); + +if (preg_match_all('/boundary="([^"]+)"/', $msg, $matches)) { + if (count($matches) == 2 && count($matches[1]) == 2 && + $matches[1][0] != $matches[1][1]) { + print('OK'); + } +} +?> +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13444.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13444.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13444.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13444.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,30 @@ +--TEST-- +Bug #9725 multipart/related & alternative wrong order +--SKIPIF-- +--FILE-- +setTXTBody("test"); +$mime->setHTMLBody("test"); +$mime->addHTMLImage("test", 'application/octet-stream', '', false); +$body = $mime->get(); +$head = $mime->headers(); +$headCT = $head['Content-Type']; +$headCT = explode(";", $headCT); +$headCT = $headCT[0]; + +$ct = preg_match_all('|Content-Type: ([^;\r\n]+)|', $body, $matches); +print($headCT); +print("\n"); +foreach ($matches[1] as $match){ + print($match); + print("\n"); +} +--EXPECT-- +multipart/alternative +text/plain +multipart/related +text/html +application/octet-stream diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13962.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13962.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_13962.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_13962.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +Bug #13962 Multiple header support +--SKIPIF-- +--FILE-- +setFrom('user@from.example.com'); +$r = $mime->txtHeaders(array('Received' => array('Received 1', 'Received 2'))); + +print_r($r); +?> +--EXPECT-- +Received: Received 1 +Received: Received 2 +MIME-Version: 1.0 +From: user@from.example.com diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14529.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14529.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14529.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14529.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Bug #14529 basename() workaround +--SKIPIF-- +--FILE-- +addAttachment('testfile', "text/plain", $filename, FALSE, 'base64', 'attachment', 'ISO-8859-1'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match('/filename([^\s]+)/i', $content, $matches)) { + echo $matches[1]; +} +?> +--EXPECT-- +*=ISO-8859-1''%C5%9Bciema; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14779.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14779.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14779.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14779.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,25 @@ +--TEST-- +Bug #14779 Proper header-body separator for empty attachment +--SKIPIF-- +--FILE-- +addAttachment('', "text/plain", 'file.txt', FALSE, 'base64', 'attachment'); +$result = $m->get(); + +if (preg_match('/(Content.*)--=.*/s', $result, $matches)) { + print_r($matches[1]."END"); +} + +?> +--EXPECT-- +Content-Transfer-Encoding: base64 +Content-Type: text/plain; + name=file.txt +Content-Disposition: attachment; + filename=file.txt + + +END diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14780.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14780.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_14780.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_14780.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Bug #14780 Invalid Content-Type when headers() is called before get() +--SKIPIF-- +--FILE-- +setTXTBody("test"); +$mime->setHTMLBody("test"); + +$head1 = $mime->headers(); +$body = $mime->get(); +$head2 = $mime->headers(); + +if ($head1 === $head2) { + echo "OK"; +} + +?> +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_15320.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_15320.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_15320.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_15320.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Bug #15320 Charset parameter in Content-Type of mail parts +--SKIPIF-- +--FILE-- +addAttachment('testfile', "text/plain", 'file.txt', FALSE, 'base64', 'attachment', 'ISO-8859-1'); + +$content = $Mime->get(); +//$content = str_replace("\n", '', $content); + +if (preg_match('/Content-type:([^\n]+)/i', $content, $matches)) { + echo $matches[1]; +} + +?> +--EXPECT-- +text/plain; charset=ISO-8859-1; + diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_16539.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_16539.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_16539.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_16539.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,49 @@ +--TEST-- +Bug #16539 Headers longer than 998 characters +--SKIPIF-- +--FILE-- + 'jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com', +'Subject' => 'jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com', +); + +echo $mime->txtHeaders($headers, true, true); +?> +--EXPECT-- +MIME-Version: 1.0 +To: jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com, jskibbie@schawk.com, + jskibbie@schawk.com, jskibbie@schawk.com +Subject: jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.co + m,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com,jskibbie@schawk.com diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_17025.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_17025.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_17025.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_17025.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,15 @@ +--TEST-- +Bug #16539 Headers longer than 998 characters +--SKIPIF-- +--FILE-- +headers($headers); +print_r($hdrs['From']); +?> +--EXPECT-- +aaaaaaaaaabbbbbbbbbbccccccccccddddddddddeeeeeeeeeeffffffffffgggggggggghhhhhhhhhh diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_17175.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_17175.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_17175.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_17175.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +Bug #17175 Content-Description support+ecoding +--SKIPIF-- +--FILE-- +setTXTBody('Test message.'); +$Mime->addAttachment('test file contents', "text/plain", + 'test.txt', FALSE, 'base64', NULL, 'UTF-8', NULL, NULL, NULL, NULL, + 'desc'); +$Mime->addAttachment('test file contents', "text/plain", + 'test2.txt', FALSE, 'base64', NULL, 'UTF-8', NULL, NULL, NULL, NULL, + 'test unicode żąśź'); + +$body = $Mime->getMessage(); +preg_match_all('/Content-Description: (.*)/', $body, $matches); +foreach ($matches[1] as $value) + echo $value."\n"; +?> +--EXPECT-- +desc +=?UTF-8?Q?test_unicode_=C5=BC=C4=85=C5=9B=C5=BA?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_18083.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_18083.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_18083.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_18083.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #18083 Separate charset for attachment's content and headers +--SKIPIF-- +--FILE-- +addAttachment('testfile', "text/plain", + base64_decode("xZtjaWVtYQ=="), FALSE, + 'base64', 'attachment', 'ISO-8859-1', 'pl', '', + 'quoted-printable', 'base64', '', 'UTF-8'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { + echo implode("\n", $matches[2]); +} +?> +--EXPECT-- +"=?UTF-8?Q?=C5=9Bciema?=" +"=?UTF-8?B?xZtjaWVtYQ==?="; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_18772.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_18772.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_18772.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_18772.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,45 @@ +--TEST-- +Bug #18772 Text/calendar message +--SKIPIF-- +--FILE-- +setSubject('test'); + +// A message with text/calendar only +$mime->setCalendarBody('VCALENDAR'); + +echo $mime->getMessage(); +echo "\n---\n"; + +// A message with alternative text +$mime->setTXTBody('vcalendar'); +$msg = $mime->getMessage(); + +echo preg_replace('/=_[0-9a-z]+/', '*', $msg); +--EXPECT-- +MIME-Version: 1.0 +Subject: test +Content-Type: text/calendar; charset=UTF-8; method=request +Content-Transfer-Encoding: quoted-printable + +VCALENDAR +--- +MIME-Version: 1.0 +Subject: test +Content-Type: multipart/alternative; + boundary="*" + +--* +Content-Transfer-Encoding: quoted-printable +Content-Type: text/plain; charset=ISO-8859-1 + +vcalendar +--* +Content-Transfer-Encoding: quoted-printable +Content-Type: text/calendar; method=request; charset=UTF-8 + +VCALENDAR +--*-- diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_19497.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_19497.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_19497.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_19497.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,22 @@ +--TEST-- +Bug #19497 Attachment filenames with a slash character +--SKIPIF-- +--FILE-- +addAttachment('testfile', "text/plain", $filename, FALSE, + 'base64', 'attachment', 'ISO-8859-1', '', '', 'quoted-printable', 'base64'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match_all('/(name|filename)=([^\s]+)/i', $content, $matches)) { + echo implode("\n", $matches[2]); +} +?> +--EXPECT-- +"test/file.txt" +"test/file.txt"; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20226.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20226.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20226.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20226.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,14 @@ +--TEST-- +Bug #20226 Mail_mimePart::encodeHeader() and ISO-2022-JP encoding +--SKIPIF-- +--FILE-- +encodeHeader('subject', $subject, 'ISO-2022-JP', 'base64'); +?> +--EXPECT-- +=?ISO-2022-JP?B?GyRCJT8lJCVIJWsbKEI=?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20273.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20273.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20273.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20273.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,13 @@ +--TEST-- +Bug #20273 Mail_mimePart::encodeHeader() and TAB character +--SKIPIF-- +--FILE-- +\t"; +$mime = new Mail_mimePart(); +echo $mime->encodeHeader('References', $refs); +?> +--EXPECT-- + diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20563.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20563.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20563.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20563.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #20563 isMultipart() method tests +--SKIPIF-- +--FILE-- +isMultipart() ? 'TRUE' : 'FALSE') . "\n"; + +$mime->setTXTBody('test'); + +echo ($mime->isMultipart() ? 'TRUE' : 'FALSE') . "\n"; + +$mime->setHTMLBody('test'); + +echo ($mime->isMultipart() ? 'TRUE' : 'FALSE') . "\n"; + +--EXPECT-- +FALSE +FALSE +TRUE diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20564.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20564.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_20564.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_20564.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,14 @@ +--TEST-- +Bug #20564 Unsetting headers +--SKIPIF-- +--FILE-- +setSubject('test'); + +$headers = $mime->headers(array('Subject' => null), true); +echo array_key_exists('Subject', $headers) ? '1' : '0'; +--EXPECT-- +0 \ No newline at end of file diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21027.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21027.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21027.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21027.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,273 @@ +--TEST-- +Bug #21027 Calendar support along with attachments and html images +--SKIPIF-- +--FILE-- +This is HTML body.'; +$icsText = 'BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//icalcreator//NONSGML iCalcreator 2.22// +METHOD:REQUEST +BEGIN:VEVENT +UID:77@localhost +DTSTAMP:20160208T170811Z +ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP= + TRUE;CN=Jacob Alvarez:MAILTO:fake1@mailinator.com +CREATED:20160208T170810Z +DTSTART:20160215T180000Z +DTEND:20160215T190000Z +ORGANIZER;CN=-:MAILTO:fake2@mailinator.com +SEQUENCE:1 +STATUS:CONFIRMED +SUMMARY:Prueba 69 +TRANSP:OPAQUE +URL:http://localhost/event/77 +END:VEVENT +END:VCALENDAR'; + +function printPartsStartAndEnd($body) { + $matches = array(); + preg_match_all('/--(=_[a-z0-9]+)--|Content-Type: ([^;\r\n]+)/', $body, $matches); + $tab = " "; + foreach ($matches[0] as $match){ + if (strpos($match, '--') === false) { + printf("%s%s\n", $tab, $match); + if (stripos($match, "multipart")) { + $tab .= " "; + } + } else { + $tab = substr($tab, 0, -4); + printf("%sEnd part\n", $tab); + } + } +} + +function printHeaderContentType($headers) { + $headerContentType = array(); + preg_match('/([^;\r\n]+)/', $headers['Content-Type'], $headerContentType); + printf("Content-Type: %s\n", $headerContentType[0]); +} + +print "TEST: text\n"; +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: html\n"; +$mime = new Mail_mime(); +$mime->setHTMLBody($htmlBody); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: attachments\n"; +$mime = new Mail_mime(); +$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: text + attachments\n"; +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: html + attachments\n"; +$mime = new Mail_mime(); +$mime->setHTMLBody($htmlBody); +$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: html + inline images\n"; +$mime = new Mail_mime(); +$mime->setHTMLBody($htmlBody); +$mime->addHTMLImage("aaaaaaaaaa", 'image/gif', 'image.gif', false, 'contentid'); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print("TEST: txt, html and attachment\n"); +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->setHTMLBody($htmlBody); +$mime->addAttachment("test", 'application/octet-stream', 'attachment', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: calendar\n"; +$mime = new Mail_mime(); +$mime->setCalendarBody($icsText); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: txt + calendar\n"; +$mime->setTXTBody($txtBody); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: txt, html, calendar\n"; +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->setHTMLBody($htmlBody); +$mime->setCalendarBody($icsText); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: txt, html + html images, and calendar\n"; +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->setHTMLBody($htmlBody); +$mime->addHTMLImage('testimage', 'image/gif', "bus.gif", false); +$mime->setCalendarBody($icsText); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print("TEST: txt, html, calendar and attachment\n"); +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->setHTMLBody($htmlBody); +$mime->setCalendarBody($icsText); +$mime->addAttachment("test", 'application/octet-stream', 'attachment', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); + +print "TEST: txt, html + html images, calendar, and attachment\n"; +$mime = new Mail_mime(); +$mime->setTXTBody($txtBody); +$mime->setHTMLBody($htmlBody); +$mime->addHTMLImage('testimage', 'image/gif', "bus.gif", false); +$mime->setCalendarBody($icsText); +$mime->addAttachment($icsText, 'application/ics', 'invite.ics', false); +$headers = $mime->headers(); +$body = $mime->get(); +printHeaderContentType($headers); +printPartsStartAndEnd($body); +print("\n"); +?> +--EXPECT-- +TEST: text +Content-Type: text/plain + +TEST: html +Content-Type: text/html + +TEST: attachments +Content-Type: multipart/mixed + Content-Type: application/ics +End part + +TEST: text + attachments +Content-Type: multipart/mixed + Content-Type: text/plain + Content-Type: application/ics +End part + +TEST: html + attachments +Content-Type: multipart/mixed + Content-Type: text/html + Content-Type: application/ics +End part + +TEST: html + inline images +Content-Type: multipart/related + Content-Type: text/html + Content-Type: image/gif +End part + +TEST: txt, html and attachment +Content-Type: multipart/mixed + Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: text/html + End part + Content-Type: application/octet-stream +End part + +TEST: calendar +Content-Type: text/calendar + +TEST: txt + calendar +Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: text/calendar +End part + +TEST: txt, html, calendar +Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: text/html + Content-Type: text/calendar +End part + +TEST: txt, html + html images, and calendar +Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: multipart/related + Content-Type: text/html + Content-Type: image/gif + End part + Content-Type: text/calendar +End part + +TEST: txt, html, calendar and attachment +Content-Type: multipart/mixed + Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: text/html + Content-Type: text/calendar + End part + Content-Type: application/octet-stream +End part + +TEST: txt, html + html images, calendar, and attachment +Content-Type: multipart/mixed + Content-Type: multipart/alternative + Content-Type: text/plain + Content-Type: multipart/related + Content-Type: text/html + Content-Type: image/gif + End part + Content-Type: text/calendar + End part + Content-Type: application/ics +End part diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21098.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21098.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21098.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21098.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,17 @@ +--TEST-- +Bug #21098 Handling of empty plain text parts +--SKIPIF-- +--FILE-- +setTxtBody(''); +$mime->setHTMLBody(''); + +$headers1 = $mime->txtHeaders(); +$body = $mime->get(); +$headers2 = $mime->txtHeaders(); +print strpos($headers1, 'text/html') && strpos($headers2, 'text/html') ? 'OK' : 'NOT OK'; +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21205.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21205.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21205.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21205.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,38 @@ +--TEST-- +Bug #21205 Handling ISO-2022-JP headers +--SKIPIF-- +'; +$charset = 'ISO-2022-JP'; +$encoding = 'base64'; +foreach ($tests as $test) { + $test = mb_convert_encoding($test, $charset, 'UTF-8'); + print Mail_mimePart::encodeHeader("subject", $test, $charset, $encoding) . PHP_EOL; + print Mail_mimePart::encodeHeader("to", $test.$addr, $charset, $encoding) . PHP_EOL; + $test = '"' . $test . '"'; + print Mail_mimePart::encodeHeader("subject", $test, $charset, $encoding) . PHP_EOL; + print Mail_mimePart::encodeHeader("to", $test.$addr, $charset, $encoding) . PHP_EOL; +} +?> +--EXPECT-- +=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= +=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= +=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= +=?ISO-2022-JP?B?GyRCIiI1fkVUSVwiIhsoQg==?= +=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= +=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= +=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= +=?ISO-2022-JP?B?GyRCIlwiXCJcIlwbKEI=?= diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21206.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21206.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21206.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21206.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,28 @@ +--TEST-- +Bug #21206 Handling quoted strings +--SKIPIF-- +--FILE-- +, b ', + '"c\\\\" , d ', +); +foreach ($tests as $test) { + $addrs = X::explodeQuotedString('[\t,]', $test); + foreach ($addrs as $addr) { + print trim($addr) . PHP_EOL; + } +} +?> +--EXPECT-- +"a" +b +"c\\" +d diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21255.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21255.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_21255.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_21255.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +Bug #21255 Boundary gets added twice +--SKIPIF-- +--FILE-- +setHTMLBody('html'); +$mime->setTXTBody('text'); +$mime->setContentType('multipart/alternative', array('boundary' => 'something')); + +$msg = $mime->getMessage(); + +echo substr_count($msg, 'boundary='); + +?> +--EXPECT-- +1 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,20 @@ +--TEST-- +Bug #3513 Support of RFC2231 in header fields. (ISO-8859-1) +--SKIPIF-- +--FILE-- +addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'ISO-8859-1'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match('/filename([^\s]+)/i', $content, $matches)) { + echo $matches[1]; +} + +--EXPECT-- +*=ISO-8859-1''F%F3%F3b%E6r.txt; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_2.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_2.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_2.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_2.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,21 @@ +--TEST-- +Bug #3513 Support of RFC2231 in header fields. (UTF-8) +--SKIPIF-- +--FILE-- +addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'UTF-8', 'de'); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match_all('/filename([^\s]+)/i', $content, $matches)) { + echo implode("\n", $matches[1]); +} + +--EXPECT-- +*0*=UTF-8'de'S%C3%BCper%20gr%C3%B6se%20tolle%20tolle%20gr%C3%BC; +*1*=%C3%9Fe.txt; diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_3.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_3.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_3513_3.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_3513_3.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,23 @@ +--TEST-- +Bug #3513 Support of RFC2231 in header fields. (ISO-2022-JP) +--SKIPIF-- +--FILE-- +addAttachment('testfile',"text/plain", $test, FALSE, 'base64', 'attachment', 'iso-2022-jp', ''); + +$content = $Mime->get(); +$content = str_replace("\n", '', $content); + +if (preg_match('/filename([^\s]+)/i', $content, $matches)) { + echo $matches[1]; +} +?> +--EXPECT-- +*=iso-2022-jp''%1B$BF|K%5C8l%1B%28B.txt; + diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_7561_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_7561_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_7561_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_7561_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,24 @@ +--TEST-- +Bug #7561 Mail_mimePart::quotedPrintableEncode() misbehavior with mbstring overload +--INI-- +mbstring.language=Neutral +mbstring.func_overload=6 +mbstring.internal_encoding=UTF-8 +mbstring.http_output=UTF-8 +--SKIPIF-- +$eol)); +$encoder->setTXTBody('test'); +$encoder->setHTMLBody('test'); +$encoder->addAttachment('Just a test', 'application/octet-stream', 'test.txt', false); +$body = $encoder->get(); +if (strpos($body, '--' . $eol . '--=')){ + print("FAILED\n"); + print("Single delimiter() between 2 parts found.\n"); + print($body); +}else{ + print("OK"); +} +?> +--EXPECT-- +OK diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_8541_1.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_8541_1.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_8541_1.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_8541_1.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,19 @@ +--TEST-- +Bug #8541 mimePart.php line delimiter is \r +--SKIPIF-- +--FILE-- +setHTMLBody('html'); +$mime->setTXTBody('text'); +$mime->setContentType('multipart/alternative', array('boundary' => 'something')); + +$temp_filename = dirname(__FILE__) . "/output1.tmp"; +touch($temp_filename); +$msg = $mime->saveMessageBody($temp_filename); +echo file_get_contents($temp_filename); + +$temp_filename = dirname(__FILE__) . "/output2.tmp"; +touch($temp_filename); +$msg = $mime->saveMessage($temp_filename); +echo file_get_contents($temp_filename); + +$temp_filename = dirname(__FILE__) . "/output3.tmp"; +$mimePart = new Mail_mimePart('abc', array( + 'content_type' => 'text/plain', + 'encoding' => 'quoted-printable', +)); +$mimePart->encodeToFile($temp_filename); +echo file_get_contents($temp_filename); + +?> +--CLEAN-- + +--EXPECT-- +--something +Content-Transfer-Encoding: quoted-printable +Content-Type: text/plain; charset=ISO-8859-1 + +text +--something +Content-Transfer-Encoding: quoted-printable +Content-Type: text/html; charset=ISO-8859-1 + +html +--something-- +MIME-Version: 1.0 +Content-Type: multipart/alternative; + boundary="something" + +--something +Content-Transfer-Encoding: quoted-printable +Content-Type: text/plain; charset=ISO-8859-1 + +text +--something +Content-Transfer-Encoding: quoted-printable +Content-Type: text/html; charset=ISO-8859-1 + +html +--something-- +Content-Transfer-Encoding: quoted-printable +Content-Type: text/plain + +abc diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_GH19.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_GH19.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_GH19.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_GH19.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,45 @@ +--TEST-- +Bug GH-19 Test boundary value with different headers()/get() call order +--SKIPIF-- +--FILE-- +setHTMLBody('html'); +$mime->setTXTBody('text'); + +$body = $mime->get(); +$hdrs = $mime->headers(array( + 'From' => 'test@domain.tld', + 'Subject' => 'Subject', + 'To' => 'to@domain.tld' +)); + +preg_match('/boundary="([^"]+)/', $hdrs['Content-Type'], $matches); +$boundary = $matches[1]; + +echo substr_count($body, "--$boundary") . "\n"; + +// Test headers() before get() + +$mime = new Mail_mime("\r\n"); +$mime->setHTMLBody('html'); +$mime->setTXTBody('text'); + +$hdrs = $mime->headers(array( + 'From' => 'test@domain.tld', + 'Subject' => 'Subject', + 'To' => 'to@domain.tld' +)); +$body = $mime->get(); + +preg_match('/boundary="([^"]+)/', $hdrs['Content-Type'], $matches); +$boundary = $matches[1]; + +echo substr_count($body, "--$boundary"); +--EXPECT-- +3 +3 diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_GH26.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_GH26.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_Bug_GH26.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_Bug_GH26.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,34 @@ +--TEST-- +Bug GH-26 Backward slash is getting added in headers +--SKIPIF-- +--FILE-- +'; +$to = <<,,t@mail.com +EOT; +$subject = "Test mime"; +$mailbody = "hello world"; + +$mail_mime->setTxtBody($mailbody); +$mail_mime->setHTMLBody($mailbody); +$mail_mime->setSubject($subject); +$mail_mime->setFrom($from); + +$body = $mail_mime->get(); + +$extra_headers = array(); +$extra_headers["To"] = $to; + +$arr_hdrs = $mail_mime->headers($extra_headers); + +echo $arr_hdrs['From'] . "\n" . $arr_hdrs['To']; + +--EXPECT-- +"George B@@Z" +"austin test" , , t@mail.com \ No newline at end of file diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_linebreak_dot.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_linebreak_dot.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_linebreak_dot.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_linebreak_dot.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,48 @@ +--TEST-- +Test for correct "." encoding when doing linebreaks +--SKIPIF-- +--FILE-- + 'text/plain', + 'encoding' => 'quoted-printable', +); + +for ($i=74; $i <= strlen($text); $i++) { + $input = substr($text, 0, $i); + $mimePart = new Mail_mimePart($input, $params); + $encoded = $mimePart->encode(); + $output = $encoded['body']; + printf("input: %02d: %s\n", strlen($input), $input); + + $lines = explode("\r\n", $output); + for($j=0; $j < count($lines); $j++) { + $line = $lines[$j]; + if ($j + 1 < count($lines)) { + $line_vis = $line.'\r\n'; + } else { + $line_vis = $line; + } + printf("output:%02d: %s\n", strlen($line), $line_vis); + } + + print("---\n"); + +} +--EXPECT-- +input: 74: 0123456789012345678901234567890123456789012345678901234567890123456789012. +output:74: 0123456789012345678901234567890123456789012345678901234567890123456789012. +--- +input: 75: 0123456789012345678901234567890123456789012345678901234567890123456789012.. +output:75: 0123456789012345678901234567890123456789012345678901234567890123456789012.. +--- +input: 76: 0123456789012345678901234567890123456789012345678901234567890123456789012... +output:76: 0123456789012345678901234567890123456789012345678901234567890123456789012... +--- +input: 77: 0123456789012345678901234567890123456789012345678901234567890123456789012...6 +output:76: 0123456789012345678901234567890123456789012345678901234567890123456789012..=\r\n +output:04: =2E6 +--- diff -Nru php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_linebreak_larger_76.phpt php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_linebreak_larger_76.phpt --- php-mail-mime-1.10.11/Mail_Mime-1.10.12/tests/test_linebreak_larger_76.phpt 1970-01-01 00:00:00.000000000 +0000 +++ php-mail-mime-1.10.12/Mail_Mime-1.10.12/tests/test_linebreak_larger_76.phpt 2024-03-10 20:22:12.000000000 +0000 @@ -0,0 +1,59 @@ +--TEST-- +Test for correct linebreaks for lines _longer_ than 76 chars. +--SKIPIF-- +--FILE-- + 'text/plain', + 'encoding' => 'quoted-printable', +); + +for ($i=74; $i <= strlen($text); $i++) { + $input = substr($text, 0, $i); + $mimePart = new Mail_mimePart($input, $params); + $encoded = $mimePart->encode(); + $output = $encoded['body']; + printf("input: %02d: %s\n", strlen($input), $input); + + $lines = explode("\r\n", $output); + for($j=0; $j < count($lines); $j++) { + $line = $lines[$j]; + if ($j + 1 < count($lines)) { + $line_vis = $line.'\r\n'; + } else { + $line_vis = $line; + } + printf("output:%02d: %s\n", strlen($line), $line_vis); + } + print("---\n"); +} +--EXPECT-- +input: 74: 12345678901234567890123456789012345678901234567890123456789012345678901234 +output:74: 12345678901234567890123456789012345678901234567890123456789012345678901234 +--- +input: 75: 123456789012345678901234567890123456789012345678901234567890123456789012345 +output:75: 123456789012345678901234567890123456789012345678901234567890123456789012345 +--- +input: 76: 1234567890123456789012345678901234567890123456789012345678901234567890123456 +output:76: 1234567890123456789012345678901234567890123456789012345678901234567890123456 +--- +input: 77: 12345678901234567890123456789012345678901234567890123456789012345678901234567 +output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n +output:02: 67 +--- +input: 78: 123456789012345678901234567890123456789012345678901234567890123456789012345678 +output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n +output:03: 678 +--- +input: 79: 1234567890123456789012345678901234567890123456789012345678901234567890123456789 +output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n +output:04: 6789 +--- +input: 80: 12345678901234567890123456789012345678901234567890123456789012345678901234567890 +output:76: 123456789012345678901234567890123456789012345678901234567890123456789012345=\r\n +output:05: 67890 +--- diff -Nru php-mail-mime-1.10.11/debian/changelog php-mail-mime-1.10.12/debian/changelog --- php-mail-mime-1.10.11/debian/changelog 2022-02-01 23:54:22.000000000 +0000 +++ php-mail-mime-1.10.12/debian/changelog 2024-03-11 11:05:42.000000000 +0000 @@ -1,3 +1,13 @@ +php-mail-mime (1.10.12-1) unstable; urgency=medium + + * New bugfix upstream release: + + Avoid PHP8.1 deprecation warnings. + * Salsa CI: Remove default configuration file. + * Update lintian override info format in d/s/lintian-overrides. + * Update standards version to 4.6.2, no changes needed. + + -- Guilhem Moulin Mon, 11 Mar 2024 12:05:42 +0100 + php-mail-mime (1.10.11-1) unstable; urgency=medium * New upstream release. diff -Nru php-mail-mime-1.10.11/debian/control php-mail-mime-1.10.12/debian/control --- php-mail-mime-1.10.11/debian/control 2022-02-01 23:54:22.000000000 +0000 +++ php-mail-mime-1.10.12/debian/control 2024-03-11 11:05:42.000000000 +0000 @@ -10,7 +10,7 @@ php-mbstring , php-pear , pkg-php-tools -Standards-Version: 4.6.0 +Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-mail-mime Vcs-Git: https://salsa.debian.org/php-team/pear/php-mail-mime.git -b debian/latest Homepage: https://pear.php.net/package/Mail_Mime/ diff -Nru php-mail-mime-1.10.11/debian/salsa-ci.yml php-mail-mime-1.10.12/debian/salsa-ci.yml --- php-mail-mime-1.10.11/debian/salsa-ci.yml 2022-02-01 23:54:22.000000000 +0000 +++ php-mail-mime-1.10.12/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ ---- -include: - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru php-mail-mime-1.10.11/debian/source/lintian-overrides php-mail-mime-1.10.12/debian/source/lintian-overrides --- php-mail-mime-1.10.11/debian/source/lintian-overrides 2022-02-01 23:54:22.000000000 +0000 +++ php-mail-mime-1.10.12/debian/source/lintian-overrides 2024-03-11 11:05:42.000000000 +0000 @@ -1 +1 @@ -very-long-line-length-in-source-file Mail_Mime-*/tests/*.phpt line * +very-long-line-length-in-source-file * [Mail_Mime-*/tests/*.phpt:*] diff -Nru php-mail-mime-1.10.11/package.xml php-mail-mime-1.10.12/package.xml --- php-mail-mime-1.10.11/package.xml 2022-01-19 18:40:28.000000000 +0000 +++ php-mail-mime-1.10.12/package.xml 2024-03-10 20:22:12.000000000 +0000 @@ -1,5 +1,5 @@ - + Mail_Mime pear.php.net Mail_Mime provides classes to create MIME messages. @@ -26,10 +26,10 @@ alec@php.net yes - 2021-09-05 - + 2024-03-10 + - 1.10.11 + 1.10.12 1.10.0 @@ -38,9 +38,8 @@ BSD Style -* Fix PHP 8.1: strlen(): Passing null to parameter #1 ($string) of type string is deprecated [alec] -* Fix encoding recipient names with @ character and no space between name and address [alec] -* Fix the license label in composer.json [jnkowa-gfk] +* Prevent from "PHP Deprecated: file_exists(): Passing null to parameter #1 ($filename) of type string" [alec] +* PHPDoc improvements [alec] @@ -95,8 +94,8 @@ - - + + @@ -1013,5 +1012,23 @@ * Corrected line breaks for lines ending in dots and length more than 74 [ixs] + + 2021-09-05 + + + 1.10.11 + 1.10.0 + + + stable + stable + + BSD Style + +* Fix PHP 8.1: strlen(): Passing null to parameter #1 ($string) of type string is deprecated [alec] +* Fix encoding recipient names with @ character and no space between name and address [alec] +* Fix the license label in composer.json [jnkowa-gfk] + +