1 files changed, 25 insertions, 18 deletions

diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 95a456ed5..63f27440f 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -24,8 +24,9 @@ if (!$OUTPUT->ajax_call)
   return;
 
 // count messages before changing anything
-$old_count = $RCMAIL->imap->messagecount(NULL, $RCMAIL->imap->threading ? 'THREADS' : 'ALL');
-$old_pages = ceil($old_count / $RCMAIL->imap->page_size);
+$threading = (bool) $RCMAIL->storage->get_threading();
+$old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+$old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
 
 // move messages
 if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
@@ -33,7 +34,7 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_targe
     $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
 
-    $moved = $RCMAIL->imap->move_message($uids, $target, $mbox);
+    $moved = $RCMAIL->storage->move_message($uids, $target, $mbox);
 
     if (!$moved) {
         // send error message
@@ -54,7 +55,7 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
     $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
 
-    $del = $RCMAIL->imap->delete_message($uids, $mbox);
+    $del = $RCMAIL->storage->delete_message($uids, $mbox);
 
     if (!$del) {
         // send error message
@@ -75,9 +76,11 @@ else {
     exit;
 }
 
+$search_request = get_input_value('_search', RCUBE_INPUT_GPC);
+
 // refresh saved search set after moving some messages
-if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $RCMAIL->imap->search_set) {
-    $_SESSION['search'] = $RCMAIL->imap->refresh_search();
+if ($search_request && $RCMAIL->storage->get_search_set()) {
+    $_SESSION['search'] = $RCMAIL->storage->refresh_search();
 }
 
 if ($_POST['_from'] == 'show')
@@ -89,26 +92,29 @@ if ($_POST['_from'] == 'show')
 }
 else
 {
-  $msg_count      = $RCMAIL->imap->messagecount(NULL, $RCMAIL->imap->threading ? 'THREADS' : 'ALL');
-  $pages          = ceil($msg_count / $RCMAIL->imap->page_size);
-  $nextpage_count = $old_count - $RCMAIL->imap->page_size * $RCMAIL->imap->list_page;
-  $remaining      = $msg_count - $RCMAIL->imap->page_size * ($RCMAIL->imap->list_page - 1);
+  $msg_count      = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+  $page_size      = $RCMAIL->storage->get_pagesize();
+  $page           = $RCMAIL->storage->get_page();
+  $pages          = ceil($msg_count / $page_size);
+  $nextpage_count = $old_count - $page_size * $page;
+  $remaining      = $msg_count - $page_size * ($page - 1);
 
   // jump back one page (user removed the whole last page)
-  if ($RCMAIL->imap->list_page > 1 && $remaining == 0) {
-    $RCMAIL->imap->set_page($RCMAIL->imap->list_page-1);
-    $_SESSION['page'] = $RCMAIL->imap->list_page;
+  if ($page > 1 && $remaining == 0) {
+    $page -= 1;
+    $RCMAIL->storage->set_page($page);
+    $_SESSION['page'] = $page;
     $jump_back = true;
   }
 
   // update message count display
   $OUTPUT->set_env('messagecount', $msg_count);
-  $OUTPUT->set_env('current_page', $RCMAIL->imap->list_page);
+  $OUTPUT->set_env('current_page', $page);
   $OUTPUT->set_env('pagecount', $pages);
 
   // update mailboxlist
-  $mbox = $RCMAIL->imap->get_mailbox_name();
-  $unseen_count = $msg_count ? $RCMAIL->imap->messagecount($mbox, 'UNSEEN') : 0;
+  $mbox = $RCMAIL->storage->get_folder();
+  $unseen_count = $msg_count ? $RCMAIL->storage->count($mbox, 'UNSEEN') : 0;
   $old_unseen = rcmail_get_unseen_count($mbox);
 
   if ($old_unseen != $unseen_count) {
@@ -123,15 +129,16 @@ else
   $OUTPUT->command('set_quota', rcmail_quota_content());
   $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
 
-  if ($RCMAIL->imap->threading)
+  if ($threading) {
     $count = get_input_value('_count', RCUBE_INPUT_POST);
+  }
 
   // add new rows from next page (if any)
   if ($addrows && $count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
     $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 = $RCMAIL->imap->list_headers($mbox, NULL, $sort_col, $sort_order,
+    $a_headers = $RCMAIL->storage->list_messages($mbox, NULL, $sort_col, $sort_order,
       $jump_back ? NULL : $count);
 
     rcmail_js_message_list($a_headers, false);