diff options
| author | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-13 02:51:05 +0000 |
|---|---|---|
| committer | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-02-13 02:51:05 +0000 |
| commit | 8e3cb8606e219e19b8c1619ab172f4d1dec121ed (patch) | |
| tree | 086eb61f57d939fa5d282559f51b3c4f5f0ed012 | |
| parent | 12e0612d935a87e48128bd9952826716d9844178 (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
git-svn-id: https://svn.roundcube.net/trunk@1059 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 5 | ||||
| -rw-r--r-- | roundcubemail/program/js/editor.js | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/editor_content.css | 7 |
4 files changed, 13 insertions, 5 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 4147eea8f..47be08931 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/02/12 (estadtherr) +---------- +- condense TinyMCE toolbar down to one line, removing table buttons (#1484747) +- fix image removal in message display when message HTML includes JS event handlers + 2008/02/11 (thomasb) ---------- - Add function to mark the selected messages as read/unread (#1457360) diff --git a/roundcubemail/program/js/editor.js b/roundcubemail/program/js/editor.js index 919f5d24b..2f58fe0b1 100644 --- a/roundcubemail/program/js/editor.js +++ b/roundcubemail/program/js/editor.js @@ -22,8 +22,8 @@ function rcmail_editor_init(skin_path) apply_source_formatting : true, theme : 'advanced', plugins : 'emotions,media,nonbreaking,table,searchreplace,spellchecker,visualchars', - theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,link,unlink,emotions,forecolor,backcolor,formatselect,fontselect,fontsizeselect', - theme_advanced_buttons2 : 'undo,redo,image,media,hr,charmap,code,nonbreaking,visualchars,separator,search,replace,spellchecker,separator,tablecontrols', + theme_advanced_buttons1 : 'bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,emotions,charmap,code,forecolor,backcolor,fontselect,fontsizeselect, separator,undo,redo,image,media', + theme_advanced_buttons2 : '', theme_advanced_buttons3 : '', theme_advanced_toolbar_location : 'top', theme_advanced_toolbar_align : 'left', diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 2563ec26b..b0d641778 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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); } diff --git a/roundcubemail/skins/default/editor_content.css b/roundcubemail/skins/default/editor_content.css index 182e79121..e8b1c88fe 100644 --- a/roundcubemail/skins/default/editor_content.css +++ b/roundcubemail/skins/default/editor_content.css @@ -3,11 +3,14 @@ body, td, pre {
font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
+ font-size: 12px;
}
body {
- background-color: #FFFFFF;
+ background-color: #FFFFFF; + margin-left: 4px; + margin-right: 4px; + margin-top: 2px; }
.mceVisualAid {
|