diff options
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/washtml.php | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/program/lib/washtml.php b/program/lib/washtml.php index a5eeb841b..9292aa158 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 @@ class washtml /* Registered callback functions for tags */ private $handlers = array(); - + /* Allowed HTML elements */ private $_html_elements = array(); @@ -112,7 +130,7 @@ class washtml /* Allowed HTML attributes */ private $_html_attribs = array(); - + /* Constructor */ public function __construct($p = array()) { @@ -123,13 +141,13 @@ class washtml 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 @@ class washtml 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 @@ class washtml $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 @@ class washtml 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])) { |