From 9606ffb32277ce4083144afc1a7f6194370cf69c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 25 Jun 2006 05:18:00 -0400
Subject: [PATCH] Changed behavior to include host-specific configuration (Bug #1483849)

---
 config/main.inc.php.dist |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index af27851..dda852c 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -117,6 +117,10 @@
 // only list folders within this path
 $rcmail_config['imap_root'] = '';
 
+// store draft message is this mailbox
+// leave blank if draft messages should not be stored
+$rcmail_config['drafts_mbox'] = 'Drafts';
+
 // store sent message is this mailbox
 // leave blank if sent messages should not be stored
 $rcmail_config['sent_mbox'] = 'Sent';
@@ -128,15 +132,22 @@
 // display these folders separately in the mailbox list
 $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
 
-// default sort col
-$rcmail_config['message_sort_col'] = 'date';
-
-// default sort order
-$rcmail_config['message_sort_order'] = 'DESC';
-
 // Set TRUE if deleted messages should not be displayed
 // This will make the application run slower
 $rcmail_config['skip_deleted'] = FALSE;
+
+// Set true to Mark deleted messages as read as well as deleted
+// False means that a message's read status is not affected by marking it as deleted
+$rcmail_config['read_when_deleted'] = TRUE;
+
+// 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;
+
+// Make use of the built-in spell checker. It is based on GoogieSpell
+// which means that the message content will be sent to Google in order to check spelling
+$rcmail_config['enable_spellcheck'] = TRUE;
 
 // path to a text file which will be added to each sent message
 // paths are relative to the RoundCube root folder
@@ -162,6 +173,9 @@
  *                                                    'fuzzy_search'  => 0);
  */
 
+// try to load host-specific configuration
+$rcmail_config['include_host_config'] = FALSE;
+
 
 /***** these settings can be overwritten by user's preferences *****/
 
@@ -180,11 +194,15 @@
 // show pretty dates as standard
 $rcmail_config['prettydate'] = TRUE;
 
+// default sort col
+$rcmail_config['message_sort_col'] = 'date';
 
-/***** try to load host-specific configuration *****/
+// default sort order
+$rcmail_config['message_sort_order'] = 'DESC';
 
-@include($_SERVER['HTTP_HOST'].'.inc.php');
+// list of configuration option names that need to be available in Javascript.
+$rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
 
 
 // end of config file
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1