diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-19 06:29:28 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-19 06:29:28 +0000 |
| commit | c9921fca64e04f8fd8de7eeda7fbb6b587d4c34e (patch) | |
| tree | 918a271c03964b7ec4e51856d3419b28c60045ad /roundcubemail/program/steps/mail | |
| parent | 40305a44d72a433a9d5cec42096295c5f6e0d762 (diff) | |
Allow vars and PHP code in templates; improved page title; fixed #1484395
git-svn-id: https://svn.roundcube.net/trunk@801 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail')
| -rw-r--r-- | roundcubemail/program/steps/mail/check_recent.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 10 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/list.inc | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/roundcubemail/program/steps/mail/check_recent.inc b/roundcubemail/program/steps/mail/check_recent.inc index 119d481ab..a2100f1d2 100644 --- a/roundcubemail/program/steps/mail/check_recent.inc +++ b/roundcubemail/program/steps/mail/check_recent.inc @@ -31,7 +31,7 @@ foreach ($a_mailboxes as $mbox_name) $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE); $OUTPUT->set_env('messagecount', $count); - $OUTPUT->command('set_unread_count', $mbox_name, $unread_count); + $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, true); $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); $OUTPUT->command('set_quota', $IMAP->get_quota()); diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 9f4c714c4..0712ef8df 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -75,6 +75,10 @@ if ($CONFIG['junk_mbox']) if (!$OUTPUT->ajax_call) rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash'); +// set page title +if (empty($_action) || $_action == 'list') + $OUTPUT->set_pagetitle(rcube_charset_convert($IMAP->get_mailbox_name(), 'UTF-7')); + // return the message list as HTML table @@ -189,11 +193,7 @@ function rcmail_message_list($attrib) // no messages in this mailbox if (!sizeof($a_headers)) - { - $out .= sprintf('<tr><td colspan="%d">%s</td></tr>', - sizeof($a_show_cols)+2, - Q(rcube_label('nomessagesfound'))); - } + $OUTPUT->show_message('nomessagesfound', 'notice'); $a_js_message_arr = array(); diff --git a/roundcubemail/program/steps/mail/list.inc b/roundcubemail/program/steps/mail/list.inc index 6c727068d..568f3d58c 100644 --- a/roundcubemail/program/steps/mail/list.inc +++ b/roundcubemail/program/steps/mail/list.inc @@ -58,7 +58,8 @@ $OUTPUT->command('set_unread_count', $mbox_name, $unseen); // add message rows if (isset($a_headers) && count($a_headers)) rcmail_js_message_list($a_headers); - +else + $OUTPUT->show_message('nomessagesfound', 'notice'); // send response $OUTPUT->send(); |