- Fix check-recent action issues and performance (#1486526)

- Fix messages order after checking for recent (#1484664)
- Fix messages copying
- Reset check-recent interval after check-recent by hand

4 files changed, 180 insertions, 109 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 98e75b29d..1f77550be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix check-recent action issues and performance (#1486526)
+- Fix messages order after checking for recent (#1484664)
 - Fix autocomplete shows entries without email (#1486452)
 - Fix listupdate event doesn't trigger on search response (#1486708)
 - Fix select_all_mode value after selecting a message (#1486720)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 6e4d9890e..d99687ca9 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -412,14 +412,15 @@ class rcube_imap
      * @param  string  Mailbox/folder name
      * @param  string  Mode for count [ALL|THREADS|UNSEEN|RECENT]
      * @param  boolean Force reading from server and update cache
-     * @param  boolean Enables MAXUIDs checking
+     * @param  boolean Enables storing folder status info (max UID/count),
+     *                 required for mailbox_status()
      * @return int     Number of messages
      * @access public
      */
-    function messagecount($mbox_name='', $mode='ALL', $force=false, $maxuid=true)
+    function messagecount($mbox_name='', $mode='ALL', $force=false, $status=true)
     {
         $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
-        return $this->_messagecount($mailbox, $mode, $force, $maxuid);
+        return $this->_messagecount($mailbox, $mode, $force, $status);
     }
 
 
@@ -429,7 +430,7 @@ class rcube_imap
      * @access  private
      * @see     rcube_imap::messagecount()
      */
-    private function _messagecount($mailbox='', $mode='ALL', $force=false, $maxuid=true)
+    private function _messagecount($mailbox='', $mode='ALL', $force=false, $status=true)
     {
         $mode = strtoupper($mode);
 
@@ -455,8 +456,10 @@ class rcube_imap
 
         if ($mode == 'THREADS') {
             $count = $this->_threadcount($mailbox, $msg_count);
-            if ($maxuid)
-                $_SESSION['maxuid'][$mailbox] = $msg_count ? $this->_id2uid($msg_count, $mailbox) : 0;
+            if ($status) {
+                $this->set_folder_stats($mailbox, 'cnt', $msg_count);
+                $this->set_folder_stats($mailbox, 'maxuid', $msg_count ? $this->_id2uid($msg_count, $mailbox) : 0);
+            }
         }
         // RECENT count is fetched a bit different
         else if ($mode == 'RECENT') {
@@ -480,16 +483,20 @@ class rcube_imap
       
             $count = is_array($index) ? count($index) : 0;
 
-            if ($mode == 'ALL' && $maxuid)
-                $_SESSION['maxuid'][$mailbox] = $index ? $this->_id2uid(max($index), $mailbox) : 0;
+            if ($mode == 'ALL' && $status) {
+                $this->set_folder_stats($mailbox, 'cnt', $count);
+                $this->set_folder_stats($mailbox, 'maxuid', $index ? $this->_id2uid(max($index), $mailbox) : 0);
+            }
         }
         else {
             if ($mode == 'UNSEEN')
                 $count = $this->conn->countUnseen($mailbox);
             else {
                 $count = $this->conn->countMessages($mailbox);
-                if ($maxuid)
-                    $_SESSION['maxuid'][$mailbox] = $count ? $this->_id2uid($count, $mailbox) : 0;
+                if ($status) {
+                    $this->set_folder_stats($mailbox,'cnt', $count);
+                    $this->set_folder_stats($mailbox, 'maxuid', $count ? $this->_id2uid($count, $mailbox) : 0);
+                }
             }
         }
 
@@ -1033,32 +1040,70 @@ class rcube_imap
         return count($a_msg_headers);
     }
   
+
     /**
-     * Fetches IDS of pseudo recent messages.
+     * Returns current status of mailbox
      *
      * We compare the maximum UID to determine the number of
      * new messages because the RECENT flag is not reliable.
      *
-     * @param string  Mailbox/folder name
-     * @return array  List of recent message UIDs
+     * @param string Mailbox/folder name
+     * @return int   Folder status
      */
-    function recent_uids($mbox_name = null, $nofetch = false)
+    function mailbox_status($mbox_name = null)
     {
         $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
-        $old_maxuid = intval($_SESSION['maxuid'][$mailbox]);
-    
-        // refresh message count -> will update $_SESSION['maxuid'][$mailbox]
+        $old = $this->get_folder_stats($mailbox);
+
+        // refresh message count -> will update 
         $this->_messagecount($mailbox, 'ALL', true);
-    
-        if ($_SESSION['maxuid'][$mailbox] > $old_maxuid) {
-            $maxuid = max(1, $old_maxuid+1);
-            return array_values((array)$this->conn->fetchHeaderIndex(
-                $mailbox, "$maxuid:*", 'UID', $this->skip_deleted, true));
-        }
-    
-        return array();
+
+        $result = 0;
+        $new = $this->get_folder_stats($mailbox);
+
+        // got new messages
+        if ($new['maxuid'] > $old['maxuid'])
+            $result += 1;
+        // some messages has been deleted
+        if ($new['cnt'] < $old['cnt'])
+            $result += 2;
+
+        // @TODO: optional checking for messages flags changes (?)
+        // @TODO: UIDVALIDITY checking
+
+        return $result;
     }
-  
+
+
+    /**
+     * Stores folder statistic data in session
+     * @TODO: move to separate DB table (cache?)
+     *
+     * @param string Mailbox name
+     * @param string Data name
+     * @param mixed  Data value
+     */
+    private function set_folder_stats($mbox_name, $name, $data)
+    {
+        $_SESSION['folders'][$mbox_name][$name] = $data;
+    }
+
+
+    /**
+     * Gets folder statistic data
+     *
+     * @param string Mailbox name
+     * @return array Stats data
+     */
+    private function get_folder_stats($mbox_name)
+    {
+        if ($_SESSION['folders'][$mbox_name])
+            return (array) $_SESSION['folders'][$mbox_name];
+        else
+            return array();
+    }
+
+
     /**
      * Return sorted array of message IDs (not UIDs)
      *
@@ -1538,9 +1583,8 @@ class rcube_imap
     {
         if (!empty($this->search_string))
             $this->search_set = $this->search('', $this->search_string, $this->search_charset,
+    	        $this->search_sort_field, $this->search_threads);
 
-    	$this->search_sort_field, $this->search_threads);
-      
         return $this->get_search_set();
     }
   
diff --git a/program/js/app.js b/program/js/app.js
index 4e7db3256..71a213f30 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1404,7 +1404,7 @@ function rcube_webmail()
     this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
 
     // reset all-pages-selection
-    if (selected || list.selection.length != list.rowcount)
+    if (selected || (list.selection.length && list.selection.length != list.rowcount))
       this.select_all_mode = false;
 
     // start timer for message preview (wait for double click)
@@ -1562,11 +1562,13 @@ function rcube_webmail()
       has_children: flags.has_children?1:0,
       depth: flags.depth?flags.depth:0,
       unread_children: flags.unread_children,
-      parent_uid: flags.parent_uid
+      parent_uid: flags.parent_uid,
+      selected: this.select_all_mode || this.message_list.in_selection(uid)
     });
 
     var c, tree = expando = '',
-      rows = this.message_list.rows,
+      list = this.message_list,
+      rows = list.rows,
       rowcount = tbody.rows.length,
       even = rowcount%2,
       message = this.env.messages[uid],
@@ -1576,7 +1578,7 @@ function rcube_webmail()
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
         + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
-        + (this.message_list.in_selection(uid) ? ' selected' : ''),
+        + (message.selected ? ' selected' : ''),
       // for performance use DOM instead of jQuery here
       row = document.createElement('tr'),
       col = document.createElement('td');
@@ -1601,19 +1603,25 @@ function rcube_webmail()
     else if(flags.unread && this.env.unreadicon)
       icon = this.env.unreadicon;
 
+    // update selection
+    if (message.selected && !list.in_selection(uid))
+      list.selection.push(uid);
+
     // threads
     if (this.env.threading) {
       // This assumes that div width is hardcoded to 15px,
       var width = message.depth * 15;
       if (message.depth) {
-        if ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
-            (!rows[message.parent_uid] || !rows[message.parent_uid].expanded)) {
+        if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
+          || ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
+            (!rows[message.parent_uid] || !rows[message.parent_uid].expanded))
+        ) {
           row.style.display = 'none';
           message.expanded = false;
         }
         else
           message.expanded = true;
-        }
+      }
       else if (message.has_children) {
         if (typeof(message.expanded) == 'undefined' && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
           message.expanded = true;
@@ -1667,13 +1675,13 @@ function rcube_webmail()
       row.appendChild(col);
     }
 
-    this.message_list.insert_row(row, attop);
+    list.insert_row(row, attop);
 
     // remove 'old' row
-    if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize) {
-      var uid = this.message_list.get_last_row();
-      this.message_list.remove_row(uid);
-      this.message_list.clear_selection(uid);
+    if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
+      var uid = list.get_last_row();
+      list.remove_row(uid);
+      list.clear_selection(uid);
     }
   };
 
@@ -1859,9 +1867,10 @@ function rcube_webmail()
       url += '&_search='+this.env.search_request;
 
     // set page=1 if changeing to another mailbox
-    if (!page && this.env.mailbox != mbox) {
+    if (this.env.mailbox != mbox) {
       page = 1;
       this.env.current_page = page;
+      this.select_all_mode = false;
       this.show_contentframe(false);
     }
 
@@ -1872,7 +1881,6 @@ function rcube_webmail()
     this.last_selected = 0;
     if (this.message_list) {
       this.message_list.clear_selection();
-      this.select_all_mode = false;
     }
     this.select_folder(mbox, this.env.mailbox);
     this.env.mailbox = mbox;
@@ -1907,6 +1915,20 @@ function rcube_webmail()
     this.http_request('list', url+add_url, true);
   };
 
+  // removes messages that doesn't exists from list selection array
+  this.update_selection = function()
+  {
+    var selected = this.message_list.selection,
+      rows = this.message_list.rows,
+      i, selection = [];
+
+    for (i in selected)
+      if (rows[selected[i]])
+        selection.push(selected[i]);
+
+    this.message_list.selection = selection;
+  }
+
   // expand all threads with unread children
   this.expand_unread = function()
   {
@@ -2176,6 +2198,9 @@ function rcube_webmail()
   // copy selected messages to the specified mailbox
   this.copy_messages = function(mbox)
   {
+    if (mbox && typeof mbox == 'object')
+      mbox = mbox.id;
+
     // exit if current or no mailbox specified or if selection is empty
     if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
       return;
@@ -4869,23 +4894,26 @@ function rcube_webmail()
       this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
   };
 
-  // use an image to send a keep-alive siganl to the server
-  this.send_keep_alive = function()
-  {
-    var d = new Date();
-    this.http_request('keep-alive', '_t='+d.getTime());
-  };
-
-  // start interval for keep-alive/recent_check signal
+  // starts interval for keep-alive/check-recent signal
   this.start_keepalive = function()
   {
+    if (this._int)
+      clearInterval(this._int);
+
     if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
       this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
     else if (this.env.keep_alive && !this.env.framed && this.task!='login')
       this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
   };
 
-  // send periodic request to check for recent messages
+  // sends keep-alive signal to the server
+  this.send_keep_alive = function()
+  {
+    var d = new Date();
+    this.http_request('keep-alive', '_t='+d.getTime());
+  };
+
+  // sends request to check for recent messages
   this.check_for_recent = function(refresh)
   {
     if (this.busy)
@@ -4896,6 +4924,8 @@ function rcube_webmail()
     if (refresh) {
       this.set_busy(true, 'checkingmail');
       addurl += '&_refresh=1';
+      // reset check-recent interval
+      this.start_keepalive();
     }
 
     if (this.gui_objects.messagelist)
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 3c2827502..76546ace1 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -19,72 +19,67 @@
 
 */
 
-$a_mailboxes = $IMAP->list_mailboxes();
+$current = $IMAP->get_mailbox_name();
 $check_all = !empty($_GET['_refresh']) || (bool)$RCMAIL->config->get('check_all_folders');
+$a_mailboxes = $check_all ? $IMAP->list_mailboxes() : (array)$current;
 
 // check recent/unseen counts for all mailboxes
 foreach ($a_mailboxes as $mbox_name) {
-  if ($mbox_name == $IMAP->get_mailbox_name()) {
-    if ($recents = $IMAP->recent_uids($mbox_name)) {
-      // refresh saved search set
-      if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && isset($_SESSION['search'][$search_request])) {
-        $_SESSION['search'][$search_request] = $IMAP->refresh_search();
-      }
-      
-      // get overall message count; allow caching because rcube_imap::recent_uids() did a refresh
-      $all_count = $IMAP->messagecount(NULL, $IMAP->threading ? 'THREADS' : 'ALL');
-      
-      $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
-      $_SESSION['unseen_count'][$mbox_name] = $unread_count;
-
-      $OUTPUT->set_env('messagecount', $all_count);
-      $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size));
-      $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, ($mbox_name == 'INBOX'));
-      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count));
-
-      if ($RCMAIL->config->get('focus_on_new_message',true))
-        $OUTPUT->command('new_message_focus');
-
-      if (!empty($_GET['_quota']))
-        $OUTPUT->command('set_quota', rcmail_quota_content());
-
-      // trigger plugin hook
-      $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name, 'count' => count($recents)));
-
-      // "No-list" mode, don't get messages
-      if (empty($_GET['_list']))
-        continue;
-
-      if ($IMAP->threading) {
-        $OUTPUT->command('message_list.clear');
-        $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'];
-        $result_h = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
-        // add to the list
-        rcmail_js_message_list($result_h);
-      }
-      else {
-        // use SEARCH/SORT to find recent messages
-        $search_str = 'UID '.min($recents).':'.max($recents);
-        if ($search_request)
-          $search_str .= ' '.$IMAP->search_string;
-
-        if ($IMAP->search($mbox_name, $search_str, NULL, 'date')) {
-          // revert sort order
-          $order = $_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC' ? 'ASC' : 'DESC';
-          // get the headers and add them to the list
-          $result_h = $IMAP->list_headers($mbox_name, 1, 'date', $order);
-          rcmail_js_message_list($result_h, true, false);
+    if ($mbox_name == $current && ($status = $IMAP->mailbox_status($mbox_name))) {
+
+        rcmail_send_unread_count($mbox_name, true);
+
+        // refresh saved search set
+        $search_request = get_input_value('_search', RCUBE_INPUT_GPC);
+        if ($search_request && isset($_SESSION['search'][$search_request])) {
+            $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+        }
+
+        if (!empty($_GET['_quota']))
+            $OUTPUT->command('set_quota', rcmail_quota_content());
+
+        // "No-list" mode, don't get messages
+        if (empty($_GET['_list']))
+            continue;
+
+        // get overall message count; allow caching because rcube_imap::mailbox_status() did a refresh
+        $all_count = $IMAP->messagecount(null, $IMAP->threading ? 'THREADS' : 'ALL');
+
+        // check current page if we're not on the first page
+        if ($all_count && $IMAP->list_page > 1) {
+            $remaining = $all_count - $IMAP->page_size * ($IMAP->list_page - 1);
+            if ($remaining <= 0) {
+                $IMAP->set_page($IMAP->list_page-1);
+                $_SESSION['page'] = $IMAP->list_page;
+            }
+        }
+
+        $OUTPUT->set_env('messagecount', $all_count);
+        $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size));
+        $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count));
+        $OUTPUT->set_env('current_page', $all_count ? $IMAP->list_page : 1);
+
+        if ($status & 1) {
+            if ($RCMAIL->config->get('focus_on_new_message', true))
+                $OUTPUT->command('new_message_focus');
+            // trigger plugin hook
+            $RCMAIL->plugins->exec_hook('new_messages', array('mailbox' => $mbox_name));
+        }
+
+        // remove old rows (and clear selection if new list is empty)
+        $OUTPUT->command('message_list.clear', $all_count ? false : true);
+
+        if ($all_count) {
+            $a_headers = $IMAP->list_headers($mbox_name, null, $_SESSION['sort_col'], $_SESSION['sort_order']);
+            // add message rows
+            rcmail_js_message_list($a_headers, false, false);
+            // remove messages that don't exists from list selection array
+            $OUTPUT->command('update_selection');
         }
-      }
     }
     else {
-      rcmail_send_unread_count($mbox_name, true);
+        rcmail_send_unread_count($mbox_name, true);
     }
-  }
-  else if ($check_all) {
-    rcmail_send_unread_count($mbox_name, true);
-  }
 }
 
 $OUTPUT->send();