- Add workaround for MSOE's multipart/related messages with non-related att...

alecpl

2010-11-26 63f9dee62db3da78d3755febf24b4fb24a743d43

- Add workaround for MSOE's multipart/related messages with non-related attachments

 CHANGELOG

@@ -77,6 +77,7 @@
- Lock submit button in onsubmit event on login page (#1487036)
- Don't set attachment's charset in Content-type header (#1487122)
- Fix handling of message bodies (quoted-printable encoded) with NULL characters (#1486189)
- Add workaround for MSOE's multipart/related messages with non-related attachments

RELEASE 0.4.2
-------------

 program/include/rcube_message.php

@@ -411,6 +411,10 @@
                    if ($plugin['abort'])
                        continue;

                    if ($part_mimetype == 'text/html') {
                        $got_html_part = true;
                    }

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

@@ -487,9 +491,18 @@
                    $part_url = $this->get_part_url($inline_object->mime_id);
                    if ($inline_object->content_id)
                        $a_replaces['cid:'.$inline_object->content_id] = $part_url;
                    if ($inline_object->content_location)
                    if ($inline_object->content_location) {
                        $a_replaces[$inline_object->content_location] = $part_url;
                }
                    // MS Outlook sends sometimes non-related attachments as related
                    // In this case multipart/related message has only one text part
                    // We'll add all such attachments to the attachments list
                    if (!isset($got_html_part) && empty($inline_object->content_id)
                        && !empty($inline_object->filename)
                    ) {
                        $this->attachments[] = $inline_object;
                    }
                }

                // add replace array to each content part
                // (will be applied later when part body is available)

 skins/default/editor_content.css

@@ -30,4 +30,3 @@
    margin-left:5px;
    width:100%;
}