diff options
| author | alecpl <alec@alec.pl> | 2011-10-23 08:49:35 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-10-23 08:49:35 +0000 |
| commit | 104e23530255676a80919b772233bc5dbbd9a3bd (patch) | |
| tree | 441577a400b02ec1bef4ecc29a571e3186d4fc6f /program | |
| parent | b9787b3560c33538db276a123dd097507a8f28f9 (diff) | |
- Improve handling of malformed charset specification in HTML messages (#1488093)
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/func.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 6ece17511..f1cc30471 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -590,16 +590,16 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html); // charset was converted to UTF-8 in rcube_imap::get_message_part(), - // -> change charset specification in HTML accordingly - $charset_pattern = '(<meta\s+[^>]*content=)[\'"]?(\w+\/\w+;\s*charset=)([a-z0-9-_]+[\'"]?)'; - if (preg_match("/$charset_pattern/Ui", $html)) { - $html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html); - } - else { - // add meta content-type to 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>')+6), 0); + // change/add charset specification in HTML accordingly, + // washtml cannot work without that + $meta = '<meta http-equiv="Content-Type" content="text/html; charset='.RCMAIL_CHARSET.'" />'; + + // remove old meta tag and add the new one, making sure + // that it is placed in the head (#1488093) + $html = preg_replace('/<meta[^>]+charset=[a-z0-9-_]+[^>]*>/Ui', '', $html); + $html = preg_replace('/(<head[^>]*>)/Ui', '\\1'.$meta, $html, -1, $rcount); + if (!$rcount) { + $html = '<head>' . $meta . '</head>' . $html; } // turn relative into absolute urls |