- small improvement in getunread.inc + fix: don't call msglist_select() for getunread and check-recent actions

release-0.6
alecpl 16 years ago
parent 4683bf1640
commit 2c832e4519

@ -2112,7 +2112,7 @@ function rcube_webmail()
if (this.env.signatures[id]) if (this.env.signatures[id])
{ {
newsig = this.env.signatures[id]['text']; newsig = String(this.env.signatures[id]['text']).replace("\n", "\r\n");
htmlsig = this.env.signatures[id]['is_html']; htmlsig = this.env.signatures[id]['is_html'];
} }
@ -3828,13 +3828,14 @@ function rcube_webmail()
case 'getunread': case 'getunread':
case 'list': case 'list':
if (this.task == 'mail') { if (this.task == 'mail') {
if (this.message_list) if (this.message_list && request_obj.__action == 'list')
this.msglist_select(this.message_list); this.msglist_select(this.message_list);
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0)); this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test()); this.enable_command('purge', this.purge_mailbox_test());
} }
else if (this.task == 'addressbook') else if (this.task == 'addressbook')
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0)); this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
break; break;
} }

@ -23,8 +23,9 @@ $a_folders = $IMAP->list_mailboxes();
if (!empty($a_folders)) if (!empty($a_folders))
{ {
$inbox = ($IMAP->get_mailbox_name() == 'INBOX');
foreach ($a_folders as $mbox_row) foreach ($a_folders as $mbox_row)
$OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), ($IMAP->get_mailbox_name() == 'INBOX' && $mbox_row == 'INBOX')); $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), $inbox && $mbox_row == 'INBOX');
} }
$OUTPUT->send(); $OUTPUT->send();

Loading…
Cancel
Save