From fa57c98854972eb93bc7aebd8ef363d56989e0f3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 17 Sep 2012 04:44:50 -0400
Subject: [PATCH] Don't add inline images from HTML part to the attachments list when forwarding in plain text
---
program/steps/mail/compose.inc | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 29e1267..04efe7d 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1047,15 +1047,23 @@
function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
{
- global $RCMAIL, $COMPOSE;
+ global $RCMAIL, $COMPOSE, $compose_mode;
$cid_map = $messages = array();
foreach ((array)$message->mime_parts as $pid => $part)
{
- if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->ctype_primary != 'multipart' &&
- ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename)
- && $part->mimetype != 'application/ms-tnef'
- ) {
+ if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) {
+ if ($part->ctype_primary == 'message' || $part->ctype_primary == 'multipart') {
+ continue;
+ }
+ if ($part->mimetype == 'application/ms-tnef') {
+ continue;
+ }
+ // skip inline images when forwarding in plain text
+ if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
+ continue;
+ }
+
$skip = false;
if ($part->mimetype == 'message/rfc822') {
$messages[] = $part->mime_id;
--
Gitblit v1.9.1