From 65e8dff41f371dcb8d360b851ed4312c59d6b713 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 7 Jul 2009 17:49:52 +0000 Subject: - if message wasn't found in preview mode display separate template --- program/steps/mail/show.inc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 2395ac604..423b9332c 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -29,11 +29,15 @@ if ($_GET['_uid']) { if (!empty($MESSAGE->headers->charset)) $IMAP->set_charset($MESSAGE->headers->charset); - // go back to list if message not found (wrong UID) + // if message not found (wrong UID)... if (empty($MESSAGE->headers)) { $OUTPUT->show_message('messageopenerror', 'error'); - if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview')) - $OUTPUT->send('messagepreview'); + // ... display error or preview page + if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messageerror')) + $OUTPUT->send('messageerror'); + else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview')) + $OUTPUT->send('messagepreview'); + // ... go back to the list else { rcmail_overwrite_action(''); return; -- cgit v1.2.3