diff options
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index fb438c9ed..829f159f4 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1097,6 +1097,12 @@ function rcmail_message_body($attrib) } } + // Skip TIFF images if browser doesn't support this format + // @TODO: we could convert TIFF to JPEG and display it + $tiff_support = !empty($_SESSION['browser_caps']) && !empty($_SESSION['browser_caps']['tif']); + $mime_regex = $tiff_support ? '/^image\//i' : '/^image\/(?!tif)/i'; + $ext_regex = '/\.(jpg|jpeg|png|gif|bmp' . ($tiff_support ? '|tif|tiff' : '') .')$/i'; + // list images after mail body if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { @@ -1106,11 +1112,11 @@ function rcmail_message_body($attrib) } // Content-Type: image/*... - if (preg_match('/^image\//i', $attach_prop->mimetype) || + if (preg_match($mime_regex, $attach_prop->mimetype) || // ...or known file extension: many clients are using application/octet-stream ($attach_prop->filename && preg_match('/^application\/octet-stream$/i', $attach_prop->mimetype) && - preg_match('/\.(jpg|jpeg|png|gif|bmp)$/i', $attach_prop->filename)) + preg_match($ext_regex, $attach_prop->filename)) ) { $out .= html::tag('hr') . html::p(array('align' => "center"), html::img(array( |