From 4d17434c12bad87c3c661c86b4f24c47d8d4eb03 Mon Sep 17 00:00:00 2001 From: alec Date: Wed, 20 Oct 2010 12:24:21 +0000 Subject: - Fix handling of attachments when Content-Disposition is not inline nor attachment (#1487051) git-svn-id: https://svn.roundcube.net/trunk@4116 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_message.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'roundcubemail/program/include/rcube_message.php') diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index ec1359c86..89d65eb1e 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/program/include/rcube_message.php @@ -448,7 +448,9 @@ class rcube_message } // 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 if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') -- cgit v1.2.3