- Fix message/rfc822 attachments containing only attachments are not parsed...

alecpl

2010-05-20 c1439f925dbfbd20566337a0251a6b4e85e9a2f9

 program/include/rcube_message.php

@@ -15,7 +15,7 @@
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id: rcube_imap.php 1344 2008-04-30 08:21:42Z thomasb $
 $Id$

*/

@@ -84,6 +84,9 @@
    else {
      $this->body = $this->imap->get_body($uid);
    }
    
    // notify plugins and let them analyze this structured message object
    $this->app->plugins->exec_hook('message_load', array('object' => $this));
  }
  
  
@@ -224,8 +227,17 @@
   */
  private function parse_structure($structure, $recursive = false)
  {
    $message_ctype_primary = strtolower($structure->ctype_primary);
    $message_ctype_secondary = strtolower($structure->ctype_secondary);
    $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);
      }
    }

    // show message headers
    if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
@@ -241,28 +253,26 @@
      $this->parts[] = &$structure;
    }
    // the same for pgp signed messages
    else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
    else if ($mimetype == 'application/pgp' && !$recursive) {
      $structure->type = 'content';
      $this->parts[] = &$structure;
    }
    // message contains alternative parts
    else if ($message_ctype_primary == 'multipart' && ($message_ctype_secondary == 'alternative') && is_array($structure->parts)) {
    else if ($mimetype == 'multipart/alternative' && is_array($structure->parts)) {
      // get html/plaintext parts
      $plain_part = $html_part = $print_part = $related_part = null;

      foreach ($structure->parts as $p => $sub_part) {
        $rel_parts = $attachmnts = null;
        $sub_ctype_primary = strtolower($sub_part->ctype_primary);
        $sub_ctype_secondary = strtolower($sub_part->ctype_secondary);
        $sub_mimetype = $sub_part->mimetype;
        
        // check if sub part is 
        if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='plain')
        // check if sub part is
        if ($sub_mimetype == 'text/plain')
          $plain_part = $p;
        else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html')
        else if ($sub_mimetype == 'text/html')
          $html_part = $p;
        else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
        else if ($sub_mimetype == 'text/enriched')
          $enriched_part = $p;
        else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative')))
        else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/alternative')))
          $related_part = $p;
      }

@@ -314,39 +324,60 @@
      }
    }
    // this is an ecrypted message -> create a plaintext body with the according message
    else if ($message_ctype_primary == 'multipart' && $message_ctype_secondary == 'encrypted') {
    else if ($mimetype == 'multipart/encrypted') {
      $p = new stdClass;
      $p->type = 'content';
      $p->ctype_primary = 'text';
      $p->ctype_secondary = 'plain';
      $p->body = rcube_label('encryptedmessage');
      $p->size = strlen($p->body);
      
      $this->parts[] = $p;
      // 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)) {
      // iterate over parts
      for ($i=0; $i < count($structure->parts); $i++) {
        $mail_part = &$structure->parts[$i];
        $primary_type = strtolower($mail_part->ctype_primary);
        $secondary_type = strtolower($mail_part->ctype_secondary);
        $primary_type = $mail_part->ctype_primary;
        $secondary_type = $mail_part->ctype_secondary;

        // real content-type of message/rfc822
        if ($mail_part->real_mimetype) {
          $part_orig_mimetype = $mail_part->mimetype;
          $part_mimetype = $mail_part->real_mimetype;
          list($primary_type, $secondary_type) = explode('/', $part_mimetype);
        }
        else
          $part_mimetype = $mail_part->mimetype;

        // multipart/alternative
        if ($primary_type=='multipart') {
          $this->parse_structure($mail_part, true);

          // list message/rfc822 as attachment as well (mostly .eml)
          if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
            $this->attachments[] = $mail_part;
        }
        // part text/[plain|html] OR message/delivery-status
        else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
                 ($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
          
          // add text part if we're not in alternative mode or if it matches the prefs
        else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
            $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification') {

          // add text part if it matches the prefs
          if (!$this->parse_alternative ||
              ($secondary_type == 'html' && $this->opt['prefer_html']) ||
              ($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
            $mail_part->type = 'content';
            $this->parts[] = $mail_part;
          }

          
          // list as attachment as well
          if (!empty($mail_part->filename))
            $this->attachments[] = $mail_part;
@@ -354,7 +385,7 @@
        // part message/*
        else if ($primary_type=='message') {
          $this->parse_structure($mail_part, true);
          

          // list as attachment as well (mostly .eml)
          if (!empty($mail_part->filename))
            $this->attachments[] = $mail_part;
@@ -362,35 +393,39 @@
        // ignore "virtual" protocol parts
        else if ($primary_type == 'protocol')
          continue;
          
        // part is Microsoft outlook TNEF (winmail.dat)
        else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {

        // part is Microsoft Outlook TNEF (winmail.dat)
        else if ($part_mimetype == 'application/ms-tnef') {
          foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
            $this->mime_parts[$tnef_part->mime_id] = $tnef_part;
            $this->attachments[] = $tnef_part;
          }
        }

        // part is file/attachment
        else if ($mail_part->disposition == 'attachment' || $mail_part->disposition == 'inline' ||
        // part is a file/attachment
        else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
                 $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) {

          // skip apple resource forks
          if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
            continue;

          // part belongs to a related message
          if ($message_ctype_secondary == 'related') {
          // 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']);
            if ($mail_part->headers['content-location'])
              $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
            
            if ($mail_part->content_id || $mail_part->content_location) {
              $this->inline_parts[] = $mail_part;
            }

            $this->inline_parts[] = $mail_part;
          }
          // is regular attachment
          else {
          // attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
          else if ($part_orig_mimetype == 'message/rfc822') {
            $this->parse_structure($mail_part, true);
          }
          // is a regular attachment
          else if (preg_match('!^[a-z0-9-.+]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
            if (!$mail_part->filename)
              $mail_part->filename = 'Part '.$mail_part->mime_id;
            $this->attachments[] = $mail_part;
@@ -399,7 +434,7 @@
      }

      // if this was a related part try to resolve references
      if ($message_ctype_secondary == 'related' && sizeof($this->inline_parts)) {
      if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
        $a_replaces = array();

        foreach ($this->inline_parts as $inline_object) {
@@ -419,7 +454,7 @@
      }
    }

    // message is single part non-text
    // message is a single part non-text
    else if ($structure->filename) {
      $this->attachments[] = $structure;
    }