From 6d5dbae53cd4b4b97da0b0c558292a7f1062a524 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 25 Jul 2008 11:13:15 -0400
Subject: [PATCH] Prefer File_Info over mime_content_type + detect mime type when uploading + some code style
---
program/steps/mail/show.inc | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 3cdf2c9..ef88c7b 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -32,7 +32,7 @@
// go back to list if message not found (wrong UID)
if (empty($MESSAGE->headers)) {
$OUTPUT->show_message('messageopenerror', 'error');
- if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
+ if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
$OUTPUT->send('messagepreview');
else {
$RCMAIL->action = 'list';
@@ -82,8 +82,11 @@
$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
// check for unset disposition notification
- if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent &&
- $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox'])
+ if ($MESSAGE->headers->mdn_to &&
+ !$MESSAGE->headers->mdn_sent &&
+ $IMAP->check_permflag('MDNSENT') &&
+ $mbox_name != $CONFIG['drafts_mbox'] &&
+ $mbox_name != $CONFIG['sent_mbox'])
{
if (intval($CONFIG['mdn_requests']) === 1)
{
@@ -194,9 +197,9 @@
'blockedobjects' => 'rcmail_remote_objects_msg'));
-if ($RCMAIL->action=='print' && template_exists('printmessage'))
+if ($RCMAIL->action=='print' && $OUTPUT->template_exists('printmessage'))
$OUTPUT->send('printmessage');
-else if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
+else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
$OUTPUT->send('messagepreview');
else
$OUTPUT->send('message');
--
Gitblit v1.9.1