Renameable folders, mail-checking changes, other fixes (richs)

2 files changed, 32 insertions, 24 deletions

diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 8a563c4c4..e51cbf867 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -9,40 +9,48 @@
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Check for recent messages                                           |
+ |   Check for recent messages, in all mailboxes                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id$
+ $Id: check_recent.inc 233 2006-06-26 17:31:20Z richs $
 
 */
 
 $REMOTE_REQUEST = TRUE;
-$mbox_name = $IMAP->get_mailbox_name();
 
-if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE))
+$a_mailboxes = $IMAP->list_mailboxes();
+
+foreach ($a_mailboxes as $mbox_name)
   {
-  $count = $IMAP->messagecount();
-  $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
-    
-  $commands = sprintf("this.set_unread_count('%s', %d, true);\n", addslashes($mbox_name), $unread_count);
-  $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());
- 
-  // add new message headers to list
-  $a_headers = array();
-  for ($i=$recent_count, $id=$count-$recent_count+1; $i>0; $i--, $id++)
-    $a_headers[] = $IMAP->get_headers($id, NULL, FALSE);
-    
-  $commands .= rcmail_js_message_list($a_headers, TRUE);
+  if ($mbox_name == $IMAP->get_mailbox_name())
+    {
+    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, true);\n", addslashes($mbox_name), $unread_count);
+      $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());
+
+      // add new message headers to list
+      $a_headers = array();
+      for ($i=$recent_count, $id=$count-$recent_count+1; $i>0; $i--, $id++)
+        $a_headers[] = $IMAP->get_headers($id, NULL, FALSE);
+
+      $commands .= rcmail_js_message_list($a_headers, TRUE);
+      }
+    }
+  else
+    {
+    if ($IMAP->messagecount($mbox_name, 'RECENT'))
+      $commands .= sprintf("this.set_unread_count('%s', %d);\n", addslashes($mbox_name), $IMAP->messagecount($mbox_name, 'UNSEEN'));
+    }
   }
 
-if (strtoupper($mbox_name)!='INBOX' && $IMAP->messagecount('INBOX', 'RECENT'))
-  $commands = sprintf("this.set_unread_count('INBOX', %d);\n", $IMAP->messagecount('INBOX', 'UNSEEN'));
-
-
 rcube_remote_response($commands);
 ?>
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 8eff11c06..eac4e3747 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -304,10 +304,10 @@ function rcmail_message_list($attrib)
 
   // define list of cols to be displayed
   $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
-  $a_sort_cols = array('subject', 'date', 'from', 'to');
+  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size');
   
   // show 'to' instead of from in sent messages
-  if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
+  if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) && ($f = array_search('from', $a_show_cols))
       && !array_search('to', $a_show_cols))
     $a_show_cols[$f] = 'to';