Ticket #1483873: interface_total_messages.patch

include/main.inc

@@ -1829 +1849 @@
   console(sprintf("%s: %0.4f sec", $label, $diff));
   }
 
+function interface_total_messages($mbox_name, $force = FALSE )
+{
+    global $IMAP;
+
+    $unsee = $IMAP->messagecount($mbox_name, 'UNSEEN', $force);
+    $all = $IMAP->messagecount($mbox_name, 'ALL', $force);
+
+    if ( $unsee ) {
+        return sprintf("this.set_unread_count('%s', '%d/%d');\n", addslashes($mbox_name), $unsee, $all);
+    } else {
+        return sprintf("this.set_unread_count('%s', '%d');\n", addslashes($mbox_name), $all);
+    }
+       
+} // end func
+
 ?>

js/app.js

@@ -3357 +3363 @@
       {
       // set new text
       text_obj = item.firstChild;
-      reg = /\s+\([0-9]+\)$/i;
+      reg = /\s+\(.*?\)$/i;
 
       if (count && text_obj.innerHTML.match(reg))
         text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')');
@@ -3371 +3377 @@
       }
 
     // set unread count to window title
-    reg = /^\([0-9]+\)\s+/i;
+    reg = /^\(.*?\)\s+/i;
     if (set_title && document.title)
       {
       var doc_title = String(document.title);

steps/mail/check_recent.inc

@@ -30 +30 @@
     if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE))
       {
       $count = $IMAP->messagecount();
-      $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
 
-      $commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $unread_count);
+      $commands .= interface_total_messages(NULL, TRUE);
       $commands .= sprintf("this.set_env('messagecount', %d);\n", $count);
       $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
       $commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota());
@@ -52 +51 @@
   else
     {
     if ($IMAP->messagecount($mbox_name, 'RECENT'))
-      $commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $IMAP->messagecount($mbox_name, 'UNSEEN'));
+      $commands .= interface_total_messages($mbox_name);
     }
   }
 

steps/mail/folders.inc

@@ -49 +49 @@
     $commands .= "this.set_env('messagecount', 0);\n";
     $commands .= "this.set_env('pagecount', 0);\n";
     $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
-    $commands .= sprintf("this.set_unread_count('%s', 0);\n", addslashes($mbox_name));
+    $commands .= interface_total_messages($mbox_name);
     }
   else
     $commands = "// purged: $success";

steps/mail/getunread.inc

@@ -27 +27 @@
   {
   foreach ($a_folders as $mbox_row)
     {
-    $commands = sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_row), $IMAP->messagecount($mbox_row, 'UNSEEN'));
+    $commands = interface_total_messages($mbox_row);
     rcube_remote_response($commands, TRUE);
     }
   }

steps/mail/list.inc

@@ -55 +55 @@
     $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
   }
 
-$unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_GET['_refresh']) ? TRUE : FALSE);
-
 // update message count display
 $pages = ceil($count/$IMAP->page_size);
 $commands = sprintf("this.set_env('messagecount', %d);\n", $count);
@@ -65 +63 @@
 
 // update mailboxlist
 $mbox_name = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $unseen);
+$commands .= interface_total_messages($mbox_name, !empty($_GET['_refresh']) ? TRUE : FALSE);
 
 
 // add message rows

steps/mail/mark.inc

@@ -32 +32 @@
   if ($marked != -1)
     {
     $mbox_name = $IMAP->get_mailbox_name();
-    $commands = sprintf("this.set_unread_count('%s', %d);\n", $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'));
+
+    $commands = interface_total_messages($mbox_name);
     rcube_remote_response($commands);
     }
   }

steps/mail/move_del.inc

@@ -68 +68 @@
 
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$commands .= interface_total_messages($mbox);
 
 if ($_action=='moveto')
-  $commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN'));
+  $commands .= interface_total_messages($_GET['_target_mbox']);
 
 $commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota());