Thomas Bruederli
2012-11-21 b81e7e91a958cb7432ef3be67de380b868ab731b
Consider filename extension to detect image attachments of type application/octet-stream
1 files modified
6 ■■■■ changed files
program/steps/mail/func.inc 6 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc
@@ -1198,7 +1198,7 @@
      }
      // Content-Type: image/*...
      if (rcmail_part_image_type($attach_prop)) {
      if ($mimetype = rcmail_part_image_type($attach_prop)) {
        // display thumbnails
        if ($thumbnail_size) {
          $show_link = array(
@@ -1207,7 +1207,7 @@
              'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
              JS_OBJECT_NAME,
              $attach_prop->mime_id,
              rcmail_fix_mimetype($attach_prop->mimetype))
              $mimetype)
          );
          $out .= html::p('image-attachment',
             html::a($show_link + array('class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)),
@@ -1222,7 +1222,7 @@
            html::span('image-filename', Q($attach_prop->filename)) .
            html::span('image-filesize', Q($RCMAIL->message_part_size($attach_prop))) .
            html::span('attachment-links',
              (in_array($attach_prop->mimetype, $client_mimetypes) ? html::a($show_link, rcube_label('showattachment')) . ' ' : '') .
              (in_array($mimetype, $client_mimetypes) ? html::a($show_link, rcube_label('showattachment')) . ' ' : '') .
              html::a($show_link['href'] . '&_download=1', rcube_label('download'))
            ) .
            html::br(array('style' => 'clear:both'))