1 files changed, 11 insertions, 3 deletions
diff --git a/config/defaults.inc.php b/config/defaults.inc.php
index 32dba4918..512455275 100644
--- a/config/defaults.inc.php
+++ b/config/defaults.inc.php
@@ -143,7 +143,7 @@ $config['imap_force_ns'] = false;
 // Note: Because the list is cached, re-login is required after change.
 $config['imap_disabled_caps'] = array();
 
-// IMAP connection timeout, in seconds. Default: 0 (no limit)
+// IMAP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
 $config['imap_timeout'] = 0;
 
 // Optional IMAP authentication identifier to be used as authorization proxy
@@ -208,7 +208,7 @@ $config['smtp_auth_pw'] = null;
 // localhost if that isn't defined.
 $config['smtp_helo_host'] = '';
 
-// SMTP connection timeout, in seconds. Default: 0 (no limit)
+// SMTP connection timeout, in seconds. Default: 0 (use default_socket_timeout)
 // Note: There's a known issue where using ssl connection with
 // timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
 $config['smtp_timeout'] = 0;
@@ -257,6 +257,10 @@ $config['log_dir'] = 'logs/';
 // use this folder to store temp files (must be writeable for apache user)
 $config['temp_dir'] = 'temp/';
 
+// expire files in temp_dir after 48 hours
+// possible units: s, m, h, d, w
+$config['temp_dir_ttl'] = '48h';
+
 // enforce connections over https
 // with this option enabled, all non-secure connections will be redirected.
 // set the port for the ssl connection as value of this option if it differs from the default 443
@@ -294,6 +298,9 @@ $config['session_domain'] = '';
 // Session name. Default: 'roundcube_sessid'
 $config['session_name'] = null;
 
+// Session authentication cookie name. Default: 'roundcube_sessauth'
+$config['session_auth_name'] = null;
+
 // Session path. Defaults to PHP session.cookie_path setting.
 $config['session_path'] = null;
 
@@ -475,7 +482,8 @@ $config['language'] = null;
 $config['date_format'] = 'Y-m-d';
 
 // give this choice of date formats to the user to select from
-$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
+$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)
 $config['time_format'] = 'H:i';