Fix PHP error in Preferences when default_folders was in dont_override (#14...

Aleksander Machniak

2014-06-11 f105dbb7691dd2ae919486a3b82b98be494e94be

Fix PHP error in Preferences when default_folders was in dont_override (#1489940)

 CHANGELOG

@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Fix PHP error in Preferences when default_folders was in dont_override (#1489940)
- Add configurable LDAP_OPT_DEREF option (#1489864)
- Fix unintentional draft autosave request if autosave is disabled (#1489882)
- Fix malformed References: header in send/saved mail (#1489891)

 program/steps/settings/func.inc

@@ -1035,7 +1035,8 @@
            }

            // Configure special folders
            if (!isset($no_override['default_folders']) && $current) {
            $set = array('drafts_mbox', 'sent_mbox', 'junk_mbox', 'trash_mbox');
            if ($current && count(array_intersect($no_override, $set)) < 4) {
                $select = $RCMAIL->folder_selector(array(
                    'noselection'   => '---',
                    'realnames'     => true,

 program/steps/settings/save_prefs.inc

@@ -192,17 +192,10 @@

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];
        }
    }