thomascube
2008-12-01 ffbf910df93d0a29fc8ea5a6fb0fa39e078fa77e
program/include/rcube_message.php
@@ -45,7 +45,20 @@
  public $sender = null;
  public $is_safe = false;
  
  /**
   * __construct
   *
   * Provide a uid, and parse message structure.
   *
   * @param string $uid The message UID.
   *
   * @uses rcmail::get_instance()
   * @uses rcube_imap::decode_mime_string()
   * @uses self::set_safe()
   *
   * @see self::$app, self::$imap, self::$opt, self::$structure
   */
  function __construct($uid)
  {
    $this->app = rcmail::get_instance();
@@ -360,14 +373,14 @@
          // skip apple resource forks
          if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
            continue;
          // part belongs to a related message
          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {
          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])
            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
            $this->inline_parts[] = $mail_part;
          }
          else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {
          if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
          // part belongs to a related message
          if ($mail_part->content_id || $mail_part->content_location) {
            $this->inline_parts[] = $mail_part;
          }
          // is regular attachment