From 9aaeb23d9de9324f2b5450b844b2155543a7e2e4 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 10 Jan 2016 05:56:41 -0500
Subject: [PATCH] Fix HTML entities encoding in message headers output
---
program/steps/mail/func.inc | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 2d89a92..67ba4f1 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -989,10 +989,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;
@@ -1040,10 +1042,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,8 +1055,9 @@
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'mail-reply-to') {
if ($headers['mail-replyto'] != $headers['reply-to']
@@ -1062,8 +1067,9 @@
$attrib['addicon'], $headers['charset'], $header_title);
$ishtml = true;
}
- else
+ else {
continue;
+ }
}
else if ($hkey == 'sender') {
if ($headers['sender'] != $headers['from']) {
@@ -1071,8 +1077,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,
@@ -1109,14 +1116,14 @@
// single header value is requested
if (!empty($attrib['valueof'])) {
- return rcube::Q($plugin['output'][$attrib['valueof']]['value'], ($attrib['valueof'] == 'subject' ? 'strict' : 'show'));
+ return rcube::Q($plugin['output'][$attrib['valueof']]['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);
--
Gitblit v1.9.1