summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2006-12-20 14:27:47 +0000
committerthomascube <thomas@roundcube.net>2006-12-20 14:27:47 +0000
commit04c61804f81a3ed839ef35e7fa70185f713498fd (patch)
tree9e323c0acddce59a3daaaa9ae86066384dff64be
parentf91a4990461d44f12755628f732b3b25544b96cc (diff)
Fixed wrong message listing when showing search results
-rw-r--r--CHANGELOG7
-rw-r--r--program/include/rcube_imap.inc99
-rw-r--r--program/steps/mail/list.inc17
-rw-r--r--program/steps/mail/move_del.inc17
-rw-r--r--program/steps/mail/search.inc114
5 files changed, 170 insertions, 84 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a27960901..8566f01a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
CHANGELOG RoundCube Webmail
---------------------------
+2006/12/20 (thomasb)
+----------
+- Fixed wrong message listing when showing search results (closes #1484131)
+- Introduced functions Q() and JQ() as aliases for rep_specialchars_output()
+- Show remote images when opening HTML message part as attachment
+
+
2006/12/17 (thomasb)
----------
- Added patch by Ryan Rittenhouse & David Glick for a resizeable preview pane
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index fafef6791..d057e0ec1 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -5,7 +5,7 @@
| program/include/rcube_imap.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2006, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -35,7 +35,7 @@ require_once('lib/mime.inc');
*
* @package RoundCube Webmail
* @author Thomas Bruederli <roundcube@gmail.com>
- * @version 1.34
+ * @version 1.36
* @link http://ilohamail.org
*/
class rcube_imap
@@ -60,6 +60,10 @@ class rcube_imap
var $msg_headers = array();
var $capabilities = array();
var $skip_deleted = FALSE;
+ var $search_set = NULL;
+ var $search_subject = '';
+ var $search_string = '';
+ var $search_charset = '';
var $debug_level = 1;
@@ -265,6 +269,36 @@ class rcube_imap
{
$this->page_size = (int)$size;
}
+
+
+ /**
+ * Save a set of message ids for future message listing methods
+ *
+ * @param array List of IMAP fields to search in
+ * @param string Search string
+ * @param array List of message ids or NULL if empty
+ */
+ function set_search_set($subject, $str=null, $msgs=null, $charset=null)
+ {
+ if (is_array($subject) && $str == null && $msgs == null)
+ list($subject, $str, $msgs, $charset) = $subject;
+ if ($msgs != null && !is_array($msgs))
+ $msgs = split(',', $msgs);
+
+ $this->search_subject = $subject;
+ $this->search_string = $str;
+ $this->search_set = is_array($msgs) ? $msgs : NULL;
+ $this->search_charset = $charset;
+ }
+
+
+ /**
+ * Return the saved search set as hash array
+ */
+ function get_search_set()
+ {
+ return array($this->search_subject, $this->search_string, $this->search_set, $this->search_charset);
+ }
/**
@@ -402,6 +436,10 @@ class rcube_imap
if (empty($mailbox))
$mailbox = $this->mailbox;
+
+ // count search set
+ if ($this->search_set && $mailbox == $this->mailbox && $mode == 'ALL')
+ return count($this->search_set);
$a_mailbox_cache = $this->get_cache('messagecount');
@@ -481,7 +519,11 @@ class rcube_imap
{
if (!strlen($mailbox))
return array();
-
+
+ // use saved message set
+ if ($this->search_set && $mailbox == $this->mailbox)
+ return $this->_list_header_set($mailbox, $this->search_set, $page, $sort_field, $sort_order);
+
if ($sort_field!=NULL)
$this->sort_field = $sort_field;
if ($sort_order!=NULL)
@@ -492,10 +534,10 @@ class rcube_imap
list($begin, $end) = $this->_get_message_range($max, $page);
- // mailbox is empty
+ // mailbox is empty
if ($begin >= $end)
return array();
-
+
$headers_sorted = FALSE;
$cache_key = $mailbox.'.msg';
$cache_status = $this->check_cache_status($mailbox, $cache_key);
@@ -614,14 +656,14 @@ class rcube_imap
$this->_fetch_headers($mailbox, join(',', $msgs), $a_msg_headers, NULL);
// return empty array if no messages found
- if (!is_array($a_msg_headers) || empty($a_msg_headers))
- return array();
+ if (!is_array($a_msg_headers) || empty($a_msg_headers))
+ return array();
// if not already sorted
$a_msg_headers = iil_SortHeaders($a_msg_headers, $this->sort_field, $this->sort_order);
- // only return the requested part of the set
- return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
+ // only return the requested part of the set
+ return array_slice(array_values($a_msg_headers), $start_msg, min($max-$start_msg, $this->page_size));
}
@@ -830,7 +872,19 @@ class rcube_imap
function search($mbox_name='', $criteria='ALL', $str=NULL, $charset=NULL)
{
$mailbox = $mbox_name ? $this->_mod_mailbox($mbox_name) : $this->mailbox;
- if ($str && $criteria)
+
+ // have an array of criterias => execute multiple searches
+ if (is_array($criteria) && $str)
+ {
+ $results = array();
+ foreach ($criteria as $crit)
+ $results = array_merge($results, $this->search($mbox_name, $crit, $str, $charset));
+
+ $results = array_unique($results);
+ $this->set_search_set($criteria, $str, $results, $charset);
+ return $results;
+ }
+ else if ($str && $criteria)
{
$search = (!empty($charset) ? "CHARSET $charset " : '') . sprintf("%s {%d}\r\n%s", $criteria, strlen($str), $str);
$results = $this->_search_index($mailbox, $search);
@@ -839,6 +893,7 @@ class rcube_imap
if (empty($results) && !empty($charset) && $charset!='ISO-8859-1')
$results = $this->search($mbox_name, $criteria, rcube_charset_convert($str, $charset, 'ISO-8859-1'), 'ISO-8859-1');
+ $this->set_search_set($criteria, $str, $results, $charset);
return $results;
}
else
@@ -866,6 +921,18 @@ class rcube_imap
return $a_messages;
}
+
+
+ /**
+ * Refresh saved search set
+ */
+ function refresh_search()
+ {
+ if (!empty($this->search_subject) && !empty($this->search_string))
+ $this->search_set = $this->search('', $this->search_subject, $this->search_string, $this->search_charset);
+
+ return $this->get_search_set();
+ }
/**
@@ -1303,6 +1370,10 @@ class rcube_imap
$this->_clear_messagecount($from_mbox);
$this->_clear_messagecount($to_mbox);
}
+
+ // remove message ids from search set
+ if ($moved && $this->search_set && $from_mbox == $this->mailbox)
+ $this->search_set = array_diff($this->search_set, $a_mids);
// update cached message headers
$cache_key = $from_mbox.'.msg';
@@ -1311,8 +1382,8 @@ class rcube_imap
$start_index = 100000;
foreach ($a_uids as $uid)
{
- if(($index = array_search($uid, $a_cache_index)) !== FALSE)
- $start_index = min($index, $start_index);
+ if (($index = array_search($uid, $a_cache_index)) !== FALSE)
+ $start_index = min($index, $start_index);
}
// clear cache from the lowest index on
@@ -1352,6 +1423,10 @@ class rcube_imap
$this->_clear_messagecount($mailbox);
}
+ // remove message ids from search set
+ if ($moved && $this->search_set && $mailbox == $this->mailbox)
+ $this->search_set = array_diff($this->search_set, $a_mids);
+
// remove deleted messages from cache
$cache_key = $mailbox.'.msg';
if ($deleted && ($a_cache_index = $this->get_message_cache_index($cache_key)))
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index b3ea08b28..9e3b38d57 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -40,20 +40,11 @@ else
$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);
- }
+
+// fetch message headers
+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);
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index a7aa5c782..b0079f75f 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -59,10 +59,15 @@ else
exit;
}
+// refresh saved seach set after moving some messages
+if (($search_request = $_GET['_search']) && $IMAP->search_set)
+ $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+
// update message count display
-$pages = ceil($IMAP->messagecount()/$IMAP->page_size);
-$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
+$msg_count = $IMAP->messagecount();
+$pages = ceil($msg_count / $IMAP->page_size);
+$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($msg_count));
$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
@@ -78,12 +83,16 @@ $commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota());
// add new rows from next page (if any)
if ($_GET['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
{
- $a_headers = $IMAP->list_headers($mbox, null, $_SESSION['sort_col'], $_SESSION['sort_order']);
+ $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'];
+
+ $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
$a_headers = array_slice($a_headers, -$count, $count);
+
$commands .= rcmail_js_message_list($a_headers);
}
-
+
// send response
rcube_remote_response($commands);
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index e1690ee63..c4b843b55 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -15,8 +15,9 @@
$REMOTE_REQUEST = TRUE;
-// reset list_page
+// reset list_page and old search results
$IMAP->set_page(1);
+$IMAP->set_search_set(NULL);
$_SESSION['page'] = 1;
// using encodeURI with javascript "should" give us
@@ -26,82 +27,85 @@ $imap_charset = 'UTF-8';
// get search string
$str = get_input_value('_search', RCUBE_INPUT_GET);
$mbox = get_input_value('_mbox', RCUBE_INPUT_GET);
-$search_request = md5($str);
+$search_request = md5($mbox.$str);
// Check the search string for type of search
-if (preg_match("/^from:/i", $str)) {
+if (preg_match("/^from:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER FROM" ,trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "HEADER FROM";
+ $search = trim($srch);
}
-else if (preg_match("/^to:/i", $str)) {
+else if (preg_match("/^to:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER TO", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "HEADER TO";
+ $search = trim($srch);
}
-else if (preg_match("/^cc:/i", $str)) {
+else if (preg_match("/^cc:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER CC", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "HEADER CC";
+ $search = trim($srch);
}
-else if (preg_match("/^subject:/i", $str)) {
+else if (preg_match("/^subject:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "HEADER SUBJECT", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "HEADER SUBJECT";
+ $search = trim($srch);
}
-else if (preg_match("/^body:/i", $str)) {
+else if (preg_match("/^body:/i", $str))
+{
list(,$srch) = explode(":", $str);
- $search = $IMAP->search($mbox, "TEXT", trim($srch), $imap_charset);
- finish_search($mbox, $search);
+ $subject = "TEXT";
+ $search = trim($srch);
}
// search in subject and sender by default
-else {
- $search = $IMAP->search($mbox, "HEADER SUBJECT", trim($str), $imap_charset);
- $search2 = $IMAP->search($mbox, "HEADER FROM", trim($str), $imap_charset);
- finish_search($mbox, array_unique(array_merge($search, $search2)));
+else
+{
+ $subject = array("HEADER SUBJECT", "HEADER FROM");
+ $search = trim($str);
}
-// Complete the search display results or report error
-function finish_search($mbox, $search)
+// execute IMAP search
+$result = $IMAP->search($mbox, $subject, $search, $imap_charset);
+
+$commands = '';
+$count = 0;
+
+// Make sure our $result is legit..
+if (is_array($result) && $result[0] != '')
{
- global $IMAP, $JS_OBJECT_NAME, $OUTPUT, $search_request;
- $commands = '';
- $count = 0;
-
- // Make sure our $search is legit..
- if (is_array($search) && $search[0] != '')
- {
- // Get the headers
- $result_h = $IMAP->list_header_set($mbox, $search, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
- $count = count($search);
+ // Get the headers
+ $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
+ $count = count($result);
- // save search results in session
- if (!is_array($_SESSION['search']))
- $_SESSION['search'] = array();
+ // save search results in session
+ if (!is_array($_SESSION['search']))
+ $_SESSION['search'] = array();
- // Make sure we got the headers
- if ($result_h != NULL)
- {
- $_SESSION['search'][$search_request] = join(',', $search);
- $commands = rcmail_js_message_list($result_h);
- $commands .= show_message('searchsuccessful', 'confirmation', array('nr' => $count));
- }
- }
- else
+ // Make sure we got the headers
+ if ($result_h != NULL)
{
- $commands = show_message('searchnomatch', 'warning');
- $search_request = -1;
+ $_SESSION['search'][$search_request] = $IMAP->get_search_set();
+ $commands = rcmail_js_message_list($result_h);
+ $commands .= show_message('searchsuccessful', 'confirmation', array('nr' => $count));
}
-
- // update message count display
- $pages = ceil($count/$IMAP->page_size);
- $commands .= sprintf("\nthis.set_env('search_request', '%s')\n", $search_request);
- $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, 1));
- rcube_remote_response($commands);
}
+else
+ {
+ $commands = show_message('searchnomatch', 'warning');
+ $search_request = -1;
+ }
+
+// update message count display
+$pages = ceil($count/$IMAP->page_size);
+$commands .= sprintf("\nthis.set_env('search_request', '%s')\n", $search_request);
+$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, 1));
+rcube_remote_response($commands);
?> \ No newline at end of file