diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-06 17:15:38 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-10-06 17:15:38 +0000 |
| commit | 79f7e4878e8a90bac291f15b0c44d8f5819744cb (patch) | |
| tree | 90b4d4dd60afb0b01f022d8cb6c94a8bf821349f /roundcubemail/program/steps/settings | |
| parent | 058cac7b020c1fff4985cf92316c40002d4e5fe9 (diff) | |
- Make htmleditor option behaviour consistent, add option to use HTML on reply to HTML message (#1485840)
git-svn-id: https://svn.roundcube.net/trunk@4054 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/settings')
| -rw-r--r-- | roundcubemail/program/steps/settings/func.inc | 7 | ||||
| -rw-r--r-- | roundcubemail/program/steps/settings/save_prefs.inc | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 6717b2c09..a7d4c11f0 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -466,11 +466,14 @@ function rcmail_user_prefs($current=null) // Show checkbox for HTML Editor if (!isset($no_override['htmleditor'])) { $field_id = 'rcmfd_htmleditor'; - $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1)); + $select_htmleditor = new html_select(array('name' => '_htmleditor', 'id' => $field_id)); + $select_htmleditor->add(rcube_label('never'), 0); + $select_htmleditor->add(rcube_label('always'), 1); + $select_htmleditor->add(rcube_label('htmlonreply'), 2); $blocks['main']['options']['htmleditor'] = array( 'title' => html::label($field_id, Q(rcube_label('htmleditor'))), - 'content' => $input_htmleditor->show($config['htmleditor']?1:0), + 'content' => $select_htmleditor->show(intval($config['htmleditor'])), ); } diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index 4621427ee..ae3d6d704 100644 --- a/roundcubemail/program/steps/settings/save_prefs.inc +++ b/roundcubemail/program/steps/settings/save_prefs.inc @@ -58,11 +58,10 @@ switch ($CURR_SECTION) 'default_charset' => get_input_value('_default_charset', RCUBE_INPUT_POST), ); - break; case 'compose': $a_user_prefs = array( - 'htmleditor' => isset($_POST['_htmleditor']) ? TRUE : FALSE, + 'htmleditor' => intval($_POST['_htmleditor']), 'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0, 'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0, 'force_7bit' => isset($_POST['_force_7bit']) ? TRUE : FALSE, |