1
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-31 03:10:09 +02:00

__construct'ify all main library classes.

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1459 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-11-29 04:29:51 +00:00
parent 43f01925cd
commit 3ef9bdf8a2
67 changed files with 75 additions and 74 deletions

View File

@@ -30,7 +30,7 @@ class HTMLPurifier_ChildDef_Chameleon extends HTMLPurifier_ChildDef
* @param $inline List of elements to allow when inline.
* @param $block List of elements to allow when block.
*/
public function HTMLPurifier_ChildDef_Chameleon($inline, $block) {
public function __construct($inline, $block) {
$this->inline = new HTMLPurifier_ChildDef_Optional($inline);
$this->block = new HTMLPurifier_ChildDef_Optional($block);
$this->elements = $this->block->elements;

View File

@@ -26,7 +26,7 @@ class HTMLPurifier_ChildDef_Custom extends HTMLPurifier_ChildDef
/**
* @param $dtd_regex Allowed child pattern from the DTD
*/
public function HTMLPurifier_ChildDef_Custom($dtd_regex) {
public function __construct($dtd_regex) {
$this->dtd_regex = $dtd_regex;
$this->_compileRegex();
}

View File

@@ -13,7 +13,7 @@ class HTMLPurifier_ChildDef_Empty extends HTMLPurifier_ChildDef
{
public $allow_empty = true;
public $type = 'empty';
public function HTMLPurifier_ChildDef_Empty() {}
public function __construct() {}
public function validateChildren($tokens_of_children, $config, &$context) {
return array();
}

View File

@@ -15,7 +15,7 @@ class HTMLPurifier_ChildDef_Required extends HTMLPurifier_ChildDef
/**
* @param $elements List of allowed element names (lowercase).
*/
public function HTMLPurifier_ChildDef_Required($elements) {
public function __construct($elements) {
if (is_string($elements)) {
$elements = str_replace(' ', '', $elements);
$elements = explode('|', $elements);

View File

@@ -11,7 +11,7 @@ class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
public $type = 'table';
public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
public function HTMLPurifier_ChildDef_Table() {}
public function __construct() {}
public function validateChildren($tokens_of_children, $config, &$context) {
if (empty($tokens_of_children)) return false;