summaryrefslogtreecommitdiff
path: root/program/steps/mail
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 /program/steps/mail
parentf91a4990461d44f12755628f732b3b25544b96cc (diff)
Fixed wrong message listing when showing search results
Diffstat (limited to 'program/steps/mail')
-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
3 files changed, 76 insertions, 72 deletions
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