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 |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index fb227c4..894dfa4 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -97,7 +97,11 @@
 $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).
@@ -112,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';
@@ -183,16 +190,18 @@
 // 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

--
Gitblit v1.9.1