Display quota information for current folder not INBOX only (#1487993)

Aleksander Machniak

2014-06-30 b8bcca7033b3d10eb7da4b7a1f9987ee9e25a45b

 program/steps/mail/check_recent.inc

@@ -21,7 +21,7 @@

// If there's no folder or messages list, there's nothing to update
// This can happen on 'refresh' request
if (empty($_REQUEST['_folderlist']) && empty($_REQUEST['_list'])) {
if (empty($_POST['_folderlist']) && empty($_POST['_list'])) {
    return;
}

@@ -30,8 +30,9 @@
$check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders');

$search_request = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC);
if ($search_request && $_SESSION['search_request'] != $search_request)
if ($search_request && $_SESSION['search_request'] != $search_request) {
    $search_request = null;
}

// list of folders to check
if ($check_all) {
@@ -76,18 +77,21 @@
        if ($search_request && isset($_SESSION['search'])) {
            unset($search_request);  // only do this once
            $_SESSION['search'] = $RCMAIL->storage->refresh_search();
            if ($_SESSION['search'][1]->multi)
            if ($_SESSION['search'][1]->multi) {
                $mbox_name = '';
            }
        }

        if (!empty($_GET['_quota']))
            $OUTPUT->command('set_quota', $RCMAIL->quota_content());
        if (!empty($_POST['_quota'])) {
            $OUTPUT->command('set_quota', $RCMAIL->quota_content(null, $mbox_name));
        }

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

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

        // get overall message count; allow caching because rcube_storage::folder_status()
        // did a refresh but only in list mode
@@ -143,7 +147,7 @@

    // set trash folder state
    if ($mbox_name === $trash) {
        $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
        $OUTPUT->command('set_trash_count', $RCMAIL->storage->count($mbox_name, 'EXISTS', true));
    }
}