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

Move order to module itself, as member variable type.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@753 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2007-02-16 03:01:23 +00:00
parent 6e1b540d99
commit e55babdc53
14 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/HTMLPurifier/HTMLModuleManager.php
View File

@ -102,22 +102,17 @@ class HTMLPurifier_HTMLModuleManager
// modules
$modules = array(
'define' => array(
'Text', 'Hypertext', 'List', 'Presentation',
'Edit', 'Bdo', 'Tables', 'Image', 'StyleAttribute'
),
'define-redefine' => array(
'Legacy'
),
'redefine' => array(
'TransformToStrict', 'TransformToXHTML11'
)
// define
'Text', 'Hypertext', 'List', 'Presentation',
'Edit', 'Bdo', 'Tables', 'Image', 'StyleAttribute',
// define-redefine
'Legacy',
// redefine
'TransformToStrict', 'TransformToXHTML11'
);
foreach ($modules as $order => $modules_of_order) {
foreach ($modules_of_order as $module) {
$this->addModule($module, $order);
}
foreach ($modules as $module) {
$this->addModule($module);
}
$this->attrTypes = new HTMLPurifier_AttrTypes();
@ -131,7 +126,7 @@ class HTMLPurifier_HTMLModuleManager
* HTMLPurifier_HTMLModule prefix, or instance of
* subclass of HTMLPurifier_HTMLModule.
*/
function addModule($module, $order = 'main') {
function addModule($module) {
if (is_string($module)) {
$original_module = $module;
if (!class_exists($module)) {
@ -146,6 +141,7 @@ class HTMLPurifier_HTMLModuleManager
}
$module = new $module();
}
$order = $module->type;
if (!isset($this->orderKeywords[$order])) {
trigger_error('Order keyword does not exist', E_USER_ERROR);
return;