diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/lib/Roundcube/rcube_imap.php | 63 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_result_multifolder.php | 15 | ||||
| -rw-r--r-- | program/steps/mail/search.inc | 3 |
3 files changed, 57 insertions, 24 deletions
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php index a708e1d92..41430db01 100644 --- a/program/lib/Roundcube/rcube_imap.php +++ b/program/lib/Roundcube/rcube_imap.php @@ -955,35 +955,52 @@ class rcube_imap extends rcube_storage $sort_field = $this->sort_field; $search_set = $this->search_set; - $this->sort_field = null; - $this->page_size = 1000; // fetch up to 1000 matching messages per folder - $this->threading = false; - - $a_msg_headers = array(); - foreach ($search_set->sets as $resultset) { - if (!$resultset->is_empty()) { - $this->search_set = $resultset; - $this->search_threads = $resultset instanceof rcube_result_thread; - $a_msg_headers = array_merge($a_msg_headers, $this->list_search_messages($resultset->get_parameters('MAILBOX'), 1)); - } - } - - // do sorting and paging + // prepare paging $cnt = $search_set->count(); $from = ($page-1) * $page_size; $to = $from + $page_size; + $slice_length = min($page_size, $cnt - $from); + + // fetch resultset headers, sort and slice them + if (!empty($sort_field)) { + $this->sort_field = null; + $this->page_size = 1000; // fetch up to 1000 matching messages per folder + $this->threading = false; + + $a_msg_headers = array(); + foreach ($search_set->sets as $resultset) { + if (!$resultset->is_empty()) { + $this->search_set = $resultset; + $this->search_threads = $resultset instanceof rcube_result_thread; + $a_msg_headers = array_merge($a_msg_headers, $this->list_search_messages($resultset->get_parameters('MAILBOX'), 1)); + } + } - // sort headers - if (!$this->threading && !empty($a_msg_headers)) { - $a_msg_headers = $this->conn->sortHeaders($a_msg_headers, $sort_field, $this->sort_order); - } + // sort headers + if (!empty($a_msg_headers)) { + $a_msg_headers = $this->conn->sortHeaders($a_msg_headers, $sort_field, $this->sort_order); + } - // store (sorted) message index - $search_set->set_message_index($a_msg_headers, $sort_field, $this->sort_order); + // store (sorted) message index + $search_set->set_message_index($a_msg_headers, $sort_field, $this->sort_order); - // only return the requested part of the set - $slice_length = min($page_size, $cnt - $from); - $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length); + // only return the requested part of the set + $a_msg_headers = array_slice(array_values($a_msg_headers), $from, $slice_length); + } + else { + // slice resultset first... + $fetch = array(); + foreach (array_slice($search_set->get(), $from, $slice_length) as $msg_id) { + list($uid, $folder) = explode('-', $msg_id, 2); + $fetch[$folder][] = $uid; + } + + // ... and fetch the requested set of headers + $a_msg_headers = array(); + foreach ($fetch as $folder => $a_index) { + $a_msg_headers = array_merge($a_msg_headers, array_values($this->fetch_headers($folder, $a_index))); + } + } if ($slice) { $a_msg_headers = array_slice($a_msg_headers, -$slice, $slice); diff --git a/program/lib/Roundcube/rcube_result_multifolder.php b/program/lib/Roundcube/rcube_result_multifolder.php index ac0889526..74a3d7805 100644 --- a/program/lib/Roundcube/rcube_result_multifolder.php +++ b/program/lib/Roundcube/rcube_result_multifolder.php @@ -169,6 +169,21 @@ class rcube_result_multifolder } /** + * Slices data set. + * + * @param $offset Offset (as for PHP's array_slice()) + * @param $length Number of elements (as for PHP's array_slice()) + * + */ + public function slice($offset, $length) + { + $data = array_slice($this->get(), $offset, $length); + + $this->index = $data; + $this->meta['count'] = count($data); + } + + /** * Filters data set. Removes elements not listed in $ids list. * * @param array $ids List of IDs to keep. diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 797c8fcd8..c97e3ac5a 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -108,7 +108,8 @@ if (!empty($subject)) { // search all, current or subfolders folders if ($scope == 'all') { - $mboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail'); + $mboxes = $RCMAIL->storage->list_folders_subscribed('', '*', 'mail', null, true); + natcasesort($mboxes); // we want natural alphabetic sorting of folders in the result set } else if ($scope == 'sub') { $mboxes = $RCMAIL->storage->list_folders_subscribed($mbox, '*', 'mail'); |