Changeset 2960 in subversion

Timestamp:

Sep 17, 2009 8:36:32 AM (4 years ago)

Author:

alec

Message:

• some code improvements for r2959 change

Location:

trunk/roundcubemail/program/steps/mail

Files:

• check_recent.inc (modified) (2 diffs)
• func.inc (modified) (5 diffs)
• list.inc (modified) (1 diff)
• mark.inc (modified) (1 diff)
• move_del.inc (modified) (1 diff)

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

@@ -70 +70 @@
     }
     else {
-      send_unread_count($mbox_name);
+      rcmail_send_unread_count($mbox_name, true);
     }
   }
   else if ($check_all) {
-    send_unread_count($mbox_name);
+    rcmail_send_unread_count($mbox_name, true);
   }
 }
@@ -80 +80 @@
 $OUTPUT->send();
 
-
-function send_unread_count($mbox_name)
-{
-    global $RCMAIL;
-
-    $old_unseen = $_SESSION['unseen_count'][$mbox_name];
-    $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', true);
-
-    if ($unseen != $old_unseen)
-      $RCMAIL->output->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
-
-    // @TODO: this data is doubled (session and cache tables) if caching is enabled
-    $_SESSION['unseen_count'][$mbox_name] = $unseen;
-}
-
 ?>

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

@@ -490 +490 @@
 
 
-/**
- *
- */
 function rcmail_messagecount_display($attrib)
   {
@@ -506 +503 @@
 
 
-/**
- *
- */
 function rcmail_quota_display($attrib)
   {
@@ -525 +519 @@
 
 
-/**
- *
- */
 function rcmail_quota_content($quota=NULL, $attrib=NULL)
   {
@@ -580 +571 @@
 
 
-/**
- *
- */
 function rcmail_get_messagecount_text($count=NULL, $page=NULL)
   {
@@ -611 +599 @@
   }
 
-/**
- *
- */
+
 function rcmail_mailbox_name_display($attrib)
 {
-    global $RCMAIL;
-
-    if (!$attrib['id'])
-        $attrib['id'] = 'rcmmailboxname';
-
-    $RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
-
-    return html::span($attrib, rcmail_get_mailbox_name_text());
+  global $RCMAIL;
+
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmmailboxname';
+
+  $RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
+
+  return html::span($attrib, rcmail_get_mailbox_name_text());
 }
 
 function rcmail_get_mailbox_name_text()
 {
-    global $RCMAIL;
-    return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
-}
+  global $RCMAIL;
+  return rcmail_localize_foldername($RCMAIL->imap->get_mailbox_name());
+}
+
+
+function rcmail_send_unread_count($mbox_name, $force=false)
+{
+  global $RCMAIL;
+    
+  $old_unseen = $_SESSION['unseen_count'][$mbox_name];
+  $unseen = $RCMAIL->imap->messagecount($mbox_name, 'UNSEEN', $force);
+
+  if ($unseen != $old_unseen)
+    $RCMAIL->output->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+
+  // @TODO: this data is doubled (session and cache tables) if caching is enabled
+  $_SESSION['unseen_count'][$mbox_name] = $unseen;
+    
+  return $unseen;
+}
+                              
 
 /**

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

@@ -61 +61 @@
   $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
 
-// count UNSEEN messages...
-$old_unseen = $_SESSION['unseen_count'][$mbox_name];
-$unseen = $count ? $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh'])) : 0;
-$_SESSION['unseen_count'][$mbox_name] = $unseen;
-
-// ...and update mailboxlist
-if ($unseen != $old_unseen)
-  $OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+// update mailboxlist
+rcmail_send_unread_count($mbox_name, !empty($_REQUEST['_refresh']));
 
 // update message count display

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

@@ -62 +62 @@
     
   if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
-    $mbox_name = $IMAP->get_mailbox_name();
-    $unseen = $IMAP->messagecount($mbox_name, 'UNSEEN');
-    $old_unseen = $_SESSION['unseen_count'][$mbox_name];
-    if ($old_unseen != $unseen) {
-      $OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
-      $_SESSION['unseen_count'][$mbox_name] = $unseen;
-    }
+    rcmail_send_unread_count($IMAP->get_mailbox_name());
   }
   else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {

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

@@ -111 +111 @@
 
   if ($RCMAIL->action=='moveto' && $target) {
-    $unseen_count = $IMAP->messagecount($target, 'UNSEEN', true);
-    $old_unseen = $_SESSION['unseen_count'][$target];
-    if ($old_unseen != $unseen_count) {
-      $OUTPUT->command('set_unread_count', $target, $unseen_count);
-      $_SESSION['unseen_count'][$target] = $unseen_count;
-    }
+    rcmail_send_unread_count($target, true);
   }