diff options
Diffstat (limited to 'program/lib/washtml.php')
| -rw-r--r-- | program/lib/washtml.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/program/lib/washtml.php b/program/lib/washtml.php index 04a65c7a1..4221abdef 100644 --- a/program/lib/washtml.php +++ b/program/lib/washtml.php @@ -101,14 +101,14 @@ class washtml 'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight', 'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border', 'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace', - 'cellborder', 'size', 'lang', 'dir', + 'cellborder', 'size', 'lang', 'dir', 'usemap', // 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', 'u'); + 'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong', 'i', 'b', 'u', 'span'); /* State for linked objects in HTML */ public $extlinks = false; @@ -133,7 +133,8 @@ class washtml /* Constructor */ - public function __construct($p = array()) { + public function __construct($p = array()) + { $this->_html_elements = array_flip((array)$p['html_elements']) + array_flip(self::$html_elements) ; $this->_html_attribs = array_flip((array)$p['html_attribs']) + array_flip(self::$html_attribs); $this->_ignore_elements = array_flip((array)$p['ignore_elements']) + array_flip(self::$ignore_elements); @@ -149,7 +150,8 @@ class washtml } /* Check CSS style */ - private function wash_style($style) { + private function wash_style($style) + { $s = ''; foreach (explode(';', $style) as $declaration) { @@ -191,7 +193,8 @@ class washtml } /* Take a node and return allowed attributes and check values */ - private function wash_attribs($node) { + private function wash_attribs($node) + { $t = ''; $washed; @@ -231,7 +234,8 @@ class washtml /* The main loop that recurse on a node tree. * It output only allowed tags with allowed attributes * and allowed inline styles */ - private function dumpHtml($node) { + private function dumpHtml($node) + { if(!$node->hasChildNodes()) return ''; @@ -248,9 +252,7 @@ class washtml else if (isset($this->_html_elements[$tagName])) { $content = $this->dumpHtml($node); $dump .= '<' . $tagName . $this->wash_attribs($node) . - // create closing tag for block elements, but also for elements - // with content or with some attributes (eg. style, class) (#1486812) - ($content != '' || $node->hasAttributes() || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />'); + ($content != '' || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />'); } else if (isset($this->_ignore_elements[$tagName])) { $dump .= '<!-- ' . htmlspecialchars($tagName, ENT_QUOTES) . ' not allowed -->'; @@ -310,5 +312,3 @@ class washtml } } - -?> |