- Small performance improvements

alecpl

2010-09-08 2aa2b332f6e216ceeabc36ef6b942c40d91bda5a

 program/include/rcube_message.php

@@ -5,7 +5,7 @@
 | program/include/rcube_message.php                                     |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland                 |
 | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -63,14 +63,17 @@
    {
        $this->app = rcmail::get_instance();
        $this->imap = $this->app->imap;
    

        $this->uid = $uid;
        $this->headers = $this->imap->get_headers($uid, NULL, true, true);

        if (!$this->headers)
            return;

        $this->subject = rcube_imap::decode_mime_string(
            $this->headers->subject, $this->headers->charset);
        list(, $this->sender) = each($this->imap->decode_address_list($this->headers->from));
    

        $this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]));
        $this->opt = array(
            'safe' => $this->is_safe,
@@ -244,17 +247,11 @@
     */
    private function parse_structure($structure, $recursive = false)
    {
        $message_ctype_primary = $structure->ctype_primary;
        $message_ctype_secondary = $structure->ctype_secondary;
        $mimetype = $structure->mimetype;

        // real content-type of message/rfc822 part
        if ($mimetype == 'message/rfc822') {
            if ($structure->real_mimetype) {
                $mimetype = $structure->real_mimetype;
                list($message_ctype_primary, $message_ctype_secondary) = explode('/', $mimetype);
            }
        }
        if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype)
            $mimetype = $structure->real_mimetype;
        else
            $mimetype = $structure->mimetype;

        // show message headers
        if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
@@ -263,6 +260,17 @@
            $c->headers = &$structure->headers;
            $this->parts[] = $c;
        }

        // Allow plugins to handle message parts
        $plugin = $this->app->plugins->exec_hook('message_part_structure',
            array('object' => $this, 'structure' => $structure,
                'mimetype' => $mimetype, 'recursive' => $recursive));

        if ($plugin['abort'])
            return;

        $structure = $plugin['structure'];
        list($message_ctype_primary, $message_ctype_secondary) = explode('/', $plugin['mimetype']);

        // print body if message doesn't have multiple parts
        if ($message_ctype_primary == 'text' && !$recursive) {
@@ -275,8 +283,6 @@
                    $this->mime_parts[$uupart->mime_id] = $uupart;
                    $this->attachments[] = $uupart;
                }

            // @TODO: plugin hook?
        }
        // the same for pgp signed messages
        else if ($mimetype == 'application/pgp' && !$recursive) {
@@ -357,17 +363,6 @@
            $p->ctype_secondary = 'plain';
            $p->body            = rcube_label('encryptedmessage');
            $p->size            = strlen($p->body);
      
            // maybe some plugins are able to decode this encrypted message part
            $data = $this->app->plugins->exec_hook('message_part_encrypted',
                array('object' => $this, 'struct' => $structure, 'part' => $p));

            if (is_array($data['parts'])) {
                $this->parts = array_merge($this->parts, $data['parts']);
            }
            else if ($data['part']) {
                $this->parts[] = $p;
            }
        }
        // message contains multiple parts
        else if (is_array($structure->parts) && !empty($structure->parts)) {
@@ -398,6 +393,17 @@
                else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
                    $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification'
                ) {
                    // Allow plugins to handle also this part
                    $plugin = $this->app->plugins->exec_hook('message_part_structure',
                        array('object' => $this, 'structure' => $mail_part,
                            'mimetype' => $part_mimetype, 'recursive' => true));

                    if ($plugin['abort'])
                        continue;

                    $mail_part = $plugin['structure'];
                    list($primary_type, $secondary_type) = explode('/', $plugin['mimetype']);

                    // add text part if it matches the prefs
                    if (!$this->parse_alternative ||
                        ($secondary_type == 'html' && $this->opt['prefer_html']) ||
@@ -440,7 +446,6 @@

                    // part belongs to a related message and is linked
                    if ($mimetype == 'multipart/related'
                        && preg_match('!^image/!', $part_mimetype)
                        && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
                        if ($mail_part->headers['content-id'])
                            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
@@ -486,6 +491,11 @@
        else if ($structure->filename) {
            $this->attachments[] = $structure;
        }
        // message is a single part non-text (without filename)
        else if (preg_match('/application\//i', $mimetype)) {
            $structure->filename = 'Part '.$structure->mime_id;
            $this->attachments[] = $structure;
        }
    }


@@ -498,7 +508,7 @@
    {
        if (strlen($part->mime_id))
            $this->mime_parts[$part->mime_id] = &$part;
      

        if (is_array($part->parts))
            for ($i=0; $i<count($part->parts); $i++)
                $this->get_mime_numbers($part->parts[$i]);
@@ -516,18 +526,17 @@
        if (!isset($part->body))
            $part->body = $this->imap->get_message_part($this->uid, $part->mime_id, $part);

        require_once('lib/tnef_decoder.inc');

        $parts = array();
        $tnef_arr = tnef_decode($part->body);
        $tnef = new tnef_decoder;
        $tnef_arr = $tnef->decompress($part->body);

        foreach ($tnef_arr as $pid => $winatt) {
            $tpart = new rcube_message_part;

            $tpart->filename        = trim($winatt['name']);
            $tpart->encoding        = 'stream';
            $tpart->ctype_primary   = trim(strtolower($winatt['type0']));
            $tpart->ctype_secondary = trim(strtolower($winatt['type1']));
            $tpart->ctype_primary   = trim(strtolower($winatt['type']));
            $tpart->ctype_secondary = trim(strtolower($winatt['subtype']));
            $tpart->mimetype        = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
            $tpart->mime_id         = 'winmail.' . $part->mime_id . '.' . $pid;
            $tpart->size            = $winatt['size'];
@@ -536,7 +545,7 @@
            $parts[] = $tpart;
            unset($tnef_arr[$pid]);
        }
        

        return $parts;
    }

@@ -582,7 +591,7 @@
                unset($matches[$pid]);
            }
        }
        

        return $parts;
    }