X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Fmail%2Flist.inc;h=3505d481ac1d98db4f30aea1aa27838597efb6f2;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=4c948bed4ab64b7574b2f3e8cf236f2048208d9b;hpb=d326b0c67bb536d2296004c927e89ab8c4a548b5;p=roundcube.git

diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 4c948be..3505d48 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/list.inc                                           |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2007, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,11 +15,14 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: list.inc 1019 2008-02-05 21:39:08Z thomasb $
+ $Id: list.inc 5266 2011-09-22 07:49:33Z alec $
 
 */
 
-$OUTPUT_TYPE = 'js';
+if (!$OUTPUT->ajax_call) {
+  return;
+}
+
 // is there a sort type for this request?
 if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
 {
@@ -27,8 +30,9 @@ if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
   list($sort_col, $sort_order) = explode('_', $sort);
 
   // set session vars for sort (so next page and task switch know how to sort)
-  $_SESSION['sort_col'] = $sort_col;
-  $_SESSION['sort_order'] = $sort_order;
+  $save_arr = array();
+  $_SESSION['sort_col'] = $save_arr['message_sort_col'] = $sort_col;
+  $_SESSION['sort_order'] = $save_arr['message_sort_order'] = $sort_order;
 }
 else
 {
@@ -37,32 +41,81 @@ 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();
+  $save_arr['list_cols'] = explode(',', $cols);
+}
+
+if ($save_arr)
+  $RCMAIL->user->save_prefs($save_arr);
+
 $mbox_name = $IMAP->get_mailbox_name();
 
+// Synchronize mailbox cache, handle flag changes
+$IMAP->mailbox_sync($mbox_name);
+
+// initialize searching result if search_filter is used
+if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
+{
+  $search_request = md5($mbox_name.$_SESSION['search_filter']);
+  $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col);
+  $_SESSION['search'] = $IMAP->get_search_set();
+  $_SESSION['search_request'] = $search_request;
+  $OUTPUT->set_env('search_request', $search_request);
+}
+
 // fetch message headers
-if ($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);
 
-$count = $IMAP->messagecount($mbox_name);
-$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh']));
+// update search set (possible change of threading mode)
+if (!empty($_REQUEST['_search']) && isset($_SESSION['search'])
+    && $_SESSION['search_request'] == $_REQUEST['_search']
+) {
+  $_SESSION['search'] = $IMAP->get_search_set();
+}
+// remove old search data
+else if (empty($_REQUEST['_search']) && isset($_SESSION['search'])) {
+  $RCMAIL->session->remove('search');
+}
+
+
+// empty result? we'll skip UNSEEN counting in rcmail_send_unread_count()
+if (empty($search_request) && empty($a_headers)) {
+    $unseen = 0;
+}
+
+// update mailboxlist
+rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']), $unseen);
 
 // update message count display
 $pages = ceil($count/$IMAP->page_size);
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', $pages);
-$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count));
-
+$OUTPUT->set_env('threading', (bool) $IMAP->threading);
+$OUTPUT->set_env('current_page', $count ? $IMAP->list_page : 1);
+$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name);
+$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());
 
 // add message rows
+rcmail_js_message_list($a_headers, FALSE, $cols);
 if (isset($a_headers) && count($a_headers))
-  rcmail_js_message_list($a_headers);
-else
-  $OUTPUT->show_message('nomessagesfound', 'notice');
-  
-// update mailboxlist
-$OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+{
+  if ($search_request)
+    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+}
+else {
+  // handle IMAP errors (e.g. #1486905)
+  if ($err_code = $IMAP->get_error_code()) {
+    rcmail_display_server_error();
+  }
+  else if ($search_request)
+    $OUTPUT->show_message('searchnomatch', 'notice');
+  else
+    $OUTPUT->show_message('nomessagesfound', 'notice');
+}
 
 // send response
 $OUTPUT->send();
-
-?>