diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-14 09:41:30 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-14 09:41:30 +0200 |
| commit | 3375a681eb4bc4aa6e64d9a423ba0d1b6b0f4e12 (patch) | |
| tree | fd092ff52c28d0213b3f7d422a3e7768ca39d37a /program/steps/mail/get.inc | |
| parent | ed837a3544b8c157b00f520e0c716304abedd519 (diff) | |
Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
Diffstat (limited to 'program/steps/mail/get.inc')
| -rw-r--r-- | program/steps/mail/get.inc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index bcc6f11bc..372757720 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -95,9 +95,7 @@ else if ($_GET['_thumb']) { else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { if ($part = $MESSAGE->mime_parts[$pid]) { - $ctype_primary = strtolower($part->ctype_primary); - $ctype_secondary = strtolower($part->ctype_secondary); - $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary); + $mimetype = rcmail_fix_mimetype($part->mimetype); // allow post-processing of the message body $plugin = $RCMAIL->plugins->exec_hook('message_part_get', @@ -107,7 +105,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { exit; // overwrite modified vars from plugin - $mimetype = $plugin['mimetype']; + $mimetype = $plugin['mimetype']; $extensions = rcube_mime::get_mime_extensions($mimetype); if ($plugin['body']) @@ -217,7 +215,6 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) { header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET)); } else { - $mimetype = rcmail_fix_mimetype($mimetype); header("Content-Type: $mimetype"); header("Content-Transfer-Encoding: binary"); } |