diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-11-25 16:21:55 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-11-25 16:21:55 +0000 |
| commit | 6ac3c9018c1c453a62dcb37a09efa7e85d6450b6 (patch) | |
| tree | 1501656b569221255e522556190d9b9174b878ef | |
| parent | dea2d5550be909d35f6548ec843576d20eb00ec5 (diff) | |
Don't create default folders by default
git-svn-id: https://svn.roundcube.net/trunk@925 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/config/main.inc.php.dist | 5 | ||||
| -rw-r--r-- | roundcubemail/program/include/main.inc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index bfb44e6a7..fc7d28323 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/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/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 1764435ee..49dd2aaff 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/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; } |