From 8794f16c620c58eb6d6505c988ed6bbbbec8dec7 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 20 Oct 2010 12:24:21 +0000 Subject: - Fix handling of attachments when Content-Disposition is not inline nor attachment (#1487051) --- program/include/rcube_message.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'program/include') diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index ec1359c86..89d65eb1e 100644 --- a/program/include/rcube_message.php +++ b/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