summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2008-02-13 02:51:05 +0000
committersvncommit <devs@roundcube.net>2008-02-13 02:51:05 +0000
commit2f93b031b2b72ec9be2255c387cae7c7713c2ff7 (patch)
tree76d2942b20d27bc553509c06ac98d216fb984805 /program/steps
parent3d695da299cf236864ee75c02969669831950676 (diff)
condense TinyMCE toolbar down to one line, removing table buttons (#1484747)
fix image removal in message display when message HTML includes JS event handlers
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 2563ec26b..b0d641778 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -988,7 +988,7 @@ function rcmail_sanitize_html($body, $container_id)
while ($body != $prev_body)
{
$prev_body = $body;
- $body = preg_replace('/(<[^!][^>]*\s)(on[^=>]+)=([^>]+>)/im', '$1__removed=$3', $body);
+ $body = preg_replace('/(<[^!][^>]*\s)on(?:load|unload|click|dblclick|mousedown|mouseup|mouseover|mousemove|mouseout|focus|blur|keypress|keydown|keyup|submit|reset|select|change)=([^>]+>)/im', '$1__removed=$2', $body);
$body = preg_replace('/(<[^!][^>]*\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body);
}