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

* Mail: fix mixed up inline images and attachments in smime signed messages

Browse Source
This commit is contained in:
hadi 2023-06-19 17:05:37 +02:00
parent b744859b70
commit fce9ba3a41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail.php
View File

@ -6136,7 +6136,7 @@ class Mail
// everything else we only consider after we checked all // everything else we only consider after we checked all
if (!isset($attachment)) $attachment = $part; if (!isset($attachment)) $attachment = $part;
// do we want content fetched, can be done later, if not needed // do we want content fetched, can be done later, if not needed
if (isset($_stream)) if (isset($_stream) && empty($structure->getMetadata('X-EGroupware-Smime')))
{ {
$this->fetchPartContents($_uid, $attachment, $_stream); $this->fetchPartContents($_uid, $attachment, $_stream);
} }

2
mail/js/app.js
View File

@ -6060,7 +6060,7 @@ app.classes.mail = AppJS.extend(
{ {
if (_obj1[i]['mail_id'] != _obj2[i]['mail_id'] || _obj1[i]['partID'] != _obj2[i]['partID']) return false; if (_obj1[i]['mail_id'] != _obj2[i]['mail_id'] || _obj1[i]['partID'] != _obj2[i]['partID']) return false;
} }
if (_obj1.length != _obj2.length) return false;
return true; return true;
}; };
if (_attachments && _attachments.length) if (_attachments && _attachments.length)