From d224551cfbf5903505f41bc9e51ad9840119942f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 31 Jul 2008 11:23:06 -0400
Subject: [PATCH] Fix read_when_deleted behavior + javascript codestyle
---
config/main.inc.php.dist | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 0be6d47..935ddce 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -91,19 +91,16 @@
$rcmail_config['smtp_log'] = TRUE;
// these cols are shown in the message list
-// available cols are: subject, from, to, cc, replyto, date, size, encoding
-$rcmail_config['list_cols'] = array('subject', 'from', 'date', 'size');
-
-// relative path to the skin folder
-$rcmail_config['skin_path'] = 'skins/default/';
+// 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
$rcmail_config['skin_include_php'] = FALSE;
-// use this folder to store temp files (must be writebale for apache user)
+// use this folder to store temp files (must be writeable for apache user)
$rcmail_config['temp_dir'] = 'temp/';
-// use this folder to store log files (must be writebale for apache user)
+// use this folder to store log files (must be writeable for apache user)
$rcmail_config['log_dir'] = 'logs/';
// session lifetime in minutes
@@ -178,7 +175,7 @@
// When a Trash folder is not present and a message is deleted, flag
// the message for deletion rather than deleting it immediately. Setting this to
// false causes deleted messages to be permanantly removed if there is no Trash folder
-$rcmail_config['flag_for_deletion'] = TRUE;
+$rcmail_config['flag_for_deletion'] = FALSE;
// Behavior if a received message requests a message delivery notification (read receipt)
// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
@@ -298,7 +295,25 @@
// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
$rcmail_config['enable_installer'] = false;
+// Log successful logins
+$rcmail_config['log_logins'] = false;
+
+/**
+ * 'Delete always'
+ * This setting reflects if mail should be always marked as deleted,
+ * even if moving to "Trash" fails. This is necessary in some setups
+ * because a) people may not have a Trash folder or b) they are over
+ * 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".
+ */
+$rcmail_config['delete_always'] = false;
+
/***** these settings can be overwritten by user's preferences *****/
+
+// skin name: folder from skins/
+$rcmail_config['skin'] = 'default';
// show up to X items in list view
$rcmail_config['pagesize'] = 40;
@@ -311,6 +326,9 @@
// prefer displaying HTML messages
$rcmail_config['prefer_html'] = TRUE;
+
+// display images in mail from known senders
+$rcmail_config['addrbook_show_images'] = FALSE;
// compose html formatted messages by default
$rcmail_config['htmleditor'] = FALSE;
@@ -330,20 +348,8 @@
// Compact INBOX on logout
$rcmail_config['logout_expunge'] = FALSE;
-/**
- * 'Delete always'
- * This setting reflects if mail should be always marked as deleted,
- * even if moving to "Trash" fails. This is necessary in some setups
- * because a) people may not have a Trash folder or b) they are over
- * 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".
- */
-$rcmail_config['delete_always'] = false;
-
-// Log successful logins
-$rcmail_config['log_logins'] = false;
+// Display attached images below the message body
+$rcmail_config['inline_images'] = TRUE;
// end of config file
?>
--
Gitblit v1.9.1