summaryrefslogtreecommitdiff
path: root/main.inc.php.dist
diff options
context:
space:
mode:
Diffstat (limited to 'main.inc.php.dist')
-rw-r--r--main.inc.php.dist9
1 files changed, 8 insertions, 1 deletions
diff --git a/main.inc.php.dist b/main.inc.php.dist
index 11297155f..15512f5dc 100644
--- a/main.inc.php.dist
+++ b/main.inc.php.dist
@@ -174,6 +174,8 @@ $rcmail_config['smtp_auth_pw'] = null;
$rcmail_config['smtp_helo_host'] = '';
// SMTP connection timeout, in seconds. Default: 0 (no limit)
+// Note: There's a known issue where using ssl connection with
+// timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
$rcmail_config['smtp_timeout'] = 0;
// ----------------------------------
@@ -251,6 +253,9 @@ $rcmail_config['session_domain'] = '';
// Session name. Default: 'roundcube_sessid'
$rcmail_config['session_name'] = null;
+// Session authentication cookie name. Default: 'roundcube_sessauth'
+$rcmail_config['session_auth_name'] = null;
+
// Session path. Defaults to PHP session.cookie_path setting.
$rcmail_config['session_path'] = null;
@@ -431,7 +436,8 @@ $rcmail_config['language'] = null;
$rcmail_config['date_format'] = 'Y-m-d';
// give this choice of date formats to the user to select from
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
+// Note: do not use ambiguous formats like m/d/Y
+$rcmail_config['date_formats'] = array('Y-m-d', 'Y/m/d', 'Y.m.d', 'd-m-Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
// use this format for time display (date or strftime format)
$rcmail_config['time_format'] = 'H:i';
@@ -866,6 +872,7 @@ $rcmail_config['mdn_requests'] = 0;
$rcmail_config['mdn_default'] = 0;
// Delivery Status Notification checkbox default state
+// Note: This can be used only if smtp_server is non-empty
$rcmail_config['dsn_default'] = 0;
// Place replies in the folder of the message being replied to