xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/Printer/CSSDefinition.php

Indentation +22 added lines, -22 removed lines

@@ -3,35 +3,35 @@
 class HTMLPurifier_Printer_CSSDefinition extends HTMLPurifier_Printer
 {
 
-    protected $def;
+	protected $def;
 
-    public function render($config) {
-        $this->def = $config->getCSSDefinition();
-        $ret = '';
+	public function render($config) {
+		$this->def = $config->getCSSDefinition();
+		$ret = '';
 
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-        $ret .= $this->start('table');
+		$ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+		$ret .= $this->start('table');
 
-        $ret .= $this->element('caption', 'Properties ($info)');
+		$ret .= $this->element('caption', 'Properties ($info)');
 
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', 'Property', array('class' => 'heavy'));
-        $ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
+		$ret .= $this->start('thead');
+		$ret .= $this->start('tr');
+		$ret .= $this->element('th', 'Property', array('class' => 'heavy'));
+		$ret .= $this->element('th', 'Definition', array('class' => 'heavy', 'style' => 'width:auto;'));
+		$ret .= $this->end('tr');
+		$ret .= $this->end('thead');
 
-        ksort($this->def->info);
-        foreach ($this->def->info as $property => $obj) {
-            $name = $this->getClass($obj, 'AttrDef_');
-            $ret .= $this->row($property, $name);
-        }
+		ksort($this->def->info);
+		foreach ($this->def->info as $property => $obj) {
+			$name = $this->getClass($obj, 'AttrDef_');
+			$ret .= $this->row($property, $name);
+		}
 
-        $ret .= $this->end('table');
-        $ret .= $this->end('div');
+		$ret .= $this->end('table');
+		$ret .= $this->end('div');
 
-        return $ret;
-    }
+		return $ret;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Printer/ConfigForm.php

Indentation +316 added lines, -316 removed lines

@@ -6,179 +6,179 @@ 
 class HTMLPurifier_Printer_ConfigForm extends HTMLPurifier_Printer
 {
 
-    /**
-     * Printers for specific fields
-     */
-    protected $fields = array();
+	/**
+	 * Printers for specific fields
+	 */
+	protected $fields = array();
 
-    /**
-     * Documentation URL, can have fragment tagged on end
-     */
-    protected $docURL;
+	/**
+	 * Documentation URL, can have fragment tagged on end
+	 */
+	protected $docURL;
 
-    /**
-     * Name of form element to stuff config in
-     */
-    protected $name;
+	/**
+	 * Name of form element to stuff config in
+	 */
+	protected $name;
 
-    /**
-     * Whether or not to compress directive names, clipping them off
-     * after a certain amount of letters. False to disable or integer letters
-     * before clipping.
-     */
-    protected $compress = false;
+	/**
+	 * Whether or not to compress directive names, clipping them off
+	 * after a certain amount of letters. False to disable or integer letters
+	 * before clipping.
+	 */
+	protected $compress = false;
 
-    /**
-     * @param $name Form element name for directives to be stuffed into
-     * @param $doc_url String documentation URL, will have fragment tagged on
-     * @param $compress Integer max length before compressing a directive name, set to false to turn off
-     */
-    public function __construct(
-        $name, $doc_url = null, $compress = false
-    ) {
-        parent::__construct();
-        $this->docURL = $doc_url;
-        $this->name   = $name;
-        $this->compress = $compress;
-        // initialize sub-printers
-        $this->fields[0]    = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL]       = new HTMLPurifier_Printer_ConfigForm_bool();
-    }
+	/**
+	 * @param $name Form element name for directives to be stuffed into
+	 * @param $doc_url String documentation URL, will have fragment tagged on
+	 * @param $compress Integer max length before compressing a directive name, set to false to turn off
+	 */
+	public function __construct(
+		$name, $doc_url = null, $compress = false
+	) {
+		parent::__construct();
+		$this->docURL = $doc_url;
+		$this->name   = $name;
+		$this->compress = $compress;
+		// initialize sub-printers
+		$this->fields[0]    = new HTMLPurifier_Printer_ConfigForm_default();
+		$this->fields[HTMLPurifier_VarParser::BOOL]       = new HTMLPurifier_Printer_ConfigForm_bool();
+	}
 
-    /**
-     * Sets default column and row size for textareas in sub-printers
-     * @param $cols Integer columns of textarea, null to use default
-     * @param $rows Integer rows of textarea, null to use default
-     */
-    public function setTextareaDimensions($cols = null, $rows = null) {
-        if ($cols) $this->fields['default']->cols = $cols;
-        if ($rows) $this->fields['default']->rows = $rows;
-    }
+	/**
+	 * Sets default column and row size for textareas in sub-printers
+	 * @param $cols Integer columns of textarea, null to use default
+	 * @param $rows Integer rows of textarea, null to use default
+	 */
+	public function setTextareaDimensions($cols = null, $rows = null) {
+		if ($cols) $this->fields['default']->cols = $cols;
+		if ($rows) $this->fields['default']->rows = $rows;
+	}
 
-    /**
-     * Retrieves styling, in case it is not accessible by webserver
-     */
-    public static function getCSS() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
-    }
+	/**
+	 * Retrieves styling, in case it is not accessible by webserver
+	 */
+	public static function getCSS() {
+		return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
+	}
 
-    /**
-     * Retrieves JavaScript, in case it is not accessible by webserver
-     */
-    public static function getJavaScript() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
-    }
+	/**
+	 * Retrieves JavaScript, in case it is not accessible by webserver
+	 */
+	public static function getJavaScript() {
+		return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
+	}
 
-    /**
-     * Returns HTML output for a configuration form
-     * @param $config Configuration object of current form state, or an array
-     *        where [0] has an HTML namespace and [1] is being rendered.
-     * @param $allowed Optional namespace(s) and directives to restrict form to.
-     */
-    public function render($config, $allowed = true, $render_controls = true) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
+	/**
+	 * Returns HTML output for a configuration form
+	 * @param $config Configuration object of current form state, or an array
+	 *        where [0] has an HTML namespace and [1] is being rendered.
+	 * @param $allowed Optional namespace(s) and directives to restrict form to.
+	 */
+	public function render($config, $allowed = true, $render_controls = true) {
+		if (is_array($config) && isset($config[0])) {
+			$gen_config = $config[0];
+			$config = $config[1];
+		} else {
+			$gen_config = $config;
+		}
 
-        $this->config = $config;
-        $this->genConfig = $gen_config;
-        $this->prepareGenerator($gen_config);
+		$this->config = $config;
+		$this->genConfig = $gen_config;
+		$this->prepareGenerator($gen_config);
 
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
-        $all = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $all[$ns][$directive] = $config->get($ns .'.'. $directive);
-        }
+		$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $config->def);
+		$all = array();
+		foreach ($allowed as $key) {
+			list($ns, $directive) = $key;
+			$all[$ns][$directive] = $config->get($ns .'.'. $directive);
+		}
 
-        $ret = '';
-        $ret .= $this->start('table', array('class' => 'hp-config'));
-        $ret .= $this->start('thead');
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
-            $ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('thead');
-        foreach ($all as $ns => $directives) {
-            $ret .= $this->renderNamespace($ns, $directives);
-        }
-        if ($render_controls) {
-             $ret .= $this->start('tbody');
-             $ret .= $this->start('tr');
-                 $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
-                     $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
-                     $ret .= '[<a href="?">Reset</a>]';
-                 $ret .= $this->end('td');
-             $ret .= $this->end('tr');
-             $ret .= $this->end('tbody');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
+		$ret = '';
+		$ret .= $this->start('table', array('class' => 'hp-config'));
+		$ret .= $this->start('thead');
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', 'Directive', array('class' => 'hp-directive'));
+			$ret .= $this->element('th', 'Value', array('class' => 'hp-value'));
+		$ret .= $this->end('tr');
+		$ret .= $this->end('thead');
+		foreach ($all as $ns => $directives) {
+			$ret .= $this->renderNamespace($ns, $directives);
+		}
+		if ($render_controls) {
+			 $ret .= $this->start('tbody');
+			 $ret .= $this->start('tr');
+				 $ret .= $this->start('td', array('colspan' => 2, 'class' => 'controls'));
+					 $ret .= $this->elementEmpty('input', array('type' => 'submit', 'value' => 'Submit'));
+					 $ret .= '[<a href="?">Reset</a>]';
+				 $ret .= $this->end('td');
+			 $ret .= $this->end('tr');
+			 $ret .= $this->end('tbody');
+		}
+		$ret .= $this->end('table');
+		return $ret;
+	}
 
-    /**
-     * Renders a single namespace
-     * @param $ns String namespace name
-     * @param $directive Associative array of directives to values
-     */
-    protected function renderNamespace($ns, $directives) {
-        $ret = '';
-        $ret .= $this->start('tbody', array('class' => 'namespace'));
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', $ns, array('colspan' => 2));
-        $ret .= $this->end('tr');
-        $ret .= $this->end('tbody');
-        $ret .= $this->start('tbody');
-        foreach ($directives as $directive => $value) {
-            $ret .= $this->start('tr');
-            $ret .= $this->start('th');
-            if ($this->docURL) {
-                $url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
-                $ret .= $this->start('a', array('href' => $url));
-            }
-                $attr = array('for' => "{$this->name}:$ns.$directive");
+	/**
+	 * Renders a single namespace
+	 * @param $ns String namespace name
+	 * @param $directive Associative array of directives to values
+	 */
+	protected function renderNamespace($ns, $directives) {
+		$ret = '';
+		$ret .= $this->start('tbody', array('class' => 'namespace'));
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', $ns, array('colspan' => 2));
+		$ret .= $this->end('tr');
+		$ret .= $this->end('tbody');
+		$ret .= $this->start('tbody');
+		foreach ($directives as $directive => $value) {
+			$ret .= $this->start('tr');
+			$ret .= $this->start('th');
+			if ($this->docURL) {
+				$url = str_replace('%s', urlencode("$ns.$directive"), $this->docURL);
+				$ret .= $this->start('a', array('href' => $url));
+			}
+				$attr = array('for' => "{$this->name}:$ns.$directive");
 
-                // crop directive name if it's too long
-                if (!$this->compress || (strlen($directive) < $this->compress)) {
-                    $directive_disp = $directive;
-                } else {
-                    $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
-                    $attr['title'] = $directive;
-                }
+				// crop directive name if it's too long
+				if (!$this->compress || (strlen($directive) < $this->compress)) {
+					$directive_disp = $directive;
+				} else {
+					$directive_disp = substr($directive, 0, $this->compress - 2) . '...';
+					$attr['title'] = $directive;
+				}
 
-                $ret .= $this->element(
-                    'label',
-                    $directive_disp,
-                    // component printers must create an element with this id
-                    $attr
-                );
-            if ($this->docURL) $ret .= $this->end('a');
-            $ret .= $this->end('th');
+				$ret .= $this->element(
+					'label',
+					$directive_disp,
+					// component printers must create an element with this id
+					$attr
+				);
+			if ($this->docURL) $ret .= $this->end('a');
+			$ret .= $this->end('th');
 
-            $ret .= $this->start('td');
-                $def = $this->config->def->info["$ns.$directive"];
-                if (is_int($def)) {
-                    $allow_null = $def < 0;
-                    $type = abs($def);
-                } else {
-                    $type = $def->type;
-                    $allow_null = isset($def->allow_null);
-                }
-                if (!isset($this->fields[$type])) $type = 0; // default
-                $type_obj = $this->fields[$type];
-                if ($allow_null) {
-                    $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
-                }
-                $ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
-            $ret .= $this->end('td');
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('tbody');
-        return $ret;
-    }
+			$ret .= $this->start('td');
+				$def = $this->config->def->info["$ns.$directive"];
+				if (is_int($def)) {
+					$allow_null = $def < 0;
+					$type = abs($def);
+				} else {
+					$type = $def->type;
+					$allow_null = isset($def->allow_null);
+				}
+				if (!isset($this->fields[$type])) $type = 0; // default
+				$type_obj = $this->fields[$type];
+				if ($allow_null) {
+					$type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
+				}
+				$ret .= $type_obj->render($ns, $directive, $value, $this->name, array($this->genConfig, $this->config));
+			$ret .= $this->end('td');
+			$ret .= $this->end('tr');
+		}
+		$ret .= $this->end('tbody');
+		return $ret;
+	}
 
 }
 
@@ -186,183 +186,183 @@ 
  * Printer decorator for directives that accept null
  */
 class HTMLPurifier_Printer_ConfigForm_NullDecorator extends HTMLPurifier_Printer {
-    /**
-     * Printer being decorated
-     */
-    protected $obj;
-    /**
-     * @param $obj Printer to decorate
-     */
-    public function __construct($obj) {
-        parent::__construct();
-        $this->obj = $obj;
-    }
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
+	/**
+	 * Printer being decorated
+	 */
+	protected $obj;
+	/**
+	 * @param $obj Printer to decorate
+	 */
+	public function __construct($obj) {
+		parent::__construct();
+		$this->obj = $obj;
+	}
+	public function render($ns, $directive, $value, $name, $config) {
+		if (is_array($config) && isset($config[0])) {
+			$gen_config = $config[0];
+			$config = $config[1];
+		} else {
+			$gen_config = $config;
+		}
+		$this->prepareGenerator($gen_config);
 
-        $ret = '';
-        $ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Null/Disabled');
-        $ret .= $this->end('label');
-        $attr = array(
-            'type' => 'checkbox',
-            'value' => '1',
-            'class' => 'null-toggle',
-            'name' => "$name"."[Null_$ns.$directive]",
-            'id' => "$name:Null_$ns.$directive",
-            'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
-        );
-        if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
-            // modify inline javascript slightly
-            $attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
-        }
-        if ($value === null) $attr['checked'] = 'checked';
-        $ret .= $this->elementEmpty('input', $attr);
-        $ret .= $this->text(' or ');
-        $ret .= $this->elementEmpty('br');
-        $ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
-        return $ret;
-    }
+		$ret = '';
+		$ret .= $this->start('label', array('for' => "$name:Null_$ns.$directive"));
+		$ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+		$ret .= $this->text(' Null/Disabled');
+		$ret .= $this->end('label');
+		$attr = array(
+			'type' => 'checkbox',
+			'value' => '1',
+			'class' => 'null-toggle',
+			'name' => "$name"."[Null_$ns.$directive]",
+			'id' => "$name:Null_$ns.$directive",
+			'onclick' => "toggleWriteability('$name:$ns.$directive',checked)" // INLINE JAVASCRIPT!!!!
+		);
+		if ($this->obj instanceof HTMLPurifier_Printer_ConfigForm_bool) {
+			// modify inline javascript slightly
+			$attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
+		}
+		if ($value === null) $attr['checked'] = 'checked';
+		$ret .= $this->elementEmpty('input', $attr);
+		$ret .= $this->text(' or ');
+		$ret .= $this->elementEmpty('br');
+		$ret .= $this->obj->render($ns, $directive, $value, $name, array($gen_config, $config));
+		return $ret;
+	}
 }
 
 /**
  * Swiss-army knife configuration form field printer
  */
 class HTMLPurifier_Printer_ConfigForm_default extends HTMLPurifier_Printer {
-    public $cols = 18;
-    public $rows = 5;
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        // this should probably be split up a little
-        $ret = '';
-        $def = $config->def->info["$ns.$directive"];
-        if (is_int($def)) {
-            $type = abs($def);
-        } else {
-            $type = $def->type;
-        }
-        if (is_array($value)) {
-            switch ($type) {
-                case HTMLPurifier_VarParser::LOOKUP:
-                    $array = $value;
-                    $value = array();
-                    foreach ($array as $val => $b) {
-                        $value[] = $val;
-                    }
-                case HTMLPurifier_VarParser::ALIST:
-                    $value = implode(PHP_EOL, $value);
-                    break;
-                case HTMLPurifier_VarParser::HASH:
-                    $nvalue = '';
-                    foreach ($value as $i => $v) {
-                        $nvalue .= "$i:$v" . PHP_EOL;
-                    }
-                    $value = $nvalue;
-                    break;
-                default:
-                    $value = '';
-            }
-        }
-        if ($type === HTMLPurifier_VarParser::MIXED) {
-            return 'Not supported';
-            $value = serialize($value);
-        }
-        $attr = array(
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:$ns.$directive"
-        );
-        if ($value === null) $attr['disabled'] = 'disabled';
-        if (isset($def->allowed)) {
-            $ret .= $this->start('select', $attr);
-            foreach ($def->allowed as $val => $b) {
-                $attr = array();
-                if ($value == $val) $attr['selected'] = 'selected';
-                $ret .= $this->element('option', $val, $attr);
-            }
-            $ret .= $this->end('select');
-        } elseif (
-            $type === HTMLPurifier_VarParser::TEXT ||
-            $type === HTMLPurifier_VarParser::ITEXT ||
-            $type === HTMLPurifier_VarParser::ALIST ||
-            $type === HTMLPurifier_VarParser::HASH ||
-            $type === HTMLPurifier_VarParser::LOOKUP
-        ) {
-            $attr['cols'] = $this->cols;
-            $attr['rows'] = $this->rows;
-            $ret .= $this->start('textarea', $attr);
-            $ret .= $this->text($value);
-            $ret .= $this->end('textarea');
-        } else {
-            $attr['value'] = $value;
-            $attr['type'] = 'text';
-            $ret .= $this->elementEmpty('input', $attr);
-        }
-        return $ret;
-    }
+	public $cols = 18;
+	public $rows = 5;
+	public function render($ns, $directive, $value, $name, $config) {
+		if (is_array($config) && isset($config[0])) {
+			$gen_config = $config[0];
+			$config = $config[1];
+		} else {
+			$gen_config = $config;
+		}
+		$this->prepareGenerator($gen_config);
+		// this should probably be split up a little
+		$ret = '';
+		$def = $config->def->info["$ns.$directive"];
+		if (is_int($def)) {
+			$type = abs($def);
+		} else {
+			$type = $def->type;
+		}
+		if (is_array($value)) {
+			switch ($type) {
+				case HTMLPurifier_VarParser::LOOKUP:
+					$array = $value;
+					$value = array();
+					foreach ($array as $val => $b) {
+						$value[] = $val;
+					}
+				case HTMLPurifier_VarParser::ALIST:
+					$value = implode(PHP_EOL, $value);
+					break;
+				case HTMLPurifier_VarParser::HASH:
+					$nvalue = '';
+					foreach ($value as $i => $v) {
+						$nvalue .= "$i:$v" . PHP_EOL;
+					}
+					$value = $nvalue;
+					break;
+				default:
+					$value = '';
+			}
+		}
+		if ($type === HTMLPurifier_VarParser::MIXED) {
+			return 'Not supported';
+			$value = serialize($value);
+		}
+		$attr = array(
+			'name' => "$name"."[$ns.$directive]",
+			'id' => "$name:$ns.$directive"
+		);
+		if ($value === null) $attr['disabled'] = 'disabled';
+		if (isset($def->allowed)) {
+			$ret .= $this->start('select', $attr);
+			foreach ($def->allowed as $val => $b) {
+				$attr = array();
+				if ($value == $val) $attr['selected'] = 'selected';
+				$ret .= $this->element('option', $val, $attr);
+			}
+			$ret .= $this->end('select');
+		} elseif (
+			$type === HTMLPurifier_VarParser::TEXT ||
+			$type === HTMLPurifier_VarParser::ITEXT ||
+			$type === HTMLPurifier_VarParser::ALIST ||
+			$type === HTMLPurifier_VarParser::HASH ||
+			$type === HTMLPurifier_VarParser::LOOKUP
+		) {
+			$attr['cols'] = $this->cols;
+			$attr['rows'] = $this->rows;
+			$ret .= $this->start('textarea', $attr);
+			$ret .= $this->text($value);
+			$ret .= $this->end('textarea');
+		} else {
+			$attr['value'] = $value;
+			$attr['type'] = 'text';
+			$ret .= $this->elementEmpty('input', $attr);
+		}
+		return $ret;
+	}
 }
 
 /**
  * Bool form field printer
  */
 class HTMLPurifier_Printer_ConfigForm_bool extends HTMLPurifier_Printer {
-    public function render($ns, $directive, $value, $name, $config) {
-        if (is_array($config) && isset($config[0])) {
-            $gen_config = $config[0];
-            $config = $config[1];
-        } else {
-            $gen_config = $config;
-        }
-        $this->prepareGenerator($gen_config);
-        $ret = '';
-        $ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
+	public function render($ns, $directive, $value, $name, $config) {
+		if (is_array($config) && isset($config[0])) {
+			$gen_config = $config[0];
+			$config = $config[1];
+		} else {
+			$gen_config = $config;
+		}
+		$this->prepareGenerator($gen_config);
+		$ret = '';
+		$ret .= $this->start('div', array('id' => "$name:$ns.$directive"));
 
-        $ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' Yes');
-        $ret .= $this->end('label');
+		$ret .= $this->start('label', array('for' => "$name:Yes_$ns.$directive"));
+		$ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+		$ret .= $this->text(' Yes');
+		$ret .= $this->end('label');
 
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:Yes_$ns.$directive",
-            'value' => '1'
-        );
-        if ($value === true) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
-        $ret .= $this->elementEmpty('input', $attr);
+		$attr = array(
+			'type' => 'radio',
+			'name' => "$name"."[$ns.$directive]",
+			'id' => "$name:Yes_$ns.$directive",
+			'value' => '1'
+		);
+		if ($value === true) $attr['checked'] = 'checked';
+		if ($value === null) $attr['disabled'] = 'disabled';
+		$ret .= $this->elementEmpty('input', $attr);
 
-        $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
-        $ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
-        $ret .= $this->text(' No');
-        $ret .= $this->end('label');
+		$ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
+		$ret .= $this->element('span', "$ns.$directive:", array('class' => 'verbose'));
+		$ret .= $this->text(' No');
+		$ret .= $this->end('label');
 
-        $attr = array(
-            'type' => 'radio',
-            'name' => "$name"."[$ns.$directive]",
-            'id' => "$name:No_$ns.$directive",
-            'value' => '0'
-        );
-        if ($value === false) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
-        $ret .= $this->elementEmpty('input', $attr);
+		$attr = array(
+			'type' => 'radio',
+			'name' => "$name"."[$ns.$directive]",
+			'id' => "$name:No_$ns.$directive",
+			'value' => '0'
+		);
+		if ($value === false) $attr['checked'] = 'checked';
+		if ($value === null) $attr['disabled'] = 'disabled';
+		$ret .= $this->elementEmpty('input', $attr);
 
-        $ret .= $this->end('div');
+		$ret .= $this->end('div');
 
-        return $ret;
-    }
+		return $ret;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +34 added lines, -11 removed lines

@@ -51,8 +51,12 @@ 
      * @param $rows Integer rows of textarea, null to use default
      */
     public function setTextareaDimensions($cols = null, $rows = null) {
-        if ($cols) $this->fields['default']->cols = $cols;
-        if ($rows) $this->fields['default']->rows = $rows;
+        if ($cols) {
+        	$this->fields['default']->cols = $cols;
+        }
+        if ($rows) {
+        	$this->fields['default']->rows = $rows;
+        }
     }
 
     /**
@@ -155,7 +159,9 @@ 
                     // component printers must create an element with this id
                     $attr
                 );
-            if ($this->docURL) $ret .= $this->end('a');
+            if ($this->docURL) {
+            	$ret .= $this->end('a');
+            }
             $ret .= $this->end('th');
 
             $ret .= $this->start('td');
@@ -167,7 +173,10 @@ 
                     $type = $def->type;
                     $allow_null = isset($def->allow_null);
                 }
-                if (!isset($this->fields[$type])) $type = 0; // default
+                if (!isset($this->fields[$type])) {
+                	$type = 0;
+                }
+                // default
                 $type_obj = $this->fields[$type];
                 if ($allow_null) {
                     $type_obj = new HTMLPurifier_Printer_ConfigForm_NullDecorator($type_obj);
@@ -223,7 +232,9 @@ 
             // modify inline javascript slightly
             $attr['onclick'] = "toggleWriteability('$name:Yes_$ns.$directive',checked);toggleWriteability('$name:No_$ns.$directive',checked)";
         }
-        if ($value === null) $attr['checked'] = 'checked';
+        if ($value === null) {
+        	$attr['checked'] = 'checked';
+        }
         $ret .= $this->elementEmpty('input', $attr);
         $ret .= $this->text(' or ');
         $ret .= $this->elementEmpty('br');
@@ -284,12 +295,16 @@ 
             'name' => "$name"."[$ns.$directive]",
             'id' => "$name:$ns.$directive"
         );
-        if ($value === null) $attr['disabled'] = 'disabled';
+        if ($value === null) {
+        	$attr['disabled'] = 'disabled';
+        }
         if (isset($def->allowed)) {
             $ret .= $this->start('select', $attr);
             foreach ($def->allowed as $val => $b) {
                 $attr = array();
-                if ($value == $val) $attr['selected'] = 'selected';
+                if ($value == $val) {
+                	$attr['selected'] = 'selected';
+                }
                 $ret .= $this->element('option', $val, $attr);
             }
             $ret .= $this->end('select');
@@ -340,8 +355,12 @@ 
             'id' => "$name:Yes_$ns.$directive",
             'value' => '1'
         );
-        if ($value === true) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
+        if ($value === true) {
+        	$attr['checked'] = 'checked';
+        }
+        if ($value === null) {
+        	$attr['disabled'] = 'disabled';
+        }
         $ret .= $this->elementEmpty('input', $attr);
 
         $ret .= $this->start('label', array('for' => "$name:No_$ns.$directive"));
@@ -355,8 +374,12 @@ 
             'id' => "$name:No_$ns.$directive",
             'value' => '0'
         );
-        if ($value === false) $attr['checked'] = 'checked';
-        if ($value === null) $attr['disabled'] = 'disabled';
+        if ($value === false) {
+        	$attr['checked'] = 'checked';
+        }
+        if ($value === null) {
+        	$attr['disabled'] = 'disabled';
+        }
         $ret .= $this->elementEmpty('input', $attr);
 
         $ret .= $this->end('div');

Spacing +7 added lines, -7 removed lines

@@ -41,8 +41,8 @@ 
         $this->name   = $name;
         $this->compress = $compress;
         // initialize sub-printers
-        $this->fields[0]    = new HTMLPurifier_Printer_ConfigForm_default();
-        $this->fields[HTMLPurifier_VarParser::BOOL]       = new HTMLPurifier_Printer_ConfigForm_bool();
+        $this->fields[0] = new HTMLPurifier_Printer_ConfigForm_default();
+        $this->fields[HTMLPurifier_VarParser::BOOL] = new HTMLPurifier_Printer_ConfigForm_bool();
     }
 
     /**
@@ -59,14 +59,14 @@ 
      * Retrieves styling, in case it is not accessible by webserver
      */
     public static function getCSS() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.css');
+        return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.css');
     }
 
     /**
      * Retrieves JavaScript, in case it is not accessible by webserver
      */
     public static function getJavaScript() {
-        return file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/Printer/ConfigForm.js');
+        return file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/Printer/ConfigForm.js');
     }
 
     /**
@@ -91,7 +91,7 @@ 
         $all = array();
         foreach ($allowed as $key) {
             list($ns, $directive) = $key;
-            $all[$ns][$directive] = $config->get($ns .'.'. $directive);
+            $all[$ns][$directive] = $config->get($ns.'.'.$directive);
         }
 
         $ret = '';
@@ -145,7 +145,7 @@ 
                 if (!$this->compress || (strlen($directive) < $this->compress)) {
                     $directive_disp = $directive;
                 } else {
-                    $directive_disp = substr($directive, 0, $this->compress - 2) . '...';
+                    $directive_disp = substr($directive, 0, $this->compress - 2).'...';
                     $attr['title'] = $directive;
                 }
 
@@ -268,7 +268,7 @@ 
                 case HTMLPurifier_VarParser::HASH:
                     $nvalue = '';
                     foreach ($value as $i => $v) {
-                        $nvalue .= "$i:$v" . PHP_EOL;
+                        $nvalue .= "$i:$v".PHP_EOL;
                     }
                     $value = $nvalue;
                     break;

classes/security/htmlpurifier/library/HTMLPurifier/Printer/HTMLDefinition.php

Indentation +263 added lines, -263 removed lines

@@ -3,269 +3,269 @@
 class HTMLPurifier_Printer_HTMLDefinition extends HTMLPurifier_Printer
 {
 
-    /**
-     * Instance of HTMLPurifier_HTMLDefinition, for easy access
-     */
-    protected $def;
-
-    public function render($config) {
-        $ret = '';
-        $this->config =& $config;
-
-        $this->def = $config->getHTMLDefinition();
-
-        $ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
-
-        $ret .= $this->renderDoctype();
-        $ret .= $this->renderEnvironment();
-        $ret .= $this->renderContentSets();
-        $ret .= $this->renderInfo();
-
-        $ret .= $this->end('div');
-
-        return $ret;
-    }
-
-    /**
-     * Renders the Doctype table
-     */
-    protected function renderDoctype() {
-        $doctype = $this->def->doctype;
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Doctype');
-        $ret .= $this->row('Name', $doctype->name);
-        $ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
-        $ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
-        $ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-
-    /**
-     * Renders environment table, which is miscellaneous info
-     */
-    protected function renderEnvironment() {
-        $def = $this->def;
-
-        $ret = '';
-
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Environment');
-
-        $ret .= $this->row('Parent of fragment', $def->info_parent);
-        $ret .= $this->renderChildren($def->info_parent_def->child);
-        $ret .= $this->row('Block wrap name', $def->info_block_wrapper);
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Global attributes');
-            $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Tag transforms');
-            $list = array();
-            foreach ($def->info_tag_transform as $old => $new) {
-                $new = $this->getClass($new, 'TagTransform_');
-                $list[] = "<$old> with $new";
-            }
-            $ret .= $this->element('td', $this->listify($list));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Pre-AttrTransform');
-            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->start('tr');
-            $ret .= $this->element('th', 'Post-AttrTransform');
-            $ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
-        $ret .= $this->end('tr');
-
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Content Sets table
-     */
-    protected function renderContentSets() {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Content Sets');
-        foreach ($this->def->info_content_sets as $name => $lookup) {
-            $ret .= $this->heavyHeader($name);
-            $ret .= $this->start('tr');
-            $ret .= $this->element('td', $this->listifyTagLookup($lookup));
-            $ret .= $this->end('tr');
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders the Elements ($info) table
-     */
-    protected function renderInfo() {
-        $ret = '';
-        $ret .= $this->start('table');
-        $ret .= $this->element('caption', 'Elements ($info)');
-        ksort($this->def->info);
-        $ret .= $this->heavyHeader('Allowed tags', 2);
-        $ret .= $this->start('tr');
-        $ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
-        $ret .= $this->end('tr');
-        foreach ($this->def->info as $name => $def) {
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
-            $ret .= $this->end('tr');
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Inline content');
-                $ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
-            $ret .= $this->end('tr');
-            if (!empty($def->excludes)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Excludes');
-                    $ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_pre)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Pre-AttrTransform');
-                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->attr_transform_post)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Post-AttrTransform');
-                    $ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
-                $ret .= $this->end('tr');
-            }
-            if (!empty($def->auto_close)) {
-                $ret .= $this->start('tr');
-                    $ret .= $this->element('th', 'Auto closed by');
-                    $ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
-                $ret .= $this->end('tr');
-            }
-            $ret .= $this->start('tr');
-                $ret .= $this->element('th', 'Allowed attributes');
-                $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
-            $ret .= $this->end('tr');
-
-            if (!empty($def->required_attr)) {
-                $ret .= $this->row('Required attributes', $this->listify($def->required_attr));
-            }
-
-            $ret .= $this->renderChildren($def->child);
-        }
-        $ret .= $this->end('table');
-        return $ret;
-    }
-
-    /**
-     * Renders a row describing the allowed children of an element
-     * @param $def HTMLPurifier_ChildDef of pertinent element
-     */
-    protected function renderChildren($def) {
-        $context = new HTMLPurifier_Context();
-        $ret = '';
-        $ret .= $this->start('tr');
-            $elements = array();
-            $attr = array();
-            if (isset($def->elements)) {
-                if ($def->type == 'strictblockquote') {
-                    $def->validateChildren(array(), $this->config, $context);
-                }
-                $elements = $def->elements;
-            }
-            if ($def->type == 'chameleon') {
-                $attr['rowspan'] = 2;
-            } elseif ($def->type == 'empty') {
-                $elements = array();
-            } elseif ($def->type == 'table') {
-                $elements = array_flip(array('col', 'caption', 'colgroup', 'thead',
-                    'tfoot', 'tbody', 'tr'));
-            }
-            $ret .= $this->element('th', 'Allowed children', $attr);
-
-            if ($def->type == 'chameleon') {
-
-                $ret .= $this->element('td',
-                    '<em>Block</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->block->elements)),0,0);
-                $ret .= $this->end('tr');
-                $ret .= $this->start('tr');
-                $ret .= $this->element('td',
-                    '<em>Inline</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
-
-            } elseif ($def->type == 'custom') {
-
-                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
-                    $def->dtd_regex);
-
-            } else {
-                $ret .= $this->element('td',
-                    '<em>'.ucfirst($def->type).'</em>: ' .
-                    $this->escape($this->listifyTagLookup($elements)),0,0);
-            }
-        $ret .= $this->end('tr');
-        return $ret;
-    }
-
-    /**
-     * Listifies a tag lookup table.
-     * @param $array Tag lookup array in form of array('tagname' => true)
-     */
-    protected function listifyTagLookup($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $discard) {
-            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
-            $list[] = $name;
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a list of objects by retrieving class names and internal state
-     * @param $array List of objects
-     * @todo Also add information about internal state
-     */
-    protected function listifyObjectList($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $discard => $obj) {
-            $list[] = $this->getClass($obj, 'AttrTransform_');
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Listifies a hash of attributes to AttrDef classes
-     * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
-     */
-    protected function listifyAttr($array) {
-        ksort($array);
-        $list = array();
-        foreach ($array as $name => $obj) {
-            if ($obj === false) continue;
-            $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
-        }
-        return $this->listify($list);
-    }
-
-    /**
-     * Creates a heavy header row
-     */
-    protected function heavyHeader($text, $num = 1) {
-        $ret = '';
-        $ret .= $this->start('tr');
-        $ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
-        $ret .= $this->end('tr');
-        return $ret;
-    }
+	/**
+	 * Instance of HTMLPurifier_HTMLDefinition, for easy access
+	 */
+	protected $def;
+
+	public function render($config) {
+		$ret = '';
+		$this->config =& $config;
+
+		$this->def = $config->getHTMLDefinition();
+
+		$ret .= $this->start('div', array('class' => 'HTMLPurifier_Printer'));
+
+		$ret .= $this->renderDoctype();
+		$ret .= $this->renderEnvironment();
+		$ret .= $this->renderContentSets();
+		$ret .= $this->renderInfo();
+
+		$ret .= $this->end('div');
+
+		return $ret;
+	}
+
+	/**
+	 * Renders the Doctype table
+	 */
+	protected function renderDoctype() {
+		$doctype = $this->def->doctype;
+		$ret = '';
+		$ret .= $this->start('table');
+		$ret .= $this->element('caption', 'Doctype');
+		$ret .= $this->row('Name', $doctype->name);
+		$ret .= $this->row('XML', $doctype->xml ? 'Yes' : 'No');
+		$ret .= $this->row('Default Modules', implode($doctype->modules, ', '));
+		$ret .= $this->row('Default Tidy Modules', implode($doctype->tidyModules, ', '));
+		$ret .= $this->end('table');
+		return $ret;
+	}
+
+
+	/**
+	 * Renders environment table, which is miscellaneous info
+	 */
+	protected function renderEnvironment() {
+		$def = $this->def;
+
+		$ret = '';
+
+		$ret .= $this->start('table');
+		$ret .= $this->element('caption', 'Environment');
+
+		$ret .= $this->row('Parent of fragment', $def->info_parent);
+		$ret .= $this->renderChildren($def->info_parent_def->child);
+		$ret .= $this->row('Block wrap name', $def->info_block_wrapper);
+
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', 'Global attributes');
+			$ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
+		$ret .= $this->end('tr');
+
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', 'Tag transforms');
+			$list = array();
+			foreach ($def->info_tag_transform as $old => $new) {
+				$new = $this->getClass($new, 'TagTransform_');
+				$list[] = "<$old> with $new";
+			}
+			$ret .= $this->element('td', $this->listify($list));
+		$ret .= $this->end('tr');
+
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', 'Pre-AttrTransform');
+			$ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_pre));
+		$ret .= $this->end('tr');
+
+		$ret .= $this->start('tr');
+			$ret .= $this->element('th', 'Post-AttrTransform');
+			$ret .= $this->element('td', $this->listifyObjectList($def->info_attr_transform_post));
+		$ret .= $this->end('tr');
+
+		$ret .= $this->end('table');
+		return $ret;
+	}
+
+	/**
+	 * Renders the Content Sets table
+	 */
+	protected function renderContentSets() {
+		$ret = '';
+		$ret .= $this->start('table');
+		$ret .= $this->element('caption', 'Content Sets');
+		foreach ($this->def->info_content_sets as $name => $lookup) {
+			$ret .= $this->heavyHeader($name);
+			$ret .= $this->start('tr');
+			$ret .= $this->element('td', $this->listifyTagLookup($lookup));
+			$ret .= $this->end('tr');
+		}
+		$ret .= $this->end('table');
+		return $ret;
+	}
+
+	/**
+	 * Renders the Elements ($info) table
+	 */
+	protected function renderInfo() {
+		$ret = '';
+		$ret .= $this->start('table');
+		$ret .= $this->element('caption', 'Elements ($info)');
+		ksort($this->def->info);
+		$ret .= $this->heavyHeader('Allowed tags', 2);
+		$ret .= $this->start('tr');
+		$ret .= $this->element('td', $this->listifyTagLookup($this->def->info), array('colspan' => 2));
+		$ret .= $this->end('tr');
+		foreach ($this->def->info as $name => $def) {
+			$ret .= $this->start('tr');
+				$ret .= $this->element('th', "<$name>", array('class'=>'heavy', 'colspan' => 2));
+			$ret .= $this->end('tr');
+			$ret .= $this->start('tr');
+				$ret .= $this->element('th', 'Inline content');
+				$ret .= $this->element('td', $def->descendants_are_inline ? 'Yes' : 'No');
+			$ret .= $this->end('tr');
+			if (!empty($def->excludes)) {
+				$ret .= $this->start('tr');
+					$ret .= $this->element('th', 'Excludes');
+					$ret .= $this->element('td', $this->listifyTagLookup($def->excludes));
+				$ret .= $this->end('tr');
+			}
+			if (!empty($def->attr_transform_pre)) {
+				$ret .= $this->start('tr');
+					$ret .= $this->element('th', 'Pre-AttrTransform');
+					$ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_pre));
+				$ret .= $this->end('tr');
+			}
+			if (!empty($def->attr_transform_post)) {
+				$ret .= $this->start('tr');
+					$ret .= $this->element('th', 'Post-AttrTransform');
+					$ret .= $this->element('td', $this->listifyObjectList($def->attr_transform_post));
+				$ret .= $this->end('tr');
+			}
+			if (!empty($def->auto_close)) {
+				$ret .= $this->start('tr');
+					$ret .= $this->element('th', 'Auto closed by');
+					$ret .= $this->element('td', $this->listifyTagLookup($def->auto_close));
+				$ret .= $this->end('tr');
+			}
+			$ret .= $this->start('tr');
+				$ret .= $this->element('th', 'Allowed attributes');
+				$ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
+			$ret .= $this->end('tr');
+
+			if (!empty($def->required_attr)) {
+				$ret .= $this->row('Required attributes', $this->listify($def->required_attr));
+			}
+
+			$ret .= $this->renderChildren($def->child);
+		}
+		$ret .= $this->end('table');
+		return $ret;
+	}
+
+	/**
+	 * Renders a row describing the allowed children of an element
+	 * @param $def HTMLPurifier_ChildDef of pertinent element
+	 */
+	protected function renderChildren($def) {
+		$context = new HTMLPurifier_Context();
+		$ret = '';
+		$ret .= $this->start('tr');
+			$elements = array();
+			$attr = array();
+			if (isset($def->elements)) {
+				if ($def->type == 'strictblockquote') {
+					$def->validateChildren(array(), $this->config, $context);
+				}
+				$elements = $def->elements;
+			}
+			if ($def->type == 'chameleon') {
+				$attr['rowspan'] = 2;
+			} elseif ($def->type == 'empty') {
+				$elements = array();
+			} elseif ($def->type == 'table') {
+				$elements = array_flip(array('col', 'caption', 'colgroup', 'thead',
+					'tfoot', 'tbody', 'tr'));
+			}
+			$ret .= $this->element('th', 'Allowed children', $attr);
+
+			if ($def->type == 'chameleon') {
+
+				$ret .= $this->element('td',
+					'<em>Block</em>: ' .
+					$this->escape($this->listifyTagLookup($def->block->elements)),0,0);
+				$ret .= $this->end('tr');
+				$ret .= $this->start('tr');
+				$ret .= $this->element('td',
+					'<em>Inline</em>: ' .
+					$this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
+
+			} elseif ($def->type == 'custom') {
+
+				$ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
+					$def->dtd_regex);
+
+			} else {
+				$ret .= $this->element('td',
+					'<em>'.ucfirst($def->type).'</em>: ' .
+					$this->escape($this->listifyTagLookup($elements)),0,0);
+			}
+		$ret .= $this->end('tr');
+		return $ret;
+	}
+
+	/**
+	 * Listifies a tag lookup table.
+	 * @param $array Tag lookup array in form of array('tagname' => true)
+	 */
+	protected function listifyTagLookup($array) {
+		ksort($array);
+		$list = array();
+		foreach ($array as $name => $discard) {
+			if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
+			$list[] = $name;
+		}
+		return $this->listify($list);
+	}
+
+	/**
+	 * Listifies a list of objects by retrieving class names and internal state
+	 * @param $array List of objects
+	 * @todo Also add information about internal state
+	 */
+	protected function listifyObjectList($array) {
+		ksort($array);
+		$list = array();
+		foreach ($array as $discard => $obj) {
+			$list[] = $this->getClass($obj, 'AttrTransform_');
+		}
+		return $this->listify($list);
+	}
+
+	/**
+	 * Listifies a hash of attributes to AttrDef classes
+	 * @param $array Array hash in form of array('attrname' => HTMLPurifier_AttrDef)
+	 */
+	protected function listifyAttr($array) {
+		ksort($array);
+		$list = array();
+		foreach ($array as $name => $obj) {
+			if ($obj === false) continue;
+			$list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
+		}
+		return $this->listify($list);
+	}
+
+	/**
+	 * Creates a heavy header row
+	 */
+	protected function heavyHeader($text, $num = 1) {
+		$ret = '';
+		$ret .= $this->start('tr');
+		$ret .= $this->element('th', $text, array('colspan' => $num, 'class' => 'heavy'));
+		$ret .= $this->end('tr');
+		return $ret;
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -222,7 +222,9 @@ 
         ksort($array);
         $list = array();
         foreach ($array as $name => $discard) {
-            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) continue;
+            if ($name !== '#PCDATA' && !isset($this->def->info[$name])) {
+            	continue;
+            }
             $list[] = $name;
         }
         return $this->listify($list);
@@ -250,7 +252,9 @@ 
         ksort($array);
         $list = array();
         foreach ($array as $name => $obj) {
-            if ($obj === false) continue;
+            if ($obj === false) {
+            	continue;
+            }
             $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
         }
         return $this->listify($list);

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
 
     public function render($config) {
         $ret = '';
-        $this->config =& $config;
+        $this->config = & $config;
 
         $this->def = $config->getHTMLDefinition();
 
@@ -60,7 +60,7 @@ 
 
         $ret .= $this->start('tr');
             $ret .= $this->element('th', 'Global attributes');
-            $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr),0,0);
+            $ret .= $this->element('td', $this->listifyAttr($def->info_global_attr), 0, 0);
         $ret .= $this->end('tr');
 
         $ret .= $this->start('tr');
@@ -150,7 +150,7 @@ 
             }
             $ret .= $this->start('tr');
                 $ret .= $this->element('th', 'Allowed attributes');
-                $ret .= $this->element('td',$this->listifyAttr($def->attr), array(), 0);
+                $ret .= $this->element('td', $this->listifyAttr($def->attr), array(), 0);
             $ret .= $this->end('tr');
 
             if (!empty($def->required_attr)) {
@@ -192,23 +192,23 @@ 
             if ($def->type == 'chameleon') {
 
                 $ret .= $this->element('td',
-                    '<em>Block</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->block->elements)),0,0);
+                    '<em>Block</em>: '.
+                    $this->escape($this->listifyTagLookup($def->block->elements)), 0, 0);
                 $ret .= $this->end('tr');
                 $ret .= $this->start('tr');
                 $ret .= $this->element('td',
-                    '<em>Inline</em>: ' .
-                    $this->escape($this->listifyTagLookup($def->inline->elements)),0,0);
+                    '<em>Inline</em>: '.
+                    $this->escape($this->listifyTagLookup($def->inline->elements)), 0, 0);
 
             } elseif ($def->type == 'custom') {
 
-                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: ' .
+                $ret .= $this->element('td', '<em>'.ucfirst($def->type).'</em>: '.
                     $def->dtd_regex);
 
             } else {
                 $ret .= $this->element('td',
-                    '<em>'.ucfirst($def->type).'</em>: ' .
-                    $this->escape($this->listifyTagLookup($elements)),0,0);
+                    '<em>'.ucfirst($def->type).'</em>: '.
+                    $this->escape($this->listifyTagLookup($elements)), 0, 0);
             }
         $ret .= $this->end('tr');
         return $ret;
@@ -251,7 +251,7 @@ 
         $list = array();
         foreach ($array as $name => $obj) {
             if ($obj === false) continue;
-            $list[] = "$name&nbsp;=&nbsp;<i>" . $this->getClass($obj, 'AttrDef_') . '</i>';
+            $list[] = "$name&nbsp;=&nbsp;<i>".$this->getClass($obj, 'AttrDef_').'</i>';
         }
         return $this->listify($list);
     }

classes/security/htmlpurifier/library/HTMLPurifier/PropertyList.php

Indentation +66 added lines, -66 removed lines

@@ -5,82 +5,82 @@
  */
 class HTMLPurifier_PropertyList
 {
-    /**
-     * Internal data-structure for properties
-     */
-    protected $data = array();
+	/**
+	 * Internal data-structure for properties
+	 */
+	protected $data = array();
 
-    /**
-     * Parent plist
-     */
-    protected $parent;
+	/**
+	 * Parent plist
+	 */
+	protected $parent;
 
-    protected $cache;
+	protected $cache;
 
-    public function __construct($parent = null) {
-        $this->parent = $parent;
-    }
+	public function __construct($parent = null) {
+		$this->parent = $parent;
+	}
 
-    /**
-     * Recursively retrieves the value for a key
-     */
-    public function get($name) {
-        if ($this->has($name)) return $this->data[$name];
-        // possible performance bottleneck, convert to iterative if necessary
-        if ($this->parent) return $this->parent->get($name);
-        throw new HTMLPurifier_Exception("Key '$name' not found");
-    }
+	/**
+	 * Recursively retrieves the value for a key
+	 */
+	public function get($name) {
+		if ($this->has($name)) return $this->data[$name];
+		// possible performance bottleneck, convert to iterative if necessary
+		if ($this->parent) return $this->parent->get($name);
+		throw new HTMLPurifier_Exception("Key '$name' not found");
+	}
 
-    /**
-     * Sets the value of a key, for this plist
-     */
-    public function set($name, $value) {
-        $this->data[$name] = $value;
-    }
+	/**
+	 * Sets the value of a key, for this plist
+	 */
+	public function set($name, $value) {
+		$this->data[$name] = $value;
+	}
 
-    /**
-     * Returns true if a given key exists
-     */
-    public function has($name) {
-        return array_key_exists($name, $this->data);
-    }
+	/**
+	 * Returns true if a given key exists
+	 */
+	public function has($name) {
+		return array_key_exists($name, $this->data);
+	}
 
-    /**
-     * Resets a value to the value of it's parent, usually the default. If
-     * no value is specified, the entire plist is reset.
-     */
-    public function reset($name = null) {
-        if ($name == null) $this->data = array();
-        else unset($this->data[$name]);
-    }
+	/**
+	 * Resets a value to the value of it's parent, usually the default. If
+	 * no value is specified, the entire plist is reset.
+	 */
+	public function reset($name = null) {
+		if ($name == null) $this->data = array();
+		else unset($this->data[$name]);
+	}
 
-    /**
-     * Squashes this property list and all of its property lists into a single
-     * array, and returns the array. This value is cached by default.
-     * @param $force If true, ignores the cache and regenerates the array.
-     */
-    public function squash($force = false) {
-        if ($this->cache !== null && !$force) return $this->cache;
-        if ($this->parent) {
-            return $this->cache = array_merge($this->parent->squash($force), $this->data);
-        } else {
-            return $this->cache = $this->data;
-        }
-    }
+	/**
+	 * Squashes this property list and all of its property lists into a single
+	 * array, and returns the array. This value is cached by default.
+	 * @param $force If true, ignores the cache and regenerates the array.
+	 */
+	public function squash($force = false) {
+		if ($this->cache !== null && !$force) return $this->cache;
+		if ($this->parent) {
+			return $this->cache = array_merge($this->parent->squash($force), $this->data);
+		} else {
+			return $this->cache = $this->data;
+		}
+	}
 
-    /**
-     * Returns the parent plist.
-     */
-    public function getParent() {
-        return $this->parent;
-    }
+	/**
+	 * Returns the parent plist.
+	 */
+	public function getParent() {
+		return $this->parent;
+	}
 
-    /**
-     * Sets the parent plist.
-     */
-    public function setParent($plist) {
-        $this->parent = $plist;
-    }
+	/**
+	 * Sets the parent plist.
+	 */
+	public function setParent($plist) {
+		$this->parent = $plist;
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +14 added lines, -5 removed lines

@@ -25,9 +25,13 @@ 
      * Recursively retrieves the value for a key
      */
     public function get($name) {
-        if ($this->has($name)) return $this->data[$name];
+        if ($this->has($name)) {
+        	return $this->data[$name];
+        }
         // possible performance bottleneck, convert to iterative if necessary
-        if ($this->parent) return $this->parent->get($name);
+        if ($this->parent) {
+        	return $this->parent->get($name);
+        }
         throw new HTMLPurifier_Exception("Key '$name' not found");
     }
 
@@ -50,8 +54,11 @@ 
      * no value is specified, the entire plist is reset.
      */
     public function reset($name = null) {
-        if ($name == null) $this->data = array();
-        else unset($this->data[$name]);
+        if ($name == null) {
+        	$this->data = array();
+        } else {
+        	unset($this->data[$name]);
+        }
     }
 
     /**
@@ -60,7 +67,9 @@ 
      * @param $force If true, ignores the cache and regenerates the array.
      */
     public function squash($force = false) {
-        if ($this->cache !== null && !$force) return $this->cache;
+        if ($this->cache !== null && !$force) {
+        	return $this->cache;
+        }
         if ($this->parent) {
             return $this->cache = array_merge($this->parent->squash($force), $this->data);
         } else {

classes/security/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php

Indentation +18 added lines, -18 removed lines

@@ -6,26 +6,26 @@
 class HTMLPurifier_PropertyListIterator extends FilterIterator
 {
 
-    protected $l;
-    protected $filter;
+	protected $l;
+	protected $filter;
 
-    /**
-     * @param $data Array of data to iterate over
-     * @param $filter Optional prefix to only allow values of
-     */
-    public function __construct(Iterator $iterator, $filter = null) {
-        parent::__construct($iterator);
-        $this->l = strlen($filter);
-        $this->filter = $filter;
-    }
+	/**
+	 * @param $data Array of data to iterate over
+	 * @param $filter Optional prefix to only allow values of
+	 */
+	public function __construct(Iterator $iterator, $filter = null) {
+		parent::__construct($iterator);
+		$this->l = strlen($filter);
+		$this->filter = $filter;
+	}
 
-    public function accept() {
-        $key = $this->getInnerIterator()->key();
-        if( strncmp($key, $this->filter, $this->l) !== 0 ) {
-            return false;
-        }
-        return true;
-    }
+	public function accept() {
+		$key = $this->getInnerIterator()->key();
+		if( strncmp($key, $this->filter, $this->l) !== 0 ) {
+			return false;
+		}
+		return true;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     public function accept() {
         $key = $this->getInnerIterator()->key();
-        if( strncmp($key, $this->filter, $this->l) !== 0 ) {
+        if (strncmp($key, $this->filter, $this->l) !== 0) {
             return false;
         }
         return true;

classes/security/htmlpurifier/library/HTMLPurifier/Strategy.php

Indentation +8 added lines, -8 removed lines

@@ -12,14 +12,14 @@
 abstract class HTMLPurifier_Strategy
 {
 
-    /**
-     * Executes the strategy on the tokens.
-     *
-     * @param $tokens Array of HTMLPurifier_Token objects to be operated on.
-     * @param $config Configuration options
-     * @returns Processed array of token objects.
-     */
-    abstract public function execute($tokens, $config, $context);
+	/**
+	 * Executes the strategy on the tokens.
+	 *
+	 * @param $tokens Array of HTMLPurifier_Token objects to be operated on.
+	 * @param $config Configuration options
+	 * @returns Processed array of token objects.
+	 */
+	abstract public function execute($tokens, $config, $context);
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Strategy/Composite.php

Indentation +10 added lines, -10 removed lines

@@ -6,17 +6,17 @@
 abstract class HTMLPurifier_Strategy_Composite extends HTMLPurifier_Strategy
 {
 
-    /**
-     * List of strategies to run tokens through.
-     */
-    protected $strategies = array();
+	/**
+	 * List of strategies to run tokens through.
+	 */
+	protected $strategies = array();
 
-    public function execute($tokens, $config, $context) {
-        foreach ($this->strategies as $strategy) {
-            $tokens = $strategy->execute($tokens, $config, $context);
-        }
-        return $tokens;
-    }
+	public function execute($tokens, $config, $context) {
+		foreach ($this->strategies as $strategy) {
+			$tokens = $strategy->execute($tokens, $config, $context);
+		}
+		return $tokens;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Strategy/Core.php

Indentation +6 added lines, -6 removed lines

@@ -6,12 +6,12 @@
 class HTMLPurifier_Strategy_Core extends HTMLPurifier_Strategy_Composite
 {
 
-    public function __construct() {
-        $this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
-        $this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
-        $this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
-        $this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
-    }
+	public function __construct() {
+		$this->strategies[] = new HTMLPurifier_Strategy_RemoveForeignElements();
+		$this->strategies[] = new HTMLPurifier_Strategy_MakeWellFormed();
+		$this->strategies[] = new HTMLPurifier_Strategy_FixNesting();
+		$this->strategies[] = new HTMLPurifier_Strategy_ValidateAttributes();
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/Strategy/FixNesting.php

Indentation +291 added lines, -291 removed lines

@@ -31,297 +31,297 @@
 class HTMLPurifier_Strategy_FixNesting extends HTMLPurifier_Strategy
 {
 
-    public function execute($tokens, $config, $context) {
-        //####################################################################//
-        // Pre-processing
-
-        // get a copy of the HTML definition
-        $definition = $config->getHTMLDefinition();
-
-        // insert implicit "parent" node, will be removed at end.
-        // DEFINITION CALL
-        $parent_name = $definition->info_parent;
-        array_unshift($tokens, new HTMLPurifier_Token_Start($parent_name));
-        $tokens[] = new HTMLPurifier_Token_End($parent_name);
-
-        // setup the context variable 'IsInline', for chameleon processing
-        // is 'false' when we are not inline, 'true' when it must always
-        // be inline, and an integer when it is inline for a certain
-        // branch of the document tree
-        $is_inline = $definition->info_parent_def->descendants_are_inline;
-        $context->register('IsInline', $is_inline);
-
-        // setup error collector
-        $e =& $context->get('ErrorCollector', true);
-
-        //####################################################################//
-        // Loop initialization
-
-        // stack that contains the indexes of all parents,
-        // $stack[count($stack)-1] being the current parent
-        $stack = array();
-
-        // stack that contains all elements that are excluded
-        // it is organized by parent elements, similar to $stack,
-        // but it is only populated when an element with exclusions is
-        // processed, i.e. there won't be empty exclusions.
-        $exclude_stack = array();
-
-        // variable that contains the start token while we are processing
-        // nodes. This enables error reporting to do its job
-        $start_token = false;
-        $context->register('CurrentToken', $start_token);
-
-        //####################################################################//
-        // Loop
-
-        // iterate through all start nodes. Determining the start node
-        // is complicated so it has been omitted from the loop construct
-        for ($i = 0, $size = count($tokens) ; $i < $size; ) {
-
-            //################################################################//
-            // Gather information on children
-
-            // child token accumulator
-            $child_tokens = array();
-
-            // scroll to the end of this node, report number, and collect
-            // all children
-            for ($j = $i, $depth = 0; ; $j++) {
-                if ($tokens[$j] instanceof HTMLPurifier_Token_Start) {
-                    $depth++;
-                    // skip token assignment on first iteration, this is the
-                    // token we currently are on
-                    if ($depth == 1) continue;
-                } elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
-                    $depth--;
-                    // skip token assignment on last iteration, this is the
-                    // end token of the token we're currently on
-                    if ($depth == 0) break;
-                }
-                $child_tokens[] = $tokens[$j];
-            }
-
-            // $i is index of start token
-            // $j is index of end token
-
-            $start_token = $tokens[$i]; // to make token available via CurrentToken
-
-            //################################################################//
-            // Gather information on parent
-
-            // calculate parent information
-            if ($count = count($stack)) {
-                $parent_index = $stack[$count-1];
-                $parent_name  = $tokens[$parent_index]->name;
-                if ($parent_index == 0) {
-                    $parent_def   = $definition->info_parent_def;
-                } else {
-                    $parent_def   = $definition->info[$parent_name];
-                }
-            } else {
-                // processing as if the parent were the "root" node
-                // unknown info, it won't be used anyway, in the future,
-                // we may want to enforce one element only (this is
-                // necessary for HTML Purifier to clean entire documents
-                $parent_index = $parent_name = $parent_def = null;
-            }
-
-            // calculate context
-            if ($is_inline === false) {
-                // check if conditions make it inline
-                if (!empty($parent_def) && $parent_def->descendants_are_inline) {
-                    $is_inline = $count - 1;
-                }
-            } else {
-                // check if we're out of inline
-                if ($count === $is_inline) {
-                    $is_inline = false;
-                }
-            }
-
-            //################################################################//
-            // Determine whether element is explicitly excluded SGML-style
-
-            // determine whether or not element is excluded by checking all
-            // parent exclusions. The array should not be very large, two
-            // elements at most.
-            $excluded = false;
-            if (!empty($exclude_stack)) {
-                foreach ($exclude_stack as $lookup) {
-                    if (isset($lookup[$tokens[$i]->name])) {
-                        $excluded = true;
-                        // no need to continue processing
-                        break;
-                    }
-                }
-            }
-
-            //################################################################//
-            // Perform child validation
-
-            if ($excluded) {
-                // there is an exclusion, remove the entire node
-                $result = false;
-                $excludes = array(); // not used, but good to initialize anyway
-            } else {
-                // DEFINITION CALL
-                if ($i === 0) {
-                    // special processing for the first node
-                    $def = $definition->info_parent_def;
-                } else {
-                    $def = $definition->info[$tokens[$i]->name];
-
-                }
-
-                if (!empty($def->child)) {
-                    // have DTD child def validate children
-                    $result = $def->child->validateChildren(
-                        $child_tokens, $config, $context);
-                } else {
-                    // weird, no child definition, get rid of everything
-                    $result = false;
-                }
-
-                // determine whether or not this element has any exclusions
-                $excludes = $def->excludes;
-            }
-
-            // $result is now a bool or array
-
-            //################################################################//
-            // Process result by interpreting $result
-
-            if ($result === true || $child_tokens === $result) {
-                // leave the node as is
-
-                // register start token as a parental node start
-                $stack[] = $i;
-
-                // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
-
-                // move cursor to next possible start node
-                $i++;
-
-            } elseif($result === false) {
-                // remove entire node
-
-                if ($e) {
-                    if ($excluded) {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
-                    } else {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
-                    }
-                }
-
-                // calculate length of inner tokens and current tokens
-                $length = $j - $i + 1;
-
-                // perform removal
-                array_splice($tokens, $i, $length);
-
-                // update size
-                $size -= $length;
-
-                // there is no start token to register,
-                // current node is now the next possible start node
-                // unless it turns out that we need to do a double-check
-
-                // this is a rought heuristic that covers 100% of HTML's
-                // cases and 99% of all other cases. A child definition
-                // that would be tricked by this would be something like:
-                // ( | a b c) where it's all or nothing. Fortunately,
-                // our current implementation claims that that case would
-                // not allow empty, even if it did
-                if (!$parent_def->child->allow_empty) {
-                    // we need to do a double-check
-                    $i = $parent_index;
-                    array_pop($stack);
-                }
-
-                // PROJECTED OPTIMIZATION: Process all children elements before
-                // reprocessing parent node.
-
-            } else {
-                // replace node with $result
-
-                // calculate length of inner tokens
-                $length = $j - $i - 1;
-
-                if ($e) {
-                    if (empty($result) && $length) {
-                        $e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
-                    } else {
-                        $e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
-                    }
-                }
-
-                // perform replacement
-                array_splice($tokens, $i + 1, $length, $result);
-
-                // update size
-                $size -= $length;
-                $size += count($result);
-
-                // register start token as a parental node start
-                $stack[] = $i;
-
-                // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
-
-                // move cursor to next possible start node
-                $i++;
-
-            }
-
-            //################################################################//
-            // Scroll to next start node
-
-            // We assume, at this point, that $i is the index of the token
-            // that is the first possible new start point for a node.
-
-            // Test if the token indeed is a start tag, if not, move forward
-            // and test again.
-            $size = count($tokens);
-            while ($i < $size and !$tokens[$i] instanceof HTMLPurifier_Token_Start) {
-                if ($tokens[$i] instanceof HTMLPurifier_Token_End) {
-                    // pop a token index off the stack if we ended a node
-                    array_pop($stack);
-                    // pop an exclusion lookup off exclusion stack if
-                    // we ended node and that node had exclusions
-                    if ($i == 0 || $i == $size - 1) {
-                        // use specialized var if it's the super-parent
-                        $s_excludes = $definition->info_parent_def->excludes;
-                    } else {
-                        $s_excludes = $definition->info[$tokens[$i]->name]->excludes;
-                    }
-                    if ($s_excludes) {
-                        array_pop($exclude_stack);
-                    }
-                }
-                $i++;
-            }
-
-        }
-
-        //####################################################################//
-        // Post-processing
-
-        // remove implicit parent tokens at the beginning and end
-        array_shift($tokens);
-        array_pop($tokens);
-
-        // remove context variables
-        $context->destroy('IsInline');
-        $context->destroy('CurrentToken');
-
-        //####################################################################//
-        // Return
-
-        return $tokens;
-
-    }
+	public function execute($tokens, $config, $context) {
+		//####################################################################//
+		// Pre-processing
+
+		// get a copy of the HTML definition
+		$definition = $config->getHTMLDefinition();
+
+		// insert implicit "parent" node, will be removed at end.
+		// DEFINITION CALL
+		$parent_name = $definition->info_parent;
+		array_unshift($tokens, new HTMLPurifier_Token_Start($parent_name));
+		$tokens[] = new HTMLPurifier_Token_End($parent_name);
+
+		// setup the context variable 'IsInline', for chameleon processing
+		// is 'false' when we are not inline, 'true' when it must always
+		// be inline, and an integer when it is inline for a certain
+		// branch of the document tree
+		$is_inline = $definition->info_parent_def->descendants_are_inline;
+		$context->register('IsInline', $is_inline);
+
+		// setup error collector
+		$e =& $context->get('ErrorCollector', true);
+
+		//####################################################################//
+		// Loop initialization
+
+		// stack that contains the indexes of all parents,
+		// $stack[count($stack)-1] being the current parent
+		$stack = array();
+
+		// stack that contains all elements that are excluded
+		// it is organized by parent elements, similar to $stack,
+		// but it is only populated when an element with exclusions is
+		// processed, i.e. there won't be empty exclusions.
+		$exclude_stack = array();
+
+		// variable that contains the start token while we are processing
+		// nodes. This enables error reporting to do its job
+		$start_token = false;
+		$context->register('CurrentToken', $start_token);
+
+		//####################################################################//
+		// Loop
+
+		// iterate through all start nodes. Determining the start node
+		// is complicated so it has been omitted from the loop construct
+		for ($i = 0, $size = count($tokens) ; $i < $size; ) {
+
+			//################################################################//
+			// Gather information on children
+
+			// child token accumulator
+			$child_tokens = array();
+
+			// scroll to the end of this node, report number, and collect
+			// all children
+			for ($j = $i, $depth = 0; ; $j++) {
+				if ($tokens[$j] instanceof HTMLPurifier_Token_Start) {
+					$depth++;
+					// skip token assignment on first iteration, this is the
+					// token we currently are on
+					if ($depth == 1) continue;
+				} elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
+					$depth--;
+					// skip token assignment on last iteration, this is the
+					// end token of the token we're currently on
+					if ($depth == 0) break;
+				}
+				$child_tokens[] = $tokens[$j];
+			}
+
+			// $i is index of start token
+			// $j is index of end token
+
+			$start_token = $tokens[$i]; // to make token available via CurrentToken
+
+			//################################################################//
+			// Gather information on parent
+
+			// calculate parent information
+			if ($count = count($stack)) {
+				$parent_index = $stack[$count-1];
+				$parent_name  = $tokens[$parent_index]->name;
+				if ($parent_index == 0) {
+					$parent_def   = $definition->info_parent_def;
+				} else {
+					$parent_def   = $definition->info[$parent_name];
+				}
+			} else {
+				// processing as if the parent were the "root" node
+				// unknown info, it won't be used anyway, in the future,
+				// we may want to enforce one element only (this is
+				// necessary for HTML Purifier to clean entire documents
+				$parent_index = $parent_name = $parent_def = null;
+			}
+
+			// calculate context
+			if ($is_inline === false) {
+				// check if conditions make it inline
+				if (!empty($parent_def) && $parent_def->descendants_are_inline) {
+					$is_inline = $count - 1;
+				}
+			} else {
+				// check if we're out of inline
+				if ($count === $is_inline) {
+					$is_inline = false;
+				}
+			}
+
+			//################################################################//
+			// Determine whether element is explicitly excluded SGML-style
+
+			// determine whether or not element is excluded by checking all
+			// parent exclusions. The array should not be very large, two
+			// elements at most.
+			$excluded = false;
+			if (!empty($exclude_stack)) {
+				foreach ($exclude_stack as $lookup) {
+					if (isset($lookup[$tokens[$i]->name])) {
+						$excluded = true;
+						// no need to continue processing
+						break;
+					}
+				}
+			}
+
+			//################################################################//
+			// Perform child validation
+
+			if ($excluded) {
+				// there is an exclusion, remove the entire node
+				$result = false;
+				$excludes = array(); // not used, but good to initialize anyway
+			} else {
+				// DEFINITION CALL
+				if ($i === 0) {
+					// special processing for the first node
+					$def = $definition->info_parent_def;
+				} else {
+					$def = $definition->info[$tokens[$i]->name];
+
+				}
+
+				if (!empty($def->child)) {
+					// have DTD child def validate children
+					$result = $def->child->validateChildren(
+						$child_tokens, $config, $context);
+				} else {
+					// weird, no child definition, get rid of everything
+					$result = false;
+				}
+
+				// determine whether or not this element has any exclusions
+				$excludes = $def->excludes;
+			}
+
+			// $result is now a bool or array
+
+			//################################################################//
+			// Process result by interpreting $result
+
+			if ($result === true || $child_tokens === $result) {
+				// leave the node as is
+
+				// register start token as a parental node start
+				$stack[] = $i;
+
+				// register exclusions if there are any
+				if (!empty($excludes)) $exclude_stack[] = $excludes;
+
+				// move cursor to next possible start node
+				$i++;
+
+			} elseif($result === false) {
+				// remove entire node
+
+				if ($e) {
+					if ($excluded) {
+						$e->send(E_ERROR, 'Strategy_FixNesting: Node excluded');
+					} else {
+						$e->send(E_ERROR, 'Strategy_FixNesting: Node removed');
+					}
+				}
+
+				// calculate length of inner tokens and current tokens
+				$length = $j - $i + 1;
+
+				// perform removal
+				array_splice($tokens, $i, $length);
+
+				// update size
+				$size -= $length;
+
+				// there is no start token to register,
+				// current node is now the next possible start node
+				// unless it turns out that we need to do a double-check
+
+				// this is a rought heuristic that covers 100% of HTML's
+				// cases and 99% of all other cases. A child definition
+				// that would be tricked by this would be something like:
+				// ( | a b c) where it's all or nothing. Fortunately,
+				// our current implementation claims that that case would
+				// not allow empty, even if it did
+				if (!$parent_def->child->allow_empty) {
+					// we need to do a double-check
+					$i = $parent_index;
+					array_pop($stack);
+				}
+
+				// PROJECTED OPTIMIZATION: Process all children elements before
+				// reprocessing parent node.
+
+			} else {
+				// replace node with $result
+
+				// calculate length of inner tokens
+				$length = $j - $i - 1;
+
+				if ($e) {
+					if (empty($result) && $length) {
+						$e->send(E_ERROR, 'Strategy_FixNesting: Node contents removed');
+					} else {
+						$e->send(E_WARNING, 'Strategy_FixNesting: Node reorganized');
+					}
+				}
+
+				// perform replacement
+				array_splice($tokens, $i + 1, $length, $result);
+
+				// update size
+				$size -= $length;
+				$size += count($result);
+
+				// register start token as a parental node start
+				$stack[] = $i;
+
+				// register exclusions if there are any
+				if (!empty($excludes)) $exclude_stack[] = $excludes;
+
+				// move cursor to next possible start node
+				$i++;
+
+			}
+
+			//################################################################//
+			// Scroll to next start node
+
+			// We assume, at this point, that $i is the index of the token
+			// that is the first possible new start point for a node.
+
+			// Test if the token indeed is a start tag, if not, move forward
+			// and test again.
+			$size = count($tokens);
+			while ($i < $size and !$tokens[$i] instanceof HTMLPurifier_Token_Start) {
+				if ($tokens[$i] instanceof HTMLPurifier_Token_End) {
+					// pop a token index off the stack if we ended a node
+					array_pop($stack);
+					// pop an exclusion lookup off exclusion stack if
+					// we ended node and that node had exclusions
+					if ($i == 0 || $i == $size - 1) {
+						// use specialized var if it's the super-parent
+						$s_excludes = $definition->info_parent_def->excludes;
+					} else {
+						$s_excludes = $definition->info[$tokens[$i]->name]->excludes;
+					}
+					if ($s_excludes) {
+						array_pop($exclude_stack);
+					}
+				}
+				$i++;
+			}
+
+		}
+
+		//####################################################################//
+		// Post-processing
+
+		// remove implicit parent tokens at the beginning and end
+		array_shift($tokens);
+		array_pop($tokens);
+
+		// remove context variables
+		$context->destroy('IsInline');
+		$context->destroy('CurrentToken');
+
+		//####################################################################//
+		// Return
+
+		return $tokens;
+
+	}
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -52,7 +52,7 @@ 
         $context->register('IsInline', $is_inline);
 
         // setup error collector
-        $e =& $context->get('ErrorCollector', true);
+        $e = & $context->get('ErrorCollector', true);
 
         //####################################################################//
         // Loop initialization
@@ -77,7 +77,7 @@ 
 
         // iterate through all start nodes. Determining the start node
         // is complicated so it has been omitted from the loop construct
-        for ($i = 0, $size = count($tokens) ; $i < $size; ) {
+        for ($i = 0, $size = count($tokens); $i < $size;) {
 
             //################################################################//
             // Gather information on children
@@ -112,7 +112,7 @@ 
 
             // calculate parent information
             if ($count = count($stack)) {
-                $parent_index = $stack[$count-1];
+                $parent_index = $stack[$count - 1];
                 $parent_name  = $tokens[$parent_index]->name;
                 if ($parent_index == 0) {
                     $parent_def   = $definition->info_parent_def;
@@ -204,7 +204,7 @@ 
                 // move cursor to next possible start node
                 $i++;
 
-            } elseif($result === false) {
+            } elseif ($result === false) {
                 // remove entire node
 
                 if ($e) {

Braces +12 added lines, -4 removed lines

@@ -92,12 +92,16 @@ 
                     $depth++;
                     // skip token assignment on first iteration, this is the
                     // token we currently are on
-                    if ($depth == 1) continue;
+                    if ($depth == 1) {
+                    	continue;
+                    }
                 } elseif ($tokens[$j] instanceof HTMLPurifier_Token_End) {
                     $depth--;
                     // skip token assignment on last iteration, this is the
                     // end token of the token we're currently on
-                    if ($depth == 0) break;
+                    if ($depth == 0) {
+                    	break;
+                    }
                 }
                 $child_tokens[] = $tokens[$j];
             }
@@ -199,7 +203,9 @@ 
                 $stack[] = $i;
 
                 // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
+                if (!empty($excludes)) {
+                	$exclude_stack[] = $excludes;
+                }
 
                 // move cursor to next possible start node
                 $i++;
@@ -268,7 +274,9 @@ 
                 $stack[] = $i;
 
                 // register exclusions if there are any
-                if (!empty($excludes)) $exclude_stack[] = $excludes;
+                if (!empty($excludes)) {
+                	$exclude_stack[] = $excludes;
+                }
 
                 // move cursor to next possible start node
                 $i++;