xpressengine / xe-core

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));
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -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,7 +189,7 @@ 
      * 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));
     }

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));
     }
 

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);
+	}
 
 }
 

Spacing +1 added lines, -1 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() {

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;
     }

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;
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
         $value = $def->content_model;
         if (is_object($value)) {
             trigger_error(
-                'Literal object child definitions should be stored in '.
+                'Literal object child definitions should be stored in ' .
                 'ElementDef->child not ElementDef->content_model',
                 E_USER_NOTICE
             );

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',

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

Indentation +61 added lines, -61 removed lines

@@ -10,72 +10,72 @@
 class HTMLPurifier_Context
 {
 
-    /**
-     * Private array that stores the references.
-     */
-    private $_storage = array();
+	/**
+	 * Private array that stores the references.
+	 */
+	private $_storage = array();
 
-    /**
-     * Registers a variable into the context.
-     * @param $name String name
-     * @param $ref Reference to variable to be registered
-     */
-    public function register($name, &$ref) {
-        if (isset($this->_storage[$name])) {
-            trigger_error("Name $name produces collision, cannot re-register",
-                          E_USER_ERROR);
-            return;
-        }
-        $this->_storage[$name] =& $ref;
-    }
+	/**
+	 * Registers a variable into the context.
+	 * @param $name String name
+	 * @param $ref Reference to variable to be registered
+	 */
+	public function register($name, &$ref) {
+		if (isset($this->_storage[$name])) {
+			trigger_error("Name $name produces collision, cannot re-register",
+						  E_USER_ERROR);
+			return;
+		}
+		$this->_storage[$name] =& $ref;
+	}
 
-    /**
-     * Retrieves a variable reference from the context.
-     * @param $name String name
-     * @param $ignore_error Boolean whether or not to ignore error
-     */
-    public function &get($name, $ignore_error = false) {
-        if (!isset($this->_storage[$name])) {
-            if (!$ignore_error) {
-                trigger_error("Attempted to retrieve non-existent variable $name",
-                              E_USER_ERROR);
-            }
-            $var = null; // so we can return by reference
-            return $var;
-        }
-        return $this->_storage[$name];
-    }
+	/**
+	 * Retrieves a variable reference from the context.
+	 * @param $name String name
+	 * @param $ignore_error Boolean whether or not to ignore error
+	 */
+	public function &get($name, $ignore_error = false) {
+		if (!isset($this->_storage[$name])) {
+			if (!$ignore_error) {
+				trigger_error("Attempted to retrieve non-existent variable $name",
+							  E_USER_ERROR);
+			}
+			$var = null; // so we can return by reference
+			return $var;
+		}
+		return $this->_storage[$name];
+	}
 
-    /**
-     * Destorys a variable in the context.
-     * @param $name String name
-     */
-    public function destroy($name) {
-        if (!isset($this->_storage[$name])) {
-            trigger_error("Attempted to destroy non-existent variable $name",
-                          E_USER_ERROR);
-            return;
-        }
-        unset($this->_storage[$name]);
-    }
+	/**
+	 * Destorys a variable in the context.
+	 * @param $name String name
+	 */
+	public function destroy($name) {
+		if (!isset($this->_storage[$name])) {
+			trigger_error("Attempted to destroy non-existent variable $name",
+						  E_USER_ERROR);
+			return;
+		}
+		unset($this->_storage[$name]);
+	}
 
-    /**
-     * Checks whether or not the variable exists.
-     * @param $name String name
-     */
-    public function exists($name) {
-        return isset($this->_storage[$name]);
-    }
+	/**
+	 * Checks whether or not the variable exists.
+	 * @param $name String name
+	 */
+	public function exists($name) {
+		return isset($this->_storage[$name]);
+	}
 
-    /**
-     * Loads a series of variables from an associative array
-     * @param $context_array Assoc array of variables to load
-     */
-    public function loadArray($context_array) {
-        foreach ($context_array as $key => $discard) {
-            $this->register($key, $context_array[$key]);
-        }
-    }
+	/**
+	 * Loads a series of variables from an associative array
+	 * @param $context_array Assoc array of variables to load
+	 */
+	public function loadArray($context_array) {
+		foreach ($context_array as $key => $discard) {
+			$this->register($key, $context_array[$key]);
+		}
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
                           E_USER_ERROR);
             return;
         }
-        $this->_storage[$name] =& $ref;
+        $this->_storage[$name] = & $ref;
     }
 
     /**

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

Indentation +37 added lines, -37 removed lines

@@ -7,43 +7,43 @@
 abstract class HTMLPurifier_Definition
 {
 
-    /**
-     * Has setup() been called yet?
-     */
-    public $setup = false;
-
-    /**
-     * If true, write out the final definition object to the cache after
-     * setup.  This will be true only if all invocations to get a raw
-     * definition object are also optimized.  This does not cause file
-     * system thrashing because on subsequent calls the cached object
-     * is used and any writes to the raw definition object are short
-     * circuited.  See enduser-customize.html for the high-level
-     * picture.
-     */
-    public $optimized = null;
-
-    /**
-     * What type of definition is it?
-     */
-    public $type;
-
-    /**
-     * Sets up the definition object into the final form, something
-     * not done by the constructor
-     * @param $config HTMLPurifier_Config instance
-     */
-    abstract protected function doSetup($config);
-
-    /**
-     * Setup function that aborts if already setup
-     * @param $config HTMLPurifier_Config instance
-     */
-    public function setup($config) {
-        if ($this->setup) return;
-        $this->setup = true;
-        $this->doSetup($config);
-    }
+	/**
+	 * Has setup() been called yet?
+	 */
+	public $setup = false;
+
+	/**
+	 * If true, write out the final definition object to the cache after
+	 * setup.  This will be true only if all invocations to get a raw
+	 * definition object are also optimized.  This does not cause file
+	 * system thrashing because on subsequent calls the cached object
+	 * is used and any writes to the raw definition object are short
+	 * circuited.  See enduser-customize.html for the high-level
+	 * picture.
+	 */
+	public $optimized = null;
+
+	/**
+	 * What type of definition is it?
+	 */
+	public $type;
+
+	/**
+	 * Sets up the definition object into the final form, something
+	 * not done by the constructor
+	 * @param $config HTMLPurifier_Config instance
+	 */
+	abstract protected function doSetup($config);
+
+	/**
+	 * Setup function that aborts if already setup
+	 * @param $config HTMLPurifier_Config instance
+	 */
+	public function setup($config) {
+		if ($this->setup) return;
+		$this->setup = true;
+		$this->doSetup($config);
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
      * @param $config HTMLPurifier_Config instance
      */
     public function setup($config) {
-        if ($this->setup) return;
+        if ($this->setup) {
+        	return;
+        }
         $this->setup = true;
         $this->doSetup($config);
     }

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

Indentation +80 added lines, -80 removed lines

@@ -11,97 +11,97 @@
 abstract class HTMLPurifier_DefinitionCache
 {
 
-    public $type;
+	public $type;
 
-    /**
-     * @param $name Type of definition objects this instance of the
-     *      cache will handle.
-     */
-    public function __construct($type) {
-        $this->type = $type;
-    }
+	/**
+	 * @param $name Type of definition objects this instance of the
+	 *      cache will handle.
+	 */
+	public function __construct($type) {
+		$this->type = $type;
+	}
 
-    /**
-     * Generates a unique identifier for a particular configuration
-     * @param Instance of HTMLPurifier_Config
-     */
-    public function generateKey($config) {
-        return $config->version . ',' . // possibly replace with function calls
-               $config->getBatchSerial($this->type) . ',' .
-               $config->get($this->type . '.DefinitionRev');
-    }
+	/**
+	 * Generates a unique identifier for a particular configuration
+	 * @param Instance of HTMLPurifier_Config
+	 */
+	public function generateKey($config) {
+		return $config->version . ',' . // possibly replace with function calls
+			   $config->getBatchSerial($this->type) . ',' .
+			   $config->get($this->type . '.DefinitionRev');
+	}
 
-    /**
-     * Tests whether or not a key is old with respect to the configuration's
-     * version and revision number.
-     * @param $key Key to test
-     * @param $config Instance of HTMLPurifier_Config to test against
-     */
-    public function isOld($key, $config) {
-        if (substr_count($key, ',') < 2) return true;
-        list($version, $hash, $revision) = explode(',', $key, 3);
-        $compare = version_compare($version, $config->version);
-        // version mismatch, is always old
-        if ($compare != 0) return true;
-        // versions match, ids match, check revision number
-        if (
-            $hash == $config->getBatchSerial($this->type) &&
-            $revision < $config->get($this->type . '.DefinitionRev')
-        ) return true;
-        return false;
-    }
+	/**
+	 * Tests whether or not a key is old with respect to the configuration's
+	 * version and revision number.
+	 * @param $key Key to test
+	 * @param $config Instance of HTMLPurifier_Config to test against
+	 */
+	public function isOld($key, $config) {
+		if (substr_count($key, ',') < 2) return true;
+		list($version, $hash, $revision) = explode(',', $key, 3);
+		$compare = version_compare($version, $config->version);
+		// version mismatch, is always old
+		if ($compare != 0) return true;
+		// versions match, ids match, check revision number
+		if (
+			$hash == $config->getBatchSerial($this->type) &&
+			$revision < $config->get($this->type . '.DefinitionRev')
+		) return true;
+		return false;
+	}
 
-    /**
-     * Checks if a definition's type jives with the cache's type
-     * @note Throws an error on failure
-     * @param $def Definition object to check
-     * @return Boolean true if good, false if not
-     */
-    public function checkDefType($def) {
-        if ($def->type !== $this->type) {
-            trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Checks if a definition's type jives with the cache's type
+	 * @note Throws an error on failure
+	 * @param $def Definition object to check
+	 * @return Boolean true if good, false if not
+	 */
+	public function checkDefType($def) {
+		if ($def->type !== $this->type) {
+			trigger_error("Cannot use definition of type {$def->type} in cache for {$this->type}");
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * Adds a definition object to the cache
-     */
-    abstract public function add($def, $config);
+	/**
+	 * Adds a definition object to the cache
+	 */
+	abstract public function add($def, $config);
 
-    /**
-     * Unconditionally saves a definition object to the cache
-     */
-    abstract public function set($def, $config);
+	/**
+	 * Unconditionally saves a definition object to the cache
+	 */
+	abstract public function set($def, $config);
 
-    /**
-     * Replace an object in the cache
-     */
-    abstract public function replace($def, $config);
+	/**
+	 * Replace an object in the cache
+	 */
+	abstract public function replace($def, $config);
 
-    /**
-     * Retrieves a definition object from the cache
-     */
-    abstract public function get($config);
+	/**
+	 * Retrieves a definition object from the cache
+	 */
+	abstract public function get($config);
 
-    /**
-     * Removes a definition object to the cache
-     */
-    abstract public function remove($config);
+	/**
+	 * Removes a definition object to the cache
+	 */
+	abstract public function remove($config);
 
-    /**
-     * Clears all objects from cache
-     */
-    abstract public function flush($config);
+	/**
+	 * Clears all objects from cache
+	 */
+	abstract public function flush($config);
 
-    /**
-     * Clears all expired (older version or revision) objects from cache
-     * @note Be carefuly implementing this method as flush. Flush must
-     *       not interfere with other Definition types, and cleanup()
-     *       should not be repeatedly called by userland code.
-     */
-    abstract public function cleanup($config);
+	/**
+	 * Clears all expired (older version or revision) objects from cache
+	 * @note Be carefuly implementing this method as flush. Flush must
+	 *       not interfere with other Definition types, and cleanup()
+	 *       should not be repeatedly called by userland code.
+	 */
+	abstract public function cleanup($config);
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -38,16 +38,22 @@
      * @param $config Instance of HTMLPurifier_Config to test against
      */
     public function isOld($key, $config) {
-        if (substr_count($key, ',') < 2) return true;
+        if (substr_count($key, ',') < 2) {
+        	return true;
+        }
         list($version, $hash, $revision) = explode(',', $key, 3);
         $compare = version_compare($version, $config->version);
         // version mismatch, is always old
-        if ($compare != 0) return true;
+        if ($compare != 0) {
+        	return true;
+        }
         // versions match, ids match, check revision number
         if (
             $hash == $config->getBatchSerial($this->type) &&
             $revision < $config->get($this->type . '.DefinitionRev')
-        ) return true;
+        ) {
+        	return true;
+        }
         return false;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator.php

Indentation +53 added lines, -53 removed lines

@@ -3,59 +3,59 @@
 class HTMLPurifier_DefinitionCache_Decorator extends HTMLPurifier_DefinitionCache
 {
 
-    /**
-     * Cache object we are decorating
-     */
-    public $cache;
-
-    public function __construct() {}
-
-    /**
-     * Lazy decorator function
-     * @param $cache Reference to cache object to decorate
-     */
-    public function decorate(&$cache) {
-        $decorator = $this->copy();
-        // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
-        $decorator->type  = $cache->type;
-        return $decorator;
-    }
-
-    /**
-     * Cross-compatible clone substitute
-     */
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator();
-    }
-
-    public function add($def, $config) {
-        return $this->cache->add($def, $config);
-    }
-
-    public function set($def, $config) {
-        return $this->cache->set($def, $config);
-    }
-
-    public function replace($def, $config) {
-        return $this->cache->replace($def, $config);
-    }
-
-    public function get($config) {
-        return $this->cache->get($config);
-    }
-
-    public function remove($config) {
-        return $this->cache->remove($config);
-    }
-
-    public function flush($config) {
-        return $this->cache->flush($config);
-    }
-
-    public function cleanup($config) {
-        return $this->cache->cleanup($config);
-    }
+	/**
+	 * Cache object we are decorating
+	 */
+	public $cache;
+
+	public function __construct() {}
+
+	/**
+	 * Lazy decorator function
+	 * @param $cache Reference to cache object to decorate
+	 */
+	public function decorate(&$cache) {
+		$decorator = $this->copy();
+		// reference is necessary for mocks in PHP 4
+		$decorator->cache =& $cache;
+		$decorator->type  = $cache->type;
+		return $decorator;
+	}
+
+	/**
+	 * Cross-compatible clone substitute
+	 */
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator();
+	}
+
+	public function add($def, $config) {
+		return $this->cache->add($def, $config);
+	}
+
+	public function set($def, $config) {
+		return $this->cache->set($def, $config);
+	}
+
+	public function replace($def, $config) {
+		return $this->cache->replace($def, $config);
+	}
+
+	public function get($config) {
+		return $this->cache->get($config);
+	}
+
+	public function remove($config) {
+		return $this->cache->remove($config);
+	}
+
+	public function flush($config) {
+		return $this->cache->flush($config);
+	}
+
+	public function cleanup($config) {
+		return $this->cache->cleanup($config);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function decorate(&$cache) {
         $decorator = $this->copy();
         // reference is necessary for mocks in PHP 4
-        $decorator->cache =& $cache;
+        $decorator->cache = & $cache;
         $decorator->type  = $cache->type;
         return $decorator;
     }

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Cleanup.php

Indentation +30 added lines, -30 removed lines

@@ -5,38 +5,38 @@
  * whenever there is a cache miss.
  */
 class HTMLPurifier_DefinitionCache_Decorator_Cleanup extends
-      HTMLPurifier_DefinitionCache_Decorator
+	  HTMLPurifier_DefinitionCache_Decorator
 {
 
-    public $name = 'Cleanup';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if (!$status) parent::cleanup($config);
-        return $status;
-    }
-
-    public function get($config) {
-        $ret = parent::get($config);
-        if (!$ret) parent::cleanup($config);
-        return $ret;
-    }
+	public $name = 'Cleanup';
+
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator_Cleanup();
+	}
+
+	public function add($def, $config) {
+		$status = parent::add($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function set($def, $config) {
+		$status = parent::set($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function replace($def, $config) {
+		$status = parent::replace($def, $config);
+		if (!$status) parent::cleanup($config);
+		return $status;
+	}
+
+	public function get($config) {
+		$ret = parent::get($config);
+		if (!$ret) parent::cleanup($config);
+		return $ret;
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -16,25 +16,33 @@
 
     public function add($def, $config) {
         $status = parent::add($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function set($def, $config) {
         $status = parent::set($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function replace($def, $config) {
         $status = parent::replace($def, $config);
-        if (!$status) parent::cleanup($config);
+        if (!$status) {
+        	parent::cleanup($config);
+        }
         return $status;
     }
 
     public function get($config) {
         $ret = parent::get($config);
-        if (!$ret) parent::cleanup($config);
+        if (!$ret) {
+        	parent::cleanup($config);
+        }
         return $ret;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/DefinitionCache/Decorator/Memory.php

Indentation +32 added lines, -32 removed lines

@@ -6,40 +6,40 @@
  * there are lots of configuration objects floating around.
  */
 class HTMLPurifier_DefinitionCache_Decorator_Memory extends
-      HTMLPurifier_DefinitionCache_Decorator
+	  HTMLPurifier_DefinitionCache_Decorator
 {
 
-    protected $definitions;
-    public $name = 'Memory';
-
-    public function copy() {
-        return new HTMLPurifier_DefinitionCache_Decorator_Memory();
-    }
-
-    public function add($def, $config) {
-        $status = parent::add($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function set($def, $config) {
-        $status = parent::set($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function replace($def, $config) {
-        $status = parent::replace($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
-        return $status;
-    }
-
-    public function get($config) {
-        $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) return $this->definitions[$key];
-        $this->definitions[$key] = parent::get($config);
-        return $this->definitions[$key];
-    }
+	protected $definitions;
+	public $name = 'Memory';
+
+	public function copy() {
+		return new HTMLPurifier_DefinitionCache_Decorator_Memory();
+	}
+
+	public function add($def, $config) {
+		$status = parent::add($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function set($def, $config) {
+		$status = parent::set($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function replace($def, $config) {
+		$status = parent::replace($def, $config);
+		if ($status) $this->definitions[$this->generateKey($config)] = $def;
+		return $status;
+	}
+
+	public function get($config) {
+		$key = $this->generateKey($config);
+		if (isset($this->definitions[$key])) return $this->definitions[$key];
+		$this->definitions[$key] = parent::get($config);
+		return $this->definitions[$key];
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -18,25 +18,33 @@
 
     public function add($def, $config) {
         $status = parent::add($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function set($def, $config) {
         $status = parent::set($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function replace($def, $config) {
         $status = parent::replace($def, $config);
-        if ($status) $this->definitions[$this->generateKey($config)] = $def;
+        if ($status) {
+        	$this->definitions[$this->generateKey($config)] = $def;
+        }
         return $status;
     }
 
     public function get($config) {
         $key = $this->generateKey($config);
-        if (isset($this->definitions[$key])) return $this->definitions[$key];
+        if (isset($this->definitions[$key])) {
+        	return $this->definitions[$key];
+        }
         $this->definitions[$key] = parent::get($config);
         return $this->definitions[$key];
     }