mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2024-09-20 11:15:18 +00:00
3f06d8316c
- Fixed bug where recursive attribute collections would result in infinite loop - Fixed bug with deep inclusions in attribute collections - Reset doctype object if HTML or Attr is changed - Add accessor functions to AttrTypes, unit tested class git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1077 48356398-32a2-884e-a903-53898d9a118a
102 lines
3.5 KiB
PHP
102 lines
3.5 KiB
PHP
<?php
|
|
|
|
require_once 'HTMLPurifier/AttrTypes.php';
|
|
require_once 'HTMLPurifier/AttrDef/Lang.php';
|
|
|
|
/**
|
|
* Defines common attribute collections that modules reference
|
|
*/
|
|
|
|
class HTMLPurifier_AttrCollections
|
|
{
|
|
|
|
/**
|
|
* Associative array of attribute collections, indexed by name
|
|
*/
|
|
var $info = array();
|
|
|
|
/**
|
|
* Performs all expansions on internal data for use by other inclusions
|
|
* It also collects all attribute collection extensions from
|
|
* modules
|
|
* @param $attr_types HTMLPurifier_AttrTypes instance
|
|
* @param $modules Hash array of HTMLPurifier_HTMLModule members
|
|
*/
|
|
function HTMLPurifier_AttrCollections($attr_types, $modules) {
|
|
// load extensions from the modules
|
|
foreach ($modules as $module) {
|
|
foreach ($module->attr_collections as $coll_i => $coll) {
|
|
if (!isset($this->info[$coll_i])) {
|
|
$this->info[$coll_i] = array();
|
|
}
|
|
foreach ($coll as $attr_i => $attr) {
|
|
if ($attr_i === 0 && isset($this->info[$coll_i][$attr_i])) {
|
|
// merge in includes
|
|
$this->info[$coll_i][$attr_i] = array_merge(
|
|
$this->info[$coll_i][$attr_i], $attr);
|
|
continue;
|
|
}
|
|
$this->info[$coll_i][$attr_i] = $attr;
|
|
}
|
|
}
|
|
}
|
|
// perform internal expansions and inclusions
|
|
foreach ($this->info as $name => $attr) {
|
|
// merge attribute collections that include others
|
|
$this->performInclusions($this->info[$name]);
|
|
// replace string identifiers with actual attribute objects
|
|
$this->expandIdentifiers($this->info[$name], $attr_types);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Takes a reference to an attribute associative array and performs
|
|
* all inclusions specified by the zero index.
|
|
* @param &$attr Reference to attribute array
|
|
*/
|
|
function performInclusions(&$attr) {
|
|
if (!isset($attr[0])) return;
|
|
$merge = $attr[0];
|
|
$seen = array(); // recursion guard
|
|
// loop through all the inclusions
|
|
for ($i = 0; isset($merge[$i]); $i++) {
|
|
if (isset($seen[$merge[$i]])) continue;
|
|
$seen[$merge[$i]] = true;
|
|
// foreach attribute of the inclusion, copy it over
|
|
foreach ($this->info[$merge[$i]] as $key => $value) {
|
|
if (isset($attr[$key])) continue; // also catches more inclusions
|
|
$attr[$key] = $value;
|
|
}
|
|
if (isset($this->info[$merge[$i]][0])) {
|
|
// recursion
|
|
$merge = array_merge($merge, $this->info[$merge[$i]][0]);
|
|
}
|
|
}
|
|
unset($attr[0]);
|
|
}
|
|
|
|
/**
|
|
* Expands all string identifiers in an attribute array by replacing
|
|
* them with the appropriate values inside HTMLPurifier_AttrTypes
|
|
* @param &$attr Reference to attribute array
|
|
* @param $attr_types HTMLPurifier_AttrTypes instance
|
|
*/
|
|
function expandIdentifiers(&$attr, $attr_types) {
|
|
foreach ($attr as $def_i => $def) {
|
|
if ($def_i === 0) continue;
|
|
if (!is_string($def)) continue;
|
|
if ($def === false) {
|
|
unset($attr[$def_i]);
|
|
continue;
|
|
}
|
|
if ($t = $attr_types->get($def)) {
|
|
$attr[$def_i] = $t;
|
|
} else {
|
|
unset($attr[$def_i]);
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
?>
|