From cb15aaa2654c00ecc78880c7daec7acee6fa61ec Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Oct 2008 13:49:05 -0400
Subject: [PATCH] Also check for negative image size + set caching headers for 1 hour
---
config/main.inc.php.dist | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 6c5b98a..7d820c4 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -107,17 +107,18 @@
// Log sent messages
$rcmail_config['smtp_log'] = TRUE;
-// how many seconds must pass between emails sent by a user
+// How many seconds must pass between emails sent by a user
$rcmail_config['sendmail_delay'] = 0;
-// these cols are shown in the message list
+// These cols are shown in the message list
// available cols are: subject, from, to, cc, replyto, date, size, encoding, flag
$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size', 'flag');
-// includes should be interpreted as PHP files
+// Includes should be interpreted as PHP files
$rcmail_config['skin_include_php'] = FALSE;
-// session lifetime in minutes
+// Session lifetime in minutes
+// must be greater than 'keep_alive'/60
$rcmail_config['session_lifetime'] = 10;
// check client IP in session athorization
@@ -285,8 +286,12 @@
// don't allow these settings to be overriden by the user
$rcmail_config['dont_override'] = array();
-// allow users to add and delete sender identities
-$rcmail_config['multiple_identities'] = true;
+// 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
+$rcmail_config['identities_level'] = 0;
// try to load host-specific configuration
// see http://trac.roundcube.net/wiki/Howto_Config for more details
@@ -319,9 +324,13 @@
* quota (and Trash is included in the quota).
*
* This is a failover setting for iil_C_Move when a message is moved
- * to the Trash, and not the same as "delete_right_away".
+ * to the Trash.
*/
$rcmail_config['delete_always'] = false;
+
+// Minimal value of user's 'keep_alive' setting (in seconds)
+// Must be less than 'session_lifetime'
+$rcmail_config['min_keep_alive'] = 60;
/***** these settings can be overwritten by user's preferences *****/
@@ -386,5 +395,9 @@
// false causes deleted messages to be permanantly removed if there is no Trash folder
$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'
+$rcmail_config['keep_alive'] = 60;
+
// end of config file
?>
--
Gitblit v1.9.1