From 69a7d3127e647e366d608de1713de44c9873ec99 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 9 Mar 2010 11:23:35 +0000 Subject: - Improved charset replacement in html meta header (#1486542) --- program/steps/mail/func.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/steps/mail/func.inc') diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 3dab087b0..3777dfded 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -682,13 +682,13 @@ function rcmail_check_safe(&$message) function rcmail_wash_html($html, $p = array(), $cid_replaces) { global $REMOTE_OBJECTS; - + $p += array('safe' => false, 'inline_html' => true); // special replacements (not properly handled by washtml class) $html_search = array( '/(<\/nobr>)(\s+)()/i', // space(s) between - '/]*>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag + '/]*>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/', // byte-order mark (only outlook?) '/]+>/i', // washtml/DOMDocument cannot handle xml namespaces ); @@ -705,9 +705,9 @@ function rcmail_wash_html($html, $p = array(), $cid_replaces) // charset was converted to UTF-8 in rcube_imap::get_message_part(), // -> change charset specification in HTML accordingly - $charset_pattern = '(]*)(content=[\'"]?\w+\/\w+;\s*charset)=([a-z0-9-_]+)'; + $charset_pattern = '(]* 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); + $html = preg_replace("/$charset_pattern/i", '\\1"\\2'.RCMAIL_CHARSET.'"', $html); } else { // add meta content-type to malformed messages, washtml cannot work without that -- cgit v1.2.3