From 3fd5e2edfc72cea56ede0512f081a67d547ed61f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 16 Nov 2011 03:57:32 -0500
Subject: [PATCH] - Apply fixes from trunk up to r5433
---
skins/default/common.css | 4 +-
CHANGELOG | 2 +
program/include/rcube_imap.php | 2
program/steps/mail/compose.inc | 7 +++
skins/default/mail.css | 1
skins/default/print.css | 4 +-
program/lib/washtml.php | 49 +++++++++++++++++-------
skins/default/editor_content.css | 9 ++--
8 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c585c12..c0e4586 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix handling of HTML form elements in messages (#1485137)
+- Fix regression in setting recipient to self when replying to a Sent message (#1487074)
- Fix listing of folders in hidden namespaces (#1486796)
- Don't consider \Noselect flag when building folders tree (#1488004)
- Fix sorting autocomplete results (#1488084)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index d56da3d..002730f 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3168,7 +3168,7 @@
// #1486796: some server configurations doesn't
// return folders in all namespaces, we'll try to detect that situation
// and ask for these namespaces separately
- if ($root == '' && $name = '*') {
+ if ($root == '' && $name == '*') {
$delim = $this->get_hierarchy_delimiter();
$namespace = $this->get_namespace();
$search = array();
diff --git a/program/lib/washtml.php b/program/lib/washtml.php
index a5eeb84..9292aa1 100644
--- a/program/lib/washtml.php
+++ b/program/lib/washtml.php
@@ -81,17 +81,35 @@
class washtml
{
/* Allowed HTML elements (default) */
- static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b', 'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'fieldset', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'ins', 'label', 'legend', 'li', 'map', 'menu', 'nobr', 'ol', 'p', 'pre', 'q', 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'wbr', 'img');
-
+ static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b',
+ 'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center',
+ 'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl',
+ 'dt', 'em', 'fieldset', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
+ 'ins', 'label', 'legend', 'li', 'map', 'menu', 'nobr', 'ol', 'p', 'pre', 'q',
+ 's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
+ 'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'wbr', 'img',
+ // form elements
+ 'button', 'input', 'textarea', 'select', 'option', 'optgroup'
+ );
+
/* Ignore these HTML tags and their content */
static $ignore_elements = array('script', 'applet', 'embed', 'object', 'style');
-
+
/* Allowed HTML attributes */
- static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height', 'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing', 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', 'cellborder', 'size', 'lang', 'dir');
+ static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height',
+ 'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing',
+ 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
+ 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
+ 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
+ 'cellborder', 'size', 'lang', 'dir',
+ // attributes of form elements
+ 'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value'
+ );
/* Block elements which could be empty but cannot be returned in short form (<tag />) */
- static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font', 'center', 'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong', 'i', 'b');
-
+ static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font', 'center',
+ 'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong', 'i', 'b');
+
/* State for linked objects in HTML */
public $extlinks = false;
@@ -100,7 +118,7 @@
/* Registered callback functions for tags */
private $handlers = array();
-
+
/* Allowed HTML elements */
private $_html_elements = array();
@@ -112,7 +130,7 @@
/* Allowed HTML attributes */
private $_html_attribs = array();
-
+
/* Constructor */
public function __construct($p = array()) {
@@ -123,13 +141,13 @@
unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['block_elements']);
$this->config = $p + array('show_washed'=>true, 'allow_remote'=>false, 'cid_map'=>array());
}
-
+
/* Register a callback function for a certain tag */
public function add_callback($tagName, $callback)
{
$this->handlers[$tagName] = $callback;
}
-
+
/* Check CSS style */
private function wash_style($style) {
$s = '';
@@ -143,7 +161,7 @@
preg_match('/^(url\(\s*[\'"]?([^\'"\)]*)[\'"]?\s*\)'./*1,2*/
'|rgb\(\s*[0-9]+\s*,\s*[0-9]+\s*,\s*[0-9]+\s*\)'.
'|-?[0-9.]+\s*(em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)?'.
- '|#[0-9a-f]{3,6}|[a-z0-9\-]+'.
+ '|#[0-9a-f]{3,6}|[a-z0-9", -]+'.
')\s*/i', $str, $match)) {
if ($match[2]) {
if (($src = $this->config['cid_map'][$match[2]])
@@ -160,8 +178,9 @@
$value .= ' url('.htmlspecialchars($match[2], ENT_QUOTES).')';
}
}
- else if ($match[0] != 'url' && $match[0] != 'rbg') //whitelist ?
+ else if ($match[0] != 'url' && $match[0] != 'rgb') //whitelist ?
$value .= ' ' . $match[0];
+
$str = substr($str, strlen($match[0]));
}
if ($value)
@@ -182,8 +201,10 @@
if (isset($this->_html_attribs[$key]) ||
($key == 'href' && preg_match('/^(http:|https:|ftp:|mailto:|#).+/i', $value)))
$t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
- else if ($key == 'style' && ($style = $this->wash_style($value)))
- $t .= ' style="' . $style . '"';
+ else if ($key == 'style' && ($style = $this->wash_style($value))) {
+ $quot = strpos($style, '"') !== false ? "'" : '"';
+ $t .= ' style=' . $quot . $style . $quot;
+ }
else if ($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
if (($src = $this->config['cid_map'][$value])
|| ($src = $this->config['cid_map'][$this->config['base_url'].$value])) {
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index c527ce1..9df25f0 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -358,11 +358,13 @@
$mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
$mailreplyto = $MESSAGE->headers->others['mail-reply-to'];
+ // Reply to mailing list...
if ($MESSAGE->reply_all == 'list' && $mailfollowup)
$fvalue = $mailfollowup;
else if ($MESSAGE->reply_all == 'list'
&& preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m))
$fvalue = $m[1];
+ // Reply to...
else if ($MESSAGE->reply_all && $mailfollowup)
$fvalue = $mailfollowup;
else if ($mailreplyto)
@@ -371,6 +373,11 @@
$fvalue = $MESSAGE->headers->replyto;
else if (!empty($MESSAGE->headers->from))
$fvalue = $MESSAGE->headers->from;
+
+ // Reply to message sent by yourself (#1487074)
+ if (!empty($ident) && $fvalue == $ident['ident']) {
+ $fvalue = $MESSAGE->headers->to;
+ }
}
// add recipient of original message if reply to all
else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
diff --git a/skins/default/common.css b/skins/default/common.css
index 6bf8e90..cd3ef62 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -2,6 +2,7 @@
body
{
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
margin: 8px;
background-color: #F6F6F6;
color: #000000;
@@ -18,9 +19,8 @@
margin: 10px;
}
-body, td, th, div, p, h3, select, input, textarea
+body, td, th, div, p, select, input, textarea
{
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 12px;
}
diff --git a/skins/default/editor_content.css b/skins/default/editor_content.css
index 2ddc87f..aabed07 100644
--- a/skins/default/editor_content.css
+++ b/skins/default/editor_content.css
@@ -1,5 +1,4 @@
/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
-/* You can extend this CSS by adding your own CSS file with the the content_css option */
body, td, pre {
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
@@ -25,8 +24,8 @@
blockquote
{
- padding-left:5px;
- border-left:#1010ff 2px solid;
- margin-left:5px;
- width:100%;
+ padding-left: 5px;
+ border-left: #1010ff 2px solid;
+ margin-left: 5px;
+ width: 100%;
}
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3ea4fec..4dfc206 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -435,6 +435,7 @@
padding-top: 2px;
padding-bottom: 2px;
text-decoration: none;
+ height: 15px;
}
#mailboxlist li.unread
diff --git a/skins/default/print.css b/skins/default/print.css
index 76c3e0c..afdf674 100644
--- a/skins/default/print.css
+++ b/skins/default/print.css
@@ -2,14 +2,14 @@
body
{
+ font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
background-color: #ffffff;
color: #000000;
margin: 2mm;
}
-body, td, th, span, div, p, h3
+body, td, th, span, div, p
{
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
font-size: 9pt;
color: #000000;
}
--
Gitblit v1.9.1