From 46f7b7096450939fe03c95aa81ce06ae4bfca89d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Mar 2016 06:51:43 -0400
Subject: [PATCH] Enable reply/reply-all/forward buttons also in preview frame of message/rfc822
---
program/steps/mail/compose.inc | 360 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 187 insertions(+), 173 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 9bb8713..9ef8647 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -5,7 +5,7 @@
| program/steps/mail/compose.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2013, The Roundcube Dev Team |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -47,9 +47,11 @@
if (!is_array($COMPOSE)) {
// Infinite redirect prevention in case of broken session (#1487028)
if ($COMPOSE_ID) {
- rcube::raise_error(array('code' => 500, 'type' => 'php',
- 'file' => __FILE__, 'line' => __LINE__,
- 'message' => "Invalid compose ID"), true, true);
+ // if we know the message with specified ID was already sent
+ // we can ignore the error and compose a new message (#1490009)
+ if ($COMPOSE_ID != $_SESSION['last_compose_session']) {
+ rcube::raise_error(array('code' => 450), false, true);
+ }
}
$COMPOSE_ID = uniqid(mt_rand());
@@ -83,7 +85,10 @@
'messagesaved', 'converting', 'editorwarning', 'searching', 'uploading', 'uploadingmany',
'fileuploaderror', 'sendmessage', 'newresponse', 'responsename', 'responsetext', 'save',
'savingresponse', 'restoresavedcomposedata', 'restoremessage', 'delete', 'restore', 'ignore',
- 'selectimportfile', 'messageissent');
+ 'selectimportfile', 'messageissent', 'loadingdata', 'nopubkeyfor', 'nopubkeyforsender',
+ 'encryptnoattachments','encryptedsendialog','searchpubkeyservers', 'importpubkeys',
+ 'encryptpubkeysfound', 'search', 'close', 'import', 'keyid', 'keylength', 'keyexpired',
+ 'keyrevoked', 'keyimportsuccess', 'keyservererror', 'attaching');
$OUTPUT->set_pagetitle($RCMAIL->gettext('compose'));
@@ -174,7 +179,7 @@
$MESSAGE = new rcube_message($msg_uid);
// make sure message is marked as read
- if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN'])) {
+ if ($MESSAGE->headers && $MESSAGE->context === null && empty($MESSAGE->headers->flags['SEEN'])) {
$RCMAIL->storage->set_flag($msg_uid, 'SEEN');
}
@@ -187,7 +192,7 @@
}
else if ($compose_mode == RCUBE_COMPOSE_FORWARD || $compose_mode == RCUBE_COMPOSE_REPLY) {
if ($compose_mode == RCUBE_COMPOSE_REPLY) {
- $COMPOSE['reply_uid'] = $msg_uid;
+ $COMPOSE['reply_uid'] = $MESSAGE->context === null ? $msg_uid : null;
if (!empty($COMPOSE['param']['all'])) {
$MESSAGE->reply_all = $COMPOSE['param']['all'];
@@ -315,7 +320,8 @@
// #1486037: remove "mailto:" prefix
$COMPOSE['param']['to'] = preg_replace('/^mailto:/i', '', $mailto[0]);
// #1490346: decode the recipient address
- $COMPOSE['param']['to'] = urldecode($COMPOSE['param']['to']);
+ // #1490510: use raw encoding for correct "+" character handling as specified in RFC6068
+ $COMPOSE['param']['to'] = rawurldecode($COMPOSE['param']['to']);
// Supported case-insensitive tokens in mailto URL
$url_tokens = array('to', 'cc', 'bcc', 'reply-to', 'in-reply-to', 'references', 'subject', 'body');
@@ -353,7 +359,12 @@
// clean HTML message body which can be submitted by URL
if (!empty($COMPOSE['param']['body'])) {
- $COMPOSE['param']['body'] = rcmail_wash_html($COMPOSE['param']['body'], array('safe' => false, 'inline_html' => true), array());
+ if ($COMPOSE['param']['html'] = strpos($COMPOSE['param']['body'], '<') !== false) {
+ $wash_params = array('safe' => false, 'inline_html' => true);
+ $COMPOSE['param']['body'] = rcmail_wash_html($COMPOSE['param']['body'], $wash_params, array());
+ $COMPOSE['param']['body'] = preg_replace('/<!--[^>\n]+>/', '', $COMPOSE['param']['body']);
+ $COMPOSE['param']['body'] = preg_replace('/<\/?body>/', '', $COMPOSE['param']['body']);
+ }
}
$RCMAIL = rcmail::get_instance();
@@ -379,6 +390,7 @@
'group' => $COMPOSE_ID,
'name' => $filename,
'mimetype' => rcube_mime::file_content_type($attach, $filename),
+ 'size' => filesize($attach),
'path' => $attach,
);
}
@@ -481,7 +493,9 @@
$top_posting = intval($RCMAIL->config->get('reply_mode')) > 0
&& !$RCMAIL->config->get('sig_below')
&& ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY || $COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD);
- $separator = $top_posting ? '---' : '-- ';
+
+ $separator = $top_posting ? '---' : '-- ';
+ $add_separator = (bool) $RCMAIL->config->get('sig_separator');
$field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.".change_identity(this)";
$select_from = new html_select($field_attrib);
@@ -496,16 +510,16 @@
$text = $html = $sql_arr['signature'];
if ($sql_arr['html_signature']) {
- $h2t = new rcube_html2text($html, false, true);
- $text = trim($h2t->get_text());
+ $text = $RCMAIL->html2text($html, array('links' => false));
+ $text = trim($text, "\r\n");
}
else {
$t2h = new rcube_text2html($text, false);
$html = $t2h->get_html();
}
- if (!preg_match('/^--[ -]\r?\n/m', $text)) {
- $text = $separator . "\n" . $text;
+ if ($add_separator && !preg_match('/^--[ -]\r?\n/m', $text)) {
+ $text = $separator . "\n" . ltrim($text, "\r\n");
$html = $separator . "<br>" . $html;
}
@@ -520,6 +534,8 @@
if (!empty($sql_arr['bcc'])) {
$identities[$identity_id]['bcc'] = $sql_arr['bcc'];
}
+
+ $identities[$identity_id]['email'] = $sql_arr['email'];
}
$out = $select_from->show($MESSAGE->compose['from']);
@@ -620,8 +636,11 @@
$fvalue .= (!empty($fvalue) ? $separator : '') . $v;
}
// Use Sender header (#1489011)
- if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false) {
- $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+ if ($v = $MESSAGE->headers->get('Sender', false)) {
+ // Skip common mailing lists addresses: *-bounces@ and *-request@ (#1490452)
+ if (empty($MESSAGE->headers->others['list-post']) || !preg_match('/-(bounces|request)@/', $v)) {
+ $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+ }
}
// When To: and Reply-To: are the same we add From: address to the list (#1489037)
@@ -694,7 +713,7 @@
function rcmail_compose_editor_mode()
{
- global $RCMAIL;
+ global $RCMAIL, $COMPOSE;
static $useHtml;
if ($useHtml !== null) {
@@ -704,20 +723,24 @@
$html_editor = intval($RCMAIL->config->get('htmleditor'));
$compose_mode = $COMPOSE['mode'];
- if (isset($_POST['_is_html'])) {
+ if (is_bool($COMPOSE['param']['html'])) {
+ $useHtml = $COMPOSE['param']['html'];
+ }
+ else if (isset($_POST['_is_html'])) {
$useHtml = !empty($_POST['_is_html']);
}
else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
$useHtml = rcmail_message_is_html();
}
else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
- $useHtml = ($html_editor == 1 || ($html_editor >= 2 && rcmail_message_is_html()));
+ $useHtml = $html_editor == 1 || ($html_editor >= 2 && rcmail_message_is_html());
}
else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
- $useHtml = ($html_editor == 1 || ($html_editor == 3 && rcmail_message_is_html()));
+ $useHtml = $html_editor == 1 || $html_editor == 4
+ || ($html_editor == 3 && rcmail_message_is_html());
}
else {
- $useHtml = ($html_editor == 1);
+ $useHtml = $html_editor == 1 || $html_editor == 4;
}
return $useHtml;
@@ -757,21 +780,31 @@
if (!empty($MESSAGE->parts)) {
// collect IDs of message/rfc822 parts
- if ($COMPOSE['mode'] == RCUBE_COMPOSE_EDIT || $COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT) {
- foreach ($MESSAGE->attachments as $part) {
- if ($part->mimetype == 'message/rfc822') {
- $messages[] = $part->mime_id;
- }
+ foreach ($MESSAGE->mime_parts() as $part) {
+ if ($part->mimetype == 'message/rfc822') {
+ $messages[] = $part->mime_id;
}
}
foreach ($MESSAGE->parts as $part) {
+ if ($part->realtype == 'multipart/encrypted') {
+ // find the encrypted message payload part
+ if ($pgp_mime_part = $MESSAGE->get_multipart_encrypted_part()) {
+ $RCMAIL->output->set_env('pgp_mime_message', array(
+ '_mbox' => $RCMAIL->storage->get_folder(),
+ '_uid' => $MESSAGE->uid,
+ '_part' => $pgp_mime_part->mime_id,
+ ));
+ }
+ continue;
+ }
+
// skip no-content and attachment parts (#1488557)
if ($part->type != 'content' || !$part->size || $MESSAGE->is_attachment($part)) {
continue;
}
- // skip all content parts inside the message/rfc822 part in DRAFT/EDIT mode
+ // skip all content parts inside the message/rfc822 part
foreach ($messages as $mimeid) {
if (strpos($part->mime_id, $mimeid . '.') === 0) {
continue 2;
@@ -788,14 +821,21 @@
}
// compose reply-body
- if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY)
+ if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY) {
$body = rcmail_create_reply_body($body, $isHtml);
+
+ if ($MESSAGE->pgp_mime) {
+ $RCMAIL->output->set_env('compose_reply_header', rcmail_get_reply_header($MESSAGE));
+ }
+ }
// forward message body inline
- else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD)
+ else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
$body = rcmail_create_forward_body($body, $isHtml);
+ }
// load draft message body
- else if ($COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT || $COMPOSE['mode'] == RCUBE_COMPOSE_EDIT)
+ else if ($COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT || $COMPOSE['mode'] == RCUBE_COMPOSE_EDIT) {
$body = rcmail_create_draft_body($body, $isHtml);
+ }
}
else { // new message
$isHtml = rcmail_compose_editor_mode();
@@ -825,7 +865,7 @@
function rcmail_compose_part_body($part, $isHtml = false)
{
- global $RCMAIL, $MESSAGE, $LINE_LENGTH;
+ global $RCMAIL, $COMPOSE, $MESSAGE, $LINE_LENGTH;
// Check if we have enough memory to handle the message in it
// #1487424: we need up to 10x more memory than the body
@@ -839,6 +879,14 @@
// message is cached but not exists (#1485443), or other error
if ($body === false) {
return '';
+ }
+
+ // register this part as pgp encrypted
+ if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
+ $MESSAGE->pgp_mime = true;
+ $RCMAIL->output->set_env('pgp_mime_message', array(
+ '_mbox' => $RCMAIL->storage->get_folder(), '_uid' => $MESSAGE->uid, '_part' => $part->mime_id,
+ ));
}
if ($isHtml) {
@@ -868,9 +916,8 @@
if ($part->ctype_secondary == 'html') {
// use html part if it has been used for message (pre)viewing
// decrease line length for quoting
- $len = $COMPOSE['mode'] == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
- $txt = new rcube_html2text($body, false, true, $len);
- $body = $txt->get_text();
+ $len = $COMPOSE['mode'] == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
+ $body = $RCMAIL->html2text($body, array('width' => $len));
}
else {
if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
@@ -1007,16 +1054,7 @@
{
global $RCMAIL, $MESSAGE, $LINE_LENGTH;
- // build reply prefix
- $from = array_pop(rcube_mime::decode_address_list($MESSAGE->get_header('from'), 1, false, $MESSAGE->headers->charset));
- $prefix = $RCMAIL->gettext(array(
- 'name' => 'mailreplyintro',
- 'vars' => array(
- 'date' => $RCMAIL->format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long')),
- 'sender' => $from['name'] ? $from['name'] : rcube_utils::idn_to_utf8($from['mailto']),
- )
- ));
-
+ $prefix = rcmail_get_reply_header($MESSAGE);
$reply_mode = intval($RCMAIL->config->get('reply_mode'));
if (!$bodyIsHtml) {
@@ -1053,13 +1091,26 @@
$suffix = '</blockquote>';
}
else {
- $suffix = '</blockquote><p></p>';
+ $suffix = '</blockquote><p><br/></p>';
}
}
return $prefix . $body . $suffix;
}
+function rcmail_get_reply_header($message)
+{
+ global $RCMAIL;
+
+ $from = array_pop(rcube_mime::decode_address_list($message->get_header('from'), 1, false, $message->headers->charset));
+ return $RCMAIL->gettext(array(
+ 'name' => 'mailreplyintro',
+ 'vars' => array(
+ 'date' => $RCMAIL->format_date($message->headers->date, $RCMAIL->config->get('date_long')),
+ 'sender' => $from['name'] ?: rcube_utils::idn_to_utf8($from['mailto']),
+ )
+ ));
+}
function rcmail_create_forward_body($body, $bodyIsHtml)
{
@@ -1140,8 +1191,24 @@
if ($bodyIsHtml) {
$body = rcmail_wash_html($body, array('safe' => 1), $cid_map);
- // remove comments (produced by washtml)
- $body = preg_replace('/<!--[^>]+-->/', '', $body);
+ // cleanup
+ $body = preg_replace(array(
+ // remove comments (produced by washtml)
+ '/<!--[^>]+-->/',
+ // remove <body> tags
+ '/<body([^>]*)>/i',
+ '/<\/body>/i',
+ // convert TinyMCE's empty-line sequence (#1490463)
+ '/<p>\xC2\xA0<\/p>/',
+ ),
+ array(
+ '',
+ '',
+ '',
+ '<p><br /></p>',
+ ),
+ $body
+ );
// replace cid with href in inline images links
if (!empty($cid_map)) {
@@ -1187,7 +1254,15 @@
$cid_map = array();
$messages = array();
- foreach ((array)$message->mime_parts as $pid => $part) {
+ if ($message->pgp_mime) {
+ return $cid_map;
+ }
+
+ foreach ((array) $message->mime_parts() as $pid => $part) {
+ if ($part->mimetype == 'message/rfc822') {
+ $messages[] = $part->mime_id;
+ }
+
if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) {
// skip parts that aren't valid attachments
if ($part->ctype_primary == 'multipart' || $part->mimetype == 'application/ms-tnef') {
@@ -1204,31 +1279,21 @@
continue;
}
- // skip message/rfc822 attachments on forwards (#1489214)
- // Thunderbird when forwarding in inline mode displays such attachments
- // and skips any attachments from inside of such part, this however
- // skipped e.g. images used in HTML body or other attachments. So,
- // better to skip .eml attachments but not their content (included files).
- if ($part->mimetype == 'message/rfc822') {
- if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
- continue;
- }
- $messages[] = $part->mime_id;
+ // skip version.txt parts of multipart/encrypted messages
+ if ($message->pgp_mime && $part->mimetype == 'application/pgp-encrypted' && $part->filename == 'version.txt') {
+ continue;
}
- else if ($COMPOSE['mode'] != RCUBE_COMPOSE_FORWARD) {
- // skip attachments included in message/rfc822 attachment (#1486487)
- foreach ($messages as $mimeid) {
- if (strpos($part->mime_id, $mimeid . '.') === 0) {
- continue 2;
- }
+
+ // skip attachments included in message/rfc822 attachment (#1486487, #1490607)
+ foreach ($messages as $mimeid) {
+ if (strpos($part->mime_id, $mimeid . '.') === 0) {
+ continue 2;
}
}
if (($attachment = $loaded_attachments[rcmail_attachment_name($part) . $part->mimetype])
- || ($attachment = rcmail_save_attachment($message, $pid))
+ || ($attachment = rcmail_save_attachment($message, $pid, $COMPOSE['id']))
) {
- $COMPOSE['attachments'][$attachment['id']] = $attachment;
-
if ($bodyIsHtml && ($part->content_id || $part->content_location)) {
$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
@@ -1252,11 +1317,27 @@
{
global $RCMAIL, $COMPOSE;
- $cid_map = array();
- foreach ((array)$message->mime_parts as $pid => $part) {
+ $cid_map = array();
+ $messages = array();
+
+ if ($message->pgp_mime) {
+ return $cid_map;
+ }
+
+ foreach ((array) $message->mime_parts() as $pid => $part) {
+ if ($part->mimetype == 'message/rfc822') {
+ $messages[] = $part->mime_id;
+ }
+
if (($part->content_id || $part->content_location) && $part->filename) {
- if ($attachment = rcmail_save_attachment($message, $pid)) {
- $COMPOSE['attachments'][$attachment['id']] = $attachment;
+ // skip attachments included in message/rfc822 attachment (#1486487, #1490607)
+ foreach ($messages as $mimeid) {
+ if (strpos($part->mime_id, $mimeid . '.') === 0) {
+ continue 2;
+ }
+ }
+
+ if ($attachment = rcmail_save_attachment($message, $pid, $COMPOSE['id'])) {
$url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
$RCMAIL->comm_path, $COMPOSE['id'], $attachment['id']);
@@ -1279,6 +1360,10 @@
$storage = $RCMAIL->get_storage();
$names = array();
$refs = array();
+
+ if ($MESSAGE->pgp_mime) {
+ return;
+ }
$loaded_attachments = array();
foreach ((array)$COMPOSE['attachments'] as $attachment) {
@@ -1320,46 +1405,11 @@
$names[$name] = 1;
$name .= '.eml';
- $data = $path = null;
-
if (!empty($loaded_attachments[$name . 'message/rfc822'])) {
continue;
}
- // don't load too big attachments into memory
- if (!rcube_utils::mem_check($message->size)) {
- $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
- $path = tempnam($temp_dir, 'rcmAttmnt');
- if ($fp = fopen($path, 'w')) {
- $storage->get_raw_body($message->uid, $fp);
- fclose($fp);
- }
- else {
- return false;
- }
- }
- else {
- $data = $storage->get_raw_body($message->uid);
- }
-
- $attachment = array(
- 'group' => $COMPOSE['id'],
- 'name' => $name,
- 'mimetype' => 'message/rfc822',
- 'data' => $data,
- 'path' => $path,
- 'size' => $path ? filesize($path) : strlen($data),
- );
-
- $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
-
- if ($attachment['status']) {
- unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
- $COMPOSE['attachments'][$attachment['id']] = $attachment;
- }
- else if ($path) {
- @unlink($path);
- }
+ rcmail_save_attachment($message, null, $COMPOSE['id'], array('filename' => $name));
if ($message->headers->messageID) {
$refs[] = $message->headers->messageID;
@@ -1373,59 +1423,6 @@
if (!empty($refs)) {
$COMPOSE['references'] = implode(' ', $refs);
}
-}
-
-
-function rcmail_save_attachment(&$message, $pid)
-{
- global $COMPOSE;
-
- $rcmail = rcmail::get_instance();
- $part = $message->mime_parts[$pid];
- $data = $path = null;
-
- // don't load too big attachments into memory
- if (!rcube_utils::mem_check($part->size)) {
- $temp_dir = unslashify($rcmail->config->get('temp_dir'));
- $path = tempnam($temp_dir, 'rcmAttmnt');
-
- if ($fp = fopen($path, 'w')) {
- $message->get_part_body($pid, false, 0, $fp);
- fclose($fp);
- }
- else {
- return false;
- }
- }
- else {
- $data = $message->get_part_body($pid);
- }
-
- $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
- $filename = rcmail_attachment_name($part);
-
- $attachment = array(
- 'group' => $COMPOSE['id'],
- 'name' => $filename,
- 'mimetype' => $mimetype,
- 'content_id' => $part->content_id,
- 'data' => $data,
- 'path' => $path,
- 'size' => $path ? filesize($path) : strlen($data),
- 'charset' => $part->charset,
- );
-
- $attachment = $rcmail->plugins->exec_hook('attachment_save', $attachment);
-
- if ($attachment['status']) {
- unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
- return $attachment;
- }
- else if ($path) {
- @unlink($path);
- }
-
- return false;
}
function rcmail_save_image($path, $mimetype = '', $data = null)
@@ -1478,6 +1475,27 @@
}
}
+/**
+ * Creates reply subject by removing common subject
+ * prefixes/suffixes from the original message subject
+ */
+function rcmail_reply_subject($subject)
+{
+ $subject = trim($subject);
+
+ // replace Re:, Re[x]:, Re-x (#1490497)
+ $prefix = '/^(re:|re\[\d\]:|re-\d:)\s*/i';
+ do {
+ $subject = preg_replace($prefix, '', $subject, -1, $count);
+ }
+ while ($count);
+
+ // replace (was: ...) (#1489375)
+ $subject = preg_replace('/\s*\([wW]as:[^\)]+\)\s*$/', '', $subject);
+
+ return 'Re: ' . $subject;
+}
+
function rcmail_compose_subject($attrib)
{
global $MESSAGE, $COMPOSE;
@@ -1500,13 +1518,7 @@
}
// create a reply-subject
else if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY) {
- if (preg_match('/^re:/i', $MESSAGE->subject))
- $subject = $MESSAGE->subject;
- else
- $subject = 'Re: '.$MESSAGE->subject;
-
- // replace (was: ...) (#1489375)
- $subject = preg_replace('/\s*\([wW]as:[^\)]+\)\s*$/', '', $subject);
+ $subject = rcmail_reply_subject($MESSAGE->subject);
}
// create a forward-subject
else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
@@ -1526,7 +1538,6 @@
return $out;
}
-
function rcmail_compose_attachment_list($attrib)
{
@@ -1556,6 +1567,9 @@
continue;
}
+ $content = sprintf('%s <span class="attachment-size">(%s)</span>',
+ rcube::Q($a_prop['name']), $RCMAIL->show_bytes($a_prop['size']));
+
$out .= html::tag('li', array(
'id' => 'rcmfile'.$id,
'class' => rcube_utils::file2class($a_prop['mimetype'], $a_prop['name']),
@@ -1570,7 +1584,7 @@
'aria-label' => $RCMAIL->gettext('delete') . ' ' . $a_prop['name'],
),
$button
- ) . rcube::Q($a_prop['name'])
+ ) . $content
);
$jslist['rcmfile'.$id] = array(
@@ -1821,8 +1835,8 @@
$form_start .= $hiddenfields->show();
}
- $form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
- $form_name = !empty($attrib['form']) ? $attrib['form'] : 'form';
+ $form_end = ($MESSAGE_FORM && !strlen($attrib['form'])) ? '</form>' : '';
+ $form_name = $attrib['form'] ?: 'form';
if (!$MESSAGE_FORM)
$RCMAIL->output->add_gui_object('messageform', $form_name);
@@ -1844,7 +1858,7 @@
'id' => 'rcmli%s', 'class' => '%s'),
html::a(array('href' => '#list',
'rel' => '%s',
- 'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-adresses','%s',this)"), '%s'));
+ 'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".command('list-addresses','%s',this)"), '%s'));
foreach ($RCMAIL->get_address_sources(false, true) as $j => $source) {
$id = strval(strlen($source['id']) ? $source['id'] : $j);
@@ -1859,7 +1873,7 @@
rcube_utils::html_identifier($id,true),
$class_name,
$source['id'],
- $js_id, (!empty($source['name']) ? $source['name'] : $id));
+ $js_id, ($source['name'] ?: $id));
}
$OUTPUT->add_gui_object('addressbookslist', $attrib['id']);
--
Gitblit v1.9.1