From b2ff3d44610e1836fe7080a7afffdf4f6ebd32da Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 25 Nov 2007 11:21:55 -0500
Subject: [PATCH] Don't create default folders by default
---
program/include/main.inc | 4 +++-
config/main.inc.php.dist | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index bfb44e6..fc7d283 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -130,7 +130,7 @@
$rcmail_config['date_today'] = 'H:i';
// add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'RoundCube Webmail/0.1b';
+$rcmail_config['useragent'] = 'RoundCube Webmail/0.1';
// use this name to compose page titles
$rcmail_config['product_name'] = 'RoundCube Webmail';
@@ -157,6 +157,9 @@
// these folders will automatically be created if they do not exist
$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
+// automatically create the above listed default folders on login
+$rcmail_config['create_default_folders'] = FALSE;
+
// protect the default folders from renames, deletes, and subscription changes
$rcmail_config['protect_default_folders'] = TRUE;
diff --git a/program/include/main.inc b/program/include/main.inc
index 1764435..49dd2aa 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -660,7 +660,9 @@
// force reloading complete list of subscribed mailboxes
rcmail_set_imap_prop();
$IMAP->clear_cache('mailboxes');
- $IMAP->create_default_folders();
+
+ if ($CONFIG['create_default_folders'])
+ $IMAP->create_default_folders();
return TRUE;
}
--
Gitblit v1.9.1