diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-09 09:22:32 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-12-09 09:22:32 +0000 |
| commit | e919462b252b2ec81c9636c7c79bd80dfd7ea762 (patch) | |
| tree | 136e5dcc7dbde965b69140c0475d9a5fa5c70d35 /roundcubemail | |
| parent | 51d658497099bb388405ac642c29a3b5136ad05e (diff) | |
- Fix parsing conditional comments in HTML messages (#1486350)
git-svn-id: https://svn.roundcube.net/trunk@3171 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 17dd36549..85134dfb8 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix parsing conditional comments in HTML messages (#1486350) - Use built-in json_encode() for proper JSON format in AJAX replies - Allow setting only selected params in 'message_compose' hook (#1486312) - Plugin API: added 'message_compose_body' hook (#1486285) diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 6b2ce0907..94f455a1b 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -608,6 +608,7 @@ function rcmail_mailbox_name_display($attrib) return html::span($attrib, rcmail_get_mailbox_name_text()); } + function rcmail_get_mailbox_name_text() { global $RCMAIL; @@ -630,7 +631,7 @@ function rcmail_send_unread_count($mbox_name, $force=false) return $unseen; } - + /** * Sets message is_safe flag according to 'show_images' option value @@ -660,6 +661,7 @@ function rcmail_check_safe(&$message) } } + /** * Cleans up the given message HTML Body (for displaying) * @@ -791,6 +793,7 @@ function rcmail_print_body($part, $p = array()) return $data['type'] == 'html' ? $data['body'] : html::tag('pre', array(), $data['body']); } + /** * Handle links and citation marks in plain text message * @@ -902,8 +905,8 @@ function rcmail_html_tag_callback($matches) $tagname = $matches[2]; $tagname = preg_replace(array( - '/:.*$/', // Microsoft's Smart Tags <st1:xxxx> - '/[^a-z0-9_-]/i', // forbidden characters + '/:.*$/', // Microsoft's Smart Tags <st1:xxxx> + '/[^a-z0-9_\[\]\!-]/i', // forbidden characters ), '', $tagname); return $matches[1].$tagname; |