From f1154163b0a9efb21d722bc658352739040ffd61 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 28 Apr 2007 14:07:12 -0400
Subject: [PATCH] Merged branch devel-addressbook from r443 back to trunk

---
 config/main.inc.php.dist |   69 +++++++++++++++++++++++++++-------
 1 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 806ec1a..894dfa4 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -97,7 +97,16 @@
 $rcmail_config['session_lifetime'] = 10;
 
 // check client IP in session athorization
-$rcmail_config['ip_check'] = TRUE;
+$rcmail_config['ip_check'] = false;
+
+// Use an additional frequently changing cookie to athenticate user sessions.
+// There have been problems reported with this feature.
+$rcmail_config['double_auth'] = false;
+
+// this key is used to encrypt the users imap password which is stored
+// in the session record (and the client cookie if remember password is enabled).
+// please provide a string of exactly 24 chars.
+$rcmail_config['des_key'] = 'rcmail-!24ByteDESkey*Str';
 
 // the default locale setting
 $rcmail_config['locale_string'] = 'en';
@@ -107,6 +116,9 @@
 
 // use this format for detailed date/time formatting
 $rcmail_config['date_long'] = 'd.m.Y H:i';
+
+// use this format for today's date display
+$rcmail_config['date_today'] = 'H:i';
 
 // add this user-agent to message headers when sending
 $rcmail_config['useragent'] = 'RoundCube Webmail/0.1b';
@@ -121,6 +133,9 @@
 // leave blank if draft messages should not be stored
 $rcmail_config['drafts_mbox'] = 'Drafts';
 
+// store spam messages in this mailbox
+$rcmail_config['junk_mbox'] = 'Junk';
+
 // store sent message is this mailbox
 // leave blank if sent messages should not be stored
 $rcmail_config['sent_mbox'] = 'Sent';
@@ -129,7 +144,8 @@
 // leave blank if they should be deleted directly
 $rcmail_config['trash_mbox'] = 'Trash';
 
-// display these folders separately in the mailbox list
+// display these folders separately in the mailbox list.
+// these folders will automatically be created if they do not exist
 $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
 
 // protect the default folders from renames, deletes, and subscription changes
@@ -148,9 +164,19 @@
 // false causes deleted messages to be permanantly removed if there is no Trash folder
 $rcmail_config['flag_for_deletion'] = TRUE;
 
-// Make use of the built-in spell checker. It is based on GoogieSpell
-// which means that the message content will be sent to Google in order to check spelling
+// Make use of the built-in spell checker. It is based on GoogieSpell.
 $rcmail_config['enable_spellcheck'] = TRUE;
+
+// For a locally installed Nox Spell Server, please specify the URI to call it.
+// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
+// Leave empty to use the Google spell checking service, what means
+// that the message content will be sent to Google in order to check spelling
+$rcmail_config['spellcheck_uri'] = '';
+
+// These languages can be selected for spell checking.
+// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
+// Leave empty for default set of Google spell check languages
+$rcmail_config['spellcheck_languages'] = NULL;
 
 // path to a text file which will be added to each sent message
 // paths are relative to the RoundCube root folder
@@ -164,17 +190,25 @@
 // like the Verisign example below. if you would like to test, 
 // simply uncomment the Verisign example.
 /** 
- *  example config for Verisign directory
+ * example config for Verisign directory
  *
- *  $rcmail_config['ldap_public']['Verisign'] = array('hosts'         => array('directory.verisign.com'),
- *                                                    'port'          => 389,
- *                                                    'base_dn'       => '',
- *                                                    'search_fields' => array('Email' => 'mail', 'Name' => 'cn'),
- *                                                    'name_field'    => 'cn',
- *                                                    'mail_field'    => 'mail',
- *                                                    'scope'         => 'sub',
- *                                                    'fuzzy_search'  => 0);
+ * $rcmail_config['ldap_public']['Verisign'] = array(
+ *  'name'          => 'Verisign.com',
+ *  'hosts'         => array('directory.verisign.com'),
+ *  'port'          => 389,
+ *  'base_dn'       => '',
+ *  'search_fields' => array('mail', 'cn'),  // fields to search in
+ *  'name_field'    => 'cn',    // this field represents the contact's name
+ *  'email_field'   => 'mail',  // this field represents the contact's e-mail
+ *  'scope'         => 'sub',   // search mode: sub|base|list
+ *  'fuzzy_search'  => true);   // server allows wildcard search
  */
+
+// don't allow these settings to be overriden by the user
+$rcmail_config['dont_override'] = array();
+
+// list of configuration option names that need to be available in Javascript.
+$rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
 
 // try to load host-specific configuration
 $rcmail_config['include_host_config'] = FALSE;
@@ -194,6 +228,9 @@
 // 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;
 
@@ -203,9 +240,11 @@
 // default sort order
 $rcmail_config['message_sort_order'] = 'DESC';
 
-// list of configuration option names that need to be available in Javascript.
-$rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
+// save compose message every 300 seconds (5min)
+$rcmail_config['draft_autosave'] = 300;
 
+// default setting if preview pane is enabled
+$rcmail_config['preview_pane'] = FALSE;
 
 // end of config file
 ?>

--
Gitblit v1.9.1