Changeset 3710 in subversion

Timestamp:

Jun 4, 2010 3:18:26 AM (3 years ago)

Author:

alec

Message:

• Skip UNSEEN counting when list is empty

Location:

trunk/roundcubemail/program/steps/mail

Files:

• func.inc (modified) (1 diff)
• list.inc (modified) (1 diff)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -552 +552 @@
 
 
-function rcmail_send_unread_count($mbox_name, $force=false)
+function rcmail_send_unread_count($mbox_name, $force=false, $count=null)
 {
   global $RCMAIL;
 
   $old_unseen = $_SESSION['unseen_count'][$mbox_name];
-  $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force);
+
+  if ($count === null)
+    $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force);
+  else
+    $unseen = $count;
 
   if ($unseen != $old_unseen || ($mbox_name == 'INBOX'))

trunk/roundcubemail/program/steps/mail/list.inc

@@ -71 +71 @@
   $_SESSION['search'][$_REQUEST['_search']] = $IMAP->get_search_set();
 
+// empty result? we'll skip UNSEEN counting in rcmail_send_unread_count()
+if (empty($search_request) && empty($a_headers)) {
+    $unseen = 0;
+}
+
 // update mailboxlist
-rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']));
+rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']), $unseen);
 
 // update message count display