diff options
| author | thomascube <thomas@roundcube.net> | 2012-01-16 15:14:41 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2012-01-16 15:14:41 +0000 |
| commit | c321a955a7b0f6d6b13ffaebf040a6c7091037ae (patch) | |
| tree | 60c257d29a726d9bdda7fb75a198342aaef315fa /program/steps/mail/search.inc | |
| parent | 8764b6ecf0c8d1b0646915a8139cdf6bbac2ca14 (diff) | |
Merged devel-framework branch (r5746:5779) back into trunk
Diffstat (limited to 'program/steps/mail/search.inc')
| -rw-r--r-- | program/steps/mail/search.inc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc index 42bdf9776..8835730e4 100644 --- a/program/steps/mail/search.inc +++ b/program/steps/mail/search.inc @@ -18,8 +18,8 @@ $REMOTE_REQUEST = TRUE; // reset list_page and old search results -$RCMAIL->imap->set_page(1); -$RCMAIL->imap->set_search_set(NULL); +$RCMAIL->storage->set_page(1); +$RCMAIL->storage->set_search_set(NULL); $_SESSION['page'] = 1; // using encodeURI with javascript "should" give us @@ -107,32 +107,32 @@ $search_str = trim($search_str); // execute IMAP search if ($search_str) - $RCMAIL->imap->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']); + $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $_SESSION['sort_col']); // save search results in session if (!is_array($_SESSION['search'])) $_SESSION['search'] = array(); if ($search_str) { - $_SESSION['search'] = $RCMAIL->imap->get_search_set(); + $_SESSION['search'] = $RCMAIL->storage->get_search_set(); $_SESSION['last_text_search'] = $str; } $_SESSION['search_request'] = $search_request; // Get the headers -$result_h = $RCMAIL->imap->list_headers($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']); -$count = $RCMAIL->imap->messagecount($mbox, $RCMAIL->imap->threading ? 'THREADS' : 'ALL'); +$result_h = $RCMAIL->storage->list_messages($mbox, 1, $_SESSION['sort_col'], $_SESSION['sort_order']); +$count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL'); // Make sure we got the headers if (!empty($result_h)) { rcmail_js_message_list($result_h); if ($search_str) - $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->imap->messagecount(NULL, 'ALL'))); + $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL'))); } // handle IMAP errors (e.g. #1486905) -else if ($err_code = $RCMAIL->imap->get_error_code()) { +else if ($err_code = $RCMAIL->storage->get_error_code()) { rcmail_display_server_error(); } else { @@ -142,8 +142,6 @@ else { // update message count display $OUTPUT->set_env('search_request', $search_str ? $search_request : ''); $OUTPUT->set_env('messagecount', $count); -$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->imap->page_size)); +$OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize())); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox); $OUTPUT->send(); - - |