From cead5c727147faac362e742aa7bcecf07f68cd99 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 May 2006 17:24:42 -0400
Subject: [PATCH] Updated CHANGELOG
---
config/main.inc.php.dist | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index e7ccc91..2a0635c 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -16,11 +16,15 @@
// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
-$rcmail_config['debug_level'] = 5;
+$rcmail_config['debug_level'] = 1;
// enable caching of messages and mailbox data in the local database.
// this is recommended if the IMAP server does not run on the same machine
$rcmail_config['enable_caching'] = TRUE;
+
+// lifetime of message cache
+// possible units: s, m, h, d, w
+$rcmail_config['message_cache_lifetime'] = '10d';
// automatically create a new RoundCube user when log-in the first time.
// a new user will be created once the IMAP login succeeds.
@@ -36,12 +40,22 @@
// TCP port used for IMAP connections
$rcmail_config['default_port'] = 143;
+// Automatically add this domain to user names for login
+// Only for IMAP servers that require full e-mail addresses for login
+// Specify an array with 'host' => 'domain' values to support multiple hosts
+$rcmail_config['username_domain'] = '';
+
// This domain will be used to form e-mail addresses of new users
// Specify an array with 'host' => 'domain' values to support multiple hosts
-$rcmail_config['mail_domain'] = 'roundcube.net';
+$rcmail_config['mail_domain'] = '';
// Path to a virtuser table file to resolve user names and e-mail addresses
$rcmail_config['virtuser_file'] = '';
+
+// Query to resolve user names and e-mail addresses from the database
+// %u will be replaced with the current username for login.
+// The query should select the user's e-mail address as first col
+$rcmail_config['virtuser_query'] = '';
// use this host for sending mails.
// to use SSL connection, set ssl://smtp.host.com
@@ -85,7 +99,7 @@
// check client IP in session athorization
$rcmail_config['ip_check'] = TRUE;
-// not sure what this was good for :-)
+// the default locale setting
$rcmail_config['locale_string'] = 'en';
// use this format for short date display
@@ -114,36 +128,42 @@
// display these folders separately in the mailbox list
$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
-// default sort col
-$rcmail_config['message_sort_col'] = 'date';
-
-// default sort order
-$rcmail_config['message_sort_order'] = 'DESC';
-
// Set TRUE if deleted messages should not be displayed
// This will make the application run slower
$rcmail_config['skip_deleted'] = FALSE;
+
+// Set true to Mark deleted messages as read as well as deleted
+// False means that a message's read status is not affected by marking it as deleted
+$rcmail_config['read_when_deleted'] = TRUE;
+
+// When a Trash folder is not present and a message is deleted, flag
+// the message for deletion rather than deleting it immediately. Setting this to
+// false causes deleted messages to be permanantly removed if there is no Trash folder
+$rcmail_config['flag_for_deletion'] = TRUE;
// path to a text file which will be added to each sent message
// paths are relative to the RoundCube root folder
$rcmail_config['generic_message_footer'] = '';
// this string is used as a delimiter for message headers when sending
-$rcmail_config['mail_header_delimiter'] = "\r\n";
+// leave empty for auto-detection
+$rcmail_config['mail_header_delimiter'] = NULL;
-// public ldap servers to search for contacts
-$rcmail_config['ldap_public'] = false;
-
-/** example config for Verisign directory
-$rcmail_config['ldap_public']['Verisign'] = array('hosts' => array('directory.verisign.com'),
- 'port' => 389,
- 'base_dn' => '',
- 'search_fields' => array('mail', 'cn'),
- 'name_field' => 'cn',
- 'mail_field' => 'mail',
- 'scope' => 'sub',
- 'fuzzy_search' => 0);
-**/
+// in order to enable public ldap search, create a config array
+// like the Verisign example below. if you would like to test,
+// simply uncomment the Verisign example.
+/**
+ * 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);
+ */
/***** these settings can be overwritten by user's preferences *****/
@@ -154,11 +174,28 @@
// use this timezone to display date/time
$rcmail_config['timezone'] = 1;
+// daylight savings are On
+$rcmail_config['dst_active'] = TRUE;
+
// prefer displaying HTML messages
$rcmail_config['prefer_html'] = TRUE;
// show pretty dates as standard
$rcmail_config['prettydate'] = TRUE;
+// default sort col
+$rcmail_config['message_sort_col'] = 'date';
+
+// 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');
+
+/***** try to load host-specific configuration *****/
+
+@include($_SERVER['HTTP_HOST'].'.inc.php');
+
+
// end of config file
-?>
+?>
\ No newline at end of file
--
Gitblit v1.9.1