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

Call no named attachment "forwarded message" only if it's a message

Browse Source
This commit is contained in:
Hadi Nategh 2019-07-30 12:14:42 +02:00
parent 1bd5987a22
commit 053a2aeefd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail.php
View File

@ -1737,7 +1737,8 @@ class Mail
$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id; $headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name'])) if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))
{ {
$headerObject['ATTACHMENTS'][$mime_id]['name']= $part->getName() ? $part->getName() : lang('forwarded message'); $headerObject['ATTACHMENTS'][$mime_id]['name']= $part->getName() ? $part->getName() :
($mime_type == "message/rfc822" ? lang('forwarded message') : lang('attachment'));
} }
if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') || if (!strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef') $headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
@ -5784,7 +5785,7 @@ class Mail
$attachment['mimeType'] = $mime_type; $attachment['mimeType'] = $mime_type;
$attachment['uid'] = $_uid; $attachment['uid'] = $_uid;
$attachment['partID'] = $mime_id; $attachment['partID'] = $mime_id;
if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName() ? $part->getName() : lang('forwarded message'); if (!isset($attachment['name'])||empty($attachment['name'])) $attachment['name'] = $part->getName() ? $part->getName() : ($mime_type == "message/rfc822" ? lang('forwarded message') : lang('attachment'));;
if ($fetchTextCalendar) if ($fetchTextCalendar)
{ {
//error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters())); //error_log(__METHOD__.' ('.__LINE__.') '.array2string($part->getAllContentTypeParameters()));