mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-05 13:47:24 +02:00
Code Issues Releases Wiki Activity

Refactor validators so that they can be reused between directives and namespaces.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1589 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-03-02 04:39:14 +00:00
parent 18320d59a4
commit d8cb360f3b
12 changed files with 131 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
library/HTMLPurifier/ConfigSchema/InterchangeValidator.php
View File

@@ -7,6 +7,9 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
{
protected $interchange;
protected $validators = array();
protected $namespaceValidators = array();
protected $directiveVaildators = array();
protected $index = 0;
/**
* @param $interchange Instance of HTMLPurifier_ConfigSchema_Interchange
@@ -20,15 +23,32 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
* Registers a HTMLPurifier_ConfigSchema_Validator to run when adding.
*/
public function addValidator($validator) {
$this->validators[] = $validator;
$this->validators[$this->index++] = $validator;
}
/**
* Register validators to be used only on directives
*/
public function addDirectiveValidator($validator) {
$this->directiveValidators[$this->index++] = $validator;
}
/**
* Register validators to be used only on namespaces
*/
public function addNamespaceValidator($validator) {
$this->namespaceValidators[$this->index++] = $validator;
}
/**
* Validates and adds a namespace hash
*/
public function addNamespace($hash) {
foreach ($this->validators as $validator) {
$validator->validateNamespace($hash, $this->interchange);
for ($i = 0; $i < $this->index; $i++) {
if (isset($this->validators[$i])) $validator = $this->validators[$i];
elseif (isset($this->namespaceValidators[$i])) $validator = $this->namespaceValidators[$i];
else continue;
$validator->validate($hash, $this->interchange);
}
$this->interchange->addNamespace($hash);
}
@@ -37,8 +57,11 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
* Validates and adds a directive hash
*/
public function addDirective($hash) {
foreach ($this->validators as $validator) {
$validator->validateDirective($hash, $this->interchange);
for ($i = 0; $i < $this->index; $i++) {
if (isset($this->validators[$i])) $validator = $this->validators[$i];
elseif (isset($this->directiveValidators[$i])) $validator = $this->directiveValidators[$i];
else continue;
$validator->validate($hash, $this->interchange);
}
$this->interchange->addDirective($hash);
}