Improve display of pgp/mime and s/mime messges. Reverts commit f4154d91

Thomas Bruederli

2015-01-16 ef29153a3270dd2407cce20f3eb3ec6322d4053b

Improve display of pgp/mime and s/mime messges. Reverts commit f4154d91

 program/lib/Roundcube/rcube_message.php

@@ -627,8 +627,19 @@
            $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 @@
            $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)) {

 program/steps/mail/func.inc

@@ -1205,7 +1205,7 @@
                }

                // fetch part body
                $body = $part->mime_id ? $MESSAGE->get_part_body($part->mime_id, true) : $part->body;
                $body = $MESSAGE->get_part_body($part->mime_id, true);

                // extract headers from message/rfc822 parts
                if ($part->mimetype == 'message/rfc822') {