mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Generalize IDAccumulator into AttrContext. Modify tests and classes accordingly. Also, this allows us to make the validate() parameters uniform among all AttrDef subclasses.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@212 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2006-08-12 16:04:40 +00:00
parent 77f2833f36
commit a2880bdff2
15 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/HTMLPurifier/AttrDef/Class.php
View File

@@ -6,9 +6,7 @@ require_once 'HTMLPurifier/Config.php';
class HTMLPurifier_AttrDef_Class extends HTMLPurifier_AttrDef
{
function validate($string, $config = null) {
if (!$config) $config = HTMLPurifier_Config::createDefault();
function validate($string, $config, &$context) {
$string = trim($string);

2
library/HTMLPurifier/AttrDef/Enum.php
View File

@@ -14,7 +14,7 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
$this->case_sensitive = $case_sensitive;
}
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if (!$this->case_sensitive) {
$string = ctype_lower($string) ? $string : strtolower($string);

6
library/HTMLPurifier/AttrDef/ID.php
View File

@@ -12,12 +12,12 @@ require_once 'HTMLPurifier/IDAccumulator.php';
class HTMLPurifier_AttrDef_ID extends HTMLPurifier_AttrDef
{
function validate($id, $config, &$accumulator) {
function validate($id, $config, &$context) {
$id = trim($id); // trim it first
if ($id === '') return false;
if (isset($accumulator->ids[$id])) return false;
if (isset($context->id_accumulator->ids[$id])) return false;
// we purposely avoid using regex, hopefully this is faster
@@ -32,7 +32,7 @@ class HTMLPurifier_AttrDef_ID extends HTMLPurifier_AttrDef
$result = ($trim === '');
}
if ($result) $accumulator->add($id);
if ($result) $context->id_accumulator->add($id);
// if no change was made to the ID, return the result
// else, return the new id if stripping whitespace made it

2
library/HTMLPurifier/AttrDef/Lang.php
View File

@@ -7,7 +7,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if (!$string) return false;

2
library/HTMLPurifier/AttrDef/Length.php
View File

@@ -6,7 +6,7 @@ require_once 'HTMLPurifier/AttrDef/Pixels.php';
class HTMLPurifier_AttrDef_Length extends HTMLPurifier_AttrDef_Pixels
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if ($string === '') return false;

2
library/HTMLPurifier/AttrDef/MultiLength.php
View File

@@ -6,7 +6,7 @@ require_once 'HTMLPurifier/AttrDef/Length.php';
class HTMLPurifier_AttrDef_MultiLength extends HTMLPurifier_AttrDef_Length
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if ($string === '') return false;

2
library/HTMLPurifier/AttrDef/NumberSpan.php
View File

@@ -6,7 +6,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_NumberSpan extends HTMLPurifier_AttrDef
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if ($string === '') return false;

2
library/HTMLPurifier/AttrDef/Pixels.php
View File

@@ -5,7 +5,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_Pixels extends HTMLPurifier_AttrDef
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
$string = trim($string);
if ($string === '0') return $string;

2
library/HTMLPurifier/AttrDef/Text.php
View File

@@ -5,7 +5,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
{
function validate($string, $config = null) {
function validate($string, $config, &$context) {
return $this->parseCDATA($string);
}

4
library/HTMLPurifier/AttrDef/URI.php
View File

@@ -12,13 +12,11 @@ HTMLPurifier_ConfigDef::define(
class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
{
function validate($uri, $config = null) {
function validate($uri, $config, &$context) {
// We'll write stack-based parsers later, for now, use regexps to
// get things working as fast as possible (irony)
if (!$config) $config = HTMLPurifier_Config::createDefault();
// parse as CDATA
$uri = $this->parseCDATA($uri);