mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-10 09:16:20 +02:00
Implement MultiLength.
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@173 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
36
library/HTMLPurifier/AttrDef/MultiLength.php
Normal file
36
library/HTMLPurifier/AttrDef/MultiLength.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once 'HTMLPurifier/AttrDef.php';
|
||||||
|
require_once 'HTMLPurifier/AttrDef/Length.php';
|
||||||
|
|
||||||
|
class HTMLPurifier_AttrDef_MultiLength extends HTMLPurifier_AttrDef_Length
|
||||||
|
{
|
||||||
|
|
||||||
|
function validate($string) {
|
||||||
|
|
||||||
|
$string = trim($string);
|
||||||
|
if ($string === '') return false;
|
||||||
|
|
||||||
|
$parent_result = parent::validate($string);
|
||||||
|
if ($parent_result !== false) return $parent_result;
|
||||||
|
|
||||||
|
$length = strlen($string);
|
||||||
|
$last_char = $string[$length - 1];
|
||||||
|
|
||||||
|
if ($last_char !== '*') return false;
|
||||||
|
|
||||||
|
$int = substr($string, 0, $length - 1);
|
||||||
|
|
||||||
|
if (!is_numeric($int)) return false;
|
||||||
|
|
||||||
|
$int = (int) $int;
|
||||||
|
|
||||||
|
if ($int < 0) return '0*';
|
||||||
|
|
||||||
|
return ((string) $int) . '*';
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
@ -8,6 +8,7 @@ require_once 'HTMLPurifier/AttrDef.php';
|
|||||||
require_once 'HTMLPurifier/AttrDef/Lang.php';
|
require_once 'HTMLPurifier/AttrDef/Lang.php';
|
||||||
require_once 'HTMLPurifier/AttrDef/Pixels.php';
|
require_once 'HTMLPurifier/AttrDef/Pixels.php';
|
||||||
require_once 'HTMLPurifier/AttrDef/Length.php';
|
require_once 'HTMLPurifier/AttrDef/Length.php';
|
||||||
|
require_once 'HTMLPurifier/AttrDef/MultiLength.php';
|
||||||
require_once 'HTMLPurifier/AttrTransform.php';
|
require_once 'HTMLPurifier/AttrTransform.php';
|
||||||
require_once 'HTMLPurifier/AttrTransform/Lang.php';
|
require_once 'HTMLPurifier/AttrTransform/Lang.php';
|
||||||
require_once 'HTMLPurifier/AttrTransform/TextAlign.php';
|
require_once 'HTMLPurifier/AttrTransform/TextAlign.php';
|
||||||
@ -296,6 +297,10 @@ class HTMLPurifier_Definition
|
|||||||
$this->info['img']->attr['height'] = $e_Length;
|
$this->info['img']->attr['height'] = $e_Length;
|
||||||
$this->info['img']->attr['width'] = $e_Length;
|
$this->info['img']->attr['width'] = $e_Length;
|
||||||
|
|
||||||
|
$e_MultiLength = new HTMLPurifier_AttrDef_MultiLength();
|
||||||
|
$this->info['col']->attr['width'] = $e_MultiLength;
|
||||||
|
$this->info['colgroup']->attr['width'] = $e_MultiLength;
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
// UNIMP : info_tag_transform : transformations of tags
|
// UNIMP : info_tag_transform : transformations of tags
|
||||||
|
|
||||||
|
31
tests/HTMLPurifier/AttrDef/MultiLengthTest.php
Normal file
31
tests/HTMLPurifier/AttrDef/MultiLengthTest.php
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require_once 'HTMLPurifier/AttrDef/LengthTest.php';
|
||||||
|
require_once 'HTMLPurifier/AttrDef/Length.php';
|
||||||
|
|
||||||
|
class HTMLPurifier_AttrDef_MultiLengthTest extends HTMLPurifier_AttrDef_LengthTest
|
||||||
|
{
|
||||||
|
|
||||||
|
function setup() {
|
||||||
|
$this->def = new HTMLPurifier_AttrDef_MultiLength();
|
||||||
|
}
|
||||||
|
|
||||||
|
function test() {
|
||||||
|
|
||||||
|
// length check
|
||||||
|
parent::test();
|
||||||
|
|
||||||
|
$this->assertDef('*');
|
||||||
|
$this->assertDef('1*');
|
||||||
|
$this->assertDef('56*');
|
||||||
|
|
||||||
|
$this->assertDef('**', false); // plain old bad
|
||||||
|
|
||||||
|
$this->assertDef('5.4*', '5*'); // no decimals
|
||||||
|
$this->assertDef('-3*', false); // no negatives
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
@ -70,8 +70,8 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
|
|||||||
// test table
|
// test table
|
||||||
$inputs[13] = <<<HTML
|
$inputs[13] = <<<HTML
|
||||||
<table frame="above" rules="rows" summary="A test table" border="2" cellpadding="5%" cellspacing="3" width="100%">
|
<table frame="above" rules="rows" summary="A test table" border="2" cellpadding="5%" cellspacing="3" width="100%">
|
||||||
<col align="right" />
|
<col align="right" width="4*" />
|
||||||
<col charoff="5" align="char" />
|
<col charoff="5" align="char" width="1*" />
|
||||||
<tr valign="top">
|
<tr valign="top">
|
||||||
<th abbr="name">Fiddly name</th>
|
<th abbr="name">Fiddly name</th>
|
||||||
<th abbr="price">Super-duper-price</th>
|
<th abbr="price">Super-duper-price</th>
|
||||||
|
Reference in New Issue
Block a user