Author: Alexandru Stanoi
Date: 2007-02-28 09:23:46 +0100 (Wed, 28 Feb 2007)
New Revision: 4694
Log:
- Defaulting Content-Disposition header to "attachment" for generating mails.
Modified:
stable/Mail/1.2/ChangeLog
stable/Mail/1.2/src/parts/file.php
stable/Mail/1.2/tests/parts/file_part_test.php
stable/Mail/1.2/tests/parts/stream_file_part_test.php
stable/Mail/1.2/tests/parts/virtual_file_part_test.php
Modified: stable/Mail/1.2/ChangeLog
===================================================================
--- stable/Mail/1.2/ChangeLog 2007-02-27 15:55:40 UTC (rev 4693)
+++ stable/Mail/1.2/ChangeLog 2007-02-28 08:23:46 UTC (rev 4694)
@@ -9,9 +9,7 @@
- Fixed issue #10283: ImapSet does not return the trailing parenthesis ')'.
- Fixed issue #10312: Fixed the value of ezcMail::QUOTED_PRINTABLE constant.
- Fixed issue #10200 (part 1): Content-Disposition header is no longer created
- during parsing if it is missing. Also it's disposition type is no longer
- "attachment" by default (this requires setting $filePart->dispositionType =
- ezcMailFile::DISPLAY_ATTACHMENT or ezcMailFile::DISPLAY_INLINE explicitly).
+ during parsing if it is missing.
- Fixed issue #10200 (part 2): The value of the generated Content-ID header
contains the filename encoded with base64 to avoid problems.
Modified: stable/Mail/1.2/src/parts/file.php
===================================================================
--- stable/Mail/1.2/src/parts/file.php 2007-02-27 15:55:40 UTC (rev 4693)
+++ stable/Mail/1.2/src/parts/file.php 2007-02-28 08:23:46 UTC (rev 4694)
@@ -201,15 +201,16 @@
*/
private function setHeaderContentDisposition()
{
- if ( isset( $this->dispositionType ) )
+ if ( $this->contentDisposition === null )
{
- if ( $this->contentDisposition === null )
- {
- $this->contentDisposition = new
ezcMailContentDispositionHeader();
- }
- $this->contentDisposition->disposition = $this->dispositionType;
- $this->contentDisposition->fileName = basename( $this->fileName );
+ $this->contentDisposition = new ezcMailContentDispositionHeader();
}
+ if ( !isset( $this->dispositionType ) )
+ {
+ $this->dispositionType = self::DISPLAY_ATTACHMENT;
+ }
+ $this->contentDisposition->disposition = $this->dispositionType;
+ $this->contentDisposition->fileName = basename( $this->fileName );
}
/**
Modified: stable/Mail/1.2/tests/parts/file_part_test.php
===================================================================
--- stable/Mail/1.2/tests/parts/file_part_test.php 2007-02-27 15:55:40 UTC
(rev 4693)
+++ stable/Mail/1.2/tests/parts/file_part_test.php 2007-02-28 08:23:46 UTC
(rev 4694)
@@ -22,7 +22,6 @@
{
$filePart = new ezcMailFile( dirname( __FILE__) . "/data/fly.jpg" );
$filePart->contentType = ezcMailFile::CONTENT_TYPE_IMAGE;
- $filePart->dispositionType = ezcMailFile::DISPLAY_ATTACHMENT;
$filePart->mimeType = "jpeg";
// file_put_contents( dirname( __FILE__ ) .
"/data/ezcMailFileTest_testGenerateBase64.data" );
$this->assertEquals( file_get_contents( dirname( __FILE__ ) .
"/data/ezcMailFilePartTest_testGenerateBase64.data" ),
Modified: stable/Mail/1.2/tests/parts/stream_file_part_test.php
===================================================================
--- stable/Mail/1.2/tests/parts/stream_file_part_test.php 2007-02-27
15:55:40 UTC (rev 4693)
+++ stable/Mail/1.2/tests/parts/stream_file_part_test.php 2007-02-28
08:23:46 UTC (rev 4694)
@@ -22,7 +22,6 @@
{
$filePart = new ezcMailStreamFile( "fly.jpg", fopen( dirname(
__FILE__) . "/data/fly.jpg", "r" ) );
$filePart->contentType = ezcMailFile::CONTENT_TYPE_IMAGE;
- $filePart->dispositionType = ezcMailFile::DISPLAY_ATTACHMENT;
$filePart->mimeType = "jpeg";
// file_put_contents( dirname( __FILE__ ) .
"/data/ezcMailFileTest_testGenerateBase64.data" );
$this->assertEquals( file_get_contents( dirname( __FILE__ ) .
"/data/ezcMailFilePartTest_testGenerateBase64.data" ),
Modified: stable/Mail/1.2/tests/parts/virtual_file_part_test.php
===================================================================
--- stable/Mail/1.2/tests/parts/virtual_file_part_test.php 2007-02-27
15:55:40 UTC (rev 4693)
+++ stable/Mail/1.2/tests/parts/virtual_file_part_test.php 2007-02-28
08:23:46 UTC (rev 4694)
@@ -22,7 +22,6 @@
{
$filePart = new ezcMailVirtualFile( "fly.jpg", file_get_contents(
dirname( __FILE__) . "/data/fly.jpg" ) );
$filePart->contentType = ezcMailFile::CONTENT_TYPE_IMAGE;
- $filePart->dispositionType = ezcMailFile::DISPLAY_ATTACHMENT;
$filePart->mimeType = "jpeg";
// file_put_contents( dirname( __FILE__ ) .
"/data/ezcMailFileTest_testGenerateBase64.data" );
$this->assertEquals( file_get_contents( dirname( __FILE__ ) .
"/data/ezcMailFilePartTest_testGenerateBase64.data" ),
--
svn-components mailing list
svn-components@lists.ez.no
http://lists.ez.no/mailman/listinfo/svn-components
