mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-03 20:58:11 +02:00
Code Issues Releases Wiki Activity

[3.1.1] Have CSS/Length.php use the new Length class. Also, put onus of non-negative to callee, which would compare $n.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1751 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-05-20 23:15:20 +00:00
parent d8da5ff406
commit 64b5581bf2
5 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/HTMLPurifier/Length.php
View File

@@ -53,17 +53,15 @@ class HTMLPurifier_Length
/**
* Validates the number and unit.
* @param bool $non_negative Whether or not to disable negative values.
* @note Maybe should be put in another class.
*/
protected function validate($non_negative = false) {
protected function validate() {
// Special case:
if ($this->n === '+0' || $this->n === '-0') $this->n = '0';
if ($this->n === '0' && $this->unit === false) return true;
if (!ctype_lower($this->unit)) $this->unit = strtolower($this->unit);
if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) return false;
// Hack:
$def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
$def = new HTMLPurifier_AttrDef_CSS_Number();
$result = $def->validate($this->n, false, false);
if ($result === false) return false;
$this->n = $result;
@@ -91,8 +89,8 @@ class HTMLPurifier_Length
/**
* Returns true if this length unit is valid.
*/
public function isValid($non_negative = false) {
if ($this->isValid === null) $this->isValid = $this->validate($non_negative);
public function isValid() {
if ($this->isValid === null) $this->isValid = $this->validate();
return $this->isValid;
}