Merged devel-framework branch (r5746:5779) back into trunk

1 files changed, 26 insertions, 19 deletions

diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index 3b52dfe4f..ab64debb7 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -30,18 +30,20 @@ $a_flags_map = array(
   'flagged' => 'FLAGGED',
   'unflagged' => 'UNFLAGGED');
 
+$threading = (bool) $RCMAIL->storage->get_threading();
+
 if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_value('_flag', RCUBE_INPUT_POST)))
 {
   $flag = $a_flags_map[$flag] ? $a_flags_map[$flag] : strtoupper($flag);
 
   if ($flag == 'DELETED' && $CONFIG['skip_deleted'] && $_POST['_from'] != 'show') {
     // 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);
+    $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
+    $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
     $count = sizeof(explode(',', $uids));
   }
 
-  $marked = $RCMAIL->imap->set_flag($uids, $flag);
+  $marked = $RCMAIL->storage->set_flag($uids, $flag);
 
   if (!$marked) {
     // send error message
@@ -57,14 +59,14 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
 
   if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
     $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
-    $read = $RCMAIL->imap->set_flag($ruids, 'SEEN');
+    $read = $RCMAIL->storage->set_flag($ruids, 'SEEN');
 
     if ($read && !$CONFIG['skip_deleted'])
       $OUTPUT->command('flag_deleted_as_read', $ruids);
   }
 
   if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
-    rcmail_send_unread_count($RCMAIL->imap->get_mailbox_name());
+    rcmail_send_unread_count($RCMAIL->storage->get_folder());
   }
   else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
     if ($_POST['_from'] == 'show') {
@@ -73,31 +75,35 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       else
         $OUTPUT->command('command', 'list');
     } else {
+      $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();
       }
 
-      $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) {
@@ -106,15 +112,16 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       }
       $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 ($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);