[Svn] r4274 - in trunk/roundcubemail: . program/include skins/default

trac at roundcube.net trac at roundcube.net
Fri Nov 26 13:41:16 CET 2010


Author: alec
Date: 2010-11-26 06:41:16 -0600 (Fri, 26 Nov 2010)
New Revision: 4274

Modified:
   trunk/roundcubemail/CHANGELOG
   trunk/roundcubemail/program/include/rcube_message.php
   trunk/roundcubemail/skins/default/editor_content.css
Log:
- Add workaround for MSOE's multipart/related messages with non-related attachments


Modified: trunk/roundcubemail/CHANGELOG
===================================================================
--- trunk/roundcubemail/CHANGELOG	2010-11-25 19:46:46 UTC (rev 4273)
+++ trunk/roundcubemail/CHANGELOG	2010-11-26 12:41:16 UTC (rev 4274)
@@ -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
 -------------

Modified: trunk/roundcubemail/program/include/rcube_message.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_message.php	2010-11-25 19:46:46 UTC (rev 4273)
+++ trunk/roundcubemail/program/include/rcube_message.php	2010-11-26 12:41:16 UTC (rev 4274)
@@ -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,8 +491,17 @@
                     $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

Modified: trunk/roundcubemail/skins/default/editor_content.css
===================================================================
--- trunk/roundcubemail/skins/default/editor_content.css	2010-11-25 19:46:46 UTC (rev 4273)
+++ trunk/roundcubemail/skins/default/editor_content.css	2010-11-26 12:41:16 UTC (rev 4274)
@@ -30,4 +30,3 @@
 	margin-left:5px;
 	width:100%;
 }
-

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list