Aleksander Machniak
2015-06-17 3f4521bcf4b538b6ac54817cfad22b51e347546d
program/steps/mail/func.inc
@@ -64,17 +64,6 @@
    $mbox_name = $RCMAIL->storage->get_folder();
    if (empty($RCMAIL->action)) {
        // initialize searching result if search_filter is used
        if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
            $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET, rcmail_sort_column());
            $search_request             = md5($mbox_name.$_SESSION['search_filter']);
            $_SESSION['search']         = $RCMAIL->storage->get_search_set();
            $_SESSION['search_request'] = $search_request;
            $OUTPUT->set_env('search_request', $search_request);
        }
        $OUTPUT->set_env('search_mods', rcmail_search_mods());
        if (!empty($_SESSION['search_scope']))
@@ -172,12 +161,17 @@
    if (!strlen($mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true))) {
        $mbox = strlen($_SESSION['mbox']) ? $_SESSION['mbox'] : 'INBOX';
    }
    if (!($page = intval($_GET['_page']))) {
        $page = $_SESSION['page'] ? $_SESSION['page'] : 1;
    if ($RCMAIL->action == 'list') {
        if (!($page = intval($_GET['_page']))) {
            $page = $_SESSION['page'] ? $_SESSION['page'] : 1;
        }
        $_SESSION['page'] = $page;
    }
    $RCMAIL->storage->set_folder($_SESSION['mbox'] = $mbox);
    $RCMAIL->storage->set_page($_SESSION['page'] = $page);
    $RCMAIL->storage->set_page($_SESSION['page']);
    // set default sort col/order to session
    if (!isset($_SESSION['sort_col'])) {
@@ -2056,7 +2050,7 @@
    $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('low'), 'HEADER X-PRIORITY 4');
    $select_filter->add($RCMAIL->gettext('priority').': '.$RCMAIL->gettext('lowest'), 'HEADER X-PRIORITY 5');
    $out = $select_filter->show($_SESSION['search_filter']);
    $out = $select_filter->show($_REQUEST['_search'] ? $_SESSION['search_filter'] : 'ALL');
    $RCMAIL->output->add_gui_object('search_filter', $attrib['id']);