From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
program/steps/mail/show.inc | 490 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 319 insertions(+), 171 deletions(-)
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index daf2e08..747cbc2 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/show.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Display a mail message similar as a usual mail application does |
@@ -14,199 +17,344 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
-$PRINT_MODE = $RCMAIL->action=='print' ? TRUE : FALSE;
+$PRINT_MODE = $RCMAIL->action == 'print' ? TRUE : FALSE;
+
+// Read browser capabilities and store them in session
+if ($caps = rcube_utils::get_input_value('_caps', rcube_utils::INPUT_GET)) {
+ $browser_caps = array();
+ foreach (explode(',', $caps) as $cap) {
+ $cap = explode('=', $cap);
+ $browser_caps[$cap[0]] = $cap[1];
+ }
+ $_SESSION['browser_caps'] = $browser_caps;
+}
+
+$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+$mbox_name = $RCMAIL->storage->get_folder();
// similar code as in program/steps/mail/get.inc
-if ($_GET['_uid'])
- {
- $MESSAGE = array('UID' => get_input_value('_uid', RCUBE_INPUT_GET));
- $MESSAGE['headers'] = $IMAP->get_headers($MESSAGE['UID']);
-
- // 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'])
- {
- $OUTPUT->show_message('messageopenerror', 'error');
- if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
- $OUTPUT->send('messagepreview');
- else
- {
- $RCMAIL->action = 'list';
- return;
- }
+if ($uid) {
+ // set message format (need to be done before rcube_message construction)
+ if (!empty($_GET['_format'])) {
+ $prefer_html = $_GET['_format'] == 'html';
+ $RCMAIL->config->set('prefer_html', $prefer_html);
+ $_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
}
-
- // check if safe flag is set
- if ($MESSAGE['is_safe'] = intval($_GET['_safe']))
- $_SESSION['safe_messages'][$MESSAGE['UID']] = true;
- else if ($_SESSION['safe_messages'][$MESSAGE['UID']])
- $MESSAGE['is_safe'] = 1;
-
- $mbox_name = $IMAP->get_mailbox_name();
-
- // 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));
-
- // 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);
-
- $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject);
- $OUTPUT->set_pagetitle($MESSAGE['subject']);
-
- if ($MESSAGE['structure'] = $IMAP->get_structure($MESSAGE['UID']))
- list($MESSAGE['parts'], $MESSAGE['attachments']) = rcmail_parse_message(
- $MESSAGE['structure'],
- array('safe' => $MESSAGE['is_safe'],
- 'prefer_html' => $CONFIG['prefer_html'],
- 'get_url' => $GET_URL.'&_part=%s')
- );
- else
- $MESSAGE['body'] = $IMAP->get_body($MESSAGE['UID']);
-
- // mark message as read
- 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']);
+ else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
+ $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
}
- }
- // give message uid to the client
- $OUTPUT->set_env('uid', $MESSAGE['UID']);
- $OUTPUT->set_env('safemode', $MESSAGE['is_safe']);
-
- // check for unset disposition notification
- if ($MESSAGE['headers']->mdn_to && !$MESSAGE['headers']->mdn_sent && $mbox_name != $CONFIG['drafts_mbox'])
- {
- if (intval($CONFIG['mdn_requests']) === 1)
- {
- if (rcmail_send_mdn($MESSAGE['UID']))
- $OUTPUT->show_message('receiptsent', 'confirmation');
+ $MESSAGE = new rcube_message($uid);
+
+ // if message not found (wrong UID)...
+ if (empty($MESSAGE->headers)) {
+ rcmail_message_error($uid);
}
- else if (empty($CONFIG['mdn_requests']))
- {
- rcube_add_label('mdnrequest');
- $OUTPUT->set_env('mdn_request', true);
- }
- }
- $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;
+ // show images?
+ rcmail_check_safe($MESSAGE);
+
+ // set message charset as default
+ if (!empty($MESSAGE->headers->charset)) {
+ $RCMAIL->storage->set_charset($MESSAGE->headers->charset);
}
- 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;
+
+ $OUTPUT->set_pagetitle(abbreviate_string($MESSAGE->subject, 128, '...', true));
+
+ // set message environment
+ $OUTPUT->set_env('uid', $MESSAGE->uid);
+ $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
+ $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
+ $OUTPUT->set_env('mailbox', $mbox_name);
+ $OUTPUT->set_env('permaurl', $RCMAIL->url(array('_action' => 'show', '_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
+
+ if ($MESSAGE->headers->get('list-post', false)) {
+ $OUTPUT->set_env('list_post', true);
}
-
- 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);
- }
+
+ // set environment
+ $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
+
+ // set configuration
+ $RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted',
+ 'skip_deleted', 'display_next', 'forward_attachment'));
+
+ // set special folders
+ foreach (array('drafts', 'trash', 'junk') as $mbox) {
+ if ($folder = $RCMAIL->config->get($mbox . '_mbox')) {
+ $OUTPUT->set_env($mbox . '_mailbox', $folder);
+ }
+ }
+
+ // mimetypes supported by the browser (default settings)
+ $mimetypes = (array)$RCMAIL->config->get('client_mimetypes');
+
+ // Remove unsupported types, which makes that attachment which cannot be
+ // displayed in a browser will be downloaded directly without displaying an overlay page
+ if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
+ unset($mimetypes[$key]);
+ }
+ if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
+ unset($mimetypes[$key]);
+ }
+ if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
+ // we can convert tiff to jpeg
+ if (!rcube_image::is_convertable('image/tiff')) {
+ unset($mimetypes[$key]);
+ }
+ }
+
+ $OUTPUT->set_env('mimetypes', array_values($mimetypes));
+
+ if ($MESSAGE->has_html_part()) {
+ $prefer_html = $RCMAIL->config->get('prefer_html');
+ $OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
+ }
+
+ if (!$OUTPUT->ajax_call) {
+ $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
+ 'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
+ }
+
+ // check for unset disposition notification
+ if ($MESSAGE->headers->mdn_to
+ && empty($MESSAGE->headers->flags['MDNSENT'])
+ && empty($MESSAGE->headers->flags['SEEN'])
+ && ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*'))
+ && $mbox_name != $RCMAIL->config->get('drafts_mbox')
+ && $mbox_name != $RCMAIL->config->get('sent_mbox')
+ ) {
+ $mdn_cfg = intval($RCMAIL->config->get('mdn_requests'));
+
+ if ($mdn_cfg == 1 || (($mdn_cfg == 3 || $mdn_cfg == 4) && rcmail_contact_exists($MESSAGE->sender['mailto']))) {
+ // Send MDN
+ if (rcmail_send_mdn($MESSAGE, $smtp_error))
+ $OUTPUT->show_message('receiptsent', 'confirmation');
+ else if ($smtp_error)
+ $OUTPUT->show_message($smtp_error['label'], 'error', $smtp_error['vars']);
+ else
+ $OUTPUT->show_message('errorsendingreceipt', 'error');
+ }
+ else if ($mdn_cfg != 2 && $mdn_cfg != 4) {
+ // Ask user
+ $OUTPUT->add_label('mdnrequest');
+ $OUTPUT->set_env('mdn_request', true);
+ }
+ }
+
+ if (empty($MESSAGE->headers->flags['SEEN'])
+ && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($RCMAIL->config->get('preview_pane_mark_read')) == 0))
+ ) {
+ $RCMAIL->output->command('set_unread_message', $MESSAGE->uid, $mbox_name);
+ $RCMAIL->plugins->exec_hook('message_read', array(
+ 'uid' => $MESSAGE->uid,
+ 'mailbox' => $mbox_name,
+ 'message' => $MESSAGE,
+ ));
+
+ $set_seen_flag = true;
+ }
+}
+
+
+$OUTPUT->add_handlers(array(
+ 'messageattachments' => 'rcmail_message_attachments',
+ 'mailboxname' => 'rcmail_mailbox_name_display',
+ 'messageobjects' => 'rcmail_message_objects',
+ 'contactphoto' => 'rcmail_message_contactphoto',
+));
+
+
+if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
+ $OUTPUT->send('messageprint', false);
+else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
+ $OUTPUT->send('messagepreview', false);
+else
+ $OUTPUT->send('message', false);
+
+
+// mark message as read
+if (!empty($set_seen_flag)) {
+ if ($RCMAIL->storage->set_flag($MESSAGE->uid, 'SEEN', $mbox_name)) {
+ if ($count = rcmail_get_unseen_count($mbox_name)) {
+ rcmail_set_unseen_count($mbox_name, $count - 1);
+ }
+ }
+}
+
+exit;
function rcmail_message_attachments($attrib)
- {
- global $CONFIG, $OUTPUT, $PRINT_MODE, $MESSAGE, $GET_URL;
+{
+ global $PRINT_MODE, $MESSAGE, $RCMAIL;
- 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";
+ $out = $ol = '';
+ $attachments = array();
- 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="%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->mime_id,
- $attach_prop->mimetype,
- $attach_prop->filename);
- }
+ if (sizeof($MESSAGE->attachments)) {
+ foreach ($MESSAGE->attachments as $attach_prop) {
+ $filename = rcmail_attachment_name($attach_prop, true);
+ $filesize = $RCMAIL->message_part_size($attach_prop);
- $out .= "</ul>";
+ if ($PRINT_MODE) {
+ $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $filesize)));
+ }
+ else {
+ if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
+ $title = $filename;
+ $filename = abbreviate_string($filename, $attrib['maxlength']);
+ }
+ else {
+ $title = '';
+ }
+
+ if ($attach_prop->size) {
+ $size = ' ' . html::span('attachment-size', '(' . rcube::Q($filesize) . ')');
+ }
+
+ $mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
+ $class = rcube_utils::file2class($mimetype, $filename);
+ $id = 'attach' . $attach_prop->mime_id;
+ $link = html::a(array(
+ 'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
+ 'onclick' => sprintf('return %s.command(\'load-attachment\',\'%s\',this)',
+ rcmail_output::JS_OBJECT_NAME, $attach_prop->mime_id),
+ 'onmouseover' => $title ? '' : 'rcube_webmail.long_subject_title_ex(this, 0)',
+ 'title' => rcube::Q($title),
+ ), rcube::Q($filename) . $size);
+
+ $ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);
+
+ $attachments[$attach_prop->mime_id] = $mimetype;
+ }
+ }
+
+ $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
+
+ $RCMAIL->output->set_env('attachments', $attachments);
+ }
+
return $out;
- }
- }
+}
+function rcmail_remote_objects_msg()
+{
+ global $MESSAGE, $RCMAIL;
+ $attrib['id'] = 'remote-objects-message';
+ $attrib['class'] = 'notice';
+ $attrib['style'] = 'display: none';
-function rcmail_remote_objects_msg($attrib)
- {
- global $CONFIG, $OUTPUT;
-
- if (!$attrib['id'])
- $attrib['id'] = 'rcmremoteobjmsg';
+ $msg = rcube::Q($RCMAIL->gettext('blockedimages')) . ' ';
+ $msg .= html::a(array(
+ 'href' => "#loadimages",
+ 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('load-images')"
+ ),
+ rcube::Q($RCMAIL->gettext('showimages')));
- // 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 .= sprintf('%s <a href="#loadimages" onclick="%s.command(\'load-images\')">%s</a>',
- Q(rcube_label('blockedimages')),
- JS_OBJECT_NAME,
- Q(rcube_label('showimages')));
-
- $out .= '</div>';
-
- $OUTPUT->add_gui_object('remoteobjectsmsg', $attrib['id']);
- return $out;
- }
+ // add link to save sender in addressbook and reload message
+ if ($MESSAGE->sender['mailto'] && $RCMAIL->config->get('show_images') == 1) {
+ $msg .= ' ' . html::a(array(
+ 'href' => "#alwaysload",
+ 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('always-load')",
+ 'style' => "white-space:nowrap"
+ ),
+ rcube::Q($RCMAIL->gettext(array('name' => 'alwaysshow', 'vars' => array('sender' => $MESSAGE->sender['mailto'])))));
+ }
+ $RCMAIL->output->add_gui_object('remoteobjectsmsg', $attrib['id']);
-$OUTPUT->add_handlers(array(
- 'messageattachments' => 'rcmail_message_attachments',
- 'blockedobjects' => 'rcmail_remote_objects_msg'));
+ return html::div($attrib, $msg);
+}
+function rcmail_message_buttons()
+{
+ global $RCMAIL, $MESSAGE;
-if ($RCMAIL->action=='print' && template_exists('printmessage'))
- $OUTPUT->send('printmessage');
-else if ($RCMAIL->action=='preview' && template_exists('messagepreview'))
- $OUTPUT->send('messagepreview');
-else
- $OUTPUT->send('message');
-?>
+ $delim = $RCMAIL->storage->get_hierarchy_delimiter();
+ $dbox = $RCMAIL->config->get('drafts_mbox');
+
+ // the message is not a draft
+ if ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0) {
+ return '';
+ }
+
+ $attrib['id'] = 'message-buttons';
+ $attrib['class'] = 'notice';
+
+ $msg = rcube::Q($RCMAIL->gettext('isdraft')) . ' ';
+ $msg .= html::a(array(
+ 'href' => "#edit",
+ 'onclick' => rcmail_output::JS_OBJECT_NAME.".command('edit')"
+ ),
+ rcube::Q($RCMAIL->gettext('edit')));
+
+ return html::div($attrib, $msg);
+}
+
+function rcmail_message_objects($attrib)
+{
+ global $RCMAIL, $MESSAGE;
+
+ if (!$attrib['id'])
+ $attrib['id'] = 'message-objects';
+
+ $content = array(
+ rcmail_message_buttons(),
+ rcmail_remote_objects_msg(),
+ );
+
+ $plugin = $RCMAIL->plugins->exec_hook('message_objects',
+ array('content' => $content, 'message' => $MESSAGE));
+
+ $content = implode("\n", $plugin['content']);
+
+ return html::div($attrib, $content);
+}
+
+function rcmail_contact_exists($email)
+{
+ global $RCMAIL;
+
+ if ($email) {
+ // @TODO: search in all address books?
+ $CONTACTS = $RCMAIL->get_address_book(-1, true);
+
+ if (is_object($CONTACTS)) {
+ $existing = $CONTACTS->search('email', $email, true, false);
+ if ($existing->count) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+function rcmail_message_contactphoto($attrib)
+{
+ global $RCMAIL, $MESSAGE;
+
+ $placeholder = $attrib['placeholder'] ? $RCMAIL->output->abs_url($attrib['placeholder'], true) : null;
+ $placeholder = $RCMAIL->output->asset_url($placeholder ? $placeholder : 'program/resources/blank.gif');
+
+ if ($MESSAGE->sender) {
+ $photo_img = $RCMAIL->url(array(
+ '_task' => 'addressbook',
+ '_action' => 'photo',
+ '_email' => $MESSAGE->sender['mailto'],
+ ));
+
+ $attrib['onerror'] = "this.src = '$placeholder'";
+ }
+ else {
+ $photo_img = $placeholder;
+ }
+
+ return html::img(array('src' => $photo_img, 'alt' => $RCMAIL->gettext('contactphoto')) + $attrib);
+}
--
Gitblit v1.9.1