From 013aaeb895d3ec8f6758db4c2521599404ad22c7 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 01 May 2016 04:56:57 -0400
Subject: [PATCH] CS improvements/fixes
---
program/steps/mail/func.inc | 129 ++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 56 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 672bbd2..b65fbef 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -168,7 +168,7 @@
// race condition and unintentional page overwrite in session
if ($RCMAIL->action == 'list' || $RCMAIL->action == 'getunread') {
if (!($page = intval($_GET['_page']))) {
- $page = $_SESSION['page'] ? $_SESSION['page'] : 1;
+ $page = $_SESSION['page'] ?: 1;
}
$_SESSION['page'] = $page;
@@ -179,7 +179,7 @@
// set default sort col/order to session
if (!isset($_SESSION['sort_col'])) {
- $_SESSION['sort_col'] = $message_sort_col ? $message_sort_col : '';
+ $_SESSION['sort_col'] = $message_sort_col ?: '';
}
if (!isset($_SESSION['sort_order'])) {
$_SESSION['sort_order'] = strtoupper($message_sort_order) == 'ASC' ? 'ASC' : 'DESC';
@@ -331,8 +331,9 @@
$OUTPUT->add_label('from', 'to');
// add id to message list table if not specified
- if (!strlen($attrib['id']))
+ if (!strlen($attrib['id'])) {
$attrib['id'] = 'rcubemessagelist';
+ }
// define list of cols to be displayed based on parameter or config
if (empty($attrib['columns'])) {
@@ -531,11 +532,7 @@
if (!empty($header->list_cols) && is_array($header->list_cols))
$a_msg_cols = array_merge($a_msg_cols, $header->list_cols);
- $OUTPUT->command('add_message_row',
- $header->uid,
- $a_msg_cols,
- $a_msg_flags,
- $insert_top);
+ $OUTPUT->command('add_message_row', $header->uid, $a_msg_cols, $a_msg_flags, $insert_top);
}
if ($RCMAIL->storage->get_threading()) {
@@ -655,8 +652,9 @@
{
global $OUTPUT;
- if (empty($attrib['id']))
+ if (empty($attrib['id'])) {
$attrib['id'] = 'rcmailcontentwindow';
+ }
return $OUTPUT->frame($attrib, true);
}
@@ -665,8 +663,9 @@
{
global $RCMAIL;
- if (!$attrib['id'])
+ if (!$attrib['id']) {
$attrib['id'] = 'rcmcountdisplay';
+ }
$RCMAIL->output->add_gui_object('countdisplay', $attrib['id']);
@@ -685,19 +684,21 @@
$page_size = $RCMAIL->storage->get_pagesize();
$start_msg = ($page-1) * $page_size + 1;
+ $max = $count;
- if ($count !== null)
- $max = $count;
- else if ($RCMAIL->action)
- $max = $RCMAIL->storage->count(NULL, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+ if ($max === null && $RCMAIL->action) {
+ $max = $RCMAIL->storage->count(null, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+ }
- if ($max == 0)
+ if (!$max) {
$out = $RCMAIL->storage->get_search_set() ? $RCMAIL->gettext('nomessages') : $RCMAIL->gettext('mailboxempty');
- else
+ }
+ else {
$out = $RCMAIL->gettext(array('name' => $RCMAIL->storage->get_threading() ? 'threadsfromto' : 'messagesfromto',
'vars' => array('from' => $start_msg,
'to' => min($max, $start_msg + $page_size - 1),
'count' => $max)));
+ }
return rcube::Q($out);
}
@@ -706,8 +707,9 @@
{
global $RCMAIL;
- if (!$attrib['id'])
+ if (!$attrib['id']) {
$attrib['id'] = 'rcmmailboxname';
+ }
$RCMAIL->output->add_gui_object('mailboxname', $attrib['id']);
@@ -725,15 +727,16 @@
global $RCMAIL;
$old_unseen = rcmail_get_unseen_count($mbox_name);
+ $unseen = $count;
- if ($count === null)
+ if ($unseen === null) {
$unseen = $RCMAIL->storage->count($mbox_name, 'UNSEEN', $force);
- else
- $unseen = $count;
+ }
- if ($unseen != $old_unseen || ($mbox_name == 'INBOX'))
+ if ($unseen != $old_unseen || ($mbox_name == 'INBOX')) {
$RCMAIL->output->command('set_unread_count', $mbox_name, $unseen,
($mbox_name == 'INBOX'), $unseen && $mark ? $mark : '');
+ }
rcmail_set_unseen_count($mbox_name, $unseen);
@@ -966,10 +969,12 @@
// now check for evil strings like expression, behavior or url()
if (!preg_match('/expression|behavior|javascript:|import[^a]/i', $stripped)) {
- if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url('))
+ if (!$washtml->get_config('allow_remote') && stripos($stripped, 'url(')) {
$washtml->extlinks = true;
- else
+ }
+ else {
$out = html::tag('style', array('type' => 'text/css'), $content);
+ }
break;
}
@@ -989,10 +994,12 @@
static $sa_attrib;
// keep header table attrib
- if (is_array($attrib) && !$sa_attrib && !$attrib['valueof'])
+ if (is_array($attrib) && !$sa_attrib && !$attrib['valueof']) {
$sa_attrib = $attrib;
- else if (!is_array($attrib) && is_array($sa_attrib))
+ }
+ else if (!is_array($attrib) && is_array($sa_attrib)) {
$attrib = $sa_attrib;
+ }
if (!isset($MESSAGE)) {
return false;
@@ -1018,8 +1025,6 @@
$output_headers = array();
foreach ($standard_headers as $hkey) {
- $ishtml = false;
-
if ($headers[$hkey])
$value = $headers[$hkey];
else if ($headers['others'][$hkey])
@@ -1030,6 +1035,7 @@
if (in_array($hkey, $exclude_headers))
continue;
+ $ishtml = false;
$header_title = $RCMAIL->gettext(preg_replace('/(^mail-|-)/', '', $hkey));
if ($hkey == 'date') {
@@ -1040,10 +1046,12 @@
}
else if ($hkey == 'priority') {
if ($value) {
- $header_value = html::span('prio' . $value, rcmail_localized_priority($value));
+ $header_value = html::span('prio' . $value, rcube::Q(rcmail_localized_priority($value)));
+ $ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'replyto') {
if ($headers['replyto'] != $headers['from']) {
@@ -1051,19 +1059,21 @@
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'mail-reply-to') {
- if ($headers['mail-replyto'] != $headers['reply-to']
- && $headers['reply-to'] != $headers['from']
+ if ($headers['mail-replyto'] != $headers['replyto']
+ && $headers['replyto'] != $headers['from']
) {
$header_value = rcmail_address_string($value, $attrib['max'], true,
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'sender') {
if ($headers['sender'] != $headers['from']) {
@@ -1071,8 +1081,9 @@
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'mail-followup-to') {
$header_value = rcmail_address_string($value, $attrib['max'], true,
@@ -1084,8 +1095,9 @@
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else if ($hkey == 'subject' && empty($value))
+ else if ($hkey == 'subject' && empty($value)) {
$header_value = $RCMAIL->gettext('nosubject');
+ }
else {
$value = is_array($value) ? implode(' ', $value) : $value;
$header_value = trim(rcube_mime::decode_header($value, $headers['charset']));
@@ -1109,14 +1121,15 @@
// single header value is requested
if (!empty($attrib['valueof'])) {
- return rcube::Q($plugin['output'][$attrib['valueof']]['value'], ($attrib['valueof'] == 'subject' ? 'strict' : 'show'));
+ $row = $plugin['output'][$attrib['valueof']];
+ return $row['html'] ? $row['value'] : rcube::Q($row['value']);
}
// compose html table
$table = new html_table(array('cols' => 2));
foreach ($plugin['output'] as $hkey => $row) {
- $val = $row['html'] ? $row['value'] : rcube::Q($row['value'], ($hkey == 'subject' ? 'strict' : 'show'));
+ $val = $row['html'] ? $row['value'] : rcube::Q($row['value']);
$table->add(array('class' => 'header-title'), rcube::Q($row['title']));
$table->add(array('class' => 'header '.$hkey), $val);
@@ -1232,15 +1245,6 @@
// fetch part body
$body = $MESSAGE->get_part_body($part->mime_id, true);
-
- // extract headers from message/rfc822 parts
- if ($part->mimetype == 'message/rfc822') {
- $msgpart = rcube_mime::parse_message($body);
- if (!empty($msgpart->headers)) {
- $part = $msgpart;
- $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
- }
- }
// message is cached but not exists (#1485443), or other error
if ($body === false) {
@@ -1634,7 +1638,7 @@
$content = rcube::Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
}
else {
- $content = rcube::Q($name ? $name : $mailto);
+ $content = rcube::Q($name ?: $mailto);
$attrs['title'] = $mailto;
}
@@ -1642,7 +1646,7 @@
}
else {
$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
- rcube::Q($name ? $name : $mailto));
+ rcube::Q($name ?: $mailto));
}
if ($addicon && $_SESSION['writeable_abook']) {
@@ -1723,9 +1727,9 @@
function rcmail_wrap_and_quote($text, $length = 72)
{
// Rebuild the message body with a maximum of $max chars, while keeping quoted message.
- $max = max(75, $length + 8);
+ $max = max(75, $length + 8);
$lines = preg_split('/\r?\n/', trim($text));
- $out = '';
+ $out = '';
foreach ($lines as $line) {
// don't wrap already quoted lines
@@ -1736,10 +1740,7 @@
$newline = '';
foreach (explode("\n", rcube_mime::wordwrap($line, $length - 2)) as $l) {
- if (strlen($l))
- $newline .= '> ' . $l . "\n";
- else
- $newline .= ">\n";
+ $newline .= strlen($l) ? "> $l\n" : ">\n";
}
$line = rtrim($newline);
@@ -1759,7 +1760,7 @@
{
$parts = array();
foreach ($p as $key => $val) {
- $encode = $key == 'folder' || strpos($val, ';') !== false;
+ $encode = $key == 'folder' || strpos($val, ';') !== false;
$parts[] = $key . '=' . ($encode ? 'B::' . base64_encode($val) : $val);
}
@@ -2212,6 +2213,8 @@
function rcmail_save_attachment($message, $pid, $compose_id, $params = array())
{
+ global $COMPOSE;
+
$rcmail = rcmail::get_instance();
$storage = $rcmail->get_storage();
@@ -2274,7 +2277,21 @@
if ($attachment['status']) {
unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
- $rcmail->session->append('compose_data_' . $compose_id . '.attachments', $attachment['id'], $attachment);
+
+ // rcube_session::append() replaces current session data with the old values
+ // (in rcube_session::reload()). This is a problem in 'compose' action, because before
+ // the first append() use we set some important data in the session.
+ // It also overwrites attachments list. Fixing reload() is not so simple if possible
+ // as we don't really know what has been added and what removed in meantime.
+ // So, for now we'll do not use append() on 'compose' action (#1490608).
+
+ if ($rcmail->action == 'compose') {
+ $COMPOSE['attachments'][$attachment['id']] = $attachment;
+ }
+ else {
+ $rcmail->session->append('compose_data_' . $compose_id . '.attachments', $attachment['id'], $attachment);
+ }
+
return $attachment;
}
else if ($path) {
--
Gitblit v1.9.1