Changeset 2714 in subversion

Timestamp:

Jul 6, 2009 1:44:35 PM (4 years ago)

Author:

alec

Message:

• simple fix for malformed Content-Disposition (#1485965)

File:

• trunk/roundcubemail/program/include/rcube_message.php (modified) (4 diffs)

trunk/roundcubemail/program/include/rcube_message.php

@@ -342 +342 @@
         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
           if (!$this->parse_alternative ||
@@ -367 +367 @@
           continue;
           
-        // part is Microsoft outlook TNEF (winmail.dat)
+        // part is Microsoft Outlook TNEF (winmail.dat)
         else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {
           foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
@@ -375 +375 @@
         }
 
-        // 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')
@@ -393 +394 @@
             }
           }
-          // is regular attachment
+          // is a regular attachment
           else {
             if (!$mail_part->filename)