xpressengine / xe-core

classes/security/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php

Indentation +191 added lines, -191 removed lines

@@ -31,197 +31,197 @@
  */
 class HTMLPurifier_ChildDef_Table extends HTMLPurifier_ChildDef
 {
-    public $allow_empty = false;
-    public $type = 'table';
-    public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
-        'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
-    public function __construct() {}
-    public function validateChildren($tokens_of_children, $config, $context) {
-        if (empty($tokens_of_children)) return false;
-
-        // this ensures that the loop gets run one last time before closing
-        // up. It's a little bit of a hack, but it works! Just make sure you
-        // get rid of the token later.
-        $tokens_of_children[] = false;
-
-        // only one of these elements is allowed in a table
-        $caption = false;
-        $thead   = false;
-        $tfoot   = false;
-
-        // as many of these as you want
-        $cols    = array();
-        $content = array();
-
-        $nesting = 0; // current depth so we can determine nodes
-        $is_collecting = false; // are we globbing together tokens to package
-                                // into one of the collectors?
-        $collection = array(); // collected nodes
-        $tag_index = 0; // the first node might be whitespace,
-                            // so this tells us where the start tag is
-        $tbody_mode = false; // if true, then we need to wrap any stray
-                             // <tr>s with a <tbody>.
-
-        foreach ($tokens_of_children as $token) {
-            $is_child = ($nesting == 0);
-
-            if ($token === false) {
-                // terminating sequence started
-            } elseif ($token instanceof HTMLPurifier_Token_Start) {
-                $nesting++;
-            } elseif ($token instanceof HTMLPurifier_Token_End) {
-                $nesting--;
-            }
-
-            // handle node collection
-            if ($is_collecting) {
-                if ($is_child) {
-                    // okay, let's stash the tokens away
-                    // first token tells us the type of the collection
-                    switch ($collection[$tag_index]->name) {
-                        case 'tbody':
-                            $tbody_mode = true;
-                        case 'tr':
-                            $content[] = $collection;
-                            break;
-                        case 'caption':
-                            if ($caption !== false) break;
-                            $caption = $collection;
-                            break;
-                        case 'thead':
-                        case 'tfoot':
-                            $tbody_mode = true;
-                            // XXX This breaks rendering properties with
-                            // Firefox, which never floats a <thead> to
-                            // the top. Ever. (Our scheme will float the
-                            // first <thead> to the top.)  So maybe
-                            // <thead>s that are not first should be
-                            // turned into <tbody>? Very tricky, indeed.
-
-                            // access the appropriate variable, $thead or $tfoot
-                            $var = $collection[$tag_index]->name;
-                            if ($$var === false) {
-                                $$var = $collection;
-                            } else {
-                                // Oops, there's a second one! What
-                                // should we do?  Current behavior is to
-                                // transmutate the first and last entries into
-                                // tbody tags, and then put into content.
-                                // Maybe a better idea is to *attach
-                                // it* to the existing thead or tfoot?
-                                // We don't do this, because Firefox
-                                // doesn't float an extra tfoot to the
-                                // bottom like it does for the first one.
-                                $collection[$tag_index]->name = 'tbody';
-                                $collection[count($collection)-1]->name = 'tbody';
-                                $content[] = $collection;
-                            }
-                            break;
-                         case 'colgroup':
-                            $cols[] = $collection;
-                            break;
-                    }
-                    $collection = array();
-                    $is_collecting = false;
-                    $tag_index = 0;
-                } else {
-                    // add the node to the collection
-                    $collection[] = $token;
-                }
-            }
-
-            // terminate
-            if ($token === false) break;
-
-            if ($is_child) {
-                // determine what we're dealing with
-                if ($token->name == 'col') {
-                    // the only empty tag in the possie, we can handle it
-                    // immediately
-                    $cols[] = array_merge($collection, array($token));
-                    $collection = array();
-                    $tag_index = 0;
-                    continue;
-                }
-                switch($token->name) {
-                    case 'caption':
-                    case 'colgroup':
-                    case 'thead':
-                    case 'tfoot':
-                    case 'tbody':
-                    case 'tr':
-                        $is_collecting = true;
-                        $collection[] = $token;
-                        continue;
-                    default:
-                        if (!empty($token->is_whitespace)) {
-                            $collection[] = $token;
-                            $tag_index++;
-                        }
-                        continue;
-                }
-            }
-        }
-
-        if (empty($content)) return false;
-
-        $ret = array();
-        if ($caption !== false) $ret = array_merge($ret, $caption);
-        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
-        if ($thead !== false)   $ret = array_merge($ret, $thead);
-        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
-
-        if ($tbody_mode) {
-            // a little tricky, since the start of the collection may be
-            // whitespace
-            $inside_tbody = false;
-            foreach ($content as $token_array) {
-                // find the starting token
-                foreach ($token_array as $t) {
-                    if ($t->name === 'tr' || $t->name === 'tbody') {
-                        break;
-                    }
-                } // iterator variable carries over
-                if ($t->name === 'tr') {
-                    if ($inside_tbody) {
-                        $ret = array_merge($ret, $token_array);
-                    } else {
-                        $ret[] = new HTMLPurifier_Token_Start('tbody');
-                        $ret = array_merge($ret, $token_array);
-                        $inside_tbody = true;
-                    }
-                } elseif ($t->name === 'tbody') {
-                    if ($inside_tbody) {
-                        $ret[] = new HTMLPurifier_Token_End('tbody');
-                        $inside_tbody = false;
-                        $ret = array_merge($ret, $token_array);
-                    } else {
-                        $ret = array_merge($ret, $token_array);
-                    }
-                } else {
-                    trigger_error("tr/tbody in content invariant failed in Table ChildDef", E_USER_ERROR);
-                }
-            }
-            if ($inside_tbody) {
-                $ret[] = new HTMLPurifier_Token_End('tbody');
-            }
-        } else {
-            foreach ($content as $token_array) {
-                // invariant: everything in here is <tr>s
-                $ret = array_merge($ret, $token_array);
-            }
-        }
-
-        if (!empty($collection) && $is_collecting == false){
-            // grab the trailing space
-            $ret = array_merge($ret, $collection);
-        }
-
-        array_pop($tokens_of_children); // remove phantom token
-
-        return ($ret === $tokens_of_children) ? true : $ret;
-
-    }
+	public $allow_empty = false;
+	public $type = 'table';
+	public $elements = array('tr' => true, 'tbody' => true, 'thead' => true,
+		'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
+	public function __construct() {}
+	public function validateChildren($tokens_of_children, $config, $context) {
+		if (empty($tokens_of_children)) return false;
+
+		// this ensures that the loop gets run one last time before closing
+		// up. It's a little bit of a hack, but it works! Just make sure you
+		// get rid of the token later.
+		$tokens_of_children[] = false;
+
+		// only one of these elements is allowed in a table
+		$caption = false;
+		$thead   = false;
+		$tfoot   = false;
+
+		// as many of these as you want
+		$cols    = array();
+		$content = array();
+
+		$nesting = 0; // current depth so we can determine nodes
+		$is_collecting = false; // are we globbing together tokens to package
+								// into one of the collectors?
+		$collection = array(); // collected nodes
+		$tag_index = 0; // the first node might be whitespace,
+							// so this tells us where the start tag is
+		$tbody_mode = false; // if true, then we need to wrap any stray
+							 // <tr>s with a <tbody>.
+
+		foreach ($tokens_of_children as $token) {
+			$is_child = ($nesting == 0);
+
+			if ($token === false) {
+				// terminating sequence started
+			} elseif ($token instanceof HTMLPurifier_Token_Start) {
+				$nesting++;
+			} elseif ($token instanceof HTMLPurifier_Token_End) {
+				$nesting--;
+			}
+
+			// handle node collection
+			if ($is_collecting) {
+				if ($is_child) {
+					// okay, let's stash the tokens away
+					// first token tells us the type of the collection
+					switch ($collection[$tag_index]->name) {
+						case 'tbody':
+							$tbody_mode = true;
+						case 'tr':
+							$content[] = $collection;
+							break;
+						case 'caption':
+							if ($caption !== false) break;
+							$caption = $collection;
+							break;
+						case 'thead':
+						case 'tfoot':
+							$tbody_mode = true;
+							// XXX This breaks rendering properties with
+							// Firefox, which never floats a <thead> to
+							// the top. Ever. (Our scheme will float the
+							// first <thead> to the top.)  So maybe
+							// <thead>s that are not first should be
+							// turned into <tbody>? Very tricky, indeed.
+
+							// access the appropriate variable, $thead or $tfoot
+							$var = $collection[$tag_index]->name;
+							if ($$var === false) {
+								$$var = $collection;
+							} else {
+								// Oops, there's a second one! What
+								// should we do?  Current behavior is to
+								// transmutate the first and last entries into
+								// tbody tags, and then put into content.
+								// Maybe a better idea is to *attach
+								// it* to the existing thead or tfoot?
+								// We don't do this, because Firefox
+								// doesn't float an extra tfoot to the
+								// bottom like it does for the first one.
+								$collection[$tag_index]->name = 'tbody';
+								$collection[count($collection)-1]->name = 'tbody';
+								$content[] = $collection;
+							}
+							break;
+						 case 'colgroup':
+							$cols[] = $collection;
+							break;
+					}
+					$collection = array();
+					$is_collecting = false;
+					$tag_index = 0;
+				} else {
+					// add the node to the collection
+					$collection[] = $token;
+				}
+			}
+
+			// terminate
+			if ($token === false) break;
+
+			if ($is_child) {
+				// determine what we're dealing with
+				if ($token->name == 'col') {
+					// the only empty tag in the possie, we can handle it
+					// immediately
+					$cols[] = array_merge($collection, array($token));
+					$collection = array();
+					$tag_index = 0;
+					continue;
+				}
+				switch($token->name) {
+					case 'caption':
+					case 'colgroup':
+					case 'thead':
+					case 'tfoot':
+					case 'tbody':
+					case 'tr':
+						$is_collecting = true;
+						$collection[] = $token;
+						continue;
+					default:
+						if (!empty($token->is_whitespace)) {
+							$collection[] = $token;
+							$tag_index++;
+						}
+						continue;
+				}
+			}
+		}
+
+		if (empty($content)) return false;
+
+		$ret = array();
+		if ($caption !== false) $ret = array_merge($ret, $caption);
+		if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
+		if ($thead !== false)   $ret = array_merge($ret, $thead);
+		if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
+
+		if ($tbody_mode) {
+			// a little tricky, since the start of the collection may be
+			// whitespace
+			$inside_tbody = false;
+			foreach ($content as $token_array) {
+				// find the starting token
+				foreach ($token_array as $t) {
+					if ($t->name === 'tr' || $t->name === 'tbody') {
+						break;
+					}
+				} // iterator variable carries over
+				if ($t->name === 'tr') {
+					if ($inside_tbody) {
+						$ret = array_merge($ret, $token_array);
+					} else {
+						$ret[] = new HTMLPurifier_Token_Start('tbody');
+						$ret = array_merge($ret, $token_array);
+						$inside_tbody = true;
+					}
+				} elseif ($t->name === 'tbody') {
+					if ($inside_tbody) {
+						$ret[] = new HTMLPurifier_Token_End('tbody');
+						$inside_tbody = false;
+						$ret = array_merge($ret, $token_array);
+					} else {
+						$ret = array_merge($ret, $token_array);
+					}
+				} else {
+					trigger_error("tr/tbody in content invariant failed in Table ChildDef", E_USER_ERROR);
+				}
+			}
+			if ($inside_tbody) {
+				$ret[] = new HTMLPurifier_Token_End('tbody');
+			}
+		} else {
+			foreach ($content as $token_array) {
+				// invariant: everything in here is <tr>s
+				$ret = array_merge($ret, $token_array);
+			}
+		}
+
+		if (!empty($collection) && $is_collecting == false){
+			// grab the trailing space
+			$ret = array_merge($ret, $collection);
+		}
+
+		array_pop($tokens_of_children); // remove phantom token
+
+		return ($ret === $tokens_of_children) ? true : $ret;
+
+	}
 }
 
 // vim: et sw=4 sts=4

Spacing +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
                                 // doesn't float an extra tfoot to the
                                 // bottom like it does for the first one.
                                 $collection[$tag_index]->name = 'tbody';
-                                $collection[count($collection)-1]->name = 'tbody';
+                                $collection[count($collection) - 1]->name = 'tbody';
                                 $content[] = $collection;
                             }
                             break;
@@ -143,7 +143,7 @@ 
                     $tag_index = 0;
                     continue;
                 }
-                switch($token->name) {
+                switch ($token->name) {
                     case 'caption':
                     case 'colgroup':
                     case 'thead':
@@ -212,7 +212,7 @@ 
             }
         }
 
-        if (!empty($collection) && $is_collecting == false){
+        if (!empty($collection) && $is_collecting == false) {
             // grab the trailing space
             $ret = array_merge($ret, $collection);
         }

Braces +24 added lines, -8 removed lines

@@ -37,7 +37,9 @@ 
         'tfoot' => true, 'caption' => true, 'colgroup' => true, 'col' => true);
     public function __construct() {}
     public function validateChildren($tokens_of_children, $config, $context) {
-        if (empty($tokens_of_children)) return false;
+        if (empty($tokens_of_children)) {
+        	return false;
+        }
 
         // this ensures that the loop gets run one last time before closing
         // up. It's a little bit of a hack, but it works! Just make sure you
@@ -85,7 +87,9 @@ 
                             $content[] = $collection;
                             break;
                         case 'caption':
-                            if ($caption !== false) break;
+                            if ($caption !== false) {
+                            	break;
+                            }
                             $caption = $collection;
                             break;
                         case 'thead':
@@ -131,7 +135,9 @@ 
             }
 
             // terminate
-            if ($token === false) break;
+            if ($token === false) {
+            	break;
+            }
 
             if ($is_child) {
                 // determine what we're dealing with
@@ -163,13 +169,23 @@ 
             }
         }
 
-        if (empty($content)) return false;
+        if (empty($content)) {
+        	return false;
+        }
 
         $ret = array();
-        if ($caption !== false) $ret = array_merge($ret, $caption);
-        if ($cols !== false)    foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
-        if ($thead !== false)   $ret = array_merge($ret, $thead);
-        if ($tfoot !== false)   $ret = array_merge($ret, $tfoot);
+        if ($caption !== false) {
+        	$ret = array_merge($ret, $caption);
+        }
+        if ($cols !== false) {
+        	foreach ($cols as $token_array) $ret = array_merge($ret, $token_array);
+        }
+        if ($thead !== false) {
+        	$ret = array_merge($ret, $thead);
+        }
+        if ($tfoot !== false) {
+        	$ret = array_merge($ret, $tfoot);
+        }
 
         if ($tbody_mode) {
             // a little tricky, since the start of the collection may be

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

Indentation +686 added lines, -686 removed lines

@@ -17,692 +17,692 @@
 class HTMLPurifier_Config
 {
 
-    /**
-     * HTML Purifier's version
-     */
-    public $version = '4.4.0';
-
-    /**
-     * Bool indicator whether or not to automatically finalize
-     * the object if a read operation is done
-     */
-    public $autoFinalize = true;
-
-    // protected member variables
-
-    /**
-     * Namespace indexed array of serials for specific namespaces (see
-     * getSerial() for more info).
-     */
-    protected $serials = array();
-
-    /**
-     * Serial for entire configuration object
-     */
-    protected $serial;
-
-    /**
-     * Parser for variables
-     */
-    protected $parser = null;
-
-    /**
-     * Reference HTMLPurifier_ConfigSchema for value checking
-     * @note This is public for introspective purposes. Please don't
-     *       abuse!
-     */
-    public $def;
-
-    /**
-     * Indexed array of definitions
-     */
-    protected $definitions;
-
-    /**
-     * Bool indicator whether or not config is finalized
-     */
-    protected $finalized = false;
-
-    /**
-     * Property list containing configuration directives.
-     */
-    protected $plist;
-
-    /**
-     * Whether or not a set is taking place due to an
-     * alias lookup.
-     */
-    private $aliasMode;
-
-    /**
-     * Set to false if you do not want line and file numbers in errors
-     * (useful when unit testing).  This will also compress some errors
-     * and exceptions.
-     */
-    public $chatty = true;
-
-    /**
-     * Current lock; only gets to this namespace are allowed.
-     */
-    private $lock;
-
-    /**
-     * @param $definition HTMLPurifier_ConfigSchema that defines what directives
-     *                    are allowed.
-     */
-    public function __construct($definition, $parent = null) {
-        $parent = $parent ? $parent : $definition->defaultPlist;
-        $this->plist = new HTMLPurifier_PropertyList($parent);
-        $this->def = $definition; // keep a copy around for checking
-        $this->parser = new HTMLPurifier_VarParser_Flexible();
-    }
-
-    /**
-     * Convenience constructor that creates a config object based on a mixed var
-     * @param mixed $config Variable that defines the state of the config
-     *                      object. Can be: a HTMLPurifier_Config() object,
-     *                      an array of directives based on loadArray(),
-     *                      or a string filename of an ini file.
-     * @param HTMLPurifier_ConfigSchema Schema object
-     * @return Configured HTMLPurifier_Config object
-     */
-    public static function create($config, $schema = null) {
-        if ($config instanceof HTMLPurifier_Config) {
-            // pass-through
-            return $config;
-        }
-        if (!$schema) {
-            $ret = HTMLPurifier_Config::createDefault();
-        } else {
-            $ret = new HTMLPurifier_Config($schema);
-        }
-        if (is_string($config)) $ret->loadIni($config);
-        elseif (is_array($config)) $ret->loadArray($config);
-        return $ret;
-    }
-
-    /**
-     * Creates a new config object that inherits from a previous one.
-     * @param HTMLPurifier_Config $config Configuration object to inherit
-     *        from.
-     * @return HTMLPurifier_Config object with $config as its parent.
-     */
-    public static function inherit(HTMLPurifier_Config $config) {
-        return new HTMLPurifier_Config($config->def, $config->plist);
-    }
-
-    /**
-     * Convenience constructor that creates a default configuration object.
-     * @return Default HTMLPurifier_Config object.
-     */
-    public static function createDefault() {
-        $definition = HTMLPurifier_ConfigSchema::instance();
-        $config = new HTMLPurifier_Config($definition);
-        return $config;
-    }
-
-    /**
-     * Retreives a value from the configuration.
-     * @param $key String key
-     */
-    public function get($key, $a = null) {
-        if ($a !== null) {
-            $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
-            $key = "$key.$a";
-        }
-        if (!$this->finalized) $this->autoFinalize();
-        if (!isset($this->def->info[$key])) {
-            // can't add % due to SimpleTest bug
-            $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
-                E_USER_WARNING);
-            return;
-        }
-        if (isset($this->def->info[$key]->isAlias)) {
-            $d = $this->def->info[$key];
-            $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
-                E_USER_ERROR);
-            return;
-        }
-        if ($this->lock) {
-            list($ns) = explode('.', $key);
-            if ($ns !== $this->lock) {
-                $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
-                return;
-            }
-        }
-        return $this->plist->get($key);
-    }
-
-    /**
-     * Retreives an array of directives to values from a given namespace
-     * @param $namespace String namespace
-     */
-    public function getBatch($namespace) {
-        if (!$this->finalized) $this->autoFinalize();
-        $full = $this->getAll();
-        if (!isset($full[$namespace])) {
-            $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
-                E_USER_WARNING);
-            return;
-        }
-        return $full[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature of a segment of the configuration object
-     * that uniquely identifies that particular configuration
-     * @note Revision is handled specially and is removed from the batch
-     *       before processing!
-     * @param $namespace Namespace to get serial for
-     */
-    public function getBatchSerial($namespace) {
-        if (empty($this->serials[$namespace])) {
-            $batch = $this->getBatch($namespace);
-            unset($batch['DefinitionRev']);
-            $this->serials[$namespace] = md5(serialize($batch));
-        }
-        return $this->serials[$namespace];
-    }
-
-    /**
-     * Returns a md5 signature for the entire configuration object
-     * that uniquely identifies that particular configuration
-     */
-    public function getSerial() {
-        if (empty($this->serial)) {
-            $this->serial = md5(serialize($this->getAll()));
-        }
-        return $this->serial;
-    }
-
-    /**
-     * Retrieves all directives, organized by namespace
-     * @warning This is a pretty inefficient function, avoid if you can
-     */
-    public function getAll() {
-        if (!$this->finalized) $this->autoFinalize();
-        $ret = array();
-        foreach ($this->plist->squash() as $name => $value) {
-            list($ns, $key) = explode('.', $name, 2);
-            $ret[$ns][$key] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Sets a value to configuration.
-     * @param $key String key
-     * @param $value Mixed value
-     */
-    public function set($key, $value, $a = null) {
-        if (strpos($key, '.') === false) {
-            $namespace = $key;
-            $directive = $value;
-            $value = $a;
-            $key = "$key.$directive";
-            $this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
-        } else {
-            list($namespace) = explode('.', $key);
-        }
-        if ($this->isFinalized('Cannot set directive after finalization')) return;
-        if (!isset($this->def->info[$key])) {
-            $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
-                E_USER_WARNING);
-            return;
-        }
-        $def = $this->def->info[$key];
-
-        if (isset($def->isAlias)) {
-            if ($this->aliasMode) {
-                $this->triggerError('Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key, E_USER_ERROR);
-                return;
-            }
-            $this->aliasMode = true;
-            $this->set($def->key, $value);
-            $this->aliasMode = false;
-            $this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
-            return;
-        }
-
-        // Raw type might be negative when using the fully optimized form
-        // of stdclass, which indicates allow_null == true
-        $rtype = is_int($def) ? $def : $def->type;
-        if ($rtype < 0) {
-            $type = -$rtype;
-            $allow_null = true;
-        } else {
-            $type = $rtype;
-            $allow_null = isset($def->allow_null);
-        }
-
-        try {
-            $value = $this->parser->parse($value, $type, $allow_null);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
-            return;
-        }
-        if (is_string($value) && is_object($def)) {
-            // resolve value alias if defined
-            if (isset($def->aliases[$value])) {
-                $value = $def->aliases[$value];
-            }
-            // check to see if the value is allowed
-            if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError('Value not supported, valid values are: ' .
-                    $this->_listify($def->allowed), E_USER_WARNING);
-                return;
-            }
-        }
-        $this->plist->set($key, $value);
-
-        // reset definitions if the directives they depend on changed
-        // this is a very costly process, so it's discouraged
-        // with finalization
-        if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
-            $this->definitions[$namespace] = null;
-        }
-
-        $this->serials[$namespace] = false;
-    }
-
-    /**
-     * Convenience function for error reporting
-     */
-    private function _listify($lookup) {
-        $list = array();
-        foreach ($lookup as $name => $b) $list[] = $name;
-        return implode(', ', $list);
-    }
-
-    /**
-     * Retrieves object reference to the HTML definition.
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawHTMLDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getHTMLDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('HTML', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the CSS definition
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawCSSDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getCSSDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('CSS', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves object reference to the URI definition
-     * @param $raw Return a copy that has not been setup yet. Must be
-     *             called before it's been setup, otherwise won't work.
-     * @param $optimized If true, this method may return null, to
-     *             indicate that a cached version of the modified
-     *             definition object is available and no further edits
-     *             are necessary.  Consider using
-     *             maybeGetRawURIDefinition, which is more explicitly
-     *             named, instead.
-     */
-    public function getURIDefinition($raw = false, $optimized = false) {
-        return $this->getDefinition('URI', $raw, $optimized);
-    }
-
-    /**
-     * Retrieves a definition
-     * @param $type Type of definition: HTML, CSS, etc
-     * @param $raw  Whether or not definition should be returned raw
-     * @param $optimized Only has an effect when $raw is true.  Whether
-     *        or not to return null if the result is already present in
-     *        the cache.  This is off by default for backwards
-     *        compatibility reasons, but you need to do things this
-     *        way in order to ensure that caching is done properly.
-     *        Check out enduser-customize.html for more details.
-     *        We probably won't ever change this default, as much as the
-     *        maybe semantics is the "right thing to do."
-     */
-    public function getDefinition($type, $raw = false, $optimized = false) {
-        if ($optimized && !$raw) {
-            throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
-        }
-        if (!$this->finalized) $this->autoFinalize();
-        // temporarily suspend locks, so we can handle recursive definition calls
-        $lock = $this->lock;
-        $this->lock = null;
-        $factory = HTMLPurifier_DefinitionCacheFactory::instance();
-        $cache = $factory->create($type, $this);
-        $this->lock = $lock;
-        if (!$raw) {
-            // full definition
-            // ---------------
-            // check if definition is in memory
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                // check if the definition is setup
-                if ($def->setup) {
-                    return $def;
-                } else {
-                    $def->setup($this);
-                    if ($def->optimized) $cache->add($def, $this);
-                    return $def;
-                }
-            }
-            // check if definition is in cache
-            $def = $cache->get($this);
-            if ($def) {
-                // definition in cache, save to memory and return it
-                $this->definitions[$type] = $def;
-                return $def;
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            // set it up
-            $this->lock = $type;
-            $def->setup($this);
-            $this->lock = null;
-            // save in cache
-            $cache->add($def, $this);
-            // return it
-            return $def;
-        } else {
-            // raw definition
-            // --------------
-            // check preconditions
-            $def = null;
-            if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
-                    // fatally error out if definition ID not set
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
-                }
-            }
-            if (!empty($this->definitions[$type])) {
-                $def = $this->definitions[$type];
-                if ($def->setup && !$optimized) {
-                    $extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
-                }
-                if ($def->optimized === null) {
-                    $extra = $this->chatty ? " (try flushing your cache)" : "";
-                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
-                }
-                if ($def->optimized !== $optimized) {
-                    $msg = $optimized ? "optimized" : "unoptimized";
-                    $extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
-                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
-                }
-            }
-            // check if definition was in memory
-            if ($def) {
-                if ($def->setup) {
-                    // invariant: $optimized === true (checked above)
-                    return null;
-                } else {
-                    return $def;
-                }
-            }
-            // if optimized, check if definition was in cache
-            // (because we do the memory check first, this formulation
-            // is prone to cache slamming, but I think
-            // guaranteeing that either /all/ of the raw
-            // setup code or /none/ of it is run is more important.)
-            if ($optimized) {
-                // This code path only gets run once; once we put
-                // something in $definitions (which is guaranteed by the
-                // trailing code), we always short-circuit above.
-                $def = $cache->get($this);
-                if ($def) {
-                    // save the full definition for later, but don't
-                    // return it yet
-                    $this->definitions[$type] = $def;
-                    return null;
-                }
-            }
-            // check invariants for creation
-            if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
-                    if ($this->chatty) {
-                        $this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
-                    } else {
-                        $this->triggerError("Useless DefinitionID declaration", E_USER_WARNING);
-                    }
-                }
-            }
-            // initialize it
-            $def = $this->initDefinition($type);
-            $def->optimized = $optimized;
-            return $def;
-        }
-        throw new HTMLPurifier_Exception("The impossible happened!");
-    }
-
-    private function initDefinition($type) {
-        // quick checks failed, let's create the object
-        if ($type == 'HTML') {
-            $def = new HTMLPurifier_HTMLDefinition();
-        } elseif ($type == 'CSS') {
-            $def = new HTMLPurifier_CSSDefinition();
-        } elseif ($type == 'URI') {
-            $def = new HTMLPurifier_URIDefinition();
-        } else {
-            throw new HTMLPurifier_Exception("Definition of $type type not supported");
-        }
-        $this->definitions[$type] = $def;
-        return $def;
-    }
-
-    public function maybeGetRawDefinition($name) {
-        return $this->getDefinition($name, true, true);
-    }
-
-    public function maybeGetRawHTMLDefinition() {
-        return $this->getDefinition('HTML', true, true);
-    }
-
-    public function maybeGetRawCSSDefinition() {
-        return $this->getDefinition('CSS', true, true);
-    }
-
-    public function maybeGetRawURIDefinition() {
-        return $this->getDefinition('URI', true, true);
-    }
-
-    /**
-     * Loads configuration values from an array with the following structure:
-     * Namespace.Directive => Value
-     * @param $config_array Configuration associative array
-     */
-    public function loadArray($config_array) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        foreach ($config_array as $key => $value) {
-            $key = str_replace('_', '.', $key);
-            if (strpos($key, '.') !== false) {
-                $this->set($key, $value);
-            } else {
-                $namespace = $key;
-                $namespace_values = $value;
-                foreach ($namespace_values as $directive => $value) {
-                    $this->set($namespace .'.'. $directive, $value);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of array(namespace, directive) for all directives
-     * that are allowed in a web-form context as per an allowed
-     * namespaces/directives list.
-     * @param $allowed List of allowed namespaces/directives
-     */
-    public static function getAllowedDirectivesForForm($allowed, $schema = null) {
-        if (!$schema) {
-            $schema = HTMLPurifier_ConfigSchema::instance();
-        }
-        if ($allowed !== true) {
-             if (is_string($allowed)) $allowed = array($allowed);
-             $allowed_ns = array();
-             $allowed_directives = array();
-             $blacklisted_directives = array();
-             foreach ($allowed as $ns_or_directive) {
-                 if (strpos($ns_or_directive, '.') !== false) {
-                     // directive
-                     if ($ns_or_directive[0] == '-') {
-                         $blacklisted_directives[substr($ns_or_directive, 1)] = true;
-                     } else {
-                         $allowed_directives[$ns_or_directive] = true;
-                     }
-                 } else {
-                     // namespace
-                     $allowed_ns[$ns_or_directive] = true;
-                 }
-             }
-        }
-        $ret = array();
-        foreach ($schema->info as $key => $def) {
-            list($ns, $directive) = explode('.', $key, 2);
-            if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) continue;
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
-            }
-            if (isset($def->isAlias)) continue;
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
-            $ret[] = array($ns, $directive);
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from $_GET/$_POST that were posted
-     * via ConfigForm
-     * @param $array $_GET or $_POST array to import
-     * @param $index Index/name that the config variables are in
-     * @param $allowed List of allowed namespaces/directives
-     * @param $mq_fix Boolean whether or not to enable magic quotes fix
-     * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
-     */
-    public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
-        $config = HTMLPurifier_Config::create($ret, $schema);
-        return $config;
-    }
-
-    /**
-     * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
-     * @note Same parameters as loadArrayFromForm
-     */
-    public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
-         $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
-         $this->loadArray($ret);
-    }
-
-    /**
-     * Prepares an array from a form into something usable for the more
-     * strict parts of HTMLPurifier_Config
-     */
-    public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
-        $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
-
-        $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
-        $ret = array();
-        foreach ($allowed as $key) {
-            list($ns, $directive) = $key;
-            $skey = "$ns.$directive";
-            if (!empty($array["Null_$skey"])) {
-                $ret[$ns][$directive] = null;
-                continue;
-            }
-            if (!isset($array[$skey])) continue;
-            $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
-            $ret[$ns][$directive] = $value;
-        }
-        return $ret;
-    }
-
-    /**
-     * Loads configuration values from an ini file
-     * @param $filename Name of ini file
-     */
-    public function loadIni($filename) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
-        $array = parse_ini_file($filename, true);
-        $this->loadArray($array);
-    }
-
-    /**
-     * Checks whether or not the configuration object is finalized.
-     * @param $error String error message, or false for no error
-     */
-    public function isFinalized($error = false) {
-        if ($this->finalized && $error) {
-            $this->triggerError($error, E_USER_ERROR);
-        }
-        return $this->finalized;
-    }
-
-    /**
-     * Finalizes configuration only if auto finalize is on and not
-     * already finalized
-     */
-    public function autoFinalize() {
-        if ($this->autoFinalize) {
-            $this->finalize();
-        } else {
-            $this->plist->squash(true);
-        }
-    }
-
-    /**
-     * Finalizes a configuration object, prohibiting further change
-     */
-    public function finalize() {
-        $this->finalized = true;
-        $this->parser = null;
-    }
-
-    /**
-     * Produces a nicely formatted error message by supplying the
-     * stack frame information OUTSIDE of HTMLPurifier_Config.
-     */
-    protected function triggerError($msg, $no) {
-        // determine previous stack frame
-        $extra = '';
-        if ($this->chatty) {
-            $trace = debug_backtrace();
-            // zip(tail(trace), trace) -- but PHP is not Haskell har har
-            for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
-                if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
-                    continue;
-                }
-                $frame = $trace[$i];
-                $extra = " invoked on line {$frame['line']} in file {$frame['file']}";
-                break;
-            }
-        }
-        trigger_error($msg . $extra, $no);
-    }
-
-    /**
-     * Returns a serialized form of the configuration object that can
-     * be reconstituted.
-     */
-    public function serialize() {
-        $this->getDefinition('HTML');
-        $this->getDefinition('CSS');
-        $this->getDefinition('URI');
-        return serialize($this);
-    }
+	/**
+	 * HTML Purifier's version
+	 */
+	public $version = '4.4.0';
+
+	/**
+	 * Bool indicator whether or not to automatically finalize
+	 * the object if a read operation is done
+	 */
+	public $autoFinalize = true;
+
+	// protected member variables
+
+	/**
+	 * Namespace indexed array of serials for specific namespaces (see
+	 * getSerial() for more info).
+	 */
+	protected $serials = array();
+
+	/**
+	 * Serial for entire configuration object
+	 */
+	protected $serial;
+
+	/**
+	 * Parser for variables
+	 */
+	protected $parser = null;
+
+	/**
+	 * Reference HTMLPurifier_ConfigSchema for value checking
+	 * @note This is public for introspective purposes. Please don't
+	 *       abuse!
+	 */
+	public $def;
+
+	/**
+	 * Indexed array of definitions
+	 */
+	protected $definitions;
+
+	/**
+	 * Bool indicator whether or not config is finalized
+	 */
+	protected $finalized = false;
+
+	/**
+	 * Property list containing configuration directives.
+	 */
+	protected $plist;
+
+	/**
+	 * Whether or not a set is taking place due to an
+	 * alias lookup.
+	 */
+	private $aliasMode;
+
+	/**
+	 * Set to false if you do not want line and file numbers in errors
+	 * (useful when unit testing).  This will also compress some errors
+	 * and exceptions.
+	 */
+	public $chatty = true;
+
+	/**
+	 * Current lock; only gets to this namespace are allowed.
+	 */
+	private $lock;
+
+	/**
+	 * @param $definition HTMLPurifier_ConfigSchema that defines what directives
+	 *                    are allowed.
+	 */
+	public function __construct($definition, $parent = null) {
+		$parent = $parent ? $parent : $definition->defaultPlist;
+		$this->plist = new HTMLPurifier_PropertyList($parent);
+		$this->def = $definition; // keep a copy around for checking
+		$this->parser = new HTMLPurifier_VarParser_Flexible();
+	}
+
+	/**
+	 * Convenience constructor that creates a config object based on a mixed var
+	 * @param mixed $config Variable that defines the state of the config
+	 *                      object. Can be: a HTMLPurifier_Config() object,
+	 *                      an array of directives based on loadArray(),
+	 *                      or a string filename of an ini file.
+	 * @param HTMLPurifier_ConfigSchema Schema object
+	 * @return Configured HTMLPurifier_Config object
+	 */
+	public static function create($config, $schema = null) {
+		if ($config instanceof HTMLPurifier_Config) {
+			// pass-through
+			return $config;
+		}
+		if (!$schema) {
+			$ret = HTMLPurifier_Config::createDefault();
+		} else {
+			$ret = new HTMLPurifier_Config($schema);
+		}
+		if (is_string($config)) $ret->loadIni($config);
+		elseif (is_array($config)) $ret->loadArray($config);
+		return $ret;
+	}
+
+	/**
+	 * Creates a new config object that inherits from a previous one.
+	 * @param HTMLPurifier_Config $config Configuration object to inherit
+	 *        from.
+	 * @return HTMLPurifier_Config object with $config as its parent.
+	 */
+	public static function inherit(HTMLPurifier_Config $config) {
+		return new HTMLPurifier_Config($config->def, $config->plist);
+	}
+
+	/**
+	 * Convenience constructor that creates a default configuration object.
+	 * @return Default HTMLPurifier_Config object.
+	 */
+	public static function createDefault() {
+		$definition = HTMLPurifier_ConfigSchema::instance();
+		$config = new HTMLPurifier_Config($definition);
+		return $config;
+	}
+
+	/**
+	 * Retreives a value from the configuration.
+	 * @param $key String key
+	 */
+	public function get($key, $a = null) {
+		if ($a !== null) {
+			$this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
+			$key = "$key.$a";
+		}
+		if (!$this->finalized) $this->autoFinalize();
+		if (!isset($this->def->info[$key])) {
+			// can't add % due to SimpleTest bug
+			$this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+				E_USER_WARNING);
+			return;
+		}
+		if (isset($this->def->info[$key]->isAlias)) {
+			$d = $this->def->info[$key];
+			$this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
+				E_USER_ERROR);
+			return;
+		}
+		if ($this->lock) {
+			list($ns) = explode('.', $key);
+			if ($ns !== $this->lock) {
+				$this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
+				return;
+			}
+		}
+		return $this->plist->get($key);
+	}
+
+	/**
+	 * Retreives an array of directives to values from a given namespace
+	 * @param $namespace String namespace
+	 */
+	public function getBatch($namespace) {
+		if (!$this->finalized) $this->autoFinalize();
+		$full = $this->getAll();
+		if (!isset($full[$namespace])) {
+			$this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+				E_USER_WARNING);
+			return;
+		}
+		return $full[$namespace];
+	}
+
+	/**
+	 * Returns a md5 signature of a segment of the configuration object
+	 * that uniquely identifies that particular configuration
+	 * @note Revision is handled specially and is removed from the batch
+	 *       before processing!
+	 * @param $namespace Namespace to get serial for
+	 */
+	public function getBatchSerial($namespace) {
+		if (empty($this->serials[$namespace])) {
+			$batch = $this->getBatch($namespace);
+			unset($batch['DefinitionRev']);
+			$this->serials[$namespace] = md5(serialize($batch));
+		}
+		return $this->serials[$namespace];
+	}
+
+	/**
+	 * Returns a md5 signature for the entire configuration object
+	 * that uniquely identifies that particular configuration
+	 */
+	public function getSerial() {
+		if (empty($this->serial)) {
+			$this->serial = md5(serialize($this->getAll()));
+		}
+		return $this->serial;
+	}
+
+	/**
+	 * Retrieves all directives, organized by namespace
+	 * @warning This is a pretty inefficient function, avoid if you can
+	 */
+	public function getAll() {
+		if (!$this->finalized) $this->autoFinalize();
+		$ret = array();
+		foreach ($this->plist->squash() as $name => $value) {
+			list($ns, $key) = explode('.', $name, 2);
+			$ret[$ns][$key] = $value;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Sets a value to configuration.
+	 * @param $key String key
+	 * @param $value Mixed value
+	 */
+	public function set($key, $value, $a = null) {
+		if (strpos($key, '.') === false) {
+			$namespace = $key;
+			$directive = $value;
+			$value = $a;
+			$key = "$key.$directive";
+			$this->triggerError("Using deprecated API: use \$config->set('$key', ...) instead", E_USER_NOTICE);
+		} else {
+			list($namespace) = explode('.', $key);
+		}
+		if ($this->isFinalized('Cannot set directive after finalization')) return;
+		if (!isset($this->def->info[$key])) {
+			$this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
+				E_USER_WARNING);
+			return;
+		}
+		$def = $this->def->info[$key];
+
+		if (isset($def->isAlias)) {
+			if ($this->aliasMode) {
+				$this->triggerError('Double-aliases not allowed, please fix '.
+					'ConfigSchema bug with' . $key, E_USER_ERROR);
+				return;
+			}
+			$this->aliasMode = true;
+			$this->set($def->key, $value);
+			$this->aliasMode = false;
+			$this->triggerError("$key is an alias, preferred directive name is {$def->key}", E_USER_NOTICE);
+			return;
+		}
+
+		// Raw type might be negative when using the fully optimized form
+		// of stdclass, which indicates allow_null == true
+		$rtype = is_int($def) ? $def : $def->type;
+		if ($rtype < 0) {
+			$type = -$rtype;
+			$allow_null = true;
+		} else {
+			$type = $rtype;
+			$allow_null = isset($def->allow_null);
+		}
+
+		try {
+			$value = $this->parser->parse($value, $type, $allow_null);
+		} catch (HTMLPurifier_VarParserException $e) {
+			$this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
+			return;
+		}
+		if (is_string($value) && is_object($def)) {
+			// resolve value alias if defined
+			if (isset($def->aliases[$value])) {
+				$value = $def->aliases[$value];
+			}
+			// check to see if the value is allowed
+			if (isset($def->allowed) && !isset($def->allowed[$value])) {
+				$this->triggerError('Value not supported, valid values are: ' .
+					$this->_listify($def->allowed), E_USER_WARNING);
+				return;
+			}
+		}
+		$this->plist->set($key, $value);
+
+		// reset definitions if the directives they depend on changed
+		// this is a very costly process, so it's discouraged
+		// with finalization
+		if ($namespace == 'HTML' || $namespace == 'CSS' || $namespace == 'URI') {
+			$this->definitions[$namespace] = null;
+		}
+
+		$this->serials[$namespace] = false;
+	}
+
+	/**
+	 * Convenience function for error reporting
+	 */
+	private function _listify($lookup) {
+		$list = array();
+		foreach ($lookup as $name => $b) $list[] = $name;
+		return implode(', ', $list);
+	}
+
+	/**
+	 * Retrieves object reference to the HTML definition.
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawHTMLDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getHTMLDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('HTML', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves object reference to the CSS definition
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawCSSDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getCSSDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('CSS', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves object reference to the URI definition
+	 * @param $raw Return a copy that has not been setup yet. Must be
+	 *             called before it's been setup, otherwise won't work.
+	 * @param $optimized If true, this method may return null, to
+	 *             indicate that a cached version of the modified
+	 *             definition object is available and no further edits
+	 *             are necessary.  Consider using
+	 *             maybeGetRawURIDefinition, which is more explicitly
+	 *             named, instead.
+	 */
+	public function getURIDefinition($raw = false, $optimized = false) {
+		return $this->getDefinition('URI', $raw, $optimized);
+	}
+
+	/**
+	 * Retrieves a definition
+	 * @param $type Type of definition: HTML, CSS, etc
+	 * @param $raw  Whether or not definition should be returned raw
+	 * @param $optimized Only has an effect when $raw is true.  Whether
+	 *        or not to return null if the result is already present in
+	 *        the cache.  This is off by default for backwards
+	 *        compatibility reasons, but you need to do things this
+	 *        way in order to ensure that caching is done properly.
+	 *        Check out enduser-customize.html for more details.
+	 *        We probably won't ever change this default, as much as the
+	 *        maybe semantics is the "right thing to do."
+	 */
+	public function getDefinition($type, $raw = false, $optimized = false) {
+		if ($optimized && !$raw) {
+			throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
+		}
+		if (!$this->finalized) $this->autoFinalize();
+		// temporarily suspend locks, so we can handle recursive definition calls
+		$lock = $this->lock;
+		$this->lock = null;
+		$factory = HTMLPurifier_DefinitionCacheFactory::instance();
+		$cache = $factory->create($type, $this);
+		$this->lock = $lock;
+		if (!$raw) {
+			// full definition
+			// ---------------
+			// check if definition is in memory
+			if (!empty($this->definitions[$type])) {
+				$def = $this->definitions[$type];
+				// check if the definition is setup
+				if ($def->setup) {
+					return $def;
+				} else {
+					$def->setup($this);
+					if ($def->optimized) $cache->add($def, $this);
+					return $def;
+				}
+			}
+			// check if definition is in cache
+			$def = $cache->get($this);
+			if ($def) {
+				// definition in cache, save to memory and return it
+				$this->definitions[$type] = $def;
+				return $def;
+			}
+			// initialize it
+			$def = $this->initDefinition($type);
+			// set it up
+			$this->lock = $type;
+			$def->setup($this);
+			$this->lock = null;
+			// save in cache
+			$cache->add($def, $this);
+			// return it
+			return $def;
+		} else {
+			// raw definition
+			// --------------
+			// check preconditions
+			$def = null;
+			if ($optimized) {
+				if (is_null($this->get($type . '.DefinitionID'))) {
+					// fatally error out if definition ID not set
+					throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
+				}
+			}
+			if (!empty($this->definitions[$type])) {
+				$def = $this->definitions[$type];
+				if ($def->setup && !$optimized) {
+					$extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
+					throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
+				}
+				if ($def->optimized === null) {
+					$extra = $this->chatty ? " (try flushing your cache)" : "";
+					throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
+				}
+				if ($def->optimized !== $optimized) {
+					$msg = $optimized ? "optimized" : "unoptimized";
+					$extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
+					throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
+				}
+			}
+			// check if definition was in memory
+			if ($def) {
+				if ($def->setup) {
+					// invariant: $optimized === true (checked above)
+					return null;
+				} else {
+					return $def;
+				}
+			}
+			// if optimized, check if definition was in cache
+			// (because we do the memory check first, this formulation
+			// is prone to cache slamming, but I think
+			// guaranteeing that either /all/ of the raw
+			// setup code or /none/ of it is run is more important.)
+			if ($optimized) {
+				// This code path only gets run once; once we put
+				// something in $definitions (which is guaranteed by the
+				// trailing code), we always short-circuit above.
+				$def = $cache->get($this);
+				if ($def) {
+					// save the full definition for later, but don't
+					// return it yet
+					$this->definitions[$type] = $def;
+					return null;
+				}
+			}
+			// check invariants for creation
+			if (!$optimized) {
+				if (!is_null($this->get($type . '.DefinitionID'))) {
+					if ($this->chatty) {
+						$this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
+					} else {
+						$this->triggerError("Useless DefinitionID declaration", E_USER_WARNING);
+					}
+				}
+			}
+			// initialize it
+			$def = $this->initDefinition($type);
+			$def->optimized = $optimized;
+			return $def;
+		}
+		throw new HTMLPurifier_Exception("The impossible happened!");
+	}
+
+	private function initDefinition($type) {
+		// quick checks failed, let's create the object
+		if ($type == 'HTML') {
+			$def = new HTMLPurifier_HTMLDefinition();
+		} elseif ($type == 'CSS') {
+			$def = new HTMLPurifier_CSSDefinition();
+		} elseif ($type == 'URI') {
+			$def = new HTMLPurifier_URIDefinition();
+		} else {
+			throw new HTMLPurifier_Exception("Definition of $type type not supported");
+		}
+		$this->definitions[$type] = $def;
+		return $def;
+	}
+
+	public function maybeGetRawDefinition($name) {
+		return $this->getDefinition($name, true, true);
+	}
+
+	public function maybeGetRawHTMLDefinition() {
+		return $this->getDefinition('HTML', true, true);
+	}
+
+	public function maybeGetRawCSSDefinition() {
+		return $this->getDefinition('CSS', true, true);
+	}
+
+	public function maybeGetRawURIDefinition() {
+		return $this->getDefinition('URI', true, true);
+	}
+
+	/**
+	 * Loads configuration values from an array with the following structure:
+	 * Namespace.Directive => Value
+	 * @param $config_array Configuration associative array
+	 */
+	public function loadArray($config_array) {
+		if ($this->isFinalized('Cannot load directives after finalization')) return;
+		foreach ($config_array as $key => $value) {
+			$key = str_replace('_', '.', $key);
+			if (strpos($key, '.') !== false) {
+				$this->set($key, $value);
+			} else {
+				$namespace = $key;
+				$namespace_values = $value;
+				foreach ($namespace_values as $directive => $value) {
+					$this->set($namespace .'.'. $directive, $value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns a list of array(namespace, directive) for all directives
+	 * that are allowed in a web-form context as per an allowed
+	 * namespaces/directives list.
+	 * @param $allowed List of allowed namespaces/directives
+	 */
+	public static function getAllowedDirectivesForForm($allowed, $schema = null) {
+		if (!$schema) {
+			$schema = HTMLPurifier_ConfigSchema::instance();
+		}
+		if ($allowed !== true) {
+			 if (is_string($allowed)) $allowed = array($allowed);
+			 $allowed_ns = array();
+			 $allowed_directives = array();
+			 $blacklisted_directives = array();
+			 foreach ($allowed as $ns_or_directive) {
+				 if (strpos($ns_or_directive, '.') !== false) {
+					 // directive
+					 if ($ns_or_directive[0] == '-') {
+						 $blacklisted_directives[substr($ns_or_directive, 1)] = true;
+					 } else {
+						 $allowed_directives[$ns_or_directive] = true;
+					 }
+				 } else {
+					 // namespace
+					 $allowed_ns[$ns_or_directive] = true;
+				 }
+			 }
+		}
+		$ret = array();
+		foreach ($schema->info as $key => $def) {
+			list($ns, $directive) = explode('.', $key, 2);
+			if ($allowed !== true) {
+				if (isset($blacklisted_directives["$ns.$directive"])) continue;
+				if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+			}
+			if (isset($def->isAlias)) continue;
+			if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
+			$ret[] = array($ns, $directive);
+		}
+		return $ret;
+	}
+
+	/**
+	 * Loads configuration values from $_GET/$_POST that were posted
+	 * via ConfigForm
+	 * @param $array $_GET or $_POST array to import
+	 * @param $index Index/name that the config variables are in
+	 * @param $allowed List of allowed namespaces/directives
+	 * @param $mq_fix Boolean whether or not to enable magic quotes fix
+	 * @param $schema Instance of HTMLPurifier_ConfigSchema to use, if not global copy
+	 */
+	public static function loadArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+		$ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $schema);
+		$config = HTMLPurifier_Config::create($ret, $schema);
+		return $config;
+	}
+
+	/**
+	 * Merges in configuration values from $_GET/$_POST to object. NOT STATIC.
+	 * @note Same parameters as loadArrayFromForm
+	 */
+	public function mergeArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true) {
+		 $ret = HTMLPurifier_Config::prepareArrayFromForm($array, $index, $allowed, $mq_fix, $this->def);
+		 $this->loadArray($ret);
+	}
+
+	/**
+	 * Prepares an array from a form into something usable for the more
+	 * strict parts of HTMLPurifier_Config
+	 */
+	public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
+		if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+		$mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+
+		$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
+		$ret = array();
+		foreach ($allowed as $key) {
+			list($ns, $directive) = $key;
+			$skey = "$ns.$directive";
+			if (!empty($array["Null_$skey"])) {
+				$ret[$ns][$directive] = null;
+				continue;
+			}
+			if (!isset($array[$skey])) continue;
+			$value = $mq ? stripslashes($array[$skey]) : $array[$skey];
+			$ret[$ns][$directive] = $value;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Loads configuration values from an ini file
+	 * @param $filename Name of ini file
+	 */
+	public function loadIni($filename) {
+		if ($this->isFinalized('Cannot load directives after finalization')) return;
+		$array = parse_ini_file($filename, true);
+		$this->loadArray($array);
+	}
+
+	/**
+	 * Checks whether or not the configuration object is finalized.
+	 * @param $error String error message, or false for no error
+	 */
+	public function isFinalized($error = false) {
+		if ($this->finalized && $error) {
+			$this->triggerError($error, E_USER_ERROR);
+		}
+		return $this->finalized;
+	}
+
+	/**
+	 * Finalizes configuration only if auto finalize is on and not
+	 * already finalized
+	 */
+	public function autoFinalize() {
+		if ($this->autoFinalize) {
+			$this->finalize();
+		} else {
+			$this->plist->squash(true);
+		}
+	}
+
+	/**
+	 * Finalizes a configuration object, prohibiting further change
+	 */
+	public function finalize() {
+		$this->finalized = true;
+		$this->parser = null;
+	}
+
+	/**
+	 * Produces a nicely formatted error message by supplying the
+	 * stack frame information OUTSIDE of HTMLPurifier_Config.
+	 */
+	protected function triggerError($msg, $no) {
+		// determine previous stack frame
+		$extra = '';
+		if ($this->chatty) {
+			$trace = debug_backtrace();
+			// zip(tail(trace), trace) -- but PHP is not Haskell har har
+			for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
+				if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+					continue;
+				}
+				$frame = $trace[$i];
+				$extra = " invoked on line {$frame['line']} in file {$frame['file']}";
+				break;
+			}
+		}
+		trigger_error($msg . $extra, $no);
+	}
+
+	/**
+	 * Returns a serialized form of the configuration object that can
+	 * be reconstituted.
+	 */
+	public function serialize() {
+		$this->getDefinition('HTML');
+		$this->getDefinition('CSS');
+		$this->getDefinition('URI');
+		return serialize($this);
+	}
 
 }
 

Braces +53 added lines, -18 removed lines

@@ -116,8 +116,11 @@ 
         } else {
             $ret = new HTMLPurifier_Config($schema);
         }
-        if (is_string($config)) $ret->loadIni($config);
-        elseif (is_array($config)) $ret->loadArray($config);
+        if (is_string($config)) {
+        	$ret->loadIni($config);
+        } elseif (is_array($config)) {
+        	$ret->loadArray($config);
+        }
         return $ret;
     }
 
@@ -150,7 +153,9 @@ 
             $this->triggerError("Using deprecated API: use \$config->get('$key.$a') instead", E_USER_WARNING);
             $key = "$key.$a";
         }
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         if (!isset($this->def->info[$key])) {
             // can't add % due to SimpleTest bug
             $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
@@ -178,7 +183,9 @@ 
      * @param $namespace String namespace
      */
     public function getBatch($namespace) {
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         $full = $this->getAll();
         if (!isset($full[$namespace])) {
             $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
@@ -220,7 +227,9 @@ 
      * @warning This is a pretty inefficient function, avoid if you can
      */
     public function getAll() {
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         $ret = array();
         foreach ($this->plist->squash() as $name => $value) {
             list($ns, $key) = explode('.', $name, 2);
@@ -244,7 +253,9 @@ 
         } else {
             list($namespace) = explode('.', $key);
         }
-        if ($this->isFinalized('Cannot set directive after finalization')) return;
+        if ($this->isFinalized('Cannot set directive after finalization')) {
+        	return;
+        }
         if (!isset($this->def->info[$key])) {
             $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
                 E_USER_WARNING);
@@ -311,7 +322,9 @@ 
      */
     private function _listify($lookup) {
         $list = array();
-        foreach ($lookup as $name => $b) $list[] = $name;
+        foreach ($lookup as $name => $b) {
+        	$list[] = $name;
+        }
         return implode(', ', $list);
     }
 
@@ -377,7 +390,9 @@ 
         if ($optimized && !$raw) {
             throw new HTMLPurifier_Exception("Cannot set optimized = true when raw = false");
         }
-        if (!$this->finalized) $this->autoFinalize();
+        if (!$this->finalized) {
+        	$this->autoFinalize();
+        }
         // temporarily suspend locks, so we can handle recursive definition calls
         $lock = $this->lock;
         $this->lock = null;
@@ -395,7 +410,9 @@ 
                     return $def;
                 } else {
                     $def->setup($this);
-                    if ($def->optimized) $cache->add($def, $this);
+                    if ($def->optimized) {
+                    	$cache->add($def, $this);
+                    }
                     return $def;
                 }
             }
@@ -524,7 +541,9 @@ 
      * @param $config_array Configuration associative array
      */
     public function loadArray($config_array) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        if ($this->isFinalized('Cannot load directives after finalization')) {
+        	return;
+        }
         foreach ($config_array as $key => $value) {
             $key = str_replace('_', '.', $key);
             if (strpos($key, '.') !== false) {
@@ -550,7 +569,9 @@ 
             $schema = HTMLPurifier_ConfigSchema::instance();
         }
         if ($allowed !== true) {
-             if (is_string($allowed)) $allowed = array($allowed);
+             if (is_string($allowed)) {
+             	$allowed = array($allowed);
+             }
              $allowed_ns = array();
              $allowed_directives = array();
              $blacklisted_directives = array();
@@ -572,11 +593,19 @@ 
         foreach ($schema->info as $key => $def) {
             list($ns, $directive) = explode('.', $key, 2);
             if ($allowed !== true) {
-                if (isset($blacklisted_directives["$ns.$directive"])) continue;
-                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) continue;
+                if (isset($blacklisted_directives["$ns.$directive"])) {
+                	continue;
+                }
+                if (!isset($allowed_directives["$ns.$directive"]) && !isset($allowed_ns[$ns])) {
+                	continue;
+                }
+            }
+            if (isset($def->isAlias)) {
+            	continue;
+            }
+            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') {
+            	continue;
             }
-            if (isset($def->isAlias)) continue;
-            if ($directive == 'DefinitionID' || $directive == 'DefinitionRev') continue;
             $ret[] = array($ns, $directive);
         }
         return $ret;
@@ -611,7 +640,9 @@ 
      * strict parts of HTMLPurifier_Config
      */
     public static function prepareArrayFromForm($array, $index = false, $allowed = true, $mq_fix = true, $schema = null) {
-        if ($index !== false) $array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+        if ($index !== false) {
+        	$array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
+        }
         $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
 
         $allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
@@ -623,7 +654,9 @@ 
                 $ret[$ns][$directive] = null;
                 continue;
             }
-            if (!isset($array[$skey])) continue;
+            if (!isset($array[$skey])) {
+            	continue;
+            }
             $value = $mq ? stripslashes($array[$skey]) : $array[$skey];
             $ret[$ns][$directive] = $value;
         }
@@ -635,7 +668,9 @@ 
      * @param $filename Name of ini file
      */
     public function loadIni($filename) {
-        if ($this->isFinalized('Cannot load directives after finalization')) return;
+        if ($this->isFinalized('Cannot load directives after finalization')) {
+        	return;
+        }
         $array = parse_ini_file($filename, true);
         $this->loadArray($array);
     }

Spacing +15 added lines, -15 removed lines

@@ -153,20 +153,20 @@ 
         if (!$this->finalized) $this->autoFinalize();
         if (!isset($this->def->info[$key])) {
             // can't add % due to SimpleTest bug
-            $this->triggerError('Cannot retrieve value of undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+            $this->triggerError('Cannot retrieve value of undefined directive '.htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
                 E_USER_WARNING);
             return;
         }
         if (isset($this->def->info[$key]->isAlias)) {
             $d = $this->def->info[$key];
-            $this->triggerError('Cannot get value from aliased directive, use real name ' . $d->key,
+            $this->triggerError('Cannot get value from aliased directive, use real name '.$d->key,
                 E_USER_ERROR);
             return;
         }
         if ($this->lock) {
             list($ns) = explode('.', $key);
             if ($ns !== $this->lock) {
-                $this->triggerError('Cannot get value of namespace ' . $ns . ' when lock for ' . $this->lock . ' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
+                $this->triggerError('Cannot get value of namespace '.$ns.' when lock for '.$this->lock.' is active, this probably indicates a Definition setup method is accessing directives that are not within its namespace', E_USER_ERROR);
                 return;
             }
         }
@@ -181,7 +181,7 @@ 
         if (!$this->finalized) $this->autoFinalize();
         $full = $this->getAll();
         if (!isset($full[$namespace])) {
-            $this->triggerError('Cannot retrieve undefined namespace ' . htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
+            $this->triggerError('Cannot retrieve undefined namespace '.htmlspecialchars($namespace, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
                 E_USER_WARNING);
             return;
         }
@@ -246,7 +246,7 @@ 
         }
         if ($this->isFinalized('Cannot set directive after finalization')) return;
         if (!isset($this->def->info[$key])) {
-            $this->triggerError('Cannot set undefined directive ' . htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . ' to value',
+            $this->triggerError('Cannot set undefined directive '.htmlspecialchars($key, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).' to value',
                 E_USER_WARNING);
             return;
         }
@@ -255,7 +255,7 @@ 
         if (isset($def->isAlias)) {
             if ($this->aliasMode) {
                 $this->triggerError('Double-aliases not allowed, please fix '.
-                    'ConfigSchema bug with' . $key, E_USER_ERROR);
+                    'ConfigSchema bug with'.$key, E_USER_ERROR);
                 return;
             }
             $this->aliasMode = true;
@@ -279,7 +279,7 @@ 
         try {
             $value = $this->parser->parse($value, $type, $allow_null);
         } catch (HTMLPurifier_VarParserException $e) {
-            $this->triggerError('Value for ' . $key . ' is of invalid type, should be ' . HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
+            $this->triggerError('Value for '.$key.' is of invalid type, should be '.HTMLPurifier_VarParser::getTypeName($type), E_USER_WARNING);
             return;
         }
         if (is_string($value) && is_object($def)) {
@@ -289,7 +289,7 @@ 
             }
             // check to see if the value is allowed
             if (isset($def->allowed) && !isset($def->allowed[$value])) {
-                $this->triggerError('Value not supported, valid values are: ' .
+                $this->triggerError('Value not supported, valid values are: '.
                     $this->_listify($def->allowed), E_USER_WARNING);
                 return;
             }
@@ -422,7 +422,7 @@ 
             // check preconditions
             $def = null;
             if ($optimized) {
-                if (is_null($this->get($type . '.DefinitionID'))) {
+                if (is_null($this->get($type.'.DefinitionID'))) {
                     // fatally error out if definition ID not set
                     throw new HTMLPurifier_Exception("Cannot retrieve raw version without specifying %$type.DefinitionID");
                 }
@@ -431,16 +431,16 @@ 
                 $def = $this->definitions[$type];
                 if ($def->setup && !$optimized) {
                     $extra = $this->chatty ? " (try moving this code block earlier in your initialization)" : "";
-                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup" . $extra);
+                    throw new HTMLPurifier_Exception("Cannot retrieve raw definition after it has already been setup".$extra);
                 }
                 if ($def->optimized === null) {
                     $extra = $this->chatty ? " (try flushing your cache)" : "";
-                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown" . $extra);
+                    throw new HTMLPurifier_Exception("Optimization status of definition is unknown".$extra);
                 }
                 if ($def->optimized !== $optimized) {
                     $msg = $optimized ? "optimized" : "unoptimized";
                     $extra = $this->chatty ? " (this backtrace is for the first inconsistent call, which was for a $msg raw definition)" : "";
-                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals" . $extra);
+                    throw new HTMLPurifier_Exception("Inconsistent use of optimized and unoptimized raw definition retrievals".$extra);
                 }
             }
             // check if definition was in memory
@@ -471,7 +471,7 @@ 
             }
             // check invariants for creation
             if (!$optimized) {
-                if (!is_null($this->get($type . '.DefinitionID'))) {
+                if (!is_null($this->get($type.'.DefinitionID'))) {
                     if ($this->chatty) {
                         $this->triggerError("Due to a documentation error in previous version of HTML Purifier, your definitions are not being cached.  If this is OK, you can remove the %$type.DefinitionRev and %$type.DefinitionID declaration.  Otherwise, modify your code to use maybeGetRawDefinition, and test if the returned value is null before making any edits (if it is null, that means that a cached version is available, and no raw operations are necessary).  See <a href='http://htmlpurifier.org/docs/enduser-customize.html#optimized'>Customize</a> for more details", E_USER_WARNING);
                     } else {
@@ -533,7 +533,7 @@ 
                 $namespace = $key;
                 $namespace_values = $value;
                 foreach ($namespace_values as $directive => $value) {
-                    $this->set($namespace .'.'. $directive, $value);
+                    $this->set($namespace.'.'.$directive, $value);
                 }
             }
         }
@@ -690,7 +690,7 @@ 
                 break;
             }
         }
-        trigger_error($msg . $extra, $no);
+        trigger_error($msg.$extra, $no);
     }
 
     /**

Doc Comments +7 added lines, -6 removed lines

@@ -89,6 +89,7 @@ 
     /**
      * @param $definition HTMLPurifier_ConfigSchema that defines what directives
      *                    are allowed.
+     * @param HTMLPurifier_PropertyList $parent
      */
     public function __construct($definition, $parent = null) {
         $parent = $parent ? $parent : $definition->defaultPlist;
@@ -104,7 +105,7 @@ 
      *                      an array of directives based on loadArray(),
      *                      or a string filename of an ini file.
      * @param HTMLPurifier_ConfigSchema Schema object
-     * @return Configured HTMLPurifier_Config object
+     * @return HTMLPurifier_Config HTMLPurifier_Config object
      */
     public static function create($config, $schema = null) {
         if ($config instanceof HTMLPurifier_Config) {
@@ -133,7 +134,7 @@ 
 
     /**
      * Convenience constructor that creates a default configuration object.
-     * @return Default HTMLPurifier_Config object.
+     * @return HTMLPurifier_Config HTMLPurifier_Config object.
      */
     public static function createDefault() {
         $definition = HTMLPurifier_ConfigSchema::instance();
@@ -143,7 +144,7 @@ 
 
     /**
      * Retreives a value from the configuration.
-     * @param $key String key
+     * @param string $key String key
      */
     public function get($key, $a = null) {
         if ($a !== null) {
@@ -543,7 +544,7 @@ 
      * Returns a list of array(namespace, directive) for all directives
      * that are allowed in a web-form context as per an allowed
      * namespaces/directives list.
-     * @param $allowed List of allowed namespaces/directives
+     * @param boolean $allowed List of allowed namespaces/directives
      */
     public static function getAllowedDirectivesForForm($allowed, $schema = null) {
         if (!$schema) {
@@ -585,7 +586,6 @@ 
     /**
      * Loads configuration values from $_GET/$_POST that were posted
      * via ConfigForm
-     * @param $array $_GET or $_POST array to import
      * @param $index Index/name that the config variables are in
      * @param $allowed List of allowed namespaces/directives
      * @param $mq_fix Boolean whether or not to enable magic quotes fix
@@ -632,7 +632,7 @@ 
 
     /**
      * Loads configuration values from an ini file
-     * @param $filename Name of ini file
+     * @param string $filename Name of ini file
      */
     public function loadIni($filename) {
         if ($this->isFinalized('Cannot load directives after finalization')) return;
@@ -674,6 +674,7 @@ 
     /**
      * Produces a nicely formatted error message by supplying the
      * stack frame information OUTSIDE of HTMLPurifier_Config.
+     * @param integer $no
      */
     protected function triggerError($msg, $no) {
         // determine previous stack frame

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

Indentation +142 added lines, -142 removed lines

@@ -5,159 +5,159 @@
  */
 class HTMLPurifier_ConfigSchema {
 
-    /**
-     * Defaults of the directives and namespaces.
-     * @note This shares the exact same structure as HTMLPurifier_Config::$conf
-     */
-    public $defaults = array();
+	/**
+	 * Defaults of the directives and namespaces.
+	 * @note This shares the exact same structure as HTMLPurifier_Config::$conf
+	 */
+	public $defaults = array();
 
-    /**
-     * The default property list. Do not edit this property list.
-     */
-    public $defaultPlist;
+	/**
+	 * The default property list. Do not edit this property list.
+	 */
+	public $defaultPlist;
 
-    /**
-     * Definition of the directives. The structure of this is:
-     *
-     *  array(
-     *      'Namespace' => array(
-     *          'Directive' => new stdclass(),
-     *      )
-     *  )
-     *
-     * The stdclass may have the following properties:
-     *
-     *  - If isAlias isn't set:
-     *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
-     *      - allow_null: If set, this directive allows null values
-     *      - aliases: If set, an associative array of value aliases to real values
-     *      - allowed: If set, a lookup array of allowed (string) values
-     *  - If isAlias is set:
-     *      - namespace: Namespace this directive aliases to
-     *      - name: Directive name this directive aliases to
-     *
-     * In certain degenerate cases, stdclass will actually be an integer. In
-     * that case, the value is equivalent to an stdclass with the type
-     * property set to the integer. If the integer is negative, type is
-     * equal to the absolute value of integer, and allow_null is true.
-     *
-     * This class is friendly with HTMLPurifier_Config. If you need introspection
-     * about the schema, you're better of using the ConfigSchema_Interchange,
-     * which uses more memory but has much richer information.
-     */
-    public $info = array();
+	/**
+	 * Definition of the directives. The structure of this is:
+	 *
+	 *  array(
+	 *      'Namespace' => array(
+	 *          'Directive' => new stdclass(),
+	 *      )
+	 *  )
+	 *
+	 * The stdclass may have the following properties:
+	 *
+	 *  - If isAlias isn't set:
+	 *      - type: Integer type of directive, see HTMLPurifier_VarParser for definitions
+	 *      - allow_null: If set, this directive allows null values
+	 *      - aliases: If set, an associative array of value aliases to real values
+	 *      - allowed: If set, a lookup array of allowed (string) values
+	 *  - If isAlias is set:
+	 *      - namespace: Namespace this directive aliases to
+	 *      - name: Directive name this directive aliases to
+	 *
+	 * In certain degenerate cases, stdclass will actually be an integer. In
+	 * that case, the value is equivalent to an stdclass with the type
+	 * property set to the integer. If the integer is negative, type is
+	 * equal to the absolute value of integer, and allow_null is true.
+	 *
+	 * This class is friendly with HTMLPurifier_Config. If you need introspection
+	 * about the schema, you're better of using the ConfigSchema_Interchange,
+	 * which uses more memory but has much richer information.
+	 */
+	public $info = array();
 
-    /**
-     * Application-wide singleton
-     */
-    static protected $singleton;
+	/**
+	 * Application-wide singleton
+	 */
+	static protected $singleton;
 
-    public function __construct() {
-        $this->defaultPlist = new HTMLPurifier_PropertyList();
-    }
+	public function __construct() {
+		$this->defaultPlist = new HTMLPurifier_PropertyList();
+	}
 
-    /**
-     * Unserializes the default ConfigSchema.
-     */
-    public static function makeFromSerial() {
-        $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
-        $r = unserialize($contents);
-        if (!$r) {
-            $hash = sha1($contents);
-            trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
-        }
-        return $r;
-    }
+	/**
+	 * Unserializes the default ConfigSchema.
+	 */
+	public static function makeFromSerial() {
+		$contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
+		$r = unserialize($contents);
+		if (!$r) {
+			$hash = sha1($contents);
+			trigger_error("Unserialization of configuration schema failed, sha1 of file was $hash", E_USER_ERROR);
+		}
+		return $r;
+	}
 
-    /**
-     * Retrieves an instance of the application-wide configuration definition.
-     */
-    public static function instance($prototype = null) {
-        if ($prototype !== null) {
-            HTMLPurifier_ConfigSchema::$singleton = $prototype;
-        } elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
-            HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
-        }
-        return HTMLPurifier_ConfigSchema::$singleton;
-    }
+	/**
+	 * Retrieves an instance of the application-wide configuration definition.
+	 */
+	public static function instance($prototype = null) {
+		if ($prototype !== null) {
+			HTMLPurifier_ConfigSchema::$singleton = $prototype;
+		} elseif (HTMLPurifier_ConfigSchema::$singleton === null || $prototype === true) {
+			HTMLPurifier_ConfigSchema::$singleton = HTMLPurifier_ConfigSchema::makeFromSerial();
+		}
+		return HTMLPurifier_ConfigSchema::$singleton;
+	}
 
-    /**
-     * Defines a directive for configuration
-     * @warning Will fail of directive's namespace is defined.
-     * @warning This method's signature is slightly different from the legacy
-     *          define() static method! Beware!
-     * @param $namespace Namespace the directive is in
-     * @param $name Key of directive
-     * @param $default Default value of directive
-     * @param $type Allowed type of the directive. See
-     *      HTMLPurifier_DirectiveDef::$type for allowed values
-     * @param $allow_null Whether or not to allow null values
-     */
-    public function add($key, $default, $type, $allow_null) {
-        $obj = new stdclass();
-        $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) $obj->allow_null = true;
-        $this->info[$key] = $obj;
-        $this->defaults[$key] = $default;
-        $this->defaultPlist->set($key, $default);
-    }
+	/**
+	 * Defines a directive for configuration
+	 * @warning Will fail of directive's namespace is defined.
+	 * @warning This method's signature is slightly different from the legacy
+	 *          define() static method! Beware!
+	 * @param $namespace Namespace the directive is in
+	 * @param $name Key of directive
+	 * @param $default Default value of directive
+	 * @param $type Allowed type of the directive. See
+	 *      HTMLPurifier_DirectiveDef::$type for allowed values
+	 * @param $allow_null Whether or not to allow null values
+	 */
+	public function add($key, $default, $type, $allow_null) {
+		$obj = new stdclass();
+		$obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
+		if ($allow_null) $obj->allow_null = true;
+		$this->info[$key] = $obj;
+		$this->defaults[$key] = $default;
+		$this->defaultPlist->set($key, $default);
+	}
 
-    /**
-     * Defines a directive value alias.
-     *
-     * Directive value aliases are convenient for developers because it lets
-     * them set a directive to several values and get the same result.
-     * @param $namespace Directive's namespace
-     * @param $name Name of Directive
-     * @param $aliases Hash of aliased values to the real alias
-     */
-    public function addValueAliases($key, $aliases) {
-        if (!isset($this->info[$key]->aliases)) {
-            $this->info[$key]->aliases = array();
-        }
-        foreach ($aliases as $alias => $real) {
-            $this->info[$key]->aliases[$alias] = $real;
-        }
-    }
+	/**
+	 * Defines a directive value alias.
+	 *
+	 * Directive value aliases are convenient for developers because it lets
+	 * them set a directive to several values and get the same result.
+	 * @param $namespace Directive's namespace
+	 * @param $name Name of Directive
+	 * @param $aliases Hash of aliased values to the real alias
+	 */
+	public function addValueAliases($key, $aliases) {
+		if (!isset($this->info[$key]->aliases)) {
+			$this->info[$key]->aliases = array();
+		}
+		foreach ($aliases as $alias => $real) {
+			$this->info[$key]->aliases[$alias] = $real;
+		}
+	}
 
-    /**
-     * Defines a set of allowed values for a directive.
-     * @warning This is slightly different from the corresponding static
-     *          method definition.
-     * @param $namespace Namespace of directive
-     * @param $name Name of directive
-     * @param $allowed Lookup array of allowed values
-     */
-    public function addAllowedValues($key, $allowed) {
-        $this->info[$key]->allowed = $allowed;
-    }
+	/**
+	 * Defines a set of allowed values for a directive.
+	 * @warning This is slightly different from the corresponding static
+	 *          method definition.
+	 * @param $namespace Namespace of directive
+	 * @param $name Name of directive
+	 * @param $allowed Lookup array of allowed values
+	 */
+	public function addAllowedValues($key, $allowed) {
+		$this->info[$key]->allowed = $allowed;
+	}
 
-    /**
-     * Defines a directive alias for backwards compatibility
-     * @param $namespace
-     * @param $name Directive that will be aliased
-     * @param $new_namespace
-     * @param $new_name Directive that the alias will be to
-     */
-    public function addAlias($key, $new_key) {
-        $obj = new stdclass;
-        $obj->key = $new_key;
-        $obj->isAlias = true;
-        $this->info[$key] = $obj;
-    }
+	/**
+	 * Defines a directive alias for backwards compatibility
+	 * @param $namespace
+	 * @param $name Directive that will be aliased
+	 * @param $new_namespace
+	 * @param $new_name Directive that the alias will be to
+	 */
+	public function addAlias($key, $new_key) {
+		$obj = new stdclass;
+		$obj->key = $new_key;
+		$obj->isAlias = true;
+		$this->info[$key] = $obj;
+	}
 
-    /**
-     * Replaces any stdclass that only has the type property with type integer.
-     */
-    public function postProcess() {
-        foreach ($this->info as $key => $v) {
-            if (count((array) $v) == 1) {
-                $this->info[$key] = $v->type;
-            } elseif (count((array) $v) == 2 && isset($v->allow_null)) {
-                $this->info[$key] = -$v->type;
-            }
-        }
-    }
+	/**
+	 * Replaces any stdclass that only has the type property with type integer.
+	 */
+	public function postProcess() {
+		foreach ($this->info as $key => $v) {
+			if (count((array) $v) == 1) {
+				$this->info[$key] = $v->type;
+			} elseif (count((array) $v) == 2 && isset($v->allow_null)) {
+				$this->info[$key] = -$v->type;
+			}
+		}
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -96,7 +96,9 @@
     public function add($key, $default, $type, $allow_null) {
         $obj = new stdclass();
         $obj->type = is_int($type) ? $type : HTMLPurifier_VarParser::$types[$type];
-        if ($allow_null) $obj->allow_null = true;
+        if ($allow_null) {
+        	$obj->allow_null = true;
+        }
         $this->info[$key] = $obj;
         $this->defaults[$key] = $default;
         $this->defaultPlist->set($key, $default);

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      * Unserializes the default ConfigSchema.
      */
     public static function makeFromSerial() {
-        $contents = file_get_contents(HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema.ser');
+        $contents = file_get_contents(HTMLPURIFIER_PREFIX.'/HTMLPurifier/ConfigSchema/schema.ser');
         $r = unserialize($contents);
         if (!$r) {
             $hash = sha1($contents);

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/ConfigSchema.php

Indentation +31 added lines, -31 removed lines

@@ -7,37 +7,37 @@
 class HTMLPurifier_ConfigSchema_Builder_ConfigSchema
 {
 
-    public function build($interchange) {
-        $schema = new HTMLPurifier_ConfigSchema();
-        foreach ($interchange->directives as $d) {
-            $schema->add(
-                $d->id->key,
-                $d->default,
-                $d->type,
-                $d->typeAllowsNull
-            );
-            if ($d->allowed !== null) {
-                $schema->addAllowedValues(
-                    $d->id->key,
-                    $d->allowed
-                );
-            }
-            foreach ($d->aliases as $alias) {
-                $schema->addAlias(
-                    $alias->key,
-                    $d->id->key
-                );
-            }
-            if ($d->valueAliases !== null) {
-                $schema->addValueAliases(
-                    $d->id->key,
-                    $d->valueAliases
-                );
-            }
-        }
-        $schema->postProcess();
-        return $schema;
-    }
+	public function build($interchange) {
+		$schema = new HTMLPurifier_ConfigSchema();
+		foreach ($interchange->directives as $d) {
+			$schema->add(
+				$d->id->key,
+				$d->default,
+				$d->type,
+				$d->typeAllowsNull
+			);
+			if ($d->allowed !== null) {
+				$schema->addAllowedValues(
+					$d->id->key,
+					$d->allowed
+				);
+			}
+			foreach ($d->aliases as $alias) {
+				$schema->addAlias(
+					$alias->key,
+					$d->id->key
+				);
+			}
+			if ($d->valueAliases !== null) {
+				$schema->addValueAliases(
+					$d->id->key,
+					$d->valueAliases
+				);
+			}
+		}
+		$schema->postProcess();
+		return $schema;
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Builder/Xml.php

Indentation +93 added lines, -93 removed lines

@@ -7,99 +7,99 @@
 class HTMLPurifier_ConfigSchema_Builder_Xml extends XMLWriter
 {
 
-    protected $interchange;
-    private $namespace;
-
-    protected function writeHTMLDiv($html) {
-        $this->startElement('div');
-
-        $purifier = HTMLPurifier::getInstance();
-        $html = $purifier->purify($html);
-        $this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        $this->writeRaw($html);
-
-        $this->endElement(); // div
-    }
-
-    protected function export($var) {
-        if ($var === array()) return 'array()';
-        return var_export($var, true);
-    }
-
-    public function build($interchange) {
-        // global access, only use as last resort
-        $this->interchange = $interchange;
-
-        $this->setIndent(true);
-        $this->startDocument('1.0', 'UTF-8');
-        $this->startElement('configdoc');
-        $this->writeElement('title', $interchange->name);
-
-        foreach ($interchange->directives as $directive) {
-            $this->buildDirective($directive);
-        }
-
-        if ($this->namespace) $this->endElement(); // namespace
-
-        $this->endElement(); // configdoc
-        $this->flush();
-    }
-
-    public function buildDirective($directive) {
-
-        // Kludge, although I suppose having a notion of a "root namespace"
-        // certainly makes things look nicer when documentation is built.
-        // Depends on things being sorted.
-        if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) $this->endElement(); // namespace
-            $this->namespace = $directive->id->getRootNamespace();
-            $this->startElement('namespace');
-            $this->writeAttribute('id', $this->namespace);
-            $this->writeElement('name', $this->namespace);
-        }
-
-        $this->startElement('directive');
-        $this->writeAttribute('id', $directive->id->toString());
-
-        $this->writeElement('name', $directive->id->getDirective());
-
-        $this->startElement('aliases');
-            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
-        $this->endElement(); // aliases
-
-        $this->startElement('constraints');
-            if ($directive->version) $this->writeElement('version', $directive->version);
-            $this->startElement('type');
-                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
-                $this->text($directive->type);
-            $this->endElement(); // type
-            if ($directive->allowed) {
-                $this->startElement('allowed');
-                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
-                $this->endElement(); // allowed
-            }
-            $this->writeElement('default', $this->export($directive->default));
-            $this->writeAttribute('xml:space', 'preserve');
-            if ($directive->external) {
-                $this->startElement('external');
-                    foreach ($directive->external as $project) $this->writeElement('project', $project);
-                $this->endElement();
-            }
-        $this->endElement(); // constraints
-
-        if ($directive->deprecatedVersion) {
-            $this->startElement('deprecated');
-                $this->writeElement('version', $directive->deprecatedVersion);
-                $this->writeElement('use', $directive->deprecatedUse->toString());
-            $this->endElement(); // deprecated
-        }
-
-        $this->startElement('description');
-            $this->writeHTMLDiv($directive->description);
-        $this->endElement(); // description
-
-        $this->endElement(); // directive
-    }
+	protected $interchange;
+	private $namespace;
+
+	protected function writeHTMLDiv($html) {
+		$this->startElement('div');
+
+		$purifier = HTMLPurifier::getInstance();
+		$html = $purifier->purify($html);
+		$this->writeAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
+		$this->writeRaw($html);
+
+		$this->endElement(); // div
+	}
+
+	protected function export($var) {
+		if ($var === array()) return 'array()';
+		return var_export($var, true);
+	}
+
+	public function build($interchange) {
+		// global access, only use as last resort
+		$this->interchange = $interchange;
+
+		$this->setIndent(true);
+		$this->startDocument('1.0', 'UTF-8');
+		$this->startElement('configdoc');
+		$this->writeElement('title', $interchange->name);
+
+		foreach ($interchange->directives as $directive) {
+			$this->buildDirective($directive);
+		}
+
+		if ($this->namespace) $this->endElement(); // namespace
+
+		$this->endElement(); // configdoc
+		$this->flush();
+	}
+
+	public function buildDirective($directive) {
+
+		// Kludge, although I suppose having a notion of a "root namespace"
+		// certainly makes things look nicer when documentation is built.
+		// Depends on things being sorted.
+		if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
+			if ($this->namespace) $this->endElement(); // namespace
+			$this->namespace = $directive->id->getRootNamespace();
+			$this->startElement('namespace');
+			$this->writeAttribute('id', $this->namespace);
+			$this->writeElement('name', $this->namespace);
+		}
+
+		$this->startElement('directive');
+		$this->writeAttribute('id', $directive->id->toString());
+
+		$this->writeElement('name', $directive->id->getDirective());
+
+		$this->startElement('aliases');
+			foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
+		$this->endElement(); // aliases
+
+		$this->startElement('constraints');
+			if ($directive->version) $this->writeElement('version', $directive->version);
+			$this->startElement('type');
+				if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
+				$this->text($directive->type);
+			$this->endElement(); // type
+			if ($directive->allowed) {
+				$this->startElement('allowed');
+					foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
+				$this->endElement(); // allowed
+			}
+			$this->writeElement('default', $this->export($directive->default));
+			$this->writeAttribute('xml:space', 'preserve');
+			if ($directive->external) {
+				$this->startElement('external');
+					foreach ($directive->external as $project) $this->writeElement('project', $project);
+				$this->endElement();
+			}
+		$this->endElement(); // constraints
+
+		if ($directive->deprecatedVersion) {
+			$this->startElement('deprecated');
+				$this->writeElement('version', $directive->deprecatedVersion);
+				$this->writeElement('use', $directive->deprecatedUse->toString());
+			$this->endElement(); // deprecated
+		}
+
+		$this->startElement('description');
+			$this->writeHTMLDiv($directive->description);
+		$this->endElement(); // description
+
+		$this->endElement(); // directive
+	}
 
 }
 

Braces +26 added lines, -8 removed lines

@@ -22,7 +22,9 @@ 
     }
 
     protected function export($var) {
-        if ($var === array()) return 'array()';
+        if ($var === array()) {
+        	return 'array()';
+        }
         return var_export($var, true);
     }
 
@@ -39,7 +41,10 @@ 
             $this->buildDirective($directive);
         }
 
-        if ($this->namespace) $this->endElement(); // namespace
+        if ($this->namespace) {
+        	$this->endElement();
+        }
+        // namespace
 
         $this->endElement(); // configdoc
         $this->flush();
@@ -51,7 +56,10 @@ 
         // certainly makes things look nicer when documentation is built.
         // Depends on things being sorted.
         if (!$this->namespace || $this->namespace !== $directive->id->getRootNamespace()) {
-            if ($this->namespace) $this->endElement(); // namespace
+            if ($this->namespace) {
+            	$this->endElement();
+            }
+            // namespace
             $this->namespace = $directive->id->getRootNamespace();
             $this->startElement('namespace');
             $this->writeAttribute('id', $this->namespace);
@@ -64,25 +72,35 @@ 
         $this->writeElement('name', $directive->id->getDirective());
 
         $this->startElement('aliases');
-            foreach ($directive->aliases as $alias) $this->writeElement('alias', $alias->toString());
+            foreach ($directive->aliases as $alias) {
+            	$this->writeElement('alias', $alias->toString());
+            }
         $this->endElement(); // aliases
 
         $this->startElement('constraints');
-            if ($directive->version) $this->writeElement('version', $directive->version);
+            if ($directive->version) {
+            	$this->writeElement('version', $directive->version);
+            }
             $this->startElement('type');
-                if ($directive->typeAllowsNull) $this->writeAttribute('allow-null', 'yes');
+                if ($directive->typeAllowsNull) {
+                	$this->writeAttribute('allow-null', 'yes');
+                }
                 $this->text($directive->type);
             $this->endElement(); // type
             if ($directive->allowed) {
                 $this->startElement('allowed');
-                    foreach ($directive->allowed as $value => $x) $this->writeElement('value', $value);
+                    foreach ($directive->allowed as $value => $x) {
+                    	$this->writeElement('value', $value);
+                    }
                 $this->endElement(); // allowed
             }
             $this->writeElement('default', $this->export($directive->default));
             $this->writeAttribute('xml:space', 'preserve');
             if ($directive->external) {
                 $this->startElement('external');
-                    foreach ($directive->external as $project) $this->writeElement('project', $project);
+                    foreach ($directive->external as $project) {
+                    	$this->writeElement('project', $project);
+                    }
                 $this->endElement();
             }
         $this->endElement(); // constraints

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange.php

Indentation +25 added lines, -25 removed lines

@@ -8,34 +8,34 @@
 class HTMLPurifier_ConfigSchema_Interchange
 {
 
-    /**
-     * Name of the application this schema is describing.
-     */
-    public $name;
+	/**
+	 * Name of the application this schema is describing.
+	 */
+	public $name;
 
-    /**
-     * Array of Directive ID => array(directive info)
-     */
-    public $directives = array();
+	/**
+	 * Array of Directive ID => array(directive info)
+	 */
+	public $directives = array();
 
-    /**
-     * Adds a directive array to $directives
-     */
-    public function addDirective($directive) {
-        if (isset($this->directives[$i = $directive->id->toString()])) {
-            throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
-        }
-        $this->directives[$i] = $directive;
-    }
+	/**
+	 * Adds a directive array to $directives
+	 */
+	public function addDirective($directive) {
+		if (isset($this->directives[$i = $directive->id->toString()])) {
+			throw new HTMLPurifier_ConfigSchema_Exception("Cannot redefine directive '$i'");
+		}
+		$this->directives[$i] = $directive;
+	}
 
-    /**
-     * Convenience function to perform standard validation. Throws exception
-     * on failed validation.
-     */
-    public function validate() {
-        $validator = new HTMLPurifier_ConfigSchema_Validator();
-        return $validator->validate($this);
-    }
+	/**
+	 * Convenience function to perform standard validation. Throws exception
+	 * on failed validation.
+	 */
+	public function validate() {
+		$validator = new HTMLPurifier_ConfigSchema_Validator();
+		return $validator->validate($this);
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Directive.php

Indentation +54 added lines, -54 removed lines

@@ -6,71 +6,71 @@
 class HTMLPurifier_ConfigSchema_Interchange_Directive
 {
 
-    /**
-     * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
-     */
-    public $id;
+	/**
+	 * ID of directive, instance of HTMLPurifier_ConfigSchema_Interchange_Id.
+	 */
+	public $id;
 
-    /**
-     * String type, e.g. 'integer' or 'istring'.
-     */
-    public $type;
+	/**
+	 * String type, e.g. 'integer' or 'istring'.
+	 */
+	public $type;
 
-    /**
-     * Default value, e.g. 3 or 'DefaultVal'.
-     */
-    public $default;
+	/**
+	 * Default value, e.g. 3 or 'DefaultVal'.
+	 */
+	public $default;
 
-    /**
-     * HTML description.
-     */
-    public $description;
+	/**
+	 * HTML description.
+	 */
+	public $description;
 
-    /**
-     * Boolean whether or not null is allowed as a value.
-     */
-    public $typeAllowsNull = false;
+	/**
+	 * Boolean whether or not null is allowed as a value.
+	 */
+	public $typeAllowsNull = false;
 
-    /**
-     * Lookup table of allowed scalar values, e.g. array('allowed' => true).
-     * Null if all values are allowed.
-     */
-    public $allowed;
+	/**
+	 * Lookup table of allowed scalar values, e.g. array('allowed' => true).
+	 * Null if all values are allowed.
+	 */
+	public $allowed;
 
-    /**
-     * List of aliases for the directive,
-     * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
-     */
-    public $aliases = array();
+	/**
+	 * List of aliases for the directive,
+	 * e.g. array(new HTMLPurifier_ConfigSchema_Interchange_Id('Ns', 'Dir'))).
+	 */
+	public $aliases = array();
 
-    /**
-     * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
-     * aliasing is disabled (necessary for non-scalar types).
-     */
-    public $valueAliases;
+	/**
+	 * Hash of value aliases, e.g. array('alt' => 'real'). Null if value
+	 * aliasing is disabled (necessary for non-scalar types).
+	 */
+	public $valueAliases;
 
-    /**
-     * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
-     * Null if the directive has always existed.
-     */
-    public $version;
+	/**
+	 * Version of HTML Purifier the directive was introduced, e.g. '1.3.1'.
+	 * Null if the directive has always existed.
+	 */
+	public $version;
 
-    /**
-     * ID of directive that supercedes this old directive, is an instance
-     * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
-     */
-    public $deprecatedUse;
+	/**
+	 * ID of directive that supercedes this old directive, is an instance
+	 * of HTMLPurifier_ConfigSchema_Interchange_Id. Null if not deprecated.
+	 */
+	public $deprecatedUse;
 
-    /**
-     * Version of HTML Purifier this directive was deprecated. Null if not
-     * deprecated.
-     */
-    public $deprecatedVersion;
+	/**
+	 * Version of HTML Purifier this directive was deprecated. Null if not
+	 * deprecated.
+	 */
+	public $deprecatedVersion;
 
-    /**
-     * List of external projects this directive depends on, e.g. array('CSSTidy').
-     */
-    public $external = array();
+	/**
+	 * List of external projects this directive depends on, e.g. array('CSSTidy').
+	 */
+	public $external = array();
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/Interchange/Id.php

Indentation +25 added lines, -25 removed lines

@@ -6,31 +6,31 @@
 class HTMLPurifier_ConfigSchema_Interchange_Id
 {
 
-    public $key;
-
-    public function __construct($key) {
-        $this->key = $key;
-    }
-
-    /**
-     * @warning This is NOT magic, to ensure that people don't abuse SPL and
-     *          cause problems for PHP 5.0 support.
-     */
-    public function toString() {
-        return $this->key;
-    }
-
-    public function getRootNamespace() {
-        return substr($this->key, 0, strpos($this->key, "."));
-    }
-
-    public function getDirective() {
-        return substr($this->key, strpos($this->key, ".") + 1);
-    }
-
-    public static function make($id) {
-        return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
-    }
+	public $key;
+
+	public function __construct($key) {
+		$this->key = $key;
+	}
+
+	/**
+	 * @warning This is NOT magic, to ensure that people don't abuse SPL and
+	 *          cause problems for PHP 5.0 support.
+	 */
+	public function toString() {
+		return $this->key;
+	}
+
+	public function getRootNamespace() {
+		return substr($this->key, 0, strpos($this->key, "."));
+	}
+
+	public function getDirective() {
+		return substr($this->key, strpos($this->key, ".") + 1);
+	}
+
+	public static function make($id) {
+		return new HTMLPurifier_ConfigSchema_Interchange_Id($id);
+	}
 
 }
 

classes/security/htmlpurifier/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php

Indentation +171 added lines, -171 removed lines

@@ -3,177 +3,177 @@
 class HTMLPurifier_ConfigSchema_InterchangeBuilder
 {
 
-    /**
-     * Used for processing DEFAULT, nothing else.
-     */
-    protected $varParser;
-
-    public function __construct($varParser = null) {
-        $this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
-    }
-
-    public static function buildFromDirectory($dir = null) {
-        $builder     = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
-        $interchange = new HTMLPurifier_ConfigSchema_Interchange();
-        return $builder->buildDir($interchange, $dir);
-    }
-
-    public function buildDir($interchange, $dir = null) {
-        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
-        if (file_exists($dir . '/info.ini')) {
-            $info = parse_ini_file($dir . '/info.ini');
-            $interchange->name = $info['name'];
-        }
-
-        $files = array();
-        $dh = opendir($dir);
-        while (false !== ($file = readdir($dh))) {
-            if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
-                continue;
-            }
-            $files[] = $file;
-        }
-        closedir($dh);
-
-        sort($files);
-        foreach ($files as $file) {
-            $this->buildFile($interchange, $dir . '/' . $file);
-        }
-
-        return $interchange;
-    }
-
-    public function buildFile($interchange, $file) {
-        $parser = new HTMLPurifier_StringHashParser();
-        $this->build(
-            $interchange,
-            new HTMLPurifier_StringHash( $parser->parseFile($file) )
-        );
-    }
-
-    /**
-     * Builds an interchange object based on a hash.
-     * @param $interchange HTMLPurifier_ConfigSchema_Interchange object to build
-     * @param $hash HTMLPurifier_ConfigSchema_StringHash source data
-     */
-    public function build($interchange, $hash) {
-        if (!$hash instanceof HTMLPurifier_StringHash) {
-            $hash = new HTMLPurifier_StringHash($hash);
-        }
-        if (!isset($hash['ID'])) {
-            throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
-        }
-        if (strpos($hash['ID'], '.') === false) {
-            if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
-                $hash->offsetGet('DESCRIPTION'); // prevent complaining
-            } else {
-                throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
-            }
-        } else {
-            $this->buildDirective($interchange, $hash);
-        }
-        $this->_findUnused($hash);
-    }
-
-    public function buildDirective($interchange, $hash) {
-        $directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
-
-        // These are required elements:
-        $directive->id = $this->id($hash->offsetGet('ID'));
-        $id = $directive->id->toString(); // convenience
-
-        if (isset($hash['TYPE'])) {
-            $type = explode('/', $hash->offsetGet('TYPE'));
-            if (isset($type[1])) $directive->typeAllowsNull = true;
-            $directive->type = $type[0];
-        } else {
-            throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
-        }
-
-        if (isset($hash['DEFAULT'])) {
-            try {
-                $directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
-            } catch (HTMLPurifier_VarParserException $e) {
-                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
-            }
-        }
-
-        if (isset($hash['DESCRIPTION'])) {
-            $directive->description = $hash->offsetGet('DESCRIPTION');
-        }
-
-        if (isset($hash['ALLOWED'])) {
-            $directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
-        }
-
-        if (isset($hash['VALUE-ALIASES'])) {
-            $directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
-        }
-
-        if (isset($hash['ALIASES'])) {
-            $raw_aliases = trim($hash->offsetGet('ALIASES'));
-            $aliases = preg_split('/\s*,\s*/', $raw_aliases);
-            foreach ($aliases as $alias) {
-                $directive->aliases[] = $this->id($alias);
-            }
-        }
-
-        if (isset($hash['VERSION'])) {
-            $directive->version = $hash->offsetGet('VERSION');
-        }
-
-        if (isset($hash['DEPRECATED-USE'])) {
-            $directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
-        }
-
-        if (isset($hash['DEPRECATED-VERSION'])) {
-            $directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
-        }
-
-        if (isset($hash['EXTERNAL'])) {
-            $directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
-        }
-
-        $interchange->addDirective($directive);
-    }
-
-    /**
-     * Evaluates an array PHP code string without array() wrapper
-     */
-    protected function evalArray($contents) {
-        return eval('return array('. $contents .');');
-    }
-
-    /**
-     * Converts an array list into a lookup array.
-     */
-    protected function lookup($array) {
-        $ret = array();
-        foreach ($array as $val) $ret[$val] = true;
-        return $ret;
-    }
-
-    /**
-     * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
-     * object based on a string Id.
-     */
-    protected function id($id) {
-        return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
-    }
-
-    /**
-     * Triggers errors for any unused keys passed in the hash; such keys
-     * may indicate typos, missing values, etc.
-     * @param $hash Instance of ConfigSchema_StringHash to check.
-     */
-    protected function _findUnused($hash) {
-        $accessed = $hash->getAccessed();
-        foreach ($hash as $k => $v) {
-            if (!isset($accessed[$k])) {
-                trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
-            }
-        }
-    }
+	/**
+	 * Used for processing DEFAULT, nothing else.
+	 */
+	protected $varParser;
+
+	public function __construct($varParser = null) {
+		$this->varParser = $varParser ? $varParser : new HTMLPurifier_VarParser_Native();
+	}
+
+	public static function buildFromDirectory($dir = null) {
+		$builder     = new HTMLPurifier_ConfigSchema_InterchangeBuilder();
+		$interchange = new HTMLPurifier_ConfigSchema_Interchange();
+		return $builder->buildDir($interchange, $dir);
+	}
+
+	public function buildDir($interchange, $dir = null) {
+		if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
+		if (file_exists($dir . '/info.ini')) {
+			$info = parse_ini_file($dir . '/info.ini');
+			$interchange->name = $info['name'];
+		}
+
+		$files = array();
+		$dh = opendir($dir);
+		while (false !== ($file = readdir($dh))) {
+			if (!$file || $file[0] == '.' || strrchr($file, '.') !== '.txt') {
+				continue;
+			}
+			$files[] = $file;
+		}
+		closedir($dh);
+
+		sort($files);
+		foreach ($files as $file) {
+			$this->buildFile($interchange, $dir . '/' . $file);
+		}
+
+		return $interchange;
+	}
+
+	public function buildFile($interchange, $file) {
+		$parser = new HTMLPurifier_StringHashParser();
+		$this->build(
+			$interchange,
+			new HTMLPurifier_StringHash( $parser->parseFile($file) )
+		);
+	}
+
+	/**
+	 * Builds an interchange object based on a hash.
+	 * @param $interchange HTMLPurifier_ConfigSchema_Interchange object to build
+	 * @param $hash HTMLPurifier_ConfigSchema_StringHash source data
+	 */
+	public function build($interchange, $hash) {
+		if (!$hash instanceof HTMLPurifier_StringHash) {
+			$hash = new HTMLPurifier_StringHash($hash);
+		}
+		if (!isset($hash['ID'])) {
+			throw new HTMLPurifier_ConfigSchema_Exception('Hash does not have any ID');
+		}
+		if (strpos($hash['ID'], '.') === false) {
+			if (count($hash) == 2 && isset($hash['DESCRIPTION'])) {
+				$hash->offsetGet('DESCRIPTION'); // prevent complaining
+			} else {
+				throw new HTMLPurifier_ConfigSchema_Exception('All directives must have a namespace');
+			}
+		} else {
+			$this->buildDirective($interchange, $hash);
+		}
+		$this->_findUnused($hash);
+	}
+
+	public function buildDirective($interchange, $hash) {
+		$directive = new HTMLPurifier_ConfigSchema_Interchange_Directive();
+
+		// These are required elements:
+		$directive->id = $this->id($hash->offsetGet('ID'));
+		$id = $directive->id->toString(); // convenience
+
+		if (isset($hash['TYPE'])) {
+			$type = explode('/', $hash->offsetGet('TYPE'));
+			if (isset($type[1])) $directive->typeAllowsNull = true;
+			$directive->type = $type[0];
+		} else {
+			throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
+		}
+
+		if (isset($hash['DEFAULT'])) {
+			try {
+				$directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
+			} catch (HTMLPurifier_VarParserException $e) {
+				throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
+			}
+		}
+
+		if (isset($hash['DESCRIPTION'])) {
+			$directive->description = $hash->offsetGet('DESCRIPTION');
+		}
+
+		if (isset($hash['ALLOWED'])) {
+			$directive->allowed = $this->lookup($this->evalArray($hash->offsetGet('ALLOWED')));
+		}
+
+		if (isset($hash['VALUE-ALIASES'])) {
+			$directive->valueAliases = $this->evalArray($hash->offsetGet('VALUE-ALIASES'));
+		}
+
+		if (isset($hash['ALIASES'])) {
+			$raw_aliases = trim($hash->offsetGet('ALIASES'));
+			$aliases = preg_split('/\s*,\s*/', $raw_aliases);
+			foreach ($aliases as $alias) {
+				$directive->aliases[] = $this->id($alias);
+			}
+		}
+
+		if (isset($hash['VERSION'])) {
+			$directive->version = $hash->offsetGet('VERSION');
+		}
+
+		if (isset($hash['DEPRECATED-USE'])) {
+			$directive->deprecatedUse = $this->id($hash->offsetGet('DEPRECATED-USE'));
+		}
+
+		if (isset($hash['DEPRECATED-VERSION'])) {
+			$directive->deprecatedVersion = $hash->offsetGet('DEPRECATED-VERSION');
+		}
+
+		if (isset($hash['EXTERNAL'])) {
+			$directive->external = preg_split('/\s*,\s*/', trim($hash->offsetGet('EXTERNAL')));
+		}
+
+		$interchange->addDirective($directive);
+	}
+
+	/**
+	 * Evaluates an array PHP code string without array() wrapper
+	 */
+	protected function evalArray($contents) {
+		return eval('return array('. $contents .');');
+	}
+
+	/**
+	 * Converts an array list into a lookup array.
+	 */
+	protected function lookup($array) {
+		$ret = array();
+		foreach ($array as $val) $ret[$val] = true;
+		return $ret;
+	}
+
+	/**
+	 * Convenience function that creates an HTMLPurifier_ConfigSchema_Interchange_Id
+	 * object based on a string Id.
+	 */
+	protected function id($id) {
+		return HTMLPurifier_ConfigSchema_Interchange_Id::make($id);
+	}
+
+	/**
+	 * Triggers errors for any unused keys passed in the hash; such keys
+	 * may indicate typos, missing values, etc.
+	 * @param $hash Instance of ConfigSchema_StringHash to check.
+	 */
+	protected function _findUnused($hash) {
+		$accessed = $hash->getAccessed();
+		foreach ($hash as $k => $v) {
+			if (!isset($accessed[$k])) {
+				trigger_error("String hash key '$k' not used by builder", E_USER_NOTICE);
+			}
+		}
+	}
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
     }
 
     public function buildDir($interchange, $dir = null) {
-        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
+        if (!$dir) {
+        	$dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
+        }
         if (file_exists($dir . '/info.ini')) {
             $info = parse_ini_file($dir . '/info.ini');
             $interchange->name = $info['name'];
@@ -84,7 +86,9 @@ 
 
         if (isset($hash['TYPE'])) {
             $type = explode('/', $hash->offsetGet('TYPE'));
-            if (isset($type[1])) $directive->typeAllowsNull = true;
+            if (isset($type[1])) {
+            	$directive->typeAllowsNull = true;
+            }
             $directive->type = $type[0];
         } else {
             throw new HTMLPurifier_ConfigSchema_Exception("TYPE in directive hash '$id' not defined");
@@ -149,7 +153,9 @@ 
      */
     protected function lookup($array) {
         $ret = array();
-        foreach ($array as $val) $ret[$val] = true;
+        foreach ($array as $val) {
+        	$ret[$val] = true;
+        }
         return $ret;
     }
 

Spacing +7 added lines, -7 removed lines

@@ -19,9 +19,9 @@ 
     }
 
     public function buildDir($interchange, $dir = null) {
-        if (!$dir) $dir = HTMLPURIFIER_PREFIX . '/HTMLPurifier/ConfigSchema/schema';
-        if (file_exists($dir . '/info.ini')) {
-            $info = parse_ini_file($dir . '/info.ini');
+        if (!$dir) $dir = HTMLPURIFIER_PREFIX.'/HTMLPurifier/ConfigSchema/schema';
+        if (file_exists($dir.'/info.ini')) {
+            $info = parse_ini_file($dir.'/info.ini');
             $interchange->name = $info['name'];
         }
 
@@ -37,7 +37,7 @@ 
 
         sort($files);
         foreach ($files as $file) {
-            $this->buildFile($interchange, $dir . '/' . $file);
+            $this->buildFile($interchange, $dir.'/'.$file);
         }
 
         return $interchange;
@@ -47,7 +47,7 @@ 
         $parser = new HTMLPurifier_StringHashParser();
         $this->build(
             $interchange,
-            new HTMLPurifier_StringHash( $parser->parseFile($file) )
+            new HTMLPurifier_StringHash($parser->parseFile($file))
         );
     }
 
@@ -94,7 +94,7 @@ 
             try {
                 $directive->default = $this->varParser->parse($hash->offsetGet('DEFAULT'), $directive->type, $directive->typeAllowsNull);
             } catch (HTMLPurifier_VarParserException $e) {
-                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage() . " in DEFAULT in directive hash '$id'");
+                throw new HTMLPurifier_ConfigSchema_Exception($e->getMessage()." in DEFAULT in directive hash '$id'");
             }
         }
 
@@ -141,7 +141,7 @@ 
      * Evaluates an array PHP code string without array() wrapper
      */
     protected function evalArray($contents) {
-        return eval('return array('. $contents .');');
+        return eval('return array('.$contents.');');
     }
 
     /**