From b542f8800e0d093afedf51c4789d901b454e4144 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 26 Apr 2013 05:43:21 -0400 Subject: [PATCH] Fix exit code on bootsrap errors in CLI mode (#1489044) --- config/main.inc.php.dist | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 20b8795..5a652a5 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -353,6 +353,10 @@ // 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 @@ -573,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. @@ -829,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