From 7dfb1fba5001299300736e6b5d95d9400575e3e7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 14:59:02 -0400
Subject: [PATCH] Set the right number of arguments for setcookie()
---
program/steps/mail/show.inc | 277 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 164 insertions(+), 113 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 992d06f..0b15c98 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -5,7 +5,7 @@
| program/steps/mail/show.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,151 +19,202 @@
*/
-require_once('Mail/mimeDecode.php');
-
-$PRINT_MODE = $_action=='print' ? TRUE : FALSE;
-
+$PRINT_MODE = $RCMAIL->action=='print' ? TRUE : FALSE;
// 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']);
+if ($_GET['_uid']) {
+ $MESSAGE = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
+ // set message charset as default
+ if (!empty($MESSAGE->headers->charset))
+ $IMAP->set_charset($MESSAGE->headers->charset);
+
// go back to list if message not found (wrong UID)
- if (!$MESSAGE['headers'] || !$MESSAGE['source'])
- {
- $_action = 'list';
- return;
+ if (empty($MESSAGE->headers)) {
+ $OUTPUT->show_message('messageopenerror', 'error');
+ if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
+ $OUTPUT->send('messagepreview');
+ else {
+ rcmail_overwrite_action('');
+ return;
}
+ }
+
+ $mbox_name = $IMAP->get_mailbox_name();
+
+ // check known senders to display images
+ if (!$MESSAGE->is_safe
+ && !empty($MESSAGE->sender['mailto'])
+ && $RCMAIL->config->get('addrbook_show_images')
+ && $MESSAGE->has_html_part()) {
+ $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
+
+ if ($CONTACTS->search('email', $MESSAGE->sender['mailto'], true, false)->count) {
+ $MESSAGE->set_safe(true);
+ }
+ }
- $mmd = new Mail_mimeDecode($MESSAGE['source']);
- $MESSAGE['structure'] = $mmd->decode(array('include_bodies' => TRUE,
- 'decode_headers' => FALSE,
- 'decode_bodies' => FALSE));
-
- $mmd->getMimeNumbers($MESSAGE['structure']);
+ // calculate Etag for this request
+ $etag = md5($MESSAGE->uid.$mbox_name.session_id().intval($MESSAGE->headers->mdn_sent).intval($MESSAGE->is_safe).intval($PRINT_MODE));
- $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['structure']->headers['subject']);
+ // allow caching, unless remote images are present
+ if ((bool)$MESSAGE->is_safe)
+ send_nocacheing_headers();
+ else if (empty($CONFIG['devel_mode']))
+ send_modified_header($_SESSION['login_time'], $etag, !$MESSAGE->headers->seen);
- 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'));
- else
- $MESSAGE['body'] = $IMAP->get_body($_GET['_uid']);
-
-
+ $OUTPUT->set_pagetitle($MESSAGE->subject);
+
// mark message as read
- if (!$MESSAGE['headers']->seen)
- $IMAP->set_flag($_GET['_uid'], 'SEEN');
+ if (!$MESSAGE->headers->seen)
+ {
+ $marked = $IMAP->set_flag($MESSAGE->uid, 'SEEN');
+ if($RCMAIL->action == 'preview' && $marked != -1)
+ {
+ $OUTPUT->command('set_unread_count_from_preview', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
+ $OUTPUT->command('mark_as_read_from_preview', $MESSAGE->uid);
+ }
+ }
// give message uid to the client
- $javascript = sprintf("%s.set_env('uid', '%s');\n", $JS_OBJECT_NAME, $_GET['_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);
+ $OUTPUT->set_env('uid', $MESSAGE->uid);
+ $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
+ $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
+ $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
- 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]);
+ // check for unset disposition notification
+ 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)
+ {
+ if (rcmail_send_mdn($MESSAGE->uid))
+ $OUTPUT->show_message('receiptsent', 'confirmation');
+ else
+ $OUTPUT->show_message('errorsendingreceipt', 'error');
+ }
+ else if (empty($CONFIG['mdn_requests']))
+ {
+ rcube_add_label('mdnrequest');
+ $OUTPUT->set_env('mdn_request', true);
+ }
+ }
- $OUTPUT->add_script($javascript);
+
+ $next = $prev = $first = $last = -1;
+ // get previous, first, next and last message UID
+ if ((!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') &&
+ $IMAP->get_capability('sort')) || !empty($_REQUEST['_search']))
+ {
+ // 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 ($prev > 0)
+ $OUTPUT->set_env('prev_uid', $prev);
+ if ($first >0)
+ $OUTPUT->set_env('first_uid', $first);
+ if ($next > 0)
+ $OUTPUT->set_env('next_uid', $next);
+ if ($last >0)
+ $OUTPUT->set_env('last_uid', $last);
}
function rcmail_message_attachments($attrib)
- {
- global $CONFIG, $OUTPUT, $PRINT_MODE, $MESSAGE, $GET_URL, $JS_OBJECT_NAME;
+{
+ global $PRINT_MODE, $MESSAGE;
+
+ $out = $ol = '';
- if (sizeof($MESSAGE['attachments']))
- {
- // allow the following attributes to be added to the <ul> tag
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
- $out = '<ul' . $attrib_str . ">\n";
-
- foreach ($MESSAGE['attachments'] as $attach_prop)
- {
- if ($PRINT_MODE)
- $out .= sprintf('<li>%s (%s)</li>'."\n",
- $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",
- $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']);
- */
+ if (sizeof($MESSAGE->attachments)) {
+ foreach ($MESSAGE->attachments as $attach_prop) {
+ if ($PRINT_MODE) {
+ $ol .= html::tag('li', null, sprintf("%s (%s)", Q($attach_prop->filename), Q(show_bytes($attach_prop->size))));
+ }
+ else {
+ if (rc_strlen($attach_prop->filename) > 50) {
+ $filename = abbreviate_string($attach_prop->filename, 50);
+ $title = $attach_prop->filename;
+ }
+ else {
+ $filename = $attach_prop->filename;
+ $title = '';
}
- $out .= "</ul>";
- return $out;
- }
- }
+ $ol .= html::tag('li', null,
+ html::a(array(
+ 'href' => $MESSAGE->get_part_url($attach_prop->mime_id),
+ 'onclick' => sprintf(
+ 'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
+ JS_OBJECT_NAME,
+ $attach_prop->mime_id,
+ $attach_prop->mimetype),
+ 'title' => Q($title),
+ ),
+ Q($filename)));
+ }
+ }
-
-
-// return an HTML iframe for loading mail content
-function rcmail_messagecontent_frame($attrib)
- {
- global $COMM_PATH, $OUTPUT, $GET_URL, $JS_OBJECT_NAME;
+ $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
+ }
- // 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;
+{
+ global $MESSAGE, $RCMAIL;
if (!$attrib['id'])
$attrib['id'] = 'rcmremoteobjmsg';
-
- // allow the following attributes to be added to the <div> tag
- $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id'));
- $out = '<div' . $attrib_str . ">";
- $out .= rep_specialchars_output(sprintf('%s <a href="#loadimages" onclick="%s.command(\'load-images\')" title="%s">%s</a>',
- rcube_label('blockedimages'),
- $JS_OBJECT_NAME,
- rcube_label('showimages'),
- rcube_label('showimages')));
+ $msg = Q(rcube_label('blockedimages')) . ' ';
+ $msg .= html::a(array('href' => "#loadimages", 'onclick' => JS_OBJECT_NAME.".command('load-images')"), Q(rcube_label('showimages')));
- $out .= '</div>';
-
- $OUTPUT->add_script(sprintf("%s.gui_object('remoteobjectsmsg', '%s');", $JS_OBJECT_NAME, $attrib['id']));
- return $out;
+ // add link to save sender in addressbook and reload message
+ if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('addrbook_show_images')) {
+ $msg .= ' ' . html::a(array('href' => "#alwaysload", 'onclick' => JS_OBJECT_NAME.".command('always-load')", 'style' => "white-space:nowrap"),
+ Q(rcube_label(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
}
+
+ $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
+ return html::div($attrib, $msg);
+}
-if ($_action=='print')
- parse_template('printmessage');
+$OUTPUT->add_handlers(array(
+ 'messageattachments' => 'rcmail_message_attachments',
+ 'mailboxname' => 'rcmail_mailbox_name_display',
+ 'blockedobjects' => 'rcmail_remote_objects_msg'));
+
+
+if ($RCMAIL->action=='print' && $OUTPUT->template_exists('printmessage'))
+ $OUTPUT->send('printmessage');
+else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
+ $OUTPUT->send('messagepreview');
else
- parse_template('message');
-?>
\ No newline at end of file
+ $OUTPUT->send('message');
+?>
--
Gitblit v1.9.1