From ef29153a3270dd2407cce20f3eb3ec6322d4053b Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 16 Jan 2015 16:13:15 +0100 Subject: Improve display of pgp/mime and s/mime messges. Reverts commit f4154d91 --- program/lib/Roundcube/rcube_message.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'program/lib') diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 20329a7f1..8af334446 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -627,8 +627,19 @@ class rcube_message $p->ctype_secondary = 'plain'; $p->mimetype = 'text/plain'; $p->realtype = 'multipart/encrypted'; + $p->mime_id = $structure->mime_id; $this->parts[] = $p; + + // add encrypted payload part as attachment + if (is_array($structure->parts)) { + for ($i=0; $i < count($structure->parts); $i++) { + $subpart = $structure->parts[$i]; + if ($subpart->mimetype == 'application/octet-stream' || !empty($subpart->filename)) { + $this->attachments[] = $subpart; + } + } + } } // this is an S/MIME ecrypted message -> create a plaintext body with the according message else if ($mimetype == 'application/pkcs7-mime') { @@ -638,8 +649,13 @@ class rcube_message $p->ctype_secondary = 'plain'; $p->mimetype = 'text/plain'; $p->realtype = 'application/pkcs7-mime'; + $p->mime_id = $structure->mime_id; $this->parts[] = $p; + + if (!empty($structure->filename)) { + $this->attachments[] = $structure; + } } // message contains multiple parts else if (is_array($structure->parts) && !empty($structure->parts)) { -- cgit v1.2.3