From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations

---
 program/steps/mail/list.inc |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index 58a1bb8..b3ea08b 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -6,7 +6,7 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
  | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
- | All rights reserved.                                                  |
+ | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
  |   Send message list to client (as remote response)                    |
@@ -20,26 +20,57 @@
 */
 
 $REMOTE_REQUEST = TRUE;
+$OUTPUT_TYPE = 'js';
 
-$count = $IMAP->messagecount();
+$sort = isset($_GET['_sort']) ? $_GET['_sort'] : false;
+
+// is there a sort type for this request?
+if ($sort)
+  {
+  // 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;
+  }
+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);
+  }
+
+$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_GET['_refresh']) ? TRUE : FALSE);
 
 // 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());
+$commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($count));
 
 // update mailboxlist
-$mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$mbox_name = $IMAP->get_mailbox_name();
+$commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $unseen);
 
 
 // add message rows
-if ($count)
-  {
-  $a_headers = $IMAP->list_headers($mbox);
+if (isset($a_headers) && count($a_headers))
   $commands .= rcmail_js_message_list($a_headers);
-  }
 
   
 // send response

--
Gitblit v1.9.1