From b4b081713ee88c9a7b2515d18c36bedf966641ce Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 03 Jul 2006 16:14:26 -0400
Subject: [PATCH] Workaround for drag-drop using whitespace in FF, Junk emptying, misc fixes

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

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 9c72bbe..ce05d80 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -121,6 +121,9 @@
 // leave blank if draft messages should not be stored
 $rcmail_config['drafts_mbox'] = 'Drafts';
 
+// store spam messages in this mailbox
+$rcmail_config['junk_mbox'] = 'Junk';
+
 // store sent message is this mailbox
 // leave blank if sent messages should not be stored
 $rcmail_config['sent_mbox'] = 'Sent';
@@ -131,6 +134,9 @@
 
 // display these folders separately in the mailbox list
 $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
+
+// protect the default folders from renames, deletes, and subscription changes
+$rcmail_config['protect_default_folders'] = TRUE;
 
 // Set TRUE if deleted messages should not be displayed
 // This will make the application run slower
@@ -173,6 +179,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 *****/
 
@@ -199,10 +208,6 @@
 
 // list of configuration option names that need to be available in Javascript.
 $rcmail_config['javascript_config'] = array('read_when_deleted', 'flag_for_deletion');
-
-/***** try to load host-specific configuration *****/
-
-@include($_SERVER['HTTP_HOST'].'.inc.php');
 
 
 // end of config file

--
Gitblit v1.9.1