Fix folders drop-down list: descend into root folder (e.g. INBOX) even if p...

thomascube

2011-08-18 fbe54043cf598b19a753dc2b21a7ed558d23fd15

 program/steps/mail/check_recent.inc

@@ -4,8 +4,8 @@
 +-----------------------------------------------------------------------+
 | program/steps/mail/check_recent.inc                                   |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                 |
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -21,9 +21,18 @@

$current = $IMAP->get_mailbox_name();
$check_all = !empty($_GET['_refresh']) || (bool)$RCMAIL->config->get('check_all_folders');
$a_mailboxes = $check_all ? $IMAP->list_mailboxes() : (array)$current;

// check recent/unseen counts for all mailboxes
// list of folders to check
if ($check_all) {
    $a_mailboxes = $IMAP->list_mailboxes('', '*', 'mail');
}
else {
    $a_mailboxes = (array) $current;
    if ($a_mailboxes[0] != 'INBOX')
        $a_mailboxes[] = 'INBOX';
}

// check recent/unseen counts
foreach ($a_mailboxes as $mbox_name) {
    if ($mbox_name == $current && ($status = $IMAP->mailbox_status($mbox_name))) {

@@ -31,8 +40,10 @@

        // refresh saved search set
        $search_request = get_input_value('_search', RCUBE_INPUT_GPC);
        if ($search_request && isset($_SESSION['search'][$search_request])) {
            $_SESSION['search'][$search_request] = $IMAP->refresh_search();
        if ($search_request && isset($_SESSION['search'])
            && $_SESSION['search_request'] == $search_request
        ) {
            $_SESSION['search'] = $IMAP->refresh_search();
        }

        if (!empty($_GET['_quota']))
@@ -60,8 +71,6 @@
        $OUTPUT->set_env('current_page', $all_count ? $IMAP->list_page : 1);

        if ($status & 1) {
            if ($RCMAIL->config->get('focus_on_new_message', true))
                $OUTPUT->command('new_message_focus');
            // trigger plugin hook
            $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name));
        }
@@ -72,7 +81,7 @@
        if ($all_count) {
            $a_headers = $IMAP->list_headers($mbox_name, null, $_SESSION['sort_col'], $_SESSION['sort_order']);
            // add message rows
            rcmail_js_message_list($a_headers, false, false);
            rcmail_js_message_list($a_headers, false);
            // remove messages that don't exists from list selection array
            $OUTPUT->command('update_selection');
        }
@@ -82,6 +91,6 @@
    }
}

$OUTPUT->send();
$RCMAIL->plugins->exec_hook('keep_alive', array());

?>
$OUTPUT->send();