Disable HTML the editor by default

2 files changed, 14 insertions, 5 deletions

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d13f71aa2..ce36839ca 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -63,6 +63,9 @@ rcube_add_label('nosubject', 'norecipientwarning', 'nosubjectwarning', 'nobodywa
 // add config parameter to client script
 $OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0);
 
+// no html editor if globally disabled
+if (!$CONFIG['enable_htmleditor'])
+  $CONFIG['htmleditor'] = false;
 
 // get reference message and set compose mode
 if ($msg_uid = get_input_value('_reply_uid', RCUBE_INPUT_GET))
@@ -407,9 +410,12 @@ function rcmail_compose_body($attrib)
     $body = rcmail_create_draft_body($body, $isHtml);
     }
 
-  $OUTPUT->include_script('tiny_mce/tiny_mce.js');
-  $OUTPUT->include_script("editor.js");
-  $OUTPUT->add_script('rcmail_editor_init("$__skin_path");');
+  if ($CONFIG['enable_htmleditor'])
+    {
+    $OUTPUT->include_script('tiny_mce/tiny_mce.js');
+    $OUTPUT->include_script("editor.js");
+    $OUTPUT->add_script('rcmail_editor_init("$__skin_path");');
+    }
 
   $out = $form_start ? "$form_start\n" : '';
 
@@ -781,6 +787,9 @@ function rcmail_receipt_checkbox($attrib)
 function rcmail_editor_selector($attrib)
 {
   global $CONFIG, $MESSAGE, $compose_mode;
+  
+  if (!$CONFIG['enable_htmleditor'])
+    return '';
 
   $choices = array(
     'html'  => 'htmltoggle',
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 18e8e523d..32eb0c5bd 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -37,7 +37,7 @@ function rcmail_user_prefs_form($attrib)
   {
   global $DB, $CONFIG, $sess_user_lang;
 
-  $no_override = is_array($CONFIG['dont_override']) ? array_flip($CONFIG['dont_override']) : array();
+  $no_override = !empty($CONFIG['dont_override']) ? array_flip((array)$CONFIG['dont_override']) : array('preview_pane'=>true);
 
   // add some labels to client
   rcube_add_label('nopagesizewarning');
@@ -161,7 +161,7 @@ function rcmail_user_prefs_form($attrib)
     }
 
   // Show checkbox for HTML Editor
-  if (!isset($no_override['htmleditor']))
+  if (!isset($no_override['htmleditor']) && $CONFIG['enable_htmleditor'])
     {
     $field_id = 'rcmfd_htmleditor';
     $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));