summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-02-04 08:23:45 +0000
committeralecpl <alec@alec.pl>2011-02-04 08:23:45 +0000
commit89d19c4e6133fe96b2c43415c7d841e78c7c1b7a (patch)
tree7c52c935817b8508e740df435a122121034c2b3c
parent784a425e07f8b249b44137eadfe2a5dfe436aaeb (diff)
- Small code improvements related to r4487
-rw-r--r--program/include/rcube_message.php35
1 files changed, 18 insertions, 17 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index ec034db69..3a96a0b7b 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -490,6 +490,7 @@ class rcube_message
// if this was a related part try to resolve references
if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
$a_replaces = array();
+ $img_regexp = '/^image\/(gif|jpe?g|png|tiff|bmp|svg)/';
foreach ($this->inline_parts as $inline_object) {
$part_url = $this->get_part_url($inline_object->mime_id);
@@ -498,23 +499,23 @@ class rcube_message
if ($inline_object->content_location) {
$a_replaces[$inline_object->content_location] = $part_url;
}
- // MS Outlook sends sometimes non-related attachments as related
- // In this case multipart/related message has only one text part
- // We'll add all such attachments to the attachments list
- if (!isset($got_html_part) && empty($inline_object->content_id)
- && !empty($inline_object->filename)
- ) {
- $this->attachments[] = $inline_object;
- }
- // MS Outlook sometimes also adds non-image attachments as related
- // We'll add all such attachments to the attachments list
- // Warning: some browsers support pdf in <img/>
- // @TODO: we should fetch HTML body and find attachment's content-id
- // to handle also image attachments without reference in the body
- if (!empty($inline_object->filename)
- && !preg_match('/^image\/(gif|jpe?g|png|tiff|bmp|svg)/', $inline_object->mimetype)
- ) {
- $this->attachments[] = $inline_object;
+
+ if (!empty($inline_object->filename)) {
+ // MS Outlook sends sometimes non-related attachments as related
+ // In this case multipart/related message has only one text part
+ // We'll add all such attachments to the attachments list
+ if (!isset($got_html_part) && empty($inline_object->content_id)) {
+ $this->attachments[] = $inline_object;
+ }
+ // MS Outlook sometimes also adds non-image attachments as related
+ // We'll add all such attachments to the attachments list
+ // Warning: some browsers support pdf in <img/>
+ else if (!preg_match($img_regexp, $inline_object->mimetype)) {
+ $this->attachments[] = $inline_object;
+ }
+ // @TODO: we should fetch HTML body and find attachment's content-id
+ // to handle also image attachments without reference in the body
+ // @TODO: should we list all image attachments in text mode?
}
}