From fcc7f861b170596c6970aecb1ddc87a3567b112f Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Sat, 30 Jul 2011 11:32:13 -0400 Subject: [PATCH] Log session validation errors; keep error message when redirecting to login after session error --- config/main.inc.php.dist | 42 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 29af284..750fa25 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -41,6 +41,9 @@ // Log successful logins to <log_dir>/userlogins or to syslog $rcmail_config['log_logins'] = false; +// Log session authentication errors to <log_dir>/session or to syslog +$rcmail_config['log_session'] = false; + // Log SQL queries to <log_dir>/sql or to syslog $rcmail_config['sql_debug'] = false; @@ -437,6 +440,16 @@ // Must be less than 'session_lifetime' $rcmail_config['min_keep_alive'] = 60; +// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. +// By default refresh time is set to 1 second. You can set this value to true +// or any integer value indicating number of seconds. +$rcmail_config['upload_progress'] = false; + +// Specifies for how many seconds the Undo button will be available +// after object delete action. Currently used with supporting address book sources. +// Setting it to 0, disables the feature. +$rcmail_config['undo_timeout'] = 0; + // ---------------------------------- // ADDRESSBOOK SETTINGS // ---------------------------------- @@ -450,6 +463,7 @@ // 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. +// Array key must contain only safe characters, ie. a-zA-Z0-9_ $rcmail_config['ldap_public'] = array(); // If you are going to use LDAP for individual address books, you will need to @@ -534,13 +548,15 @@ 'scope' => 'sub', // search mode: sub|base|list 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act 'fuzzy_search' => true, // server allows wildcard search + 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) + 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. // definition for contact groups (uncomment if no groups are supported) // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in thist case, assure that groups and contacts are seperated due to the concernig filters! + // -> in this case, assure that groups and contacts are separated due to the concernig filters! 'groups' => array( 'base_dn' => '', 'filter' => '(objectClass=groupOfNames)', @@ -557,6 +573,15 @@ // before address books will be searched. Most useful for LDAP directories that // may need to do lengthy results building given overly-broad searches $rcmail_config['autocomplete_min_length'] = 1; + +// Number of parallel autocomplete requests. +// If there's more than one address book, n parallel (async) requests will be created, +// where each request will search in one address book. By default (0), all address +// books are searched in one request. +$rcmail_config['autocomplete_threads'] = 0; + +// Max. numer of entries in autocomplete popup. Default: 15. +$rcmail_config['autocomplete_max'] = 15; // show address fields in this order // available placeholders: {street}, {locality}, {zipcode}, {country}, {region} @@ -630,8 +655,8 @@ // False means that a message's read status is not affected by marking it as deleted $rcmail_config['read_when_deleted'] = true; -// Set to true to newer delete messages immediately -// Use 'Purge' to remove messages marked as deleted +// Set to true to never delete messages immediately +// Use 'Purge' to remove messages marked as deleted $rcmail_config['flag_for_deletion'] = false; // Default interval for keep-alive/check-recent requests (in seconds) @@ -674,6 +699,9 @@ // Please note that folder names should to be in sync with $rcmail_config['default_imap_folders'] $rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); +// Defaults of the addressbook search field configuration. +$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); + // 'Delete always' // This setting reflects if mail should be always deleted // when moving to Trash fails. This is necessary in some setups @@ -698,4 +726,12 @@ // Sets default mode of Forward feature to "forward as attachment" $rcmail_config['forward_attachment'] = false; +// Defines address book (internal index) to which new contacts will be added +// By default it is the first writeable addressbook. +// Note: Use '0' for built-in address book. +$rcmail_config['default_addressbook'] = null; + +// Enables spell checking before sending a message. +$rcmail_config['spellcheck_before_send'] = false; + // end of config file -- Gitblit v1.9.1