mirrors/htmlpurifier
0
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-01-05 06:01:52 +00:00
Code Releases Activity

[2.0.1] Reorder definition cache includes

Browse Source 
- Update some comments, rename some variables

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1196 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang 2007-06-21 23:56:19 +00:00
parent 996ccdbdda
commit dda4038446
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -11,6 +11,7 @@ NEWS ( CHANGELOG and HISTORY ) HTMLPurifier
2.0.1, unknown release date 2.0.1, unknown release date
- Clean up special case code for <script> tags - Clean up special case code for <script> tags
. Rewire some test-cases to swallow errors rather than expect them . Rewire some test-cases to swallow errors rather than expect them
. HTMLDefinition printer updated with some of the new attributes . HTMLDefinition printer updated with some of the new attributes

2
library/HTMLPurifier/DefinitionCache.php
View File

@ -4,6 +4,8 @@ require_once 'HTMLPurifier/DefinitionCache/Serializer.php';
require_once 'HTMLPurifier/DefinitionCache/Null.php'; require_once 'HTMLPurifier/DefinitionCache/Null.php';
require_once 'HTMLPurifier/DefinitionCache/Decorator.php'; require_once 'HTMLPurifier/DefinitionCache/Decorator.php';
require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
/** /**
* Abstract class representing Definition cache managers that implements * Abstract class representing Definition cache managers that implements

3
library/HTMLPurifier/DefinitionCache/Decorator.php
View File

@ -2,9 +2,6 @@
require_once 'HTMLPurifier/DefinitionCache.php'; require_once 'HTMLPurifier/DefinitionCache.php';
require_once 'HTMLPurifier/DefinitionCache/Decorator/Memory.php';
require_once 'HTMLPurifier/DefinitionCache/Decorator/Cleanup.php';
class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
{ {

12
library/HTMLPurifier/Lexer/DOMLex.php
View File

@ -38,25 +38,25 @@ class HTMLPurifier_Lexer_DOMLex extends HTMLPurifier_Lexer
$this->factory = new HTMLPurifier_TokenFactory(); $this->factory = new HTMLPurifier_TokenFactory();
} }
public function tokenizeHTML($string, $config, &$context) { public function tokenizeHTML($html, $config, &$context) {
$string = $this->normalize($string, $config, $context); $html = $this->normalize($html, $config, $context);
// preprocess string, essential for UTF-8 // preprocess html, essential for UTF-8
$string = $html =
'<!DOCTYPE html '. '<!DOCTYPE html '.
'PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'. 'PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'.
'"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'. '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'.
'<html><head>'. '<html><head>'.
'<meta http-equiv="Content-Type" content="text/html;'. '<meta http-equiv="Content-Type" content="text/html;'.
' charset=utf-8" />'. ' charset=utf-8" />'.
'</head><body><div>'.$string.'</div></body></html>'; '</head><body><div>'.$html.'</div></body></html>';
$doc = new DOMDocument(); $doc = new DOMDocument();
$doc->encoding = 'UTF-8'; // theoretically, the above has this covered $doc->encoding = 'UTF-8'; // theoretically, the above has this covered
set_error_handler(array($this, 'muteErrorHandler')); set_error_handler(array($this, 'muteErrorHandler'));
$doc->loadHTML($string); $doc->loadHTML($html);
restore_error_handler(); restore_error_handler();
$tokens = array(); $tokens = array();

5
library/HTMLPurifier/Lexer/DirectLex.php
View File

@ -22,12 +22,9 @@ HTMLPurifier_ConfigSchema::define(
* A pure PHP parser, DirectLex has absolutely no dependencies, making * A pure PHP parser, DirectLex has absolutely no dependencies, making
* it a reasonably good default for PHP4. Written with efficiency in mind, * it a reasonably good default for PHP4. Written with efficiency in mind,
* it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it * it can be four times faster than HTMLPurifier_Lexer_PEARSax3, although it
* pales in comparison to HTMLPurifier_Lexer_DOMLex. It will support UTF-8 * pales in comparison to HTMLPurifier_Lexer_DOMLex.
* completely eventually.
* *
* @todo Reread XML spec and document differences. * @todo Reread XML spec and document differences.
*
* @todo Determine correct behavior in transforming comment data. (preserve dashes?)
*/ */
class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer class HTMLPurifier_Lexer_DirectLex extends HTMLPurifier_Lexer
{ {