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

[3.0.0] Convert all $context calls away from references

Browse Source 
- Update TODO list
- URISchemeRegistry doesn't return a reference for instance anymore, should do the same for other singletons

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1477 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-01-05 00:10:43 +00:00
parent beefb11879
commit a7fab00cdd
101 changed files with 131 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ require_once 'HTMLPurifier/CSSDefinition.php';
class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
{
public function validate($css, $config, &$context) {
public function validate($css, $config, $context) {
$css = $this->parseCDATA($css);

2
library/HTMLPurifier/AttrDef/CSS/AlphaValue.php
View File

@@ -10,7 +10,7 @@ class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Numbe
parent::__construct(false); // opacity is non-negative, but we will clamp it
}
public function validate($number, $config, &$context) {
public function validate($number, $config, $context) {
$result = parent::validate($number, $config, $context);
if ($result === false) return $result;
$float = (float) $result;

2
library/HTMLPurifier/AttrDef/CSS/Background.php
View File

@@ -25,7 +25,7 @@ class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
$this->info['background-position'] = $def->info['background-position'];
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
// regular pre-processing
$string = $this->parseCDATA($string);

2
library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php
View File

@@ -56,7 +56,7 @@ class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
$this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = $this->parseCDATA($string);
$bits = explode(' ', $string);

2
library/HTMLPurifier/AttrDef/CSS/Border.php
View File

@@ -20,7 +20,7 @@ class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
$this->info['border-top-color'] = $def->info['border-top-color'];
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = $this->parseCDATA($string);
// we specifically will not support rgb() syntax with spaces
$bits = explode(' ', $string);

2
library/HTMLPurifier/AttrDef/CSS/Color.php
View File

@@ -33,7 +33,7 @@ This directive has been available since 2.0.0.
class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
{
public function validate($color, $config, &$context) {
public function validate($color, $config, $context) {
static $colors = null;
if ($colors === null) $colors = $config->get('Core', 'ColorKeywords');

2
library/HTMLPurifier/AttrDef/CSS/Composite.php
View File

@@ -25,7 +25,7 @@ class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
$this->defs = $defs;
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
foreach ($this->defs as $i => $def) {
$result = $this->defs[$i]->validate($string, $config, $context);
if ($result !== false) return $result;

2
library/HTMLPurifier/AttrDef/CSS/Filter.php
View File

@@ -17,7 +17,7 @@ class HTMLPurifier_AttrDef_CSS_Filter extends HTMLPurifier_AttrDef
$this->intValidator = new HTMLPurifier_AttrDef_Integer();
}
public function validate($value, $config, &$context) {
public function validate($value, $config, $context) {
$value = $this->parseCDATA($value);
if ($value === 'none') return $value;
// if we looped this we could support multiple filters

2
library/HTMLPurifier/AttrDef/CSS/Font.php
View File

@@ -28,7 +28,7 @@ class HTMLPurifier_AttrDef_CSS_Font extends HTMLPurifier_AttrDef
$this->info['font-family'] = $def->info['font-family'];
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
static $system_fonts = array(
'caption' => true,

2
library/HTMLPurifier/AttrDef/CSS/FontFamily.php
View File

@@ -10,7 +10,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_CSS_FontFamily extends HTMLPurifier_AttrDef
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
static $generic_names = array(
'serif' => true,
'sans-serif' => true,

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

@@ -29,7 +29,7 @@ class HTMLPurifier_AttrDef_CSS_Length extends HTMLPurifier_AttrDef
$this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
}
public function validate($length, $config, &$context) {
public function validate($length, $config, $context) {
$length = $this->parseCDATA($length);
if ($length === '') return false;

2
library/HTMLPurifier/AttrDef/CSS/ListStyle.php
View File

@@ -22,7 +22,7 @@ class HTMLPurifier_AttrDef_CSS_ListStyle extends HTMLPurifier_AttrDef
$this->info['list-style-image'] = $def->info['list-style-image'];
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
// regular pre-processing
$string = $this->parseCDATA($string);

2
library/HTMLPurifier/AttrDef/CSS/Multiple.php
View File

@@ -37,7 +37,7 @@ class HTMLPurifier_AttrDef_CSS_Multiple extends HTMLPurifier_AttrDef
$this->max = $max;
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = $this->parseCDATA($string);
if ($string === '') return false;
$parts = explode(' ', $string); // parseCDATA replaced \r, \t and \n

2
library/HTMLPurifier/AttrDef/CSS/Number.php
View File

@@ -18,7 +18,7 @@ class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
$this->non_negative = $non_negative;
}
public function validate($number, $config, &$context) {
public function validate($number, $config, $context) {
$number = $this->parseCDATA($number);

2
library/HTMLPurifier/AttrDef/CSS/Percentage.php
View File

@@ -21,7 +21,7 @@ class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
$this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = $this->parseCDATA($string);

2
library/HTMLPurifier/AttrDef/CSS/TextDecoration.php
View File

@@ -10,7 +10,7 @@ require_once 'HTMLPurifier/AttrDef.php';
class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
static $allowed_values = array(
'line-through' => true,

2
library/HTMLPurifier/AttrDef/CSS/URI.php
View File

@@ -18,7 +18,7 @@ class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
parent::__construct(true); // always embedded
}
public function validate($uri_string, $config, &$context) {
public function validate($uri_string, $config, $context) {
// parse the URI out of the string and then pass it onto
// the parent object

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

@@ -35,7 +35,7 @@ class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
$this->case_sensitive = $case_sensitive;
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = trim($string);
if (!$this->case_sensitive) {
// we may want to do full case-insensitive libraries

2
library/HTMLPurifier/AttrDef/HTML/Bool.php
View File

@@ -13,7 +13,7 @@ class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
public function __construct($name = false) {$this->name = $name;}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
if (empty($string)) return false;
return $this->name;
}

2
library/HTMLPurifier/AttrDef/HTML/Color.php
View File

@@ -9,7 +9,7 @@ require_once 'HTMLPurifier/AttrDef/CSS/Color.php'; // for %Core.ColorKeywords
class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
static $colors = null;
if ($colors === null) $colors = $config->get('Core', 'ColorKeywords');

2
library/HTMLPurifier/AttrDef/HTML/FrameTarget.php
View File

@@ -24,7 +24,7 @@ class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
public function __construct() {}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
if ($this->valid_values === false) $this->valid_values = $config->get('Attr', 'AllowedFrameTargets');
return parent::validate($string, $config, $context);
}

2
library/HTMLPurifier/AttrDef/HTML/ID.php
View File

@@ -66,7 +66,7 @@ class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
// ref functionality disabled, since we also have to verify
// whether or not the ID it refers to exists
public function validate($id, $config, &$context) {
public function validate($id, $config, $context) {
if (!$config->get('Attr', 'EnableID')) return false;

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

@@ -13,7 +13,7 @@ require_once 'HTMLPurifier/AttrDef/HTML/Pixels.php';
class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = trim($string);
if ($string === '') return false;

2
library/HTMLPurifier/AttrDef/HTML/LinkTypes.php
View File

@@ -42,7 +42,7 @@ class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
$this->name = $configLookup[$name];
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$allowed = $config->get('Attr', $this->name);
if (empty($allowed)) return false;

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

@@ -12,7 +12,7 @@ require_once 'HTMLPurifier/AttrDef/HTML/Length.php';
class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = trim($string);
if ($string === '') return false;

2
library/HTMLPurifier/AttrDef/HTML/Nmtokens.php
View File

@@ -13,7 +13,7 @@ require_once 'HTMLPurifier/Config.php';
class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$string = trim($string);

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

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

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

@@ -40,7 +40,7 @@ class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
$this->positive = $positive;
}
public function validate($integer, $config, &$context) {
public function validate($integer, $config, $context) {
$integer = $this->parseCDATA($integer);
if ($integer === '') return false;

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

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

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

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

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

@@ -80,7 +80,7 @@ class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
$this->embedsResource = (bool) $embeds_resource;
}
public function validate($uri, $config, &$context) {
public function validate($uri, $config, $context) {
if ($config->get('URI', 'Disable')) return false;

2
library/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
View File

@@ -9,7 +9,7 @@ require_once 'HTMLPurifier/AttrDef/URI/Email.php';
class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
{
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
// no support for named mailboxes i.e. "Bob <bob@example.com>"
// that needs more percent encoding to be done
if ($string == '') return false;

2
library/HTMLPurifier/AttrDef/URI/Host.php
View File

@@ -25,7 +25,7 @@ class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
$this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
}
public function validate($string, $config, &$context) {
public function validate($string, $config, $context) {
$length = strlen($string);
if ($string === '') return '';
if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {

2
library/HTMLPurifier/AttrDef/URI/IPv4.php
View File

@@ -14,7 +14,7 @@ class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
*/
protected $ip4;
public function validate($aIP, $config, &$context) {
public function validate($aIP, $config, $context) {
if (!$this->ip4) $this->_loadRegex();

2
library/HTMLPurifier/AttrDef/URI/IPv6.php
View File

@@ -11,7 +11,7 @@ require_once 'HTMLPurifier/AttrDef/URI/IPv4.php';
class HTMLPurifier_AttrDef_URI_IPv6 extends HTMLPurifier_AttrDef_URI_IPv4
{
public function validate($aIP, $config, &$context) {
public function validate($aIP, $config, $context) {
if (!$this->ip4) $this->_loadRegex();