Merge branch 'master' of https://github.com/roundcube/roundcubemail

Andy Wermke

2013-04-04 92cd7f34b07e86062f2c024039e3309768b48ce6

 program/steps/mail/check_recent.inc

@@ -25,7 +25,7 @@
    return;
}

$current = $RCMAIL->storage->get_folder();
$current   = $RCMAIL->storage->get_folder();
$check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders');

// list of folders to check
@@ -34,9 +34,14 @@
}
else {
    $a_mailboxes = (array) $current;
    if ($a_mailboxes[0] != 'INBOX')
    if ($current != 'INBOX') {
        $a_mailboxes[] = 'INBOX';
    }
}

// Control folders list from a plugin
$plugin      = $RCMAIL->plugins->exec_hook('check_recent', array('folders' => $a_mailboxes, 'all' => $check_all));
$a_mailboxes = $plugin['folders'];

// check recent/unseen counts
foreach ($a_mailboxes as $mbox_name) {
@@ -47,12 +52,12 @@
    }

    // Get mailbox status
    $status = $RCMAIL->storage->folder_status($mbox_name);
    $status = $RCMAIL->storage->folder_status($mbox_name, $diff);

    if ($status & 1) {
        // trigger plugin hook
        $RCMAIL->plugins->exec_hook('new_messages',
            array('mailbox' => $mbox_name, 'is_current' => $is_current));
            array('mailbox' => $mbox_name, 'is_current' => $is_current, 'diff' => $diff));
    }

    rcmail_send_unread_count($mbox_name, true, null,
@@ -70,13 +75,15 @@
        if (!empty($_GET['_quota']))
            $OUTPUT->command('set_quota', rcmail_quota_content());

        $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));

        // "No-list" mode, don't get messages
        if (empty($_GET['_list']))
            continue;

        // get overall message count; allow caching because rcube_storage::folder_status() did a refresh
        $list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL';
        $all_count = $RCMAIL->storage->count(null, $list_mode, false, false);
        $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, false, false);
        $page      = $RCMAIL->storage->get_page();
        $page_size = $RCMAIL->storage->get_pagesize();

@@ -108,4 +115,7 @@
    }
}

// trigger refresh hook
$RCMAIL->plugins->exec_hook('refresh', array());

$OUTPUT->send();