extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 03:50:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing the fix: forwarded messages containing just a PDF were now unreadable again

Browse Source
This commit is contained in:
ralf 2024-03-08 14:41:47 +02:00
parent 5d24c6830e
commit 16c20f62ef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Mail.php
View File

@ -6227,7 +6227,7 @@ class Mail
* Some broken clients e.g. SAP Netweaver sends mails containing only a base64 decoded PDF, but set NO Content-Transfer-Type: base64. * Some broken clients e.g. SAP Netweaver sends mails containing only a base64 decoded PDF, but set NO Content-Transfer-Type: base64.
* *
* @param Horde_Mime_Part $part * @param Horde_Mime_Part $part
* @return Horde_Mime_Part * @return bool true: part needed fixing AND is base64 encoded, false: no need to fix the part
*/ */
public static function fixBinaryPart(Horde_Mime_Part $part) public static function fixBinaryPart(Horde_Mime_Part $part)
{ {
@ -6238,8 +6238,9 @@ class Mail
unserialize($part->serialize())[9] !== 'base64') unserialize($part->serialize())[9] !== 'base64')
{ {
$part->setTransferEncoding('binary', ['send' => true]); $part->setTransferEncoding('binary', ['send' => true]);
return true;
} }
return $part; return false;
} }
/** /**
@ -6261,12 +6262,12 @@ class Mail
$fetchAsBinary = true; $fetchAsBinary = true;
if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false; if ($_mimetype && strtolower($_mimetype)=='message/rfc822') $fetchAsBinary = false;
self::fixBinaryPart($part); $need_base64 = self::fixBinaryPart($part);
// we need to set content on structure to decode transfer encoding // we need to set content on structure to decode transfer encoding
$part->setContents( $part->setContents(
$this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary), $this->getBodyPart($_uid, $part->getMimeId(), null, $_preserveSeen, $_stream, $encoding, $fetchAsBinary),
array('encoding' => !$fetchAsBinary&&!$encoding?'8bit':$encoding)); array('encoding' => $need_base64 ? 'base64' : (!$fetchAsBinary&&!$encoding?'8bit':$encoding)));
return $part; return $part;
} }