Add option to enable HTML editor always, except when replying to plain text messages (#1489365)
| | |
| | | CHANGELOG Roundcube Webmail |
| | | =========================== |
| | | |
| | | - Add option to enable HTML editor always, except when replying to plain text messages (#1489365) |
| | | - Emoticons: Added option to switch on/off emoticons in compose editor (#1485732) |
| | | - Emoticons: Added option to switch on/off emoticons in plain text messages |
| | | - Emoticons: All emoticons-related functionality is handled by the plugin now |
| | |
| | | $config['compose_extwin'] = false; |
| | | |
| | | // compose html formatted messages by default |
| | | // 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message |
| | | // 0 - never, |
| | | // 1 - always, |
| | | // 2 - on reply to HTML message, |
| | | // 3 - on forward or reply to HTML message |
| | | // 4 - always, except when replying to plain text message |
| | | $config['htmleditor'] = 0; |
| | | |
| | | // save copies of compose messages in the browser's local storage |
| | |
| | | $labels['showremoteimages'] = 'Display remote inline images'; |
| | | $labels['fromknownsenders'] = 'from known senders'; |
| | | $labels['always'] = 'always'; |
| | | $labels['alwaysbutplain'] = 'always, except when replying to plain text'; |
| | | $labels['showinlineimages'] = 'Display attached images below the message'; |
| | | $labels['autosavedraft'] = 'Automatically save draft'; |
| | | $labels['everynminutes'] = 'every $n minute(s)'; |
| | |
| | | $useHtml = rcmail_message_is_html(); |
| | | } |
| | | else if ($compose_mode == RCUBE_COMPOSE_REPLY) { |
| | | $useHtml = ($html_editor == 1 || ($html_editor >= 2 && rcmail_message_is_html())); |
| | | $useHtml = $html_editor == 1 || ($html_editor >= 2 && rcmail_message_is_html()); |
| | | } |
| | | else if ($compose_mode == RCUBE_COMPOSE_FORWARD) { |
| | | $useHtml = ($html_editor == 1 || ($html_editor == 3 && rcmail_message_is_html())); |
| | | $useHtml = $html_editor == 1 || $html_editor == 4 |
| | | || ($html_editor == 3 && rcmail_message_is_html()); |
| | | } |
| | | else { |
| | | $useHtml = ($html_editor == 1); |
| | | $useHtml = $html_editor == 1 || $html_editor == 4; |
| | | } |
| | | |
| | | return $useHtml; |
| | |
| | | $select = new html_select(array('name' => '_htmleditor', 'id' => $field_id)); |
| | | |
| | | $select->add($RCMAIL->gettext('never'), 0); |
| | | $select->add($RCMAIL->gettext('always'), 1); |
| | | $select->add($RCMAIL->gettext('htmlonreply'), 2); |
| | | $select->add($RCMAIL->gettext('htmlonreplyandforward'), 3); |
| | | $select->add($RCMAIL->gettext('always'), 1); |
| | | $select->add($RCMAIL->gettext('alwaysbutplain'), 4); |
| | | |
| | | $blocks['main']['options']['htmleditor'] = array( |
| | | 'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('htmleditor'))), |