| | |
| | | $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col; |
| | | $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order; |
| | | } |
| | | else |
| | | { |
| | | // use session settings if set, defaults if not |
| | | $sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col']; |
| | | $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order']; |
| | | } |
| | | |
| | | // is there a set of columns for this request? |
| | | if ($cols = get_input_value('_cols', RCUBE_INPUT_GET)) |
| | |
| | | $save_arr['list_cols'] = explode(',', $cols); |
| | | } |
| | | |
| | | if ($save_arr) { |
| | | if ($save_arr) |
| | | $RCMAIL->user->save_prefs($save_arr); |
| | | |
| | | // force page reload if list columns changed in IE8 (#1487822) |
| | | if ($save_arr['list_cols'] && $OUTPUT->browser->ie && $OUTPUT->browser->ver == 8) { |
| | | $OUTPUT->redirect(array('_mbox' => $RCMAIL->storage->get_folder()), 0); |
| | | } |
| | | } |
| | | |
| | | $mbox_name = $RCMAIL->storage->get_folder(); |
| | | $threading = (bool) $RCMAIL->storage->get_threading(); |
| | |
| | | if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') |
| | | { |
| | | $search_request = md5($mbox_name.$_SESSION['search_filter']); |
| | | $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col); |
| | | $RCMAIL->storage->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, rcmail_sort_column()); |
| | | $_SESSION['search'] = $RCMAIL->storage->get_search_set(); |
| | | $_SESSION['search_request'] = $search_request; |
| | | $OUTPUT->set_env('search_request', $search_request); |
| | |
| | | |
| | | // fetch message headers |
| | | if ($count = $RCMAIL->storage->count($mbox_name, $threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh']))) |
| | | $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, $sort_col, $sort_order); |
| | | $a_headers = $RCMAIL->storage->list_messages($mbox_name, NULL, rcmail_sort_column(), rcmail_sort_order()); |
| | | |
| | | // update search set (possible change of threading mode) |
| | | if (!empty($_REQUEST['_search']) && isset($_SESSION['search']) |