summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2012-02-08 12:54:49 +0000
committeralecpl <alec@alec.pl>2012-02-08 12:54:49 +0000
commit33423a5570cd640ecf054ff71e85469461c57167 (patch)
treea26713edc33fc06f32f1f63edabe4e593d9e6cd3 /program/include
parenta7321e7578b54d8bb1080f437ebc223ad5d325cc (diff)
- Fix issue where some text from original message was missing on reply (#1488340)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_message.php42
1 files changed, 30 insertions, 12 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index d0959efe0..ee1e92de1 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -188,15 +188,36 @@ class rcube_message
/**
* Determine if the message contains a HTML part
*
+ * @param bool $recursive Enables checking in all levels of the structure
+ *
* @return bool True if a HTML is available, False if not
*/
- function has_html_part()
+ function has_html_part($recursive = true)
{
// check all message parts
- foreach ($this->parts as $pid => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html')
+ foreach ($this->parts as $part) {
+ if ($part->mimetype == 'text/html') {
+ // Level check, we'll skip e.g. HTML attachments
+ if (!$recursive) {
+ $level = explode('.', $part->mime_id);
+
+ // Level too high
+ if (count($level) > 2) {
+ continue;
+ }
+
+ // HTML part can be on the lower level, if not...
+ if (count($level) > 1) {
+ // It can be an alternative or related message part
+ $parent = $this->mime_parts[0];
+ if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
+ continue;
+ }
+ }
+ }
+
return true;
+ }
}
return false;
@@ -211,10 +232,9 @@ class rcube_message
function first_html_part()
{
// check all message parts
- foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html') {
- return $this->get_part_content($mime_id);
+ foreach ($this->mime_parts as $pid => $part) {
+ if ($part->mimetype == 'text/html') {
+ return $this->get_part_content($pid);
}
}
}
@@ -234,12 +254,10 @@ class rcube_message
// check all message parts
foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
-
- if ($mimetype == 'text/plain') {
+ if ($part->mimetype == 'text/plain') {
return $this->get_part_content($mime_id);
}
- else if ($mimetype == 'text/html') {
+ else if ($part->mimetype == 'text/html') {
$out = $this->get_part_content($mime_id);
// remove special chars encoding