|
|
|
@ -192,17 +192,10 @@ case 'addressbook':
|
|
|
|
|
|
|
|
|
|
case 'folders':
|
|
|
|
|
// special handling for 'default_folders'
|
|
|
|
|
if (in_array('default_folders', (array)$CONFIG['dont_override'])) {
|
|
|
|
|
foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
|
|
|
|
|
$a_user_prefs[$p] = $CONFIG[$p];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
$a_user_prefs['default_folders'] = array('INBOX');
|
|
|
|
|
foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
|
|
|
|
|
if ($a_user_prefs[$p]) {
|
|
|
|
|
$a_user_prefs['default_folders'][] = $a_user_prefs[$p];
|
|
|
|
|
}
|
|
|
|
|
$a_user_prefs['default_folders'] = array('INBOX');
|
|
|
|
|
foreach (array('drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox') as $p) {
|
|
|
|
|
if ($a_user_prefs[$p]) {
|
|
|
|
|
$a_user_prefs['default_folders'][] = $a_user_prefs[$p];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|