extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 08:23:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing the fix, only set binary, if it has not content-transfer-encoding header with value base64

Browse Source
This commit is contained in:
ralf 2024-03-05 20:03:18 +02:00
parent 858eebd527
commit 39d2b0aa54
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Mail.php
View File

@ -7326,8 +7326,11 @@ class Mail
$structure->setTransferEncoding('8bit'); $structure->setTransferEncoding('8bit');
$structure->setCharset('utf-8'); $structure->setCharset('utf-8');
} }
// if we have no text body, but only a PDF or an image, set binary, as it's already base64 transfer-encoded // if we have no text body, but only a PDF or an image AND transfer-encoding is NOT base64,
if ($structure->getType() === 'application/pdf' || $structure->getPrimaryType() === 'image') // set binary, as it's already base64 transfer-encoded but lacks the necessary header
if (($structure->getType() === 'application/pdf' || $structure->getPrimaryType() === 'image') &&
// hack to read protected $structure->_transfer_encoding
unserialize($structure->serialize())[9] !== 'base64')
{ {
$structure->setTransferEncoding('binary', ['send' => true]); $structure->setTransferEncoding('binary', ['send' => true]);
} }