Mirrors/roundcubemail
1
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2025-12-28 07:55:07 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Support early MIME types for S/MIME encrypted messages (#9973)

Browse Source 
Co-authored-by: Mathias Schneider <thiesje@web.de>
This commit is contained in:
Mathias Schneider 2025-09-21 10:14:24 +02:00 committed by GitHub
parent 7fd9bf05e3
commit bdbfbd9074
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
program/js/app.js
View File

@ -2530,7 +2530,7 @@ function rcube_webmail() {
html = '<span class="' + flags.attachmentClass + '" title="' + label + '"></span>';
} else if (flags.ctype == 'multipart/report') {
html = '<span class="report"></span>';
} else if (flags.ctype == 'multipart/encrypted' || flags.ctype == 'application/pkcs7-mime') {
} else if (flags.ctype == 'multipart/encrypted' || flags.ctype == 'application/pkcs7-mime' || flags.ctype == 'application/x-pkcs7-mime') {
html = '<span class="encrypted"></span>';
} else if (flags.hasattachment || (!flags.hasnoattachment && /application\/|multipart\/(m|signed)/.test(flags.ctype))) {
html = '<span class="attachment" title="' + label + '"></span>';

2
program/lib/Roundcube/rcube_message.php
View File

@ -892,7 +892,7 @@ class rcube_message
}
}
// this is an S/MIME encrypted message -> create a plaintext body with the according message
elseif ($mimetype == 'application/pkcs7-mime') {
elseif ($mimetype == 'application/pkcs7-mime' || $mimetype == 'application/x-pkcs7-mime') {
$p = new rcube_message_part();
$p->type = 'content';
$p->ctype_primary = 'text';