From 65e8dff41f371dcb8d360b851ed4312c59d6b713 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 07 Jul 2009 13:49:52 -0400
Subject: [PATCH] - if message wasn't found in preview mode display separate template

---
 program/steps/mail/show.inc               |   10 +++++++---
 skins/default/templates/messageerror.html |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 2395ac6..423b933 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -29,11 +29,15 @@
   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;
diff --git a/skins/default/templates/messageerror.html b/skins/default/templates/messageerror.html
new file mode 100644
index 0000000..d180e74
--- /dev/null
+++ b/skins/default/templates/messageerror.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe" style="background-color:#F2F2F2;">
+
+<div style="margin:20px auto; text-align:center">
+<img src="/images/watermark.gif" width="260" height="228" alt="" />
+</div>
+
+</body>
+</html>

--
Gitblit v1.9.1