|
|
@ -42,9 +42,6 @@ if ($_GET['_uid']) {
|
|
|
|
|
|
|
|
|
|
|
|
$mbox_name = $IMAP->get_mailbox_name();
|
|
|
|
$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->is_safe).intval($PRINT_MODE));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// check known senders to display images
|
|
|
|
// check known senders to display images
|
|
|
|
if (!$MESSAGE->is_safe
|
|
|
|
if (!$MESSAGE->is_safe
|
|
|
|
&& !empty($MESSAGE->sender['mailto'])
|
|
|
|
&& !empty($MESSAGE->sender['mailto'])
|
|
|
@ -57,6 +54,9 @@ if ($_GET['_uid']) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// calculate Etag for this request
|
|
|
|
|
|
|
|
$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
|
|
|
|
// allow caching, unless remote images are present
|
|
|
|
if ((bool)$MESSAGE->is_safe)
|
|
|
|
if ((bool)$MESSAGE->is_safe)
|
|
|
|
send_nocacheing_headers();
|
|
|
|
send_nocacheing_headers();
|
|
|
|