xpressengine / xe-core

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.');');
     }
 
     /**

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

Indentation +189 added lines, -189 removed lines

@@ -11,195 +11,195 @@
 class HTMLPurifier_ConfigSchema_Validator
 {
 
-    /**
-     * Easy to access global objects.
-     */
-    protected $interchange, $aliases;
-
-    /**
-     * Context-stack to provide easy to read error messages.
-     */
-    protected $context = array();
-
-    /**
-     * HTMLPurifier_VarParser to test default's type.
-     */
-    protected $parser;
-
-    public function __construct() {
-        $this->parser = new HTMLPurifier_VarParser();
-    }
-
-    /**
-     * Validates a fully-formed interchange object. Throws an
-     * HTMLPurifier_ConfigSchema_Exception if there's a problem.
-     */
-    public function validate($interchange) {
-        $this->interchange = $interchange;
-        $this->aliases = array();
-        // PHP is a bit lax with integer <=> string conversions in
-        // arrays, so we don't use the identical !== comparison
-        foreach ($interchange->directives as $i => $directive) {
-            $id = $directive->id->toString();
-            if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
-            $this->validateDirective($directive);
-        }
-        return true;
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
-     */
-    public function validateId($id) {
-        $id_string = $id->toString();
-        $this->context[] = "id '$id_string'";
-        if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
-            // handled by InterchangeBuilder
-            $this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
-        }
-        // keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
-        // we probably should check that it has at least one namespace
-        $this->with($id, 'key')
-            ->assertNotEmpty()
-            ->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
-        array_pop($this->context);
-    }
-
-    /**
-     * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
-     */
-    public function validateDirective($d) {
-        $id = $d->id->toString();
-        $this->context[] = "directive '$id'";
-        $this->validateId($d->id);
-
-        $this->with($d, 'description')
-            ->assertNotEmpty();
-
-        // BEGIN - handled by InterchangeBuilder
-        $this->with($d, 'type')
-            ->assertNotEmpty();
-        $this->with($d, 'typeAllowsNull')
-            ->assertIsBool();
-        try {
-            // This also tests validity of $d->type
-            $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
-        } catch (HTMLPurifier_VarParserException $e) {
-            $this->error('default', 'had error: ' . $e->getMessage());
-        }
-        // END - handled by InterchangeBuilder
-
-        if (!is_null($d->allowed) || !empty($d->valueAliases)) {
-            // allowed and valueAliases require that we be dealing with
-            // strings, so check for that early.
-            $d_int = HTMLPurifier_VarParser::$types[$d->type];
-            if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
-                $this->error('type', 'must be a string type when used with allowed or value aliases');
-            }
-        }
-
-        $this->validateDirectiveAllowed($d);
-        $this->validateDirectiveValueAliases($d);
-        $this->validateDirectiveAliases($d);
-
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $allowed member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveAllowed($d) {
-        if (is_null($d->allowed)) return;
-        $this->with($d, 'allowed')
-            ->assertNotEmpty()
-            ->assertIsLookup(); // handled by InterchangeBuilder
-        if (is_string($d->default) && !isset($d->allowed[$d->default])) {
-            $this->error('default', 'must be an allowed value');
-        }
-        $this->context[] = 'allowed';
-        foreach ($d->allowed as $val => $x) {
-            if (!is_string($val)) $this->error("value $val", 'must be a string');
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $valueAliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveValueAliases($d) {
-        if (is_null($d->valueAliases)) return;
-        $this->with($d, 'valueAliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'valueAliases';
-        foreach ($d->valueAliases as $alias => $real) {
-            if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
-            if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
-            if ($alias === $real) {
-                $this->error("alias '$alias'", "must not be an alias to itself");
-            }
-        }
-        if (!is_null($d->allowed)) {
-            foreach ($d->valueAliases as $alias => $real) {
-                if (isset($d->allowed[$alias])) {
-                    $this->error("alias '$alias'", 'must not be an allowed value');
-                } elseif (!isset($d->allowed[$real])) {
-                    $this->error("alias '$alias'", 'must be an alias to an allowed value');
-                }
-            }
-        }
-        array_pop($this->context);
-    }
-
-    /**
-     * Extra validation if $aliases member variable of
-     * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
-     */
-    public function validateDirectiveAliases($d) {
-        $this->with($d, 'aliases')
-            ->assertIsArray(); // handled by InterchangeBuilder
-        $this->context[] = 'aliases';
-        foreach ($d->aliases as $alias) {
-            $this->validateId($alias);
-            $s = $alias->toString();
-            if (isset($this->interchange->directives[$s])) {
-                $this->error("alias '$s'", 'collides with another directive');
-            }
-            if (isset($this->aliases[$s])) {
-                $other_directive = $this->aliases[$s];
-                $this->error("alias '$s'", "collides with alias for directive '$other_directive'");
-            }
-            $this->aliases[$s] = $d->id->toString();
-        }
-        array_pop($this->context);
-    }
-
-    // protected helper functions
-
-    /**
-     * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
-     * for validating simple member variables of objects.
-     */
-    protected function with($obj, $member) {
-        return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
-    }
-
-    /**
-     * Emits an error, providing helpful context.
-     */
-    protected function error($target, $msg) {
-        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
-        else $prefix = ucfirst($this->getFormattedContext());
-        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
-    }
-
-    /**
-     * Returns a formatted context string.
-     */
-    protected function getFormattedContext() {
-        return implode(' in ', array_reverse($this->context));
-    }
+	/**
+	 * Easy to access global objects.
+	 */
+	protected $interchange, $aliases;
+
+	/**
+	 * Context-stack to provide easy to read error messages.
+	 */
+	protected $context = array();
+
+	/**
+	 * HTMLPurifier_VarParser to test default's type.
+	 */
+	protected $parser;
+
+	public function __construct() {
+		$this->parser = new HTMLPurifier_VarParser();
+	}
+
+	/**
+	 * Validates a fully-formed interchange object. Throws an
+	 * HTMLPurifier_ConfigSchema_Exception if there's a problem.
+	 */
+	public function validate($interchange) {
+		$this->interchange = $interchange;
+		$this->aliases = array();
+		// PHP is a bit lax with integer <=> string conversions in
+		// arrays, so we don't use the identical !== comparison
+		foreach ($interchange->directives as $i => $directive) {
+			$id = $directive->id->toString();
+			if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+			$this->validateDirective($directive);
+		}
+		return true;
+	}
+
+	/**
+	 * Validates a HTMLPurifier_ConfigSchema_Interchange_Id object.
+	 */
+	public function validateId($id) {
+		$id_string = $id->toString();
+		$this->context[] = "id '$id_string'";
+		if (!$id instanceof HTMLPurifier_ConfigSchema_Interchange_Id) {
+			// handled by InterchangeBuilder
+			$this->error(false, 'is not an instance of HTMLPurifier_ConfigSchema_Interchange_Id');
+		}
+		// keys are now unconstrained (we might want to narrow down to A-Za-z0-9.)
+		// we probably should check that it has at least one namespace
+		$this->with($id, 'key')
+			->assertNotEmpty()
+			->assertIsString(); // implicit assertIsString handled by InterchangeBuilder
+		array_pop($this->context);
+	}
+
+	/**
+	 * Validates a HTMLPurifier_ConfigSchema_Interchange_Directive object.
+	 */
+	public function validateDirective($d) {
+		$id = $d->id->toString();
+		$this->context[] = "directive '$id'";
+		$this->validateId($d->id);
+
+		$this->with($d, 'description')
+			->assertNotEmpty();
+
+		// BEGIN - handled by InterchangeBuilder
+		$this->with($d, 'type')
+			->assertNotEmpty();
+		$this->with($d, 'typeAllowsNull')
+			->assertIsBool();
+		try {
+			// This also tests validity of $d->type
+			$this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
+		} catch (HTMLPurifier_VarParserException $e) {
+			$this->error('default', 'had error: ' . $e->getMessage());
+		}
+		// END - handled by InterchangeBuilder
+
+		if (!is_null($d->allowed) || !empty($d->valueAliases)) {
+			// allowed and valueAliases require that we be dealing with
+			// strings, so check for that early.
+			$d_int = HTMLPurifier_VarParser::$types[$d->type];
+			if (!isset(HTMLPurifier_VarParser::$stringTypes[$d_int])) {
+				$this->error('type', 'must be a string type when used with allowed or value aliases');
+			}
+		}
+
+		$this->validateDirectiveAllowed($d);
+		$this->validateDirectiveValueAliases($d);
+		$this->validateDirectiveAliases($d);
+
+		array_pop($this->context);
+	}
+
+	/**
+	 * Extra validation if $allowed member variable of
+	 * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+	 */
+	public function validateDirectiveAllowed($d) {
+		if (is_null($d->allowed)) return;
+		$this->with($d, 'allowed')
+			->assertNotEmpty()
+			->assertIsLookup(); // handled by InterchangeBuilder
+		if (is_string($d->default) && !isset($d->allowed[$d->default])) {
+			$this->error('default', 'must be an allowed value');
+		}
+		$this->context[] = 'allowed';
+		foreach ($d->allowed as $val => $x) {
+			if (!is_string($val)) $this->error("value $val", 'must be a string');
+		}
+		array_pop($this->context);
+	}
+
+	/**
+	 * Extra validation if $valueAliases member variable of
+	 * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+	 */
+	public function validateDirectiveValueAliases($d) {
+		if (is_null($d->valueAliases)) return;
+		$this->with($d, 'valueAliases')
+			->assertIsArray(); // handled by InterchangeBuilder
+		$this->context[] = 'valueAliases';
+		foreach ($d->valueAliases as $alias => $real) {
+			if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
+			if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
+			if ($alias === $real) {
+				$this->error("alias '$alias'", "must not be an alias to itself");
+			}
+		}
+		if (!is_null($d->allowed)) {
+			foreach ($d->valueAliases as $alias => $real) {
+				if (isset($d->allowed[$alias])) {
+					$this->error("alias '$alias'", 'must not be an allowed value');
+				} elseif (!isset($d->allowed[$real])) {
+					$this->error("alias '$alias'", 'must be an alias to an allowed value');
+				}
+			}
+		}
+		array_pop($this->context);
+	}
+
+	/**
+	 * Extra validation if $aliases member variable of
+	 * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
+	 */
+	public function validateDirectiveAliases($d) {
+		$this->with($d, 'aliases')
+			->assertIsArray(); // handled by InterchangeBuilder
+		$this->context[] = 'aliases';
+		foreach ($d->aliases as $alias) {
+			$this->validateId($alias);
+			$s = $alias->toString();
+			if (isset($this->interchange->directives[$s])) {
+				$this->error("alias '$s'", 'collides with another directive');
+			}
+			if (isset($this->aliases[$s])) {
+				$other_directive = $this->aliases[$s];
+				$this->error("alias '$s'", "collides with alias for directive '$other_directive'");
+			}
+			$this->aliases[$s] = $d->id->toString();
+		}
+		array_pop($this->context);
+	}
+
+	// protected helper functions
+
+	/**
+	 * Convenience function for generating HTMLPurifier_ConfigSchema_ValidatorAtom
+	 * for validating simple member variables of objects.
+	 */
+	protected function with($obj, $member) {
+		return new HTMLPurifier_ConfigSchema_ValidatorAtom($this->getFormattedContext(), $obj, $member);
+	}
+
+	/**
+	 * Emits an error, providing helpful context.
+	 */
+	protected function error($target, $msg) {
+		if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
+		else $prefix = ucfirst($this->getFormattedContext());
+		throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
+	}
+
+	/**
+	 * Returns a formatted context string.
+	 */
+	protected function getFormattedContext() {
+		return implode(' in ', array_reverse($this->context));
+	}
 
 }
 

Braces +23 added lines, -8 removed lines

@@ -41,7 +41,9 @@ 
         // arrays, so we don't use the identical !== comparison
         foreach ($interchange->directives as $i => $directive) {
             $id = $directive->id->toString();
-            if ($i != $id) $this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+            if ($i != $id) {
+            	$this->error(false, "Integrity violation: key '$i' does not match internal id '$id'");
+            }
             $this->validateDirective($directive);
         }
         return true;
@@ -110,7 +112,9 @@ 
      * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
      */
     public function validateDirectiveAllowed($d) {
-        if (is_null($d->allowed)) return;
+        if (is_null($d->allowed)) {
+        	return;
+        }
         $this->with($d, 'allowed')
             ->assertNotEmpty()
             ->assertIsLookup(); // handled by InterchangeBuilder
@@ -119,7 +123,9 @@ 
         }
         $this->context[] = 'allowed';
         foreach ($d->allowed as $val => $x) {
-            if (!is_string($val)) $this->error("value $val", 'must be a string');
+            if (!is_string($val)) {
+            	$this->error("value $val", 'must be a string');
+            }
         }
         array_pop($this->context);
     }
@@ -129,13 +135,19 @@ 
      * HTMLPurifier_ConfigSchema_Interchange_Directive is defined.
      */
     public function validateDirectiveValueAliases($d) {
-        if (is_null($d->valueAliases)) return;
+        if (is_null($d->valueAliases)) {
+        	return;
+        }
         $this->with($d, 'valueAliases')
             ->assertIsArray(); // handled by InterchangeBuilder
         $this->context[] = 'valueAliases';
         foreach ($d->valueAliases as $alias => $real) {
-            if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
-            if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
+            if (!is_string($alias)) {
+            	$this->error("alias $alias", 'must be a string');
+            }
+            if (!is_string($real)) {
+            	$this->error("alias target $real from alias '$alias'",  'must be a string');
+            }
             if ($alias === $real) {
                 $this->error("alias '$alias'", "must not be an alias to itself");
             }
@@ -189,8 +201,11 @@ 
      * Emits an error, providing helpful context.
      */
     protected function error($target, $msg) {
-        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
-        else $prefix = ucfirst($this->getFormattedContext());
+        if ($target !== false) {
+        	$prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
+        } else {
+        	$prefix = ucfirst($this->getFormattedContext());
+        }
         throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
     }
 

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
             // This also tests validity of $d->type
             $this->parser->parse($d->default, $d->type, $d->typeAllowsNull);
         } catch (HTMLPurifier_VarParserException $e) {
-            $this->error('default', 'had error: ' . $e->getMessage());
+            $this->error('default', 'had error: '.$e->getMessage());
         }
         // END - handled by InterchangeBuilder
 
@@ -135,7 +135,7 @@ 
         $this->context[] = 'valueAliases';
         foreach ($d->valueAliases as $alias => $real) {
             if (!is_string($alias)) $this->error("alias $alias", 'must be a string');
-            if (!is_string($real))  $this->error("alias target $real from alias '$alias'",  'must be a string');
+            if (!is_string($real))  $this->error("alias target $real from alias '$alias'", 'must be a string');
             if ($alias === $real) {
                 $this->error("alias '$alias'", "must not be an alias to itself");
             }
@@ -189,9 +189,9 @@ 
      * Emits an error, providing helpful context.
      */
     protected function error($target, $msg) {
-        if ($target !== false) $prefix = ucfirst($target) . ' in ' .  $this->getFormattedContext();
+        if ($target !== false) $prefix = ucfirst($target).' in '.$this->getFormattedContext();
         else $prefix = ucfirst($this->getFormattedContext());
-        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix . ' ' . $msg));
+        throw new HTMLPurifier_ConfigSchema_Exception(trim($prefix.' '.$msg));
     }
 
     /**

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

Indentation +42 added lines, -42 removed lines

@@ -9,57 +9,57 @@
 class HTMLPurifier_ConfigSchema_ValidatorAtom
 {
 
-    protected $context, $obj, $member, $contents;
+	protected $context, $obj, $member, $contents;
 
-    public function __construct($context, $obj, $member) {
-        $this->context     = $context;
-        $this->obj         = $obj;
-        $this->member      = $member;
-        $this->contents    =& $obj->$member;
-    }
+	public function __construct($context, $obj, $member) {
+		$this->context     = $context;
+		$this->obj         = $obj;
+		$this->member      = $member;
+		$this->contents    =& $obj->$member;
+	}
 
-    public function assertIsString() {
-        if (!is_string($this->contents)) $this->error('must be a string');
-        return $this;
-    }
+	public function assertIsString() {
+		if (!is_string($this->contents)) $this->error('must be a string');
+		return $this;
+	}
 
-    public function assertIsBool() {
-        if (!is_bool($this->contents)) $this->error('must be a boolean');
-        return $this;
-    }
+	public function assertIsBool() {
+		if (!is_bool($this->contents)) $this->error('must be a boolean');
+		return $this;
+	}
 
-    public function assertIsArray() {
-        if (!is_array($this->contents)) $this->error('must be an array');
-        return $this;
-    }
+	public function assertIsArray() {
+		if (!is_array($this->contents)) $this->error('must be an array');
+		return $this;
+	}
 
-    public function assertNotNull() {
-        if ($this->contents === null) $this->error('must not be null');
-        return $this;
-    }
+	public function assertNotNull() {
+		if ($this->contents === null) $this->error('must not be null');
+		return $this;
+	}
 
-    public function assertAlnum() {
-        $this->assertIsString();
-        if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
-        return $this;
-    }
+	public function assertAlnum() {
+		$this->assertIsString();
+		if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
+		return $this;
+	}
 
-    public function assertNotEmpty() {
-        if (empty($this->contents)) $this->error('must not be empty');
-        return $this;
-    }
+	public function assertNotEmpty() {
+		if (empty($this->contents)) $this->error('must not be empty');
+		return $this;
+	}
 
-    public function assertIsLookup() {
-        $this->assertIsArray();
-        foreach ($this->contents as $v) {
-            if ($v !== true) $this->error('must be a lookup array');
-        }
-        return $this;
-    }
+	public function assertIsLookup() {
+		$this->assertIsArray();
+		foreach ($this->contents as $v) {
+			if ($v !== true) $this->error('must be a lookup array');
+		}
+		return $this;
+	}
 
-    protected function error($msg) {
-        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
-    }
+	protected function error($msg) {
+		throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
+	}
 
 }
 

Braces +21 added lines, -7 removed lines

@@ -19,40 +19,54 @@
     }
 
     public function assertIsString() {
-        if (!is_string($this->contents)) $this->error('must be a string');
+        if (!is_string($this->contents)) {
+        	$this->error('must be a string');
+        }
         return $this;
     }
 
     public function assertIsBool() {
-        if (!is_bool($this->contents)) $this->error('must be a boolean');
+        if (!is_bool($this->contents)) {
+        	$this->error('must be a boolean');
+        }
         return $this;
     }
 
     public function assertIsArray() {
-        if (!is_array($this->contents)) $this->error('must be an array');
+        if (!is_array($this->contents)) {
+        	$this->error('must be an array');
+        }
         return $this;
     }
 
     public function assertNotNull() {
-        if ($this->contents === null) $this->error('must not be null');
+        if ($this->contents === null) {
+        	$this->error('must not be null');
+        }
         return $this;
     }
 
     public function assertAlnum() {
         $this->assertIsString();
-        if (!ctype_alnum($this->contents)) $this->error('must be alphanumeric');
+        if (!ctype_alnum($this->contents)) {
+        	$this->error('must be alphanumeric');
+        }
         return $this;
     }
 
     public function assertNotEmpty() {
-        if (empty($this->contents)) $this->error('must not be empty');
+        if (empty($this->contents)) {
+        	$this->error('must not be empty');
+        }
         return $this;
     }
 
     public function assertIsLookup() {
         $this->assertIsArray();
         foreach ($this->contents as $v) {
-            if ($v !== true) $this->error('must be a lookup array');
+            if ($v !== true) {
+            	$this->error('must be a lookup array');
+            }
         }
         return $this;
     }

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
         $this->context     = $context;
         $this->obj         = $obj;
         $this->member      = $member;
-        $this->contents    =& $obj->$member;
+        $this->contents    = & $obj->$member;
     }
 
     public function assertIsString() {
@@ -58,7 +58,7 @@ 
     }
 
     protected function error($msg) {
-        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member) . ' in ' . $this->context . ' ' . $msg);
+        throw new HTMLPurifier_ConfigSchema_Exception(ucfirst($this->member).' in '.$this->context.' '.$msg);
     }
 
 }

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

Indentation +135 added lines, -135 removed lines

@@ -6,149 +6,149 @@
 class HTMLPurifier_ContentSets
 {
 
-    /**
-     * List of content set strings (pipe seperators) indexed by name.
-     */
-    public $info = array();
+	/**
+	 * List of content set strings (pipe seperators) indexed by name.
+	 */
+	public $info = array();
 
-    /**
-     * List of content set lookups (element => true) indexed by name.
-     * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
-     */
-    public $lookup = array();
+	/**
+	 * List of content set lookups (element => true) indexed by name.
+	 * @note This is in HTMLPurifier_HTMLDefinition->info_content_sets
+	 */
+	public $lookup = array();
 
-    /**
-     * Synchronized list of defined content sets (keys of info)
-     */
-    protected $keys = array();
-    /**
-     * Synchronized list of defined content values (values of info)
-     */
-    protected $values = array();
+	/**
+	 * Synchronized list of defined content sets (keys of info)
+	 */
+	protected $keys = array();
+	/**
+	 * Synchronized list of defined content values (values of info)
+	 */
+	protected $values = array();
 
-    /**
-     * Merges in module's content sets, expands identifiers in the content
-     * sets and populates the keys, values and lookup member variables.
-     * @param $modules List of HTMLPurifier_HTMLModule
-     */
-    public function __construct($modules) {
-        if (!is_array($modules)) $modules = array($modules);
-        // populate content_sets based on module hints
-        // sorry, no way of overloading
-        foreach ($modules as $module_i => $module) {
-            foreach ($module->content_sets as $key => $value) {
-                $temp = $this->convertToLookup($value);
-                if (isset($this->lookup[$key])) {
-                    // add it into the existing content set
-                    $this->lookup[$key] = array_merge($this->lookup[$key], $temp);
-                } else {
-                    $this->lookup[$key] = $temp;
-                }
-            }
-        }
-        $old_lookup = false;
-        while ($old_lookup !== $this->lookup) {
-            $old_lookup = $this->lookup;
-            foreach ($this->lookup as $i => $set) {
-                $add = array();
-                foreach ($set as $element => $x) {
-                    if (isset($this->lookup[$element])) {
-                        $add += $this->lookup[$element];
-                        unset($this->lookup[$i][$element]);
-                    }
-                }
-                $this->lookup[$i] += $add;
-            }
-        }
+	/**
+	 * Merges in module's content sets, expands identifiers in the content
+	 * sets and populates the keys, values and lookup member variables.
+	 * @param $modules List of HTMLPurifier_HTMLModule
+	 */
+	public function __construct($modules) {
+		if (!is_array($modules)) $modules = array($modules);
+		// populate content_sets based on module hints
+		// sorry, no way of overloading
+		foreach ($modules as $module_i => $module) {
+			foreach ($module->content_sets as $key => $value) {
+				$temp = $this->convertToLookup($value);
+				if (isset($this->lookup[$key])) {
+					// add it into the existing content set
+					$this->lookup[$key] = array_merge($this->lookup[$key], $temp);
+				} else {
+					$this->lookup[$key] = $temp;
+				}
+			}
+		}
+		$old_lookup = false;
+		while ($old_lookup !== $this->lookup) {
+			$old_lookup = $this->lookup;
+			foreach ($this->lookup as $i => $set) {
+				$add = array();
+				foreach ($set as $element => $x) {
+					if (isset($this->lookup[$element])) {
+						$add += $this->lookup[$element];
+						unset($this->lookup[$i][$element]);
+					}
+				}
+				$this->lookup[$i] += $add;
+			}
+		}
 
-        foreach ($this->lookup as $key => $lookup) {
-            $this->info[$key] = implode(' | ', array_keys($lookup));
-        }
-        $this->keys   = array_keys($this->info);
-        $this->values = array_values($this->info);
-    }
+		foreach ($this->lookup as $key => $lookup) {
+			$this->info[$key] = implode(' | ', array_keys($lookup));
+		}
+		$this->keys   = array_keys($this->info);
+		$this->values = array_values($this->info);
+	}
 
-    /**
-     * Accepts a definition; generates and assigns a ChildDef for it
-     * @param $def HTMLPurifier_ElementDef reference
-     * @param $module Module that defined the ElementDef
-     */
-    public function generateChildDef(&$def, $module) {
-        if (!empty($def->child)) return; // already done!
-        $content_model = $def->content_model;
-        if (is_string($content_model)) {
-            // Assume that $this->keys is alphanumeric
-            $def->content_model = preg_replace_callback(
-                '/\b(' . implode('|', $this->keys) . ')\b/',
-                array($this, 'generateChildDefCallback'),
-                $content_model
-            );
-            //$def->content_model = str_replace(
-            //    $this->keys, $this->values, $content_model);
-        }
-        $def->child = $this->getChildDef($def, $module);
-    }
+	/**
+	 * Accepts a definition; generates and assigns a ChildDef for it
+	 * @param $def HTMLPurifier_ElementDef reference
+	 * @param $module Module that defined the ElementDef
+	 */
+	public function generateChildDef(&$def, $module) {
+		if (!empty($def->child)) return; // already done!
+		$content_model = $def->content_model;
+		if (is_string($content_model)) {
+			// Assume that $this->keys is alphanumeric
+			$def->content_model = preg_replace_callback(
+				'/\b(' . implode('|', $this->keys) . ')\b/',
+				array($this, 'generateChildDefCallback'),
+				$content_model
+			);
+			//$def->content_model = str_replace(
+			//    $this->keys, $this->values, $content_model);
+		}
+		$def->child = $this->getChildDef($def, $module);
+	}
 
-    public function generateChildDefCallback($matches) {
-        return $this->info[$matches[0]];
-    }
+	public function generateChildDefCallback($matches) {
+		return $this->info[$matches[0]];
+	}
 
-    /**
-     * Instantiates a ChildDef based on content_model and content_model_type
-     * member variables in HTMLPurifier_ElementDef
-     * @note This will also defer to modules for custom HTMLPurifier_ChildDef
-     *       subclasses that need content set expansion
-     * @param $def HTMLPurifier_ElementDef to have ChildDef extracted
-     * @return HTMLPurifier_ChildDef corresponding to ElementDef
-     */
-    public function getChildDef($def, $module) {
-        $value = $def->content_model;
-        if (is_object($value)) {
-            trigger_error(
-                'Literal object child definitions should be stored in '.
-                'ElementDef->child not ElementDef->content_model',
-                E_USER_NOTICE
-            );
-            return $value;
-        }
-        switch ($def->content_model_type) {
-            case 'required':
-                return new HTMLPurifier_ChildDef_Required($value);
-            case 'optional':
-                return new HTMLPurifier_ChildDef_Optional($value);
-            case 'empty':
-                return new HTMLPurifier_ChildDef_Empty();
-            case 'custom':
-                return new HTMLPurifier_ChildDef_Custom($value);
-        }
-        // defer to its module
-        $return = false;
-        if ($module->defines_child_def) { // save a func call
-            $return = $module->getChildDef($def);
-        }
-        if ($return !== false) return $return;
-        // error-out
-        trigger_error(
-            'Could not determine which ChildDef class to instantiate',
-            E_USER_ERROR
-        );
-        return false;
-    }
+	/**
+	 * Instantiates a ChildDef based on content_model and content_model_type
+	 * member variables in HTMLPurifier_ElementDef
+	 * @note This will also defer to modules for custom HTMLPurifier_ChildDef
+	 *       subclasses that need content set expansion
+	 * @param $def HTMLPurifier_ElementDef to have ChildDef extracted
+	 * @return HTMLPurifier_ChildDef corresponding to ElementDef
+	 */
+	public function getChildDef($def, $module) {
+		$value = $def->content_model;
+		if (is_object($value)) {
+			trigger_error(
+				'Literal object child definitions should be stored in '.
+				'ElementDef->child not ElementDef->content_model',
+				E_USER_NOTICE
+			);
+			return $value;
+		}
+		switch ($def->content_model_type) {
+			case 'required':
+				return new HTMLPurifier_ChildDef_Required($value);
+			case 'optional':
+				return new HTMLPurifier_ChildDef_Optional($value);
+			case 'empty':
+				return new HTMLPurifier_ChildDef_Empty();
+			case 'custom':
+				return new HTMLPurifier_ChildDef_Custom($value);
+		}
+		// defer to its module
+		$return = false;
+		if ($module->defines_child_def) { // save a func call
+			$return = $module->getChildDef($def);
+		}
+		if ($return !== false) return $return;
+		// error-out
+		trigger_error(
+			'Could not determine which ChildDef class to instantiate',
+			E_USER_ERROR
+		);
+		return false;
+	}
 
-    /**
-     * Converts a string list of elements separated by pipes into
-     * a lookup array.
-     * @param $string List of elements
-     * @return Lookup array of elements
-     */
-    protected function convertToLookup($string) {
-        $array = explode('|', str_replace(' ', '', $string));
-        $ret = array();
-        foreach ($array as $i => $k) {
-            $ret[$k] = true;
-        }
-        return $ret;
-    }
+	/**
+	 * Converts a string list of elements separated by pipes into
+	 * a lookup array.
+	 * @param $string List of elements
+	 * @return Lookup array of elements
+	 */
+	protected function convertToLookup($string) {
+		$array = explode('|', str_replace(' ', '', $string));
+		$ret = array();
+		foreach ($array as $i => $k) {
+			$ret[$k] = true;
+		}
+		return $ret;
+	}
 
 }
 

Braces +10 added lines, -3 removed lines

@@ -32,7 +32,9 @@ 
      * @param $modules List of HTMLPurifier_HTMLModule
      */
     public function __construct($modules) {
-        if (!is_array($modules)) $modules = array($modules);
+        if (!is_array($modules)) {
+        	$modules = array($modules);
+        }
         // populate content_sets based on module hints
         // sorry, no way of overloading
         foreach ($modules as $module_i => $module) {
@@ -74,7 +76,10 @@ 
      * @param $module Module that defined the ElementDef
      */
     public function generateChildDef(&$def, $module) {
-        if (!empty($def->child)) return; // already done!
+        if (!empty($def->child)) {
+        	return;
+        }
+        // already done!
         $content_model = $def->content_model;
         if (is_string($content_model)) {
             // Assume that $this->keys is alphanumeric
@@ -126,7 +131,9 @@ 
         if ($module->defines_child_def) { // save a func call
             $return = $module->getChildDef($def);
         }
-        if ($return !== false) return $return;
+        if ($return !== false) {
+        	return $return;
+        }
         // error-out
         trigger_error(
             'Could not determine which ChildDef class to instantiate',

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
         if (is_string($content_model)) {
             // Assume that $this->keys is alphanumeric
             $def->content_model = preg_replace_callback(
-                '/\b(' . implode('|', $this->keys) . ')\b/',
+                '/\b('.implode('|', $this->keys).')\b/',
                 array($this, 'generateChildDefCallback'),
                 $content_model
             );