From 38bf9d3b71067a51ffc9a915ea288929d1fb08e4 Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Thu, 14 Dec 2006 15:44:42 -0500
Subject: [PATCH] updated Spanish translation
---
program/steps/mail/show.inc | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 51633fa..fd82345 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -23,6 +23,8 @@
$PRINT_MODE = $_action=='print' ? TRUE : FALSE;
+// allow this request to be cached
+send_future_expire_header();
// similar code as in program/steps/mail/get.inc
if ($_GET['_uid'])
@@ -30,12 +32,18 @@
$MESSAGE = array('UID' => get_input_value('_uid', RCUBE_INPUT_GET));
$MESSAGE['headers'] = $IMAP->get_headers($MESSAGE['UID']);
$MESSAGE['structure'] = $IMAP->get_structure($MESSAGE['UID']);
-
+
// go back to list if message not found (wrong UID)
if (!$MESSAGE['headers'] || !$MESSAGE['structure'])
{
- $_action = 'list';
- return;
+ show_message('messageopenerror', 'error');
+ if ($_action=='preview' && template_exists('messagepreview'))
+ parse_template('messagepreview');
+ else
+ {
+ $_action = 'list';
+ return;
+ }
}
$MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
@@ -52,7 +60,7 @@
// mark message as read
- if (!$MESSAGE['headers']->seen)
+ if (!$MESSAGE['headers']->seen && $_action != 'preview')
$IMAP->set_flag($_GET['_uid'], 'SEEN');
// give message uid to the client
@@ -60,7 +68,7 @@
$javascript .= sprintf("%s.set_env('safemode', '%b');", $JS_OBJECT_NAME, $_GET['_safe']);
$next = $prev = -1;
- // get previous and next message UID
+ // get previous, first, next and last message UID
if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
$IMAP->get_capability('sort'))
{
@@ -69,21 +77,29 @@
$MESSAGE['index'] = array_search((string)$MESSAGE['UID'], $a_msg_index, TRUE);
$prev = isset($a_msg_index[$MESSAGE['index']-1]) ? $a_msg_index[$MESSAGE['index']-1] : -1 ;
+ $first = count($a_msg_index)>0 ? $a_msg_index[0] : -1;
$next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ;
+ $last = count($a_msg_index)>0 ? $a_msg_index[count($a_msg_index)-1] : -1;
}
else
{
// this assumes that we are sorted by date_DESC
$seq = $IMAP->get_id($MESSAGE['UID']);
$prev = $IMAP->get_uid($seq + 1);
+ $first = $IMAP->get_uid($IMAP->messagecount());
$next = $IMAP->get_uid($seq - 1);
+ $last = $IMAP->get_uid(1);
$MESSAGE['index'] = $IMAP->messagecount() - $seq;
}
if ($prev > 0)
$javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $prev);
+ if ($first >0)
+ $javascript .= sprintf("\n%s.set_env('first_uid', '%s');", $JS_OBJECT_NAME, $first);
if ($next > 0)
$javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $next);
+ if ($last >0)
+ $javascript .= sprintf("\n%s.set_env('last_uid', '%s');", $JS_OBJECT_NAME, $last);
$OUTPUT->add_script($javascript);
}
@@ -123,28 +139,6 @@
-// return an HTML iframe for loading mail content
-function rcmail_messagecontent_frame($attrib)
- {
- global $COMM_PATH, $OUTPUT, $GET_URL, $JS_OBJECT_NAME;
-
- // allow the following attributes to be added to the <iframe> tag
- $attrib_str = create_attrib_string($attrib);
- $framename = 'rcmailcontentwindow';
-
- $out = sprintf('<iframe src="%s" name="%s"%s>%s</iframe>'."\n",
- $GET_URL,
- $framename,
- $attrib_str,
- rcube_label('loading'));
-
-
- $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');");
-
- return $out;
- }
-
-
function rcmail_remote_objects_msg($attrib)
{
global $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
@@ -169,8 +163,10 @@
}
-if ($_action=='print')
+if ($_action=='print' && template_exists('printmessage'))
parse_template('printmessage');
+else if ($_action=='preview' && template_exists('messagepreview'))
+ parse_template('messagepreview');
else
parse_template('message');
?>
\ No newline at end of file
--
Gitblit v1.9.1