From 5b4562e4942a3ac733723a6a677e35da3b154ddf Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 26 Sep 2008 09:20:42 +0000 Subject: - read 'name' parameter after 'filename' and rfc2231's parameters, Thunderbird truncate long filenames in 'name', but 'filename' contains the whole name --- program/include/rcube_imap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/include/rcube_imap.php') diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index ba76b19c1..fa4cae57c 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -1182,8 +1182,6 @@ class rcube_imap { if (!empty($part->d_parameters['filename'])) $filename_mime = $part->d_parameters['filename']; - else if (!empty($part->ctype_parameters['name'])) - $filename_mime = $part->ctype_parameters['name']; else if (!empty($part->d_parameters['filename*'])) $filename_encoded = $part->d_parameters['filename*']; else if (!empty($part->ctype_parameters['name*'])) @@ -1258,6 +1256,9 @@ class rcube_imap } } } + // read 'name' after rfc2231 parameters as it may contains truncated filename (from Thunderbird) + else if (!empty($part->ctype_parameters['name'])) + $filename_mime = $part->ctype_parameters['name']; // Content-Disposition else if (!empty($part->headers['content-description'])) $filename_mime = $part->headers['content-description']; -- cgit v1.2.3