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

[1.7.0] Eliminated modes in favor for special-case "Tidy" modules

Browse Source 
- Add $xml property to Doctype, make more serialize friendly in preparation for stuffing into Config object
- Add FIXME markers for areas of further development, code is hooked so this is easy
- Document what the new Tidy classes will be

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1065 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-05-16 03:00:18 +00:00
parent 2d035483dd
commit a5136b65e4
4 changed files with 70 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
library/HTMLPurifier/HTMLModuleManager.php
View File

@ -115,33 +115,38 @@ class HTMLPurifier_HTMLModuleManager
$transitional = array('Legacy', 'Target');
$this->doctypes->register(
'HTML 4.01 Transitional',
'HTML 4.01 Transitional', false,
array_merge($common, $transitional),
array('correctional' => array('TransformToStrict'))
array('TransformToStrict')
// Tidy: Transitional
);
$this->doctypes->register(
'XHTML 1.0 Transitional',
'HTML 4.01 Strict', false,
array_merge($common),
array('TransformToStrict')
// Tidy: Strict
);
$this->doctypes->register(
'XHTML 1.0 Transitional', true,
array_merge($common, $transitional),
array('correctional' => array('TransformToStrict'))
array('TransformToStrict')
// Tidy: Transitional, XHTML
);
$this->doctypes->register(
'HTML 4.01 Strict',
'XHTML 1.0 Strict', true,
array_merge($common),
array('lenient' => array('TransformToStrict'))
array('TransformToStrict')
// Tidy: Strict, XHTML
);
$this->doctypes->register(
'XHTML 1.0 Strict',
'XHTML 1.1', true,
array_merge($common),
array('lenient' => array('TransformToStrict'))
);
$this->doctypes->register(
'XHTML 1.1',
array_merge($common),
array('lenient' => array('TransformToStrict', 'TransformToXHTML11'))
array('TransformToStrict', 'TransformToXHTML11')
// Tidy: Strict, XHTML1_1
);
}
@ -247,15 +252,12 @@ class HTMLPurifier_HTMLModuleManager
$modules = array_merge($modules, $this->userModules);
foreach ($modules as $module) {
if (is_object($module)) {
$this->registeredModules[$module->name] = $module;
continue;
} else {
if (!isset($this->registeredModules[$module])) {
$this->registerModule($module);
}
}
$this->modules[$module] = $this->registeredModules[$module];
$this->processModule($module);
}
foreach ($doctype->tidyModules as $module) {
$this->processModule($module);
// FIXME!!! initialize the tidy modules here
}
// setup lookup table based on all valid modules
@ -284,6 +286,17 @@ class HTMLPurifier_HTMLModuleManager
}
/**
* Takes a module and adds it to the active module collection,
* registering it if necessary.
*/
function processModule($module) {
if (!isset($this->registeredModules[$module]) || is_object($module)) {
$this->registerModule($module);
}
$this->modules[$module] = $this->registeredModules[$module];
}
/**
* Retrieves merged element definitions.
* @return Array of HTMLPurifier_ElementDef