svn: /pear/packages/Mail_Mime/trunk/ mime.php package.xml tests/test_Bug_13444.phpt tests/test_Bug_9725_1.phpt

alec Wed, 30 Dec 2009 11:53:05 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292796 Log: - Fixed Bug #13444: Problem in multipart mail with txt, html and images. Reverted fix for #9725 Bugs: http://pear.php.net/bugs/13444 (unknown) http://pear.php.net/bugs/9725 (unknown) Changed paths: U pear/packages/Mail_Mime/trunk/mime.php U pear/packages/Mail_Mime/trunk/package.xml A pear/packages/Mail_Mime/trunk/tests/test_Bug_13444.phpt D pear/packages/Mail_Mime/trunk/tests/test_Bug_9725_1.phpt Modified: pear/packages/Mail_Mime/trunk/mime.php =================================================================== --- pear/packages/Mail_Mime/trunk/mime.php 2009-12-30 11:47:41 UTC (rev 292795) +++ pear/packages/Mail_Mime/trunk/mime.php 2009-12-30 11:53:05 UTC (rev 292796) @@ -821,6 +821,37 @@ break; case $html AND !$attachments AND $html_images: + // * Content-Type: multipart/alternative; + // * text + // * Content-Type: multipart/related; + // * html + // * image... + if (isset($this->_txtbody)) { + $message =& $this->_addAlternativePart($null); + $this->_addTextPart($message, $this->_txtbody); + + $ht =& $this->_addRelatedPart($message); + $this->_addHtmlPart($ht); + for ($i = 0; $i < count($this->_html_images); $i++) { + $this->_addHtmlImagePart($ht, $this->_html_images[$i]); + } + // * Content-Type: multipart/related; + // * html + // * image... + } else { + $message =& $this->_addRelatedPart($null); + $this->_addHtmlPart($message); + for ($i = 0; $i < count($this->_html_images); $i++) { + $this->_addHtmlImagePart($message, $this->_html_images[$i]); + } + } +/* + // #13444, #9725: the code below was a non-RFC compliant hack + // * Content-Type: multipart/related; + // * Content-Type: multipart/alternative; + // * text + // * html + // * image... $message =& $this->_addRelatedPart($null); if (isset($this->_txtbody)) { $alt =& $this->_addAlternativePart($message); @@ -832,6 +863,7 @@ for ($i = 0; $i < count($this->_html_images); $i++) { $this->_addHtmlImagePart($message, $this->_html_images[$i]); } +*/ break; case $html AND $attachments AND !$html_images: Modified: pear/packages/Mail_Mime/trunk/package.xml =================================================================== --- pear/packages/Mail_Mime/trunk/package.xml 2009-12-30 11:47:41 UTC (rev 292795) +++ pear/packages/Mail_Mime/trunk/package.xml 2009-12-30 11:53:05 UTC (rev 292796) @@ -39,6 +39,9 @@ </stability> <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD Style</license> <notes> +Fixed Bugs: + * Bug #13444: Problem in multipart mail with txt, html and images. Reverted fix for #9725 [alec] + Implemented Features: * Feature #10884: Provide easy way to set build params [alec] </notes> @@ -65,11 +68,11 @@ <file baseinstalldir="Mail" name="test_Bug_8541_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_9558_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_9722_1.phpt" role="test" /> - <file baseinstalldir="Mail" name="test_Bug_9725_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_9976_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_10596_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_10816_1.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_11731.phpt" role="test" /> + <file baseinstalldir="Mail" name="test_Bug_13444.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_14779.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_15320.phpt" role="test" /> <file baseinstalldir="Mail" name="test_Bug_14529.phpt" role="test" /> Added: pear/packages/Mail_Mime/trunk/tests/test_Bug_13444.phpt =================================================================== --- pear/packages/Mail_Mime/trunk/tests/test_Bug_13444.phpt (rev 0) +++ pear/packages/Mail_Mime/trunk/tests/test_Bug_13444.phpt 2009-12-30 11:53:05 UTC (rev 292796) @@ -0,0 +1,31 @@ +--TEST-- +Bug #9725 multipart/related & alternative wrong order +--SKIPIF-- +--FILE-- +<?php +error_reporting(E_ALL); // ignore E_STRICT +include("Mail/mime.php"); + +$mime = new Mail_mime(); +$mime->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: (.*);|', $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 Deleted: pear/packages/Mail_Mime/trunk/tests/test_Bug_9725_1.phpt =================================================================== --- pear/packages/Mail_Mime/trunk/tests/test_Bug_9725_1.phpt 2009-12-30 11:47:41 UTC (rev 292795) +++ pear/packages/Mail_Mime/trunk/tests/test_Bug_9725_1.phpt 2009-12-30 11:53:05 UTC (rev 292796) @@ -1,31 +0,0 @@ ---TEST-- -Bug #9725 multipart/related & alternative wrong order ---SKIPIF-- ---FILE-- -<?php -error_reporting(E_ALL); // ignore E_STRICT -include("Mail/mime.php"); - -$mime = new Mail_mime(); -$mime->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: (.*);|', $body, $matches); -print($headCT); -print("\n"); -foreach ($matches[1] as $match){ - print($match); - print("\n"); -} ---EXPECT-- -multipart/related -multipart/alternative -text/plain -text/html -application/octet-stream