Merge branch 'fix-attachment-encoding'

This commit is contained in:
Bernhard Breytenbach 2014-08-25 14:30:00 +02:00
commit b96c24a3e9

View File

@ -194,23 +194,23 @@ class Attachment
{ {
$dirname = dirname($path); $dirname = dirname($path);
if (file_exists($path)) { if (file_exists($path)) {
if (!is_writable($path)) if (!is_writable($path)) {
return false; return false;
}
} elseif (!is_dir($dirname) || !is_writable($dirname)) { } elseif (!is_dir($dirname) || !is_writable($dirname)) {
return false; return false;
} }
if (($filePointer = fopen($path, 'w')) == false) if (($filePointer = fopen($path, 'w')) == false) {
return false; return false;
}
switch ($this->encoding) { switch ($this->encoding) {
case 3: case 3: //base64
case 'base64':
$streamFilter = stream_filter_append($filePointer, 'convert.base64-decode', STREAM_FILTER_WRITE); $streamFilter = stream_filter_append($filePointer, 'convert.base64-decode', STREAM_FILTER_WRITE);
break; break;
case 4: case 4: //quoted-printable
case 'quoted-printable':
$streamFilter = stream_filter_append($filePointer, 'convert.quoted-printable-decode', STREAM_FILTER_WRITE); $streamFilter = stream_filter_append($filePointer, 'convert.quoted-printable-decode', STREAM_FILTER_WRITE);
break; break;