Changeset 3299 in subversion

Timestamp:

Mar 2, 2010 2:54:11 AM (3 years ago)

Author:

thomasb

Message:

Fix checking for new mail (#1485794)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (5 diffs)
• program/steps/mail/check_recent.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix checking for new mail: now checks unseen count of inbox (#1485794)
 - Improve performance by avoiding unnecessary updates to the session table (#1486325)
 - Fix invalid <font> tags which cause HTML message rendering problems (#1486521)

trunk/roundcubemail/program/js/app.js

@@ -625 +625 @@
           sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
         else
-          sort_order = 'ASC';
-        
+          sort_order = 'ASC';
+
         // set table header class
         $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
@@ -1619 +1619 @@
       this.set_busy(true, 'searching');
       this.http_request('search', '_filter='+filter
-            + (search ? '&_q='+urlencode(search) : '')
-            + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
+          + (search ? '&_q='+urlencode(search) : '')
+          + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
     }
 
@@ -4261 +4261 @@
       case 'moveto':
         if (this.env.action == 'show') {
-          // re-enable commands on move/delete error
-          this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
+          // re-enable commands on move/delete error
+          this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
         } else if (this.message_list)
           this.message_list.init();
@@ -4275 +4275 @@
           // disable commands useless when mailbox is empty
           this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 
-            'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 
-            'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+            'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 
+            'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
         }
         break;
@@ -4322 +4322 @@
 
   // send periodic request to check for recent messages
-  this.check_for_recent = function(setbusy)
+  this.check_for_recent = function(refresh)
     {
     if (this.busy)
       return;
 
-    if (setbusy)
+    var addurl = '_t=' + (new Date().getTime());
+
+    if (refresh) {
       this.set_busy(true, 'checkingmail');
-
-    var addurl = '_t=' + (new Date().getTime());
+      addurl += '&_refresh=1';
+    }
 
     if (this.gui_objects.messagelist)

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

@@ -23 +23 @@
 $check_all = (bool)$RCMAIL->config->get('check_all_folders');
 
+// check if unread count of INBOX changed and refresh message list if so
+if (!empty($_GET['_refresh'])) {
+  $unread_count = $IMAP->messagecount('INBOX', 'UNSEEN', TRUE);
+  if ($unread_count > $_SESSION['unseen_count']['INBOX']) {
+    $OUTPUT->command('set_unread_count', 'INBOX', $unread_count, true);
+    $OUTPUT->command('list_mailbox', 'INBOX', 1);  // let the client switch to INBOX and get the message list
+    $OUTPUT->send();
+  }
+}
+
+// check recent/unseen counts for all mailboxes
 foreach ($a_mailboxes as $mbox_name) {
   if ($mbox_name == $IMAP->get_mailbox_name()) {