mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-11-09 15:28:40 +00:00
[1.6.1] Add attribute transformation smoketests
- Repair broken noshade implementation - Add lots of advisory comments to TransformToStrict.php git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1019 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
parent
a01459c87a
commit
92ea74cba2
1
NEWS
1
NEWS
@ -29,6 +29,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier
|
|||||||
browsers) but not others (which have spotty browser implementations)
|
browsers) but not others (which have spotty browser implementations)
|
||||||
! XHTML 1.1 mode now sort-of works without any fatal errors, and
|
! XHTML 1.1 mode now sort-of works without any fatal errors, and
|
||||||
lang is now moved over to xml:lang.
|
lang is now moved over to xml:lang.
|
||||||
|
! Attribute transformation smoketest available at smoketests/attrTransform.php
|
||||||
- Possibly fatal bug with __autoload() fixed in module manager
|
- Possibly fatal bug with __autoload() fixed in module manager
|
||||||
- Invert HTMLModuleManager->addModule() processing order to check
|
- Invert HTMLModuleManager->addModule() processing order to check
|
||||||
prefixes first and then the literal module
|
prefixes first and then the literal module
|
||||||
|
|||||||
@ -50,6 +50,13 @@ class HTMLPurifier_HTMLModule_TransformToStrict extends HTMLPurifier_HTMLModule
|
|||||||
|
|
||||||
function HTMLPurifier_HTMLModule_TransformToStrict() {
|
function HTMLPurifier_HTMLModule_TransformToStrict() {
|
||||||
|
|
||||||
|
// behavior with transformations when there's another CSS property
|
||||||
|
// working on it is interesting: the CSS will *always* override
|
||||||
|
// the deprecated attribute, whereas an inline CSS declaration will
|
||||||
|
// override the corresponding declaration in, say, an external
|
||||||
|
// stylesheet. This behavior won't affect most people, but it
|
||||||
|
// does represent an operational difference we CANNOT fix.
|
||||||
|
|
||||||
// deprecated tag transforms
|
// deprecated tag transforms
|
||||||
$this->info_tag_transform['font'] = new HTMLPurifier_TagTransform_Font();
|
$this->info_tag_transform['font'] = new HTMLPurifier_TagTransform_Font();
|
||||||
$this->info_tag_transform['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
|
$this->info_tag_transform['menu'] = new HTMLPurifier_TagTransform_Simple('ul');
|
||||||
@ -99,6 +106,7 @@ class HTMLPurifier_HTMLModule_TransformToStrict extends HTMLPurifier_HTMLModule
|
|||||||
$this->info['td']->attr_transform_pre['width'] =
|
$this->info['td']->attr_transform_pre['width'] =
|
||||||
$this->info['th']->attr_transform_pre['width'] =
|
$this->info['th']->attr_transform_pre['width'] =
|
||||||
$this->info['hr']->attr_transform_pre['width'] = new HTMLPurifier_AttrTransform_Length('width');
|
$this->info['hr']->attr_transform_pre['width'] = new HTMLPurifier_AttrTransform_Length('width');
|
||||||
|
|
||||||
$this->info['td']->attr_transform_pre['nowrap'] =
|
$this->info['td']->attr_transform_pre['nowrap'] =
|
||||||
$this->info['th']->attr_transform_pre['nowrap'] = new HTMLPurifier_AttrTransform_BoolToCSS('nowrap', 'white-space:nowrap;');
|
$this->info['th']->attr_transform_pre['nowrap'] = new HTMLPurifier_AttrTransform_BoolToCSS('nowrap', 'white-space:nowrap;');
|
||||||
|
|
||||||
@ -109,7 +117,10 @@ class HTMLPurifier_HTMLModule_TransformToStrict extends HTMLPurifier_HTMLModule
|
|||||||
$this->info['img']->attr_transform_pre['vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
|
$this->info['img']->attr_transform_pre['vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
|
||||||
|
|
||||||
$this->info['hr']->attr_transform_pre['size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
|
$this->info['hr']->attr_transform_pre['size'] = new HTMLPurifier_AttrTransform_Length('size', 'height');
|
||||||
$this->info['hr']->attr_transform_pre['noshade'] = new HTMLPurifier_AttrTransform_BoolToCSS('noshade', 'border-style:solid;');
|
|
||||||
|
// this transformation is not precise but often good enough.
|
||||||
|
// different browsers use different styles to designate noshade
|
||||||
|
$this->info['hr']->attr_transform_pre['noshade'] = new HTMLPurifier_AttrTransform_BoolToCSS('noshade', 'color:#808080;background-color:#808080;border: 0;');
|
||||||
|
|
||||||
$this->info['br']->attr_transform_pre['clear'] =
|
$this->info['br']->attr_transform_pre['clear'] =
|
||||||
new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
|
new HTMLPurifier_AttrTransform_EnumToCSS('clear', array(
|
||||||
@ -119,12 +130,16 @@ class HTMLPurifier_HTMLModule_TransformToStrict extends HTMLPurifier_HTMLModule
|
|||||||
'none' => 'clear:none;',
|
'none' => 'clear:none;',
|
||||||
));
|
));
|
||||||
|
|
||||||
|
// this is a slightly unreasonable attribute
|
||||||
$this->info['caption']->attr_transform_pre['align'] =
|
$this->info['caption']->attr_transform_pre['align'] =
|
||||||
new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
|
new HTMLPurifier_AttrTransform_EnumToCSS('align', array(
|
||||||
|
// we're following IE's behavior, not Firefox's, due
|
||||||
|
// to the fact that no one supports caption-side:right,
|
||||||
|
// W3C included (with CSS 2.1)
|
||||||
'left' => 'text-align:left;',
|
'left' => 'text-align:left;',
|
||||||
'right' => 'text-align:right;',
|
'right' => 'text-align:right;',
|
||||||
'top' => 'caption-side:top;',
|
'top' => 'caption-side:top;',
|
||||||
'bottom' => 'caption-side:bottom;'
|
'bottom' => 'caption-side:bottom;' // not supported by IE
|
||||||
));
|
));
|
||||||
|
|
||||||
$this->info['table']->attr_transform_pre['align'] =
|
$this->info['table']->attr_transform_pre['align'] =
|
||||||
|
|||||||
68
smoketests/attrTransform.php
Normal file
68
smoketests/attrTransform.php
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
require 'common.php';
|
||||||
|
|
||||||
|
?><!DOCTYPE html
|
||||||
|
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||||
|
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-loose.dtd">
|
||||||
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||||
|
<head>
|
||||||
|
<title>HTML Purifier Attribute Transformation Smoketest</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
|
<style type="text/css">
|
||||||
|
div.container {position:relative;height:120px;border:1px solid #CCC;
|
||||||
|
margin-bottom:1em; width:225px; float:left; margin-top:1em;
|
||||||
|
margin-right:1em;}
|
||||||
|
h2 {clear:left;margin-bottom:0;}
|
||||||
|
div.container.legend .test {text-align:center;line-height:100px;}
|
||||||
|
div.test {width:100px;height:100px;border:1px solid black;
|
||||||
|
position:absolute;top:10px;overflow:auto;}
|
||||||
|
div.test.html {left:10px;border-right:none;background:#FCC;}
|
||||||
|
div.test.css {left:110px;background:#CFC;}
|
||||||
|
img.marked {border:1px solid #000;background:#FFF;}
|
||||||
|
table.bright {background-color:#F00;}
|
||||||
|
hr.short {width:50px;}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>HTML Purifier Attribute Transformation Smoketest</h1>
|
||||||
|
<div class="container legend">
|
||||||
|
<div class="test html">
|
||||||
|
HTML
|
||||||
|
</div>
|
||||||
|
<div class="test css">
|
||||||
|
CSS
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<?php
|
||||||
|
|
||||||
|
if (version_compare(PHP_VERSION, '5', '<')) exit('<p>Requires PHP 5.</p>');
|
||||||
|
|
||||||
|
$xml = simplexml_load_file('attrTransform.xml');
|
||||||
|
|
||||||
|
// attr transform enabled HTML Purifier
|
||||||
|
$config = HTMLPurifier_Config::createDefault();
|
||||||
|
$purifier = new HTMLPurifier($config);
|
||||||
|
|
||||||
|
$title = isset($_GET['title']) ? $_GET['title'] : true;
|
||||||
|
|
||||||
|
foreach ($xml->group as $group) {
|
||||||
|
echo '<h2>' . $group['title'] . '</h2>';
|
||||||
|
foreach ($group->sample as $sample) {
|
||||||
|
$sample = (string) $sample;
|
||||||
|
?>
|
||||||
|
<div class="container">
|
||||||
|
<div class="test html">
|
||||||
|
<?php echo $sample; ?>
|
||||||
|
</div>
|
||||||
|
<div class="test css">
|
||||||
|
<?php echo $purifier->purify($sample); ?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
173
smoketests/attrTransform.xml
Normal file
173
smoketests/attrTransform.xml
Normal file
@ -0,0 +1,173 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<samples>
|
||||||
|
<group title="menu,dir">
|
||||||
|
<sample><![CDATA[<menu><li>menu</li></menu>]]></sample>
|
||||||
|
<sample><![CDATA[<dir><li>dir</li></dir>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="font">
|
||||||
|
<sample><![CDATA[<font color="red">Red</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font color="#0000FF">#0000FF</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font face="Arial">Arial</font>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="font.size">
|
||||||
|
<sample><![CDATA[<font size="-99">-99</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="0">0</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="1">1</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="2">2</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="3">3</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="4">4</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="5">5</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="6">6</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="7">7</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="8">8</font>]]></sample>
|
||||||
|
<sample><![CDATA[<font size="99">99</font>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="center">
|
||||||
|
<sample><![CDATA[<center>Centered</center>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="p.align">
|
||||||
|
<sample><![CDATA[<p align="left">Left</p>]]></sample>
|
||||||
|
<sample><![CDATA[<p align="center">Center</p>]]></sample>
|
||||||
|
<sample><![CDATA[<p align="right">Right</p>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="table.bgcolor">
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table bgcolor="black" cellspacing="2" cellpadding="2" border="1">
|
||||||
|
<tr bgcolor="red">
|
||||||
|
<th bgcolor="green">To</th>
|
||||||
|
<td bgcolor="blue">Be</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<th bgcolor="green">Or</th>
|
||||||
|
<td>Not</td>
|
||||||
|
</tr>
|
||||||
|
<tr bgcolor="red">
|
||||||
|
<th>To</th>
|
||||||
|
<td>Be</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table class="bright" bgcolor="black" cellspacing="2" cellpadding="2" border="1">
|
||||||
|
<tr>
|
||||||
|
<th bgcolor="green">Or</th>
|
||||||
|
<td>Not</td>
|
||||||
|
</tr>
|
||||||
|
<tr bgcolor="blue">
|
||||||
|
<th bgcolor="green">To</th>
|
||||||
|
<td>Be</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="img.border">
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" border="2" />]]></sample>
|
||||||
|
<sample><![CDATA[<a href="http://example.com/"><img src="img.png" alt="I" border="2" /></a>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="td,th,hr.width">
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<tr>
|
||||||
|
<th width="20">x1</th>
|
||||||
|
<td width="40">x2</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<tr>
|
||||||
|
<th width="33%">x1</th>
|
||||||
|
<td width="67%">x2</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[<hr width="70%" /><hr width="30" />]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="td,th.nowrap">
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<tr>
|
||||||
|
<th>This wants to wrap</th>
|
||||||
|
<td>really badly yes it does</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<tr>
|
||||||
|
<th nowrap>This wants to wrap</th>
|
||||||
|
<td nowrap>really badly yes it does</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="td,th.height">
|
||||||
|
<sample><![CDATA[<table border="1"><tr><td height="60">tall</td></tr></table>]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="img.vspace,hspace">
|
||||||
|
<sample><![CDATA[a<img src="img.png" alt="I" class="marked" hspace="7" />a]]></sample>
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" class="marked" vspace="7" /><br />o]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="hr">
|
||||||
|
<sample><![CDATA[<hr size="4" />]]></sample>
|
||||||
|
<sample><![CDATA[<hr size="50" noshade />]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="br.clear">
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" align="right" />B<br />A]]></sample>
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" align="right" />B<br clear="right" />A]]></sample>
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" align="right" /><img src="img.png" alt="I" align="left" />B<br />A]]></sample>
|
||||||
|
<sample><![CDATA[<img src="img.png" alt="I" align="right" /><img src="img.png" alt="I" align="left" />B<br clear="all" />A]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="caption.align">
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<caption align="left">Left</caption>
|
||||||
|
<tr><td>1.1</td><td>1.2</td></tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<caption align="right">Right</caption>
|
||||||
|
<tr><td>1.1</td><td>1.2</td></tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<caption align="top">Top</caption>
|
||||||
|
<tr><td>1.1</td><td>1.2</td></tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
<sample><![CDATA[
|
||||||
|
<table border="1">
|
||||||
|
<caption align="bottom">Bottom</caption>
|
||||||
|
<tr><td>1.1</td><td>1.2</td></tr>
|
||||||
|
</table>
|
||||||
|
]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="img.align">
|
||||||
|
<sample><![CDATA[left<img src="img.png" alt="I" class="marked" align="left" />]]></sample>
|
||||||
|
<sample><![CDATA[right<img src="img.png" alt="I" class="marked" align="right" />]]></sample>
|
||||||
|
<sample><![CDATA[o<img src="img.png" alt="I" class="marked" align="top" /> top]]></sample>
|
||||||
|
<sample><![CDATA[o<img src="img.png" alt="I" class="marked" align="bottom" /> bottom]]></sample>
|
||||||
|
<sample><![CDATA[o<img src="img.png" alt="I" class="marked" align="middle" /> middle]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="table.align">
|
||||||
|
<sample><![CDATA[a<table align="left" class="bright"><tr><td>left</td></tr></table>a]]></sample>
|
||||||
|
<sample><![CDATA[a<table align="center" class="bright"><tr><td>center</td></tr></table>a]]></sample>
|
||||||
|
<sample><![CDATA[a<table align="right" class="bright"><tr><td>right</td></tr></table>a]]></sample>
|
||||||
|
</group>
|
||||||
|
<group title="hr.align">
|
||||||
|
<sample><![CDATA[<hr align="left" class="short" />left]]></sample>
|
||||||
|
<sample><![CDATA[<hr align="center" class="short" />center]]></sample>
|
||||||
|
<sample><![CDATA[<hr align="right" class="short" />right]]></sample>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- sample
|
||||||
|
<group title="">
|
||||||
|
<sample><![CDATA[]]></sample>
|
||||||
|
<sample><![CDATA[]]></sample>
|
||||||
|
<sample><![CDATA[]]></sample>
|
||||||
|
</group>
|
||||||
|
-->
|
||||||
|
</samples>
|
||||||
BIN
smoketests/img.png
Normal file
BIN
smoketests/img.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
@ -326,7 +326,7 @@ class HTMLPurifier_Strategy_ValidateAttributesTest extends
|
|||||||
);
|
);
|
||||||
$this->assertResult(
|
$this->assertResult(
|
||||||
'<hr noshade />',
|
'<hr noshade />',
|
||||||
'<hr style="border-style:solid;" />'
|
'<hr style="color:#808080;background-color:#808080;border:0;" />'
|
||||||
);
|
);
|
||||||
// align transformation
|
// align transformation
|
||||||
$this->assertResult(
|
$this->assertResult(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user