Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-09 01:26:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
thomascube
2008-02-05 21:39:08 +00:00
parent a527781d5a
commit cf1f0f97b2
7 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
program/include/rcmail_template.inc
View File

@@ -312,6 +312,13 @@ class rcmail_template extends rcube_html_page
if (!$this->framed && !empty($this->js_env))
$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)
{
$method = array_shift($args);
@@ -326,12 +333,7 @@ class rcmail_template extends rcube_html_page
join(',', $args));
}
// 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;
}

2
program/steps/mail/check_recent.inc
View File

@@ -35,7 +35,7 @@ foreach ($a_mailboxes as $mbox_name)
$unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
$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());

2
program/steps/mail/getunread.inc
View File

@@ -24,7 +24,7 @@ $a_folders = $IMAP->list_mailboxes();
if (!empty($a_folders))
{
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'));
}
$OUTPUT->send();

6
program/steps/mail/list.inc
View File

@@ -52,9 +52,6 @@ $OUTPUT->set_env('messagecount', $count);
$OUTPUT->set_env('pagecount', $pages);
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count));
// update mailboxlist
$OUTPUT->command('set_unread_count', $mbox_name, $unseen);
// add message rows
if (isset($a_headers) && count($a_headers))
@@ -62,6 +59,9 @@ if (isset($a_headers) && count($a_headers))
else
$OUTPUT->show_message('nomessagesfound', 'notice');
// update mailboxlist
$OUTPUT->command('set_unread_count', $mbox_name, $unseen, ($mbox_name == 'INBOX'));
// send response
$OUTPUT->send();

2
program/steps/mail/mark.inc
View File

@@ -32,7 +32,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
if ($marked != -1)
{
$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();
}
}

2
program/steps/mail/move_del.inc
View File

@@ -86,7 +86,7 @@ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
// 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)
$OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN'));