Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-05 07:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table

Browse Source
This commit is contained in:
thomascube
2008-12-01 20:15:50 +00:00
parent e3379e05eb
commit ffbf910df9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
program/include/rcube_message.php
View File

@@ -373,14 +373,14 @@ class rcube_message
// 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

2
program/steps/mail/func.inc
View File

@@ -649,7 +649,7 @@ function rcmail_print_body($part, $p = array())
// 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