From df8e8ec9eee72743d0f14a8409aacf66c4a80d89 Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Mon, 11 Dec 2006 12:09:34 -0500
Subject: [PATCH] updated da, de_DE, pt_BR, bs_BA, fr, pl, et_EE translations
---
program/steps/mail/show.inc | 133 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 65 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 992d06f..fd82345 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -23,55 +23,83 @@
$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'])
{
- $MESSAGE = array();
- $MESSAGE['headers'] = $IMAP->get_headers($_GET['_uid']);
- $MESSAGE['source'] = rcmail_message_source($_GET['_uid']);
+ $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['source'])
+ 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;
+ }
}
- $mmd = new Mail_mimeDecode($MESSAGE['source']);
- $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
- 'decode_headers' => FALSE,
- 'decode_bodies' => FALSE));
-
- $mmd->getMimeNumbers($MESSAGE['structure']);
-
- $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['structure']->headers['subject']);
-
+ $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
+
if ($MESSAGE['structure'])
- list($MESSAGE['parts'], $MESSAGE['attachments']) = rcmail_parse_message($MESSAGE['structure'],
- array('safe' => (bool)$_GET['_safe'],
- 'prefer_html' => $CONFIG['prefer_html'],
- 'get_url' => $GET_URL.'&_part=%s'));
+ list($MESSAGE['parts'], $MESSAGE['attachments']) = rcmail_parse_message(
+ $MESSAGE['structure'],
+ array('safe' => (bool)$_GET['_safe'],
+ 'prefer_html' => $CONFIG['prefer_html'],
+ 'get_url' => $GET_URL.'&_part=%s')
+ );
else
- $MESSAGE['body'] = $IMAP->get_body($_GET['_uid']);
+ $MESSAGE['body'] = $IMAP->get_body($MESSAGE['UID']);
// 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
- $javascript = sprintf("%s.set_env('uid', '%s');\n", $JS_OBJECT_NAME, $_GET['_uid']);
+ $javascript = sprintf("%s.set_env('uid', '%s');\n", $JS_OBJECT_NAME, $MESSAGE['UID']);
$javascript .= sprintf("%s.set_env('safemode', '%b');", $JS_OBJECT_NAME, $_GET['_safe']);
- // get previous and next message UID
- $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
- $MESSAGE['index'] = array_search((string)$_GET['_uid'], $a_msg_index, TRUE);
+ $next = $prev = -1;
+ // get previous, first, next and last message UID
+ if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
+ $IMAP->get_capability('sort'))
+ {
+ // Only if we use custom sorting
+ $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']);
+
+ $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 (isset($a_msg_index[$MESSAGE['index']-1]))
- $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']-1]);
- if (isset($a_msg_index[$MESSAGE['index']+1]))
- $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']+1]);
+ 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);
}
@@ -92,21 +120,16 @@
{
if ($PRINT_MODE)
$out .= sprintf('<li>%s (%s)</li>'."\n",
- $attach_prop['filename'],
- show_bytes($attach_prop['size']));
+ $attach_prop->filename,
+ show_bytes($attach_prop->size));
else
- $out .= sprintf('<li><a href="#attachment" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n",
+ $out .= sprintf('<li><a href="%s&_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n",
+ htmlspecialchars($GET_URL),
+ $attach_prop->mime_id,
$JS_OBJECT_NAME,
- $attach_prop['part_id'],
- $attach_prop['mimetype'],
- $attach_prop['filename']);
- /* direct link
- else
- $out .= sprintf('<li><a href="%s&_part=%s&_frame=1" target="rcubemailattachment">%s</a></li>'."\n",
- $GET_URL,
- $attach_prop['part_id'],
- $attach_prop['filename']);
- */
+ $attach_prop->mime_id,
+ $attach_prop->mimetype,
+ $attach_prop->filename);
}
$out .= "</ul>";
@@ -114,28 +137,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)
@@ -162,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