From 79f7e4878e8a90bac291f15b0c44d8f5819744cb Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 6 Oct 2010 17:15:38 +0000
Subject: - 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
---
 roundcubemail/installer/config.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'roundcubemail/installer/config.php')

diff --git a/roundcubemail/installer/config.php b/roundcubemail/installer/config.php
index f35c6c2c0..5250782f9 100644
--- a/roundcubemail/installer/config.php
+++ b/roundcubemail/installer/config.php
@@ -14,7 +14,6 @@ $RCI->bool_config_props = array(
   'smtp_log' => 1,
   'prefer_html' => 1,
   'preview_pane' => 1,
-  'htmleditor' => 1,
   'debug_level' => 1,
 );
 
@@ -543,13 +542,16 @@ echo $check_prevpane->show(intval($RCI->getprop('preview_pane')));
 
 <dt class="propname">htmleditor <span class="userconf">*</span></dt>
 <dd>
+<label for="cfghtmlcompose">Compose HTML formatted messages</label>
 <?php
 
-$check_htmlcomp = new html_checkbox(array('name' => '_htmleditor', 'id' => "cfghtmlcompose", 'value' => 1));
-echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));
+$select_htmlcomp = new html_select(array('name' => '_htmleditor', 'id' => "cfghtmlcompose"));
+$select_htmlcomp->add('never', 0);
+$select_htmlcomp->add('always', 1);
+$select_htmlcomp->add('on reply to HTML message only', 2);
+echo $select_htmlcomp->show(intval($RCI->getprop('htmleditor')));
 
 ?>
-<label for="cfghtmlcompose">Compose HTML formatted messages</label><br />
 </dd>
 
 <dt class="propname">draft_autosave <span class="userconf">*</span></dt>
-- 
cgit v1.2.3