From ffbf910df93d0a29fc8ea5a6fb0fa39e078fa77e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 01 Dec 2008 15:15:50 -0500
Subject: [PATCH] Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table
---
program/steps/mail/func.inc | 2 +-
program/include/rcube_message.php | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 9aff68b..75c47df 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -373,14 +373,14 @@
// skip apple resource forks
if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
continue;
-
- // part belongs to a related message
- if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {
+
+ if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
- $this->inline_parts[] = $mail_part;
- }
- else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {
+ if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+
+ // part belongs to a related message
+ if ($mail_part->content_id || $mail_part->content_location) {
$this->inline_parts[] = $mail_part;
}
// is regular attachment
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 20c805a..dc0a708 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -649,7 +649,7 @@
// add head for malformed messages, washtml cannot work without that
if (!preg_match('/<head[^>]*>(.*)<\/head>/Uims', $html))
$html = '<head></head>'. $html;
- $html = substr_replace($html, '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '</head>')), 0);
+ $html = substr_replace($html, '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'" />', intval(stripos($html, '<head>')+6), 0);
}
// clean HTML with washhtml by Frederic Motte
--
Gitblit v1.9.1