From 32ca1f9fc8a78e092565b51cc97faa724bb4e6cf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 30 May 2009 05:09:57 -0400
Subject: [PATCH] - css fixes (#1485869)
---
config/main.inc.php.dist | 96 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 41 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index fff3017..d7c27b0 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -5,7 +5,7 @@
| Main configuration file |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
+-----------------------------------------------------------------------+
@@ -21,6 +21,10 @@
// log driver: 'syslog' or 'file'.
$rcmail_config['log_driver'] = 'file';
+// date format for log entries
+// (read http://php.net/manual/en/function.date.php for all format characters)
+$rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';
+
// Syslog ident string to use, if using the 'syslog' log driver.
$rcmail_config['syslog_id'] = 'roundcube';
@@ -34,6 +38,9 @@
// use this folder to store temp files (must be writeable for apache user)
$rcmail_config['temp_dir'] = 'temp/';
+
+// List of active plugins (in plugins/ directory)
+$rcmail_config['plugins'] = array();
// 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
@@ -51,7 +58,7 @@
// the mail host chosen to perform the log-in
// leave blank to show a textbox at login, give a list of hosts
// to display a pulldown menu or set one host as string.
-// To use SSL connection, enter ssl://hostname:993
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
$rcmail_config['default_host'] = '';
// TCP port used for IMAP connections
@@ -62,8 +69,7 @@
$rcmail_config['imap_auth_type'] = null;
// If you know your imap's root directory and its folder delimiter,
-// you can specify them here. Otherwise they will be determined
-// during every imap connection.
+// you can specify them here. Otherwise they will be determined automatically.
$rcmail_config['imap_root'] = null;
$rcmail_config['imap_delimiter'] = null;
@@ -81,7 +87,8 @@
// 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
+// The query should select the user's e-mail address as first column
+// and optional identity name as second column
$rcmail_config['virtuser_query'] = '';
// use this host for sending mails.
@@ -153,7 +160,7 @@
$rcmail_config['date_today'] = 'H:i';
// add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.2-beta';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.3-beta';
// use this name to compose page titles
$rcmail_config['product_name'] = 'RoundCube Webmail';
@@ -210,8 +217,7 @@
// 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, should be defined
-// when using local Pspell extension
+// Leave empty for default set of available language.
$rcmail_config['spellcheck_languages'] = NULL;
// path to a text file which will be added to each sent message
@@ -220,6 +226,12 @@
// add a received header to outgoing mails containing the creators IP and hostname
$rcmail_config['http_received_header'] = false;
+
+// Whether or not to encrypt the IP address and the host name
+// these could, in some circles, be considered as sensitive information;
+// however, for the administrator, these could be invaluable help
+// when tracking down issues.
+$rcmail_config['http_received_header_encrypt'] = false;
// this string is used as a delimiter for message headers when sending
// leave empty for auto-detection
@@ -237,6 +249,8 @@
// In order to enable public ldap search, configure an array like the Verisign
// example further below. if you would like to test, simply uncomment the example.
+$rcmail_config['ldap_public'] = array();
+
//
// If you are going to use LDAP for individual address books, you will need to
// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
@@ -247,43 +261,43 @@
// o=root
// ou=people
// uid=user@domain
-// mail=contact@contactdomain
-//
+// mail=contact@contactdomain
+//
// So the base_dn would be uid=%fu,ou=people,o=root
// The bind_dn would be the same as based_dn or some super user login.
-/**
+/*
* example config for Verisign directory
*
- * $rcmail_config['ldap_public']['Verisign'] = array(
- * 'name' => 'Verisign.com',
- * 'hosts' => array('directory.verisign.com'),
- * 'port' => 389,
- * 'use_tls' => false,
- * 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
- * // %fu - The full username provided, assumes the username is an email
- * // address, uses the username_domain value if not an email address.
- * // %u - The username prior to the '@'.
- * // %d - The domain name after the '@'.
- * 'base_dn' => '',
- * 'bind_dn' => '',
- * 'bind_pass' => '',
- * 'writable' => false, // Indicates if we can write to the LDAP directory or not.
- * // If writable is true then these fields need to be populated:
- * // LDAP_Object_Classes, required_fields, LDAP_rdn
- * 'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
- * 'required_fields' => array("cn", "sn", "mail"), // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
- * 'LDAP_rdn' => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
- * 'ldap_version' => 3, // using LDAPv3
- * '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
- * 'surname_field' => 'sn', // this field represents the contact's last name
- * 'firstname_field' => 'gn', // this field represents the contact's first name
- * 'sort' => 'cn', // The field to sort the listing by.
- * 'scope' => 'sub', // search mode: sub|base|list
- * 'filter' => '', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
- * 'fuzzy_search' => true); // server allows wildcard search
- */
+$rcmail_config['ldap_public']['Verisign'] = array(
+ 'name' => 'Verisign.com',
+ 'hosts' => array('directory.verisign.com'),
+ 'port' => 389,
+ 'use_tls' => false,
+ 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
+ // %fu - The full username provided, assumes the username is an email
+ // address, uses the username_domain value if not an email address.
+ // %u - The username prior to the '@'.
+ // %d - The domain name after the '@'.
+ 'base_dn' => '',
+ 'bind_dn' => '',
+ 'bind_pass' => '',
+ 'writable' => false, // Indicates if we can write to the LDAP directory or not.
+ // If writable is true then these fields need to be populated:
+ // LDAP_Object_Classes, required_fields, LDAP_rdn
+ 'LDAP_Object_Classes' => array("top", "inetOrgPerson"), // To create a new contact these are the object classes to specify (or any other classes you wish to use).
+ 'required_fields' => array("cn", "sn", "mail"), // The required fields needed to build a new contact as required by the object classes (can include additional fields not required by the object classes).
+ 'LDAP_rdn' => 'mail', // The RDN field that is used for new entries, this field needs to be one of the search_fields, the base of base_dn is appended to the RDN to insert into the LDAP directory.
+ 'ldap_version' => 3, // using LDAPv3
+ '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
+ 'surname_field' => 'sn', // this field represents the contact's last name
+ 'firstname_field' => 'gn', // this field represents the contact's first name
+ 'sort' => 'cn', // The field to sort the listing by.
+ 'scope' => 'sub', // search mode: sub|base|list
+ 'filter' => '', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
+ 'fuzzy_search' => true); // server allows wildcard search
+*/
// An ordered array of the ids of the addressbooks that should be searched
// when populating address autocomplete fields server-side. ex: array('sql','Verisign');
--
Gitblit v1.9.1