Changeset 4116 in subversion for trunk/roundcubemail/program/include/rcube_message.php

Timestamp:

Oct 20, 2010 8:24:21 AM (3 years ago)

Author:

alec

Message:

• Fix handling of attachments when Content-Disposition is not inline nor attachment (#1487051)

File:

• trunk/roundcubemail/program/include/rcube_message.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_message.php

@@ -449 +449 @@
                 // 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)
+                    $mail_part->headers['content-id'] ||
+                    ($mail_part->filename &&
+                        (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
                 ) {
                     // skip apple resource forks