summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-11-25 16:21:55 +0000
committerthomascube <thomas@roundcube.net>2007-11-25 16:21:55 +0000
commitb2ff3d44610e1836fe7080a7afffdf4f6ebd32da (patch)
tree417843b8dbd1b40c7aa6e3a4a9bf76df755d94c1
parenta898459be2e0ed1be20de4c7aeaba8df357f5d6b (diff)
Don't create default folders by default
-rw-r--r--config/main.inc.php.dist5
-rw-r--r--program/include/main.inc4
2 files changed, 7 insertions, 2 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index bfb44e6a7..fc7d28323 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -130,7 +130,7 @@ $rcmail_config['date_long'] = 'd.m.Y H:i';
$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 @@ $rcmail_config['trash_mbox'] = 'Trash';
// 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 1764435ee..49dd2aaff 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -660,7 +660,9 @@ function rcmail_login($user, $pass, $host=NULL)
// 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;
}