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

[3.1.0] Implement Duplicate validator, also modify some design things

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1596 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-03-04 04:13:07 +00:00
parent 1b434f0ecc
commit 4c798bd17e
8 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,7 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
protected $interchange;
protected $validators = array();
protected $namespaceValidators = array();
protected $directiveVaildators = array();
protected $index = 0;
protected $directiveValidators = array();
/**
* @param $interchange Instance of HTMLPurifier_ConfigSchema_Interchange
@@ -23,31 +22,29 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
* Registers a HTMLPurifier_ConfigSchema_Validator to run when adding.
*/
public function addValidator($validator) {
$this->validators[$this->index++] = $validator;
$this->addNamespaceValidator($validator);
$this->addDirectiveValidator($validator);
}
/**
* Register validators to be used only on directives
*/
public function addDirectiveValidator($validator) {
$this->directiveValidators[$this->index++] = $validator;
$this->directiveValidators[] = $validator;
}
/**
* Register validators to be used only on namespaces
*/
public function addNamespaceValidator($validator) {
$this->namespaceValidators[$this->index++] = $validator;
$this->namespaceValidators[] = $validator;
}
/**
* Validates and adds a namespace hash
*/
public function addNamespace($hash) {
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;
foreach ($this->namespaceValidators as $validator) {
$validator->validate($hash, $this->interchange);
}
$this->interchange->addNamespace($hash);
@@ -57,10 +54,7 @@ class HTMLPurifier_ConfigSchema_InterchangeValidator
* Validates and adds a directive hash
*/
public function addDirective($hash) {
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;
foreach ($this->directiveValidators as $validator) {
$validator->validate($hash, $this->interchange);
}
$this->interchange->addDirective($hash);