Changeset cf1f0f9 in github

Timestamp:

Feb 5, 2008 4:39:08 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

a02d486

Parents:

a527781

Message:

Applied patch for updating page title (#1484727, #1484650)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcmail_template.inc (modified) (2 diffs)
• program/steps/mail/check_recent.inc (modified) (1 diff)
• program/steps/mail/getunread.inc (modified) (1 diff)
• program/steps/mail/list.inc (modified) (2 diffs)
• program/steps/mail/mark.inc (modified) (1 diff)
• program/steps/mail/move_del.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ---------------------------
 
-2008/02/04 (thomasb)
+2008/02/05 (thomasb)
 ----------
 - Fix regular expression for checking e-mail address (#1484710)
 - Make sending of read receipts configurable
+- Respect config when localize folder names (#1484707)
+- Aplied patch for updating page title (#1484727, #1484650)
 
 2008/02/02 (thomasb)

program/include/rcmail_template.inc

@@ -313 +313 @@
       $out .= ($this->ajax_call ? 'this' : JS_OBJECT_NAME) . '.set_env('.json_serialize($this->js_env).");\n";
     
+    // add command to set page title
+    if ($this->ajax_call && !empty($this->pagetitle))
+      $out .= sprintf(
+        "this.set_pagetitle('%s');\n",
+        JQ((!empty($this->config['product_name']) ? $this->config['product_name'].' :: ' : '') . $this->pagetitle)
+      );
+
     foreach ($this->js_commands as $i => $args)
     {
@@ -327 +334 @@
     }
     
-    // add command to set page title
-    if ($this->ajax_call && !empty($this->pagetitle))
-      $out .= sprintf(
-        "this.set_pagetitle('%s');\n",
-        JQ((!empty($this->config['product_name']) ? $this->config['product_name'].' :: ' : '') . $this->pagetitle)
-      );
+
     
     return $out;

program/steps/mail/check_recent.inc

@@ -36 +36 @@
 
       $OUTPUT->set_env('messagecount', $IMAP->messagecount());
-      $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, true);
+      $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, ($mbox_name == 'INBOX'));
       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text());
       $OUTPUT->command('set_quota', $IMAP->get_quota());

program/steps/mail/getunread.inc

@@ -25 +25 @@
 {
   foreach ($a_folders as $mbox_row)
-    $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'));
+    $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), ($IMAP->get_mailbox_name() == 'INBOX' && $mbox_row == 'INBOX'));
 }
 

program/steps/mail/list.inc

@@ -53 +53 @@
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count));
 
-// update mailboxlist
-$OUTPUT->command('set_unread_count', $mbox_name, $unseen);
-
 
 // add message rows
@@ -63 +60 @@
   $OUTPUT->show_message('nomessagesfound', 'notice');
   
+// update mailboxlist
+$OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
+
 // send response
 $OUTPUT->send();

program/steps/mail/mark.inc

@@ -33 +33 @@
   {
     $mbox_name = $IMAP->get_mailbox_name();
-    $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'));
+    $OUTPUT->command('set_unread_count', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
     $OUTPUT->send();
   }

program/steps/mail/move_del.inc

@@ -87 +87 @@
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
-$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'), ($mbox == 'INBOX'));
 
 if ($_action=='moveto' && $target)