diff options
| -rw-r--r-- | index.php | 3 | ||||
| -rw-r--r-- | program/js/app.js | 9 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 7 |
4 files changed, 15 insertions, 8 deletions
@@ -265,6 +265,9 @@ if ($_task=='mail') // kill compose entry from session if (isset($_SESSION['compose'])) rcmail_compose_cleanup(); + + // make sure the message count is refreshed + $IMAP->messagecount($_SESSION['mbox'], 'ALL', TRUE); } diff --git a/program/js/app.js b/program/js/app.js index 3914fd318..35afe8671 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -2680,10 +2680,10 @@ function rcube_webmail() } // set unread count to window title - if ((set_title || mbox==this.env.mailbox) && document.title) + reg = /^\([0-9]+\)\s+/i; + if (set_title && count && document.title) { var doc_title = String(document.title); - reg = /^\([0-9]+\)\s+/i; if (count && doc_title.match(reg)) document.title = doc_title.replace(reg, '('+count+') '); @@ -2692,6 +2692,11 @@ function rcube_webmail() else document.title = doc_title.replace(reg, ''); } + // remove unread count from window title + else if (document.title) + { + document.title = document.title.replace(reg, ''); + } }; diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 58465062f..8a41bdea3 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -142,7 +142,7 @@ function rcmail_compose_headers($attrib) if ($fname && !empty($_POST[$fname])) - $fvalue = get_input_value($fname, RCUBE_INPUT_POST); + $fvalue = get_input_value($fname, RCUBE_INPUT_POST, TRUE); else if ($header && is_object($REPLY_MESSAGE['headers'])) { // get recipent address(es) out of the message headers @@ -433,7 +433,7 @@ function rcmail_compose_subject($attrib) // use subject from post if (isset($_POST['_subject'])) - $subject = get_input_value('_subject', RCUBE_INPUT_POST); + $subject = get_input_value('_subject', RCUBE_INPUT_POST, TRUE); // create a reply-subject else if (isset($REPLY_MESSAGE['subject'])) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 926121dea..dc510b059 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -300,12 +300,12 @@ function rcmail_message_list($attrib) // add col definition $out .= '<colgroup>'; - $out .= '<col class="icon">'; + $out .= '<col class="icon" />'; foreach ($a_show_cols as $col) - $out .= sprintf('<col class="%s">', $col); + $out .= sprintf('<col class="%s" />', $col); - $out .= '<col class="icon">'; + $out .= '<col class="icon" />'; $out .= "</colgroup>\n"; // add table title @@ -366,7 +366,6 @@ function rcmail_message_list($attrib) $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n"; $out .= "</tr></thead>\n<tbody>\n"; - // no messages in this mailbox if (!sizeof($a_headers)) { |