Fix canned responses in HTML mode (#1489536)

pull/165/head
Thomas Bruederli 11 years ago
parent 90dc9b1512
commit 9675702579

@ -3396,7 +3396,7 @@ function rcube_webmail()
if ($("input[name='_is_html']").val() == '1') { if ($("input[name='_is_html']").val() == '1') {
var editor = tinyMCE.get(this.env.composebody); var editor = tinyMCE.get(this.env.composebody);
editor.getWin().focus(); // correct focus in IE & Chrome editor.getWin().focus(); // correct focus in IE & Chrome
editor.selection.setContent(insert, { format:'text' }); editor.selection.setContent(this.quote_html(insert).replace(/\r?\n/g, '<br/>'), { format:'text' });
} }
// replace selection in compose textarea // replace selection in compose textarea
else { else {

@ -35,7 +35,7 @@ if (($key = rcube_utils::get_input_value('_key', rcube_utils::INPUT_GPC))) {
// save response // save response
if ($RCMAIL->action == 'save-response' && isset($_POST['_name']) && !$RESPONSE_RECORD['static']) { if ($RCMAIL->action == 'save-response' && isset($_POST['_name']) && !$RESPONSE_RECORD['static']) {
$name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)); $name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST));
$text = trim(rcube_utils::get_input_value('_text', rcube_utils::INPUT_POST)); $text = trim(rcube_utils::get_input_value('_text', rcube_utils::INPUT_POST, true));
if (!empty($name) && !empty($text)) { if (!empty($name) && !empty($text)) {
$dupes = 0; $dupes = 0;

@ -22,7 +22,7 @@
if (!empty($_POST['_insert'])) { if (!empty($_POST['_insert'])) {
$name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)); $name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST));
$text = trim(rcube_utils::get_input_value('_text', rcube_utils::INPUT_POST)); $text = trim(rcube_utils::get_input_value('_text', rcube_utils::INPUT_POST, true));
if (!empty($name) && !empty($text)) { if (!empty($name) && !empty($text)) {
$dupes = 0; $dupes = 0;

Loading…
Cancel
Save