From 3efc74654a30bd6d0141e1a15a123274408e9be8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 9 Jul 2012 12:19:38 +0200 Subject: - Don't add attachments content into reply/forward/draft message body (#1488557) --- program/include/rcube_message.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'program/include') diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php index a140b86c6..9d36acf38 100644 --- a/program/include/rcube_message.php +++ b/program/include/rcube_message.php @@ -276,6 +276,32 @@ class rcube_message } + /** + * Checks if part of the message is an attachment (or part of it) + * + * @param rcube_message_part $part Message part + * + * @return bool True if the part is an attachment part + */ + public function is_attachment($part) + { + foreach ($this->attachments as $att_part) { + if ($att_part->mime_id == $part->mime_id) { + return true; + } + + // check if the part is a subpart of another attachment part (message/rfc822) + if ($att_part->mimetype == 'message/rfc822') { + if (in_array($part, (array)$att_part->parts)) { + return true; + } + } + } + + return false; + } + + /** * Read the message structure returend by the IMAP server * and build flat lists of content parts and attachments -- cgit v1.2.3