From a7e552b5a436375e233e7d4df4ed6cfc9e58d435 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Thu, 06 Aug 2015 13:52:01 -0400 Subject: [PATCH] Get rid of Mail_mimeDecode package dependency (#1490416) --- program/lib/Roundcube/rcube_mime.php | 58 +++++++++++----------------------------------------------- 1 files changed, 11 insertions(+), 47 deletions(-) diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php index 7936a41..7e86de6 100644 --- a/program/lib/Roundcube/rcube_mime.php +++ b/program/lib/Roundcube/rcube_mime.php @@ -63,60 +63,24 @@ * Parse the given raw message source and return a structure * of rcube_message_part objects. * - * It makes use of the PEAR:Mail_mimeDecode library + * It makes use of the rcube_mime_decode library * - * @param string The message source + * @param string $raw_body The message source + * * @return object rcube_message_part The message structure */ public static function parse_message($raw_body) { - $mime = new Mail_mimeDecode($raw_body); - $struct = $mime->decode(array('include_bodies' => true, 'decode_bodies' => true)); - return self::structure_part($struct); - } + $conf = array( + 'include_bodies' => true, + 'decode_bodies' => true, + 'decode_headers' => false, + 'default_charset' => self::get_charset(), + ); + $mime = new rcube_mime_decode($conf); - /** - * Recursive method to convert a Mail_mimeDecode part into a rcube_message_part object - * - * @param object A message part struct - * @param int Part count - * @param string Parent MIME ID - * - * @return object rcube_message_part - */ - private static function structure_part($part, $count=0, $parent='') - { - $struct = new rcube_message_part; - $struct->mime_id = $part->mime_id ? $part->mime_id : (empty($parent) ? (string)$count : "$parent.$count"); - $struct->headers = $part->headers; - $struct->ctype_primary = $part->ctype_primary; - $struct->ctype_secondary = $part->ctype_secondary; - $struct->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary; - $struct->ctype_parameters = $part->ctype_parameters; - - if ($part->headers['content-transfer-encoding']) - $struct->encoding = $part->headers['content-transfer-encoding']; - if ($part->ctype_parameters['charset']) - $struct->charset = $part->ctype_parameters['charset']; - - $part_charset = $struct->charset ? $struct->charset : self::get_charset(); - - // determine filename - if (($filename = $part->d_parameters['filename']) || ($filename = $part->ctype_parameters['name'])) { - $struct->filename = rcube_mime::decode_mime_string($filename, $part_charset); - } - - // copy part body and convert it to UTF-8 if necessary - $struct->body = $part->ctype_primary == 'text' || !$part->ctype_parameters['charset'] ? rcube_charset::convert($part->body, $part_charset) : $part->body; - $struct->size = strlen($part->body); - $struct->disposition = $part->disposition; - - foreach ((array)$part->parts as $child_part) { - $struct->parts[] = self::structure_part($child_part, ++$count, $struct->mime_id); - } - - return $struct; + return $mime->decode($raw_body); } -- Gitblit v1.9.1