summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-04-13 09:15:39 +0000
committeralecpl <alec@alec.pl>2008-04-13 09:15:39 +0000
commit3f5cef86665d068478fe7298f8b811e4de47b605 (patch)
treed97287b879b04739d3e8135643123ff5153aea98 /program/steps/mail
parentf21ebb47c7ed6b62f9e8400c93c727be19c51367 (diff)
- reverted r1295
- disable caching for unseen messages to allow marking as read remarked messages
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/show.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 1fe4aa9b4..a530184d8 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -30,7 +30,7 @@ if ($_GET['_uid'])
// set message charset as default
if (!empty($MESSAGE['headers']->charset))
$IMAP->set_charset($MESSAGE['headers']->charset);
-
+
// go back to list if message not found (wrong UID)
if (!$MESSAGE['headers'])
{
@@ -53,13 +53,13 @@ if ($_GET['_uid'])
$mbox_name = $IMAP->get_mailbox_name();
// calculate Etag for this request
- $etag = md5($MESSAGE['UID'].$mbox_name.session_id().intval($MESSAGE['headers']->mdn_sent).intval($MESSAGE['headers']->seen).intval($MESSAGE['is_safe']).intval($PRINT_MODE));
+ $etag = md5($MESSAGE['UID'].$mbox_name.session_id().intval($MESSAGE['headers']->mdn_sent).intval($MESSAGE['is_safe']).intval($PRINT_MODE));
// allow caching, unless remote images are present
if ((bool)$MESSAGE['is_safe'])
send_nocacheing_headers();
else if (empty($CONFIG['devel_mode']))
- send_modified_header($_SESSION['login_time'], $etag);
+ send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE['headers']->seen);
$MESSAGE['subject'] = rcube_imap::decode_mime_string($MESSAGE['headers']->subject, $MESSAGE['headers']->charset);
$OUTPUT->set_pagetitle($MESSAGE['subject']);