banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1485647: handle PRE_TEXT tags in html messages (+ small fixes)

Browse Source
release-0.6
alecpl 16 years ago
parent 922c2d923a
commit 3348176aba
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
program/steps/mail/func.inc
Unescape Escape View File

@ -642,19 +642,21 @@ function rcmail_print_body($part, $p = array())
// special replacements (not properly handled by washtml class) // special replacements (not properly handled by washtml class)
$html_search = array( $html_search = array(
'/(<\/nobr>)(\s+)(<nobr>)/i', // space(s) between <NOBR> '/(<\/nobr>)(\s+)(<nobr>)/i', // space(s) between <NOBR>
'/(<[\/]*st1:[^>]+>)/i', // Microsoft's Smart Tags <ST1> '/(<[\/]*st1:[^>]+>)/i', // Microsoft's Smart Tags <ST1>
'/<title>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag '/<\/?rte_text>/i', // Rich Text Editor tags (#1485647)
'/<html[^>]*>/im', // malformed html: remove html tags (#1485139) '/<title>.*<\/title>/i', // PHP bug #32547 workaround: remove title tag
'/<\/html>/i', // malformed html: remove html tags (#1485139) '/<html[^>]*>/im', // malformed html: remove html tags (#1485139)
'/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im', // remove byte-order mark (only outlook?) '/<\/html>/i', // malformed html: remove html tags (#1485139)
'/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im', // remove byte-order mark (only outlook?)
); );
$html_replace = array( $html_replace = array(
'\\1'.' &nbsp; '.'\\3', '\\1'.' &nbsp; '.'\\3',
'', '',
'', '',
'', '',
'\\1',
'', '',
'',
'\\1',
); );
$html = preg_replace($html_search, $html_replace, $html); $html = preg_replace($html_search, $html_replace, $html);

Write Preview
Loading…
Cancel
Save