thomascube
2007-10-20 111b278fe0d15fd1eccf44048cb4a0643b5ffc49
Disable HTML the editor by default

4 files modified
38 ■■■■■ changed files
config/main.inc.php.dist 13 ●●●● patch | view | raw | blame | history
program/steps/mail/compose.inc 15 ●●●● patch | view | raw | blame | history
program/steps/settings/func.inc 4 ●●●● patch | view | raw | blame | history
skins/default/templates/compose.html 6 ●●●●● patch | view | raw | blame | history
config/main.inc.php.dist
@@ -130,7 +130,7 @@
$rcmail_config['date_today'] = 'H:i';
// 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
$rcmail_config['product_name'] = 'RoundCube Webmail';
@@ -174,6 +174,8 @@
$rcmail_config['flag_for_deletion'] = TRUE;
// 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;
// For a locally installed Nox Spell Server, please specify the URI to call it.
@@ -219,6 +221,9 @@
 *  'fuzzy_search'  => true);   // server allows wildcard search
 */
// 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();
@@ -243,9 +248,6 @@
// prefer displaying HTML messages
$rcmail_config['prefer_html'] = TRUE;
// compose html formatted messages by default
$rcmail_config['htmleditor'] = TRUE;
// show pretty dates as standard
$rcmail_config['prettydate'] = TRUE;
@@ -257,9 +259,6 @@
// save compose message every 300 seconds (5min)
$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
@@ -63,6 +63,9 @@
// 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 @@
    $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_editor_selector($attrib)
{
  global $CONFIG, $MESSAGE, $compose_mode;
  if (!$CONFIG['enable_htmleditor'])
    return '';
  $choices = array(
    'html'  => 'htmltoggle',
program/steps/settings/func.inc
@@ -37,7 +37,7 @@
  {
  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 @@
    }
  // 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));
skins/default/templates/compose.html
@@ -137,8 +137,10 @@
<roundcube:button type="input" command="list" class="button" label="cancel" />
</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>
</tbody></table>