From 92cd7f34b07e86062f2c024039e3309768b48ce6 Mon Sep 17 00:00:00 2001 From: Andy Wermke <andy@dev.next-step-software.com> Date: Thu, 04 Apr 2013 10:10:23 -0400 Subject: [PATCH] Merge branch 'master' of https://github.com/roundcube/roundcubemail --- config/main.inc.php.dist | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 3e7630c..5a652a5 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -63,8 +63,8 @@ // IMAP // ---------------------------------- -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts +// 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/TLS connection, enter hostname with prefix ssl:// or tls:// // Supported replacement variables: @@ -73,6 +73,8 @@ // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld +// WARNING: After hostname change update of mail_host column in users table is +// required to match old user data records with the new host. $rcmail_config['default_host'] = ''; // TCP port used for IMAP connections @@ -351,11 +353,16 @@ // send plaintext messages as format=flowed $rcmail_config['send_format_flowed'] = true; +// According to RFC2298, return receipt envelope sender address must be empty. +// If this option is true, Roundcube will use user's identity as envelope sender for MDN responses. +$rcmail_config['mdn_use_from'] = false; + // 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 // 2 - one identity with possibility to edit all params // 3 - one identity with possibility to edit all params but not email address +// 4 - one identity with possibility to edit only signature $rcmail_config['identities_level'] = 0; // Mimetypes supported by the browser. @@ -367,9 +374,10 @@ // Set to null if the default path should be used. $rcmail_config['mime_magic'] = null; -// Path to local mime.types mapping table. +// Absolute path to a local mime.types mapping table file. // This is used to derive mime-types from the filename extension or vice versa. -// Such a file is usually part of the apache webserver. +// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system, +// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types $rcmail_config['mime_types'] = null; // path to imagemagick identify binary @@ -569,6 +577,7 @@ 'port' => 389, 'use_tls' => false, 'ldap_version' => 3, // using LDAPv3 + 'network_timeout' => 10, // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x '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. @@ -825,9 +834,6 @@ // 2 - New messages only // 3 - Forwards and Replies only $rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; // Use MIME encoding (quoted-printable) for 8bit characters in message body $rcmail_config['force_7bit'] = false; -- Gitblit v1.9.1