diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/check_recent.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 10 | ||||
| -rw-r--r-- | program/steps/mail/list.inc | 3 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc index 119d481ab..a2100f1d2 100644 --- a/program/steps/mail/check_recent.inc +++ b/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/program/steps/mail/func.inc b/program/steps/mail/func.inc index 9f4c714c4..0712ef8df 100644 --- a/program/steps/mail/func.inc +++ b/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/program/steps/mail/list.inc b/program/steps/mail/list.inc index 6c727068d..568f3d58c 100644 --- a/program/steps/mail/list.inc +++ b/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(); diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index ec9001f70..18e8e523d 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -26,7 +26,10 @@ $sql_result = $DB->query("SELECT username, mail_host FROM ".get_table_name('user $_SESSION['user_id']); if ($USER_DATA = $DB->fetch_assoc($sql_result)) - $OUTPUT->set_pagetitle(sprintf('%s %s@%s', rcube_label('settingsfor'), $USER_DATA['username'], $USER_DATA['mail_host'])); +{ + $username = $USER_DATA['username'] . (!strpos($USER_DATA['username'], '@') ? '@'.$USER_DATA['mail_host'] : ''); + $OUTPUT->set_pagetitle(sprintf('%s %s', rcube_label('settingsfor'), $username)); +} |