From efe5a55c4c5d4bd2ba7d5398d33824a45f628f3a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 04 Dec 2009 05:53:20 -0500
Subject: [PATCH] - added comment
---
program/include/rcube_message.php | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 7c2457e..4d01348 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -224,8 +224,9 @@
*
* @param object rcube_message_part Message structure node
* @param bool True when called recursively
+ * @param bool True when message should be parsed as message/alternative
*/
- private function parse_structure($structure, $recursive = false)
+ private function parse_structure($structure, $recursive = false, $force_alternative = false)
{
$message_ctype_primary = strtolower($structure->ctype_primary);
$message_ctype_secondary = strtolower($structure->ctype_secondary);
@@ -350,22 +351,33 @@
else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
- // add text part if we're not in alternative mode or if it matches the prefs
- if (!$this->parse_alternative ||
+ // add text part if it matches the prefs
+ if ((!$this->parse_alternative && !$force_alternative) ||
($secondary_type == 'html' && $this->opt['prefer_html']) ||
($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
$mail_part->type = 'content';
$this->parts[] = $mail_part;
}
-
+
// list as attachment as well
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
}
// part message/*
else if ($primary_type=='message') {
- $this->parse_structure($mail_part, true);
-
+ // let's try to find out if message/rfc822 is a multipart/alternative
+ if ($secondary_type == 'rfc822' && is_array($mail_part->parts) && count($mail_part->parts) > 1) {
+ $types = array();
+ // iterate over parts to find its types and count them by type
+ for ($j=0; $j < count($mail_part->parts); $j++) {
+ $_type = strtolower($mail_part->parts[$j]->ctype_primary).'/'.strtolower($mail_part->parts[$j]->ctype_secondary);
+ $types[$_type] = $types[$_type] ? $types[$_type]+1 : 1;
+ }
+ if ($types['text/plain'] == 1 && $types['text/html'] == 1)
+ $_alternative = true;
+ }
+ $this->parse_structure($mail_part, true, $_alternative);
+
// list as attachment as well (mostly .eml)
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
@@ -402,7 +414,7 @@
$this->inline_parts[] = $mail_part;
}
// is a regular attachment
- else if (preg_match('!^[a-z]+/[a-z0-9-.]+$!i', $mail_part->mimetype)) {
+ else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $mail_part->mimetype)) {
if (!$mail_part->filename)
$mail_part->filename = 'Part '.$mail_part->mime_id;
$this->attachments[] = $mail_part;
--
Gitblit v1.9.1