From ae9d5832ae6cf9dd191e2770354d9d4b29ef5892 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Fri, 22 Jan 2010 03:07:45 -0500 Subject: [PATCH] - Removed problematic browser-caching of messages --- program/steps/mail/show.inc | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index c7431d6..3998e62 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -40,26 +40,12 @@ } } + send_nocacheing_headers(); + $mbox_name = $IMAP->get_mailbox_name(); // show images? rcmail_check_safe($MESSAGE); - - // calculate Etag for this request - $etag = md5($MESSAGE->uid.$mbox_name.session_id() - .intval($MESSAGE->headers->mdn_sent) - .intval($MESSAGE->is_safe) - .(!empty($MESSAGE->attachments) ? intval($CONFIG['inline_images']) : '') - .intval($PRINT_MODE) - .$_SESSION['sort_col'].$_SESSION['sort_order'] - .$IMAP->messagecount($mbox_name, 'ALL', true) - ); - - // 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, !$MESSAGE->headers->seen); // set message charset as default if (!empty($MESSAGE->headers->charset)) -- Gitblit v1.9.1