Changeset 111b278f in github

Timestamp:

Oct 20, 2007 5:47:11 PM (6 years ago)

Author:

thomascube <thomas@…>

Children:

5f6c93c6

Parents:

1ee2cf3

Message:

Disable HTML the editor by default

Files:

• config/main.inc.php.dist (modified) (5 diffs)
• program/steps/mail/compose.inc (modified) (3 diffs)
• program/steps/settings/func.inc (modified) (2 diffs)
• skins/default/templates/compose.html (modified) (1 diff)

config/main.inc.php.dist

@@ -131 +131 @@
 
 // add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.1b';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.1-rc2';
 
 // use this name to compose page titles
@@ -175 +175 @@
 
 // Make use of the built-in spell checker. It is based on GoogieSpell.
+// Since Google only accepts connections over https your PHP installatation
+// requires to be compiled with Open SSL support
 $rcmail_config['enable_spellcheck'] = TRUE;
 
@@ -220 +222 @@
  */
 
+// enable composing html formatted messages (experimental)
+$rcmail_config['enable_htmleditor'] = FALSE;
+
 // don't allow these settings to be overriden by the user
 $rcmail_config['dont_override'] = array();
@@ -244 +249 @@
 $rcmail_config['prefer_html'] = TRUE;
 
-// compose html formatted messages by default
-$rcmail_config['htmleditor'] = TRUE;
-
 // show pretty dates as standard
 $rcmail_config['prettydate'] = TRUE;
@@ -259 +261 @@
 $rcmail_config['draft_autosave'] = 300;
 
-// default setting if preview pane is enabled
-$rcmail_config['preview_pane'] = FALSE;
-
 // don't let users set pagesize to more than this value if set
 $rcmail_config['max_pagesize'] = 200;

program/steps/mail/compose.inc

@@ -64 +64 @@
 $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
@@ -408 +411 @@
     }
 
-  $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" : '';
@@ -782 +788 @@
 {
   global $CONFIG, $MESSAGE, $compose_mode;
+  
+  if (!$CONFIG['enable_htmleditor'])
+    return '';
 
   $choices = array(

program/steps/settings/func.inc

@@ -38 +38 @@
   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
@@ -162 +162 @@
 
   // Show checkbox for HTML Editor
-  if (!isset($no_override['htmleditor']))
+  if (!isset($no_override['htmleditor']) && $CONFIG['enable_htmleditor'])
     {
     $field_id = 'rcmfd_htmleditor';

skins/default/templates/compose.html

@@ -138 +138 @@
 </td>
 <td align="right">
- <roundcube:label name="editortype" />:&nbsp;
- <span class="radios-left"><roundcube:object name="editorSelector" tabindex="9" /></span>
+  <roundcube:if condition="config:enable_htmleditor" />
+    <roundcube:label name="editortype" />:&nbsp;
+    <span class="radios-left"><roundcube:object name="editorSelector" tabindex="9" /></span>
+  <roundcube:endif />
 </td>
 </tr>