Imported Upstream version 0.2~stable

[roundcube.git] / program / steps / mail / list.inc

diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 02c15cf101cb2a591fec5cf826258efd126a492e..cf6db639cde0c7cdb7771d77e6ee4035b6378c43 100644 (file)
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/list.inc                                           |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,66 +15,73 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: list.inc 232 2006-05-18 15:46:50Z cmcnulty $
+ $Id: list.inc 2109 2008-12-03 08:16:44Z alec $
 
 */
 
-$REMOTE_REQUEST = TRUE;
-$OUTPUT_TYPE = 'js';
-
-$sort = isset($_GET['_sort']) ? $_GET['_sort'] : false;
-
 // is there a sort type for this request?
-if ($sort)
-  {
+if ($sort = get_input_value('_sort', RCUBE_INPUT_GET))
+{
   // yes, so set the sort vars
   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;
+  
+  $RCMAIL->user->save_prefs($save_arr);
+}
 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'];
-  }
-  
+}
 
-// we have a saved search request
-if (!empty($_GET['_search']) && isset($_SESSION['search'][$_GET['_search']]))
-  {
-  $a_msgs = split(',', $_SESSION['search'][$_GET['_search']]);
-  $a_headers = $IMAP->list_header_set($mbox_name, $a_msgs, NULL, $sort_col, $sort_order);
-  $count = count($a_msgs);
-  }
-else
-  {
-  if ($count = $IMAP->messagecount())
-    $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
-  }
+$mbox_name = $IMAP->get_mailbox_name();
 
-$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_GET['_refresh']) ? TRUE : FALSE);
+// initialize searching result if search_filter is used
+if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL')
+{
+  $search_request = md5($mbox_name.$_SESSION['search_filter']);
 
-// update message count display
-$pages = ceil($count/$IMAP->page_size);
-$commands = sprintf("this.set_env('messagecount', %d);\n", $count);
-$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
-$commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($count));
+  $IMAP->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET, $sort_col);
+  $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+  $OUTPUT->set_env('search_request', $search_request);
+}
+                             
 
-// update mailboxlist
-$mbox_name = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $unseen);
+// fetch message headers
+if ($IMAP->messagecount($mbox_name, '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 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->command('set_mailboxname', rcmail_get_mailbox_name_text());
 
 // add message rows
 if (isset($a_headers) && count($a_headers))
-  $commands .= rcmail_js_message_list($a_headers);
-
+{
+  rcmail_js_message_list($a_headers);
+  if ($search_request)
+    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $count));
+}
+else if ($search_request)
+  $OUTPUT->show_message('searchnomatch', 'notice');
+else
+  $OUTPUT->show_message('nomessagesfound', 'notice');
   
+// update mailboxlist
+$OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+
 // send response
-rcube_remote_response($commands);
+$OUTPUT->send();
 
-exit;
-?>
\ No newline at end of file
+?>