diff options
author | thomascube <thomas@roundcube.net> | 2010-03-17 15:24:09 +0300 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2010-03-17 15:24:09 +0300 |
commit | f52c936f4d451a5d3a87d2501aa5a1701cdafde5 (patch) | |
tree | e95611d6d47ea75e76d15ebbdea1daf4a3de83ba /program/steps/mail/list.inc | |
parent | f4f1c442f7eb3edbb48dbcc705c6d83dcaf8e021 (diff) |
Merged devel-threads branch (r3066:3364) back into trunk
Diffstat (limited to 'program/steps/mail/list.inc')
-rw-r--r-- | program/steps/mail/list.inc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index cd1a3142d..89d127cdc 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.inc @@ -33,8 +33,6 @@ if ($sort = get_input_value('_sort', RCUBE_INPUT_GET)) $save_arr = array(); $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col; $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order; - - $RCMAIL->user->save_prefs($save_arr); } else { @@ -43,6 +41,16 @@ else $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 = array(); + $_SESSION['list_columns'] = $save_arr['list_cols'] = explode(',', $cols); +} + +if ($save_arr) + $RCMAIL->user->save_prefs($save_arr); + $mbox_name = $IMAP->get_mailbox_name(); // initialize searching result if search_filter is used @@ -55,9 +63,13 @@ if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') } // fetch message headers -if ($count = $IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh']))) +if ($count = $IMAP->messagecount($mbox_name, $IMAP->threading ? 'THREADS' : 'ALL', !empty($_REQUEST['_refresh']))) $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order); +// update search set (possible change of threading mode) +if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) + $_SESSION['search'][$_REQUEST['_search']] = $IMAP->get_search_set(); + // update mailboxlist rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh'])); @@ -65,13 +77,14 @@ rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh'])); $pages = ceil($count/$IMAP->page_size); $OUTPUT->set_env('messagecount', $count); $OUTPUT->set_env('pagecount', $pages); +$OUTPUT->set_env('threading', (bool) $IMAP->threading); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count)); $OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text()); // add message rows +rcmail_js_message_list($a_headers, FALSE, TRUE, (bool) $cols); if (isset($a_headers) && count($a_headers)) { - rcmail_js_message_list($a_headers); if ($search_request) $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count)); } |