From aa83596b0bec71af8d96ee346d7a625709bf0750 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sat, 10 Nov 2012 06:13:53 -0500 Subject: [PATCH] Clarify keep-alive setting, move it to User Interface section, change label to "Refresh (check for new messages, etc.)", allow no-refresh mode. --- config/main.inc.php.dist | 58 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 38 insertions(+), 20 deletions(-) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 58f9ca8..64312b6 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -21,7 +21,7 @@ // LOGGING/DEBUGGING // ---------------------------------- -// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace +// system error reporting, sum of: 1 = log; 4 = show, 8 = trace $rcmail_config['debug_level'] = 1; // log driver: 'syslog' or 'file'. @@ -78,7 +78,7 @@ // TCP port used for IMAP connections $rcmail_config['default_port'] = 143; -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use +// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use // best server supported one) $rcmail_config['imap_auth_type'] = null; @@ -182,6 +182,9 @@ // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! $rcmail_config['enable_installer'] = false; +// don't allow these settings to be overriden by the user +$rcmail_config['dont_override'] = array(); + // provide an URL where a user can get support for this Roundcube installation // PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! $rcmail_config['support_url'] = ''; @@ -224,11 +227,12 @@ // 0 - disabled, 1 - username and host only, 2 - username, host, password $rcmail_config['login_autocomplete'] = 0; -// If users authentication is not case sensitive this must be enabled. -// You can also use it to force conversion of logins to lower case. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = false; +// Forces conversion of logins to lower case. +// 0 - disabled, 1 - only domain part, 2 - domain and local part. +// If users authentication is case-insensitive this must be enabled. +// Note: After enabling it all user records need to be updated, e.g. with query: +// UPDATE users SET username = LOWER(username); +$rcmail_config['login_lc'] = 2; // Includes should be interpreted as PHP files $rcmail_config['skin_include_php'] = false; @@ -237,14 +241,16 @@ $rcmail_config['display_version'] = false; // Session lifetime in minutes -// must be greater than 'keep_alive'/60 $rcmail_config['session_lifetime'] = 10; -// session domain: .example.org +// Session domain: .example.org $rcmail_config['session_domain'] = ''; -// session name. Default: 'roundcube_sessid' +// Session name. Default: 'roundcube_sessid' $rcmail_config['session_name'] = null; + +// Session path. Defaults to PHP session.cookie_path setting. +$rcmail_config['session_path'] = null; // Backend to use for session storage. Can either be 'db' (default) or 'memcache' // If set to memcache, a list of servers need to be specified in 'memcache_hosts' @@ -345,9 +351,6 @@ // send plaintext messages as format=flowed $rcmail_config['send_format_flowed'] = true; -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - // Set identities access level: // 0 - many identities with possibility to edit all params // 1 - many identities with possibility to edit all params but not email address @@ -374,6 +377,10 @@ // Enable DNS checking for e-mail address validation $rcmail_config['email_dns_check'] = false; + +// Disables saving sent messages in Sent folder (like gmail) (Default: false) +// Note: useful when SMTP server stores sent mail in user mailbox +$rcmail_config['no_save_sent_messages'] = false; // ---------------------------------- // PLUGINS @@ -492,7 +499,6 @@ $rcmail_config['max_pagesize'] = 200; // Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' $rcmail_config['min_keep_alive'] = 60; // Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. @@ -510,10 +516,12 @@ // ---------------------------------- // This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. +// 'sql' (default), 'ldap' and ''. // If set to 'ldap' then it will look at using the first writable LDAP // address book as the primary address book and it will not display the // SQL address book in the 'Address Book' view. +// If set to '' then no address book will be displayed or only the +// addressbook which is created by a plugin (like CardDAV). $rcmail_config['address_book_type'] = 'sql'; // In order to enable public ldap search, configure an array like the Verisign @@ -720,8 +728,14 @@ // 2 - Always show inline images $rcmail_config['show_images'] = 0; +// open messages in new window +$rcmail_config['message_extwin'] = false; + +// open message compose form in new window +$rcmail_config['compose_extwin'] = false; + // compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only +// 0 - never, 1 - always, 2 - on reply to HTML message, 3 - on forward or reply to HTML message $rcmail_config['htmleditor'] = 0; // show pretty dates as standard @@ -764,8 +778,9 @@ // Use 'Purge' to remove messages marked as deleted $rcmail_config['flag_for_deletion'] = false; -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' +// Default interval for auto-refresh requests (in seconds) +// These are requests for system state updates e.g. checking for new messages, etc. +// Setting it to 0 disables the feature. $rcmail_config['keep_alive'] = 60; // If true all folders will be checked for recent messages @@ -779,8 +794,11 @@ // 2 - Expand only threads with unread messages $rcmail_config['autoexpand_threads'] = 0; -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; +// When replying: +// -1 - don't cite the original message +// 0 - place cursor below the original message +// 1 - place cursor above original message (top posting) +$rcmail_config['reply_mode'] = 0; // When replying strip original signature from message $rcmail_config['strip_existing_sig'] = true; -- Gitblit v1.9.1