diff options
| author | alecpl <alec@alec.pl> | 2011-12-14 09:08:54 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-12-14 09:08:54 +0000 |
| commit | e2f30659a1bae74290df0e843bac5326cb05b79d (patch) | |
| tree | f7fac49c8409b8d8571584fec8656b71605404dc /program | |
| parent | f41565354bd197a2c0b756bf698c66bf71e99e8c (diff) | |
- Backported r5598:r5599 from trunk
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_imap.php | 5 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 1c5dd2e3f..2d7a94f55 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -1636,6 +1636,7 @@ class rcube_imap * @param string $sort_field Header field to sort by * @return array search results as list of message IDs * @access public + * @todo: Search criteria should be provided in non-IMAP format, eg. array */ function search($mailbox='', $str=NULL, $charset=NULL, $sort_field=NULL) { @@ -1775,9 +1776,9 @@ class rcube_imap $string_offset = $m[1] + strlen($m[0]) + 4; // {}\r\n $string = substr($str, $string_offset - 1, $m[0]); $string = rcube_charset_convert($string, $charset, $dest_charset); - if (!$string) + if ($string === false) continue; - $res .= sprintf("%s{%d}\r\n%s", substr($str, $last, $m[1] - $last - 1), strlen($string), $string); + $res .= substr($str, $last, $m[1] - $last - 1) . rcube_imap_generic::escape($string); $last = $m[0] + $string_offset - 1; } if ($last < strlen($str)) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index e51c2569b..503a56b00 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1046,6 +1046,11 @@ function rcmail_message_body($attrib) // list images after mail body if ($CONFIG['inline_images'] && !empty($MESSAGE->attachments)) { foreach ($MESSAGE->attachments as $attach_prop) { + // skip inline images + if ($attach_prop->content_id && $attach_prop->disposition == 'inline') { + continue; + } + // Content-Type: image/*... if (preg_match('/^image\//i', $attach_prop->mimetype) || // ...or known file extension: many clients are using application/octet-stream |