xpressengine / xe-core

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

Indentation +98 added lines, -98 removed lines

@@ -13,110 +13,110 @@
 abstract class HTMLPurifier_AttrDef
 {
 
-    /**
-     * Tells us whether or not an HTML attribute is minimized. Has no
-     * meaning in other contexts.
-     */
-    public $minimized = false;
+	/**
+	 * Tells us whether or not an HTML attribute is minimized. Has no
+	 * meaning in other contexts.
+	 */
+	public $minimized = false;
 
-    /**
-     * Tells us whether or not an HTML attribute is required. Has no
-     * meaning in other contexts
-     */
-    public $required = false;
+	/**
+	 * Tells us whether or not an HTML attribute is required. Has no
+	 * meaning in other contexts
+	 */
+	public $required = false;
 
-    /**
-     * Validates and cleans passed string according to a definition.
-     *
-     * @param $string String to be validated and cleaned.
-     * @param $config Mandatory HTMLPurifier_Config object.
-     * @param $context Mandatory HTMLPurifier_AttrContext object.
-     */
-    abstract public function validate($string, $config, $context);
+	/**
+	 * Validates and cleans passed string according to a definition.
+	 *
+	 * @param $string String to be validated and cleaned.
+	 * @param $config Mandatory HTMLPurifier_Config object.
+	 * @param $context Mandatory HTMLPurifier_AttrContext object.
+	 */
+	abstract public function validate($string, $config, $context);
 
-    /**
-     * Convenience method that parses a string as if it were CDATA.
-     *
-     * This method process a string in the manner specified at
-     * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
-     * leading and trailing whitespace, ignoring line feeds, and replacing
-     * carriage returns and tabs with spaces.  While most useful for HTML
-     * attributes specified as CDATA, it can also be applied to most CSS
-     * values.
-     *
-     * @note This method is not entirely standards compliant, as trim() removes
-     *       more types of whitespace than specified in the spec. In practice,
-     *       this is rarely a problem, as those extra characters usually have
-     *       already been removed by HTMLPurifier_Encoder.
-     *
-     * @warning This processing is inconsistent with XML's whitespace handling
-     *          as specified by section 3.3.3 and referenced XHTML 1.0 section
-     *          4.7.  However, note that we are NOT necessarily
-     *          parsing XML, thus, this behavior may still be correct. We
-     *          assume that newlines have been normalized.
-     */
-    public function parseCDATA($string) {
-        $string = trim($string);
-        $string = str_replace(array("\n", "\t", "\r"), ' ', $string);
-        return $string;
-    }
+	/**
+	 * Convenience method that parses a string as if it were CDATA.
+	 *
+	 * This method process a string in the manner specified at
+	 * <http://www.w3.org/TR/html4/types.html#h-6.2> by removing
+	 * leading and trailing whitespace, ignoring line feeds, and replacing
+	 * carriage returns and tabs with spaces.  While most useful for HTML
+	 * attributes specified as CDATA, it can also be applied to most CSS
+	 * values.
+	 *
+	 * @note This method is not entirely standards compliant, as trim() removes
+	 *       more types of whitespace than specified in the spec. In practice,
+	 *       this is rarely a problem, as those extra characters usually have
+	 *       already been removed by HTMLPurifier_Encoder.
+	 *
+	 * @warning This processing is inconsistent with XML's whitespace handling
+	 *          as specified by section 3.3.3 and referenced XHTML 1.0 section
+	 *          4.7.  However, note that we are NOT necessarily
+	 *          parsing XML, thus, this behavior may still be correct. We
+	 *          assume that newlines have been normalized.
+	 */
+	public function parseCDATA($string) {
+		$string = trim($string);
+		$string = str_replace(array("\n", "\t", "\r"), ' ', $string);
+		return $string;
+	}
 
-    /**
-     * Factory method for creating this class from a string.
-     * @param $string String construction info
-     * @return Created AttrDef object corresponding to $string
-     */
-    public function make($string) {
-        // default implementation, return a flyweight of this object.
-        // If $string has an effect on the returned object (i.e. you
-        // need to overload this method), it is best
-        // to clone or instantiate new copies. (Instantiation is safer.)
-        return $this;
-    }
+	/**
+	 * Factory method for creating this class from a string.
+	 * @param $string String construction info
+	 * @return Created AttrDef object corresponding to $string
+	 */
+	public function make($string) {
+		// default implementation, return a flyweight of this object.
+		// If $string has an effect on the returned object (i.e. you
+		// need to overload this method), it is best
+		// to clone or instantiate new copies. (Instantiation is safer.)
+		return $this;
+	}
 
-    /**
-     * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
-     * properly. THIS IS A HACK!
-     */
-    protected function mungeRgb($string) {
-        return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
-    }
+	/**
+	 * Removes spaces from rgb(0, 0, 0) so that shorthand CSS properties work
+	 * properly. THIS IS A HACK!
+	 */
+	protected function mungeRgb($string) {
+		return preg_replace('/rgb\((\d+)\s*,\s*(\d+)\s*,\s*(\d+)\)/', 'rgb(\1,\2,\3)', $string);
+	}
 
-    /**
-     * Parses a possibly escaped CSS string and returns the "pure" 
-     * version of it.
-     */
-    protected function expandCSSEscape($string) {
-        // flexibly parse it
-        $ret = '';
-        for ($i = 0, $c = strlen($string); $i < $c; $i++) {
-            if ($string[$i] === '\\') {
-                $i++;
-                if ($i >= $c) {
-                    $ret .= '\\';
-                    break;
-                }
-                if (ctype_xdigit($string[$i])) {
-                    $code = $string[$i];
-                    for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                        if (!ctype_xdigit($string[$i])) break;
-                        $code .= $string[$i];
-                    }
-                    // We have to be extremely careful when adding
-                    // new characters, to make sure we're not breaking
-                    // the encoding.
-                    $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
-                    $ret .= $char;
-                    if ($i < $c && trim($string[$i]) !== '') $i--;
-                    continue;
-                }
-                if ($string[$i] === "\n") continue;
-            }
-            $ret .= $string[$i];
-        }
-        return $ret;
-    }
+	/**
+	 * Parses a possibly escaped CSS string and returns the "pure" 
+	 * version of it.
+	 */
+	protected function expandCSSEscape($string) {
+		// flexibly parse it
+		$ret = '';
+		for ($i = 0, $c = strlen($string); $i < $c; $i++) {
+			if ($string[$i] === '\\') {
+				$i++;
+				if ($i >= $c) {
+					$ret .= '\\';
+					break;
+				}
+				if (ctype_xdigit($string[$i])) {
+					$code = $string[$i];
+					for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
+						if (!ctype_xdigit($string[$i])) break;
+						$code .= $string[$i];
+					}
+					// We have to be extremely careful when adding
+					// new characters, to make sure we're not breaking
+					// the encoding.
+					$char = HTMLPurifier_Encoder::unichr(hexdec($code));
+					if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
+					$ret .= $char;
+					if ($i < $c && trim($string[$i]) !== '') $i--;
+					continue;
+				}
+				if ($string[$i] === "\n") continue;
+			}
+			$ret .= $string[$i];
+		}
+		return $ret;
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -99,19 +99,27 @@
                 if (ctype_xdigit($string[$i])) {
                     $code = $string[$i];
                     for ($a = 1, $i++; $i < $c && $a < 6; $i++, $a++) {
-                        if (!ctype_xdigit($string[$i])) break;
+                        if (!ctype_xdigit($string[$i])) {
+                        	break;
+                        }
                         $code .= $string[$i];
                     }
                     // We have to be extremely careful when adding
                     // new characters, to make sure we're not breaking
                     // the encoding.
                     $char = HTMLPurifier_Encoder::unichr(hexdec($code));
-                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') continue;
+                    if (HTMLPurifier_Encoder::cleanUTF8($char) === '') {
+                    	continue;
+                    }
                     $ret .= $char;
-                    if ($i < $c && trim($string[$i]) !== '') $i--;
+                    if ($i < $c && trim($string[$i]) !== '') {
+                    	$i--;
+                    }
                     continue;
                 }
-                if ($string[$i] === "\n") continue;
+                if ($string[$i] === "\n") {
+                	continue;
+                }
             }
             $ret .= $string[$i];
         }

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS.php

Indentation +56 added lines, -56 removed lines

@@ -14,73 +14,73 @@
 class HTMLPurifier_AttrDef_CSS extends HTMLPurifier_AttrDef
 {
 
-    public function validate($css, $config, $context) {
+	public function validate($css, $config, $context) {
 
-        $css = $this->parseCDATA($css);
+		$css = $this->parseCDATA($css);
 
-        $definition = $config->getCSSDefinition();
+		$definition = $config->getCSSDefinition();
 
-        // we're going to break the spec and explode by semicolons.
-        // This is because semicolon rarely appears in escaped form
-        // Doing this is generally flaky but fast
-        // IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
-        // for details
+		// we're going to break the spec and explode by semicolons.
+		// This is because semicolon rarely appears in escaped form
+		// Doing this is generally flaky but fast
+		// IT MIGHT APPEAR IN URIs, see HTMLPurifier_AttrDef_CSSURI
+		// for details
 
-        $declarations = explode(';', $css);
-        $propvalues = array();
+		$declarations = explode(';', $css);
+		$propvalues = array();
 
-        /**
-         * Name of the current CSS property being validated.
-         */
-        $property = false;
-        $context->register('CurrentCSSProperty', $property);
+		/**
+		 * Name of the current CSS property being validated.
+		 */
+		$property = false;
+		$context->register('CurrentCSSProperty', $property);
 
-        foreach ($declarations as $declaration) {
-            if (!$declaration) continue;
-            if (!strpos($declaration, ':')) continue;
-            list($property, $value) = explode(':', $declaration, 2);
-            $property = trim($property);
-            $value    = trim($value);
-            $ok = false;
-            do {
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-                if (ctype_lower($property)) break;
-                $property = strtolower($property);
-                if (isset($definition->info[$property])) {
-                    $ok = true;
-                    break;
-                }
-            } while(0);
-            if (!$ok) continue;
-            // inefficient call, since the validator will do this again
-            if (strtolower(trim($value)) !== 'inherit') {
-                // inherit works for everything (but only on the base property)
-                $result = $definition->info[$property]->validate(
-                    $value, $config, $context );
-            } else {
-                $result = 'inherit';
-            }
-            if ($result === false) continue;
-            $propvalues[$property] = $result;
-        }
+		foreach ($declarations as $declaration) {
+			if (!$declaration) continue;
+			if (!strpos($declaration, ':')) continue;
+			list($property, $value) = explode(':', $declaration, 2);
+			$property = trim($property);
+			$value    = trim($value);
+			$ok = false;
+			do {
+				if (isset($definition->info[$property])) {
+					$ok = true;
+					break;
+				}
+				if (ctype_lower($property)) break;
+				$property = strtolower($property);
+				if (isset($definition->info[$property])) {
+					$ok = true;
+					break;
+				}
+			} while(0);
+			if (!$ok) continue;
+			// inefficient call, since the validator will do this again
+			if (strtolower(trim($value)) !== 'inherit') {
+				// inherit works for everything (but only on the base property)
+				$result = $definition->info[$property]->validate(
+					$value, $config, $context );
+			} else {
+				$result = 'inherit';
+			}
+			if ($result === false) continue;
+			$propvalues[$property] = $result;
+		}
 
-        $context->destroy('CurrentCSSProperty');
+		$context->destroy('CurrentCSSProperty');
 
-        // procedure does not write the new CSS simultaneously, so it's
-        // slightly inefficient, but it's the only way of getting rid of
-        // duplicates. Perhaps config to optimize it, but not now.
+		// procedure does not write the new CSS simultaneously, so it's
+		// slightly inefficient, but it's the only way of getting rid of
+		// duplicates. Perhaps config to optimize it, but not now.
 
-        $new_declarations = '';
-        foreach ($propvalues as $prop => $value) {
-            $new_declarations .= "$prop:$value;";
-        }
+		$new_declarations = '';
+		foreach ($propvalues as $prop => $value) {
+			$new_declarations .= "$prop:$value;";
+		}
 
-        return $new_declarations ? $new_declarations : false;
+		return $new_declarations ? $new_declarations : false;
 
-    }
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
                     $ok = true;
                     break;
                 }
-            } while(0);
+            } while (0);
             if (!$ok) continue;
             // inefficient call, since the validator will do this again
             if (strtolower(trim($value)) !== 'inherit') {

Braces +15 added lines, -5 removed lines

@@ -36,8 +36,12 @@ 
         $context->register('CurrentCSSProperty', $property);
 
         foreach ($declarations as $declaration) {
-            if (!$declaration) continue;
-            if (!strpos($declaration, ':')) continue;
+            if (!$declaration) {
+            	continue;
+            }
+            if (!strpos($declaration, ':')) {
+            	continue;
+            }
             list($property, $value) = explode(':', $declaration, 2);
             $property = trim($property);
             $value    = trim($value);
@@ -47,14 +51,18 @@ 
                     $ok = true;
                     break;
                 }
-                if (ctype_lower($property)) break;
+                if (ctype_lower($property)) {
+                	break;
+                }
                 $property = strtolower($property);
                 if (isset($definition->info[$property])) {
                     $ok = true;
                     break;
                 }
             } while(0);
-            if (!$ok) continue;
+            if (!$ok) {
+            	continue;
+            }
             // inefficient call, since the validator will do this again
             if (strtolower(trim($value)) !== 'inherit') {
                 // inherit works for everything (but only on the base property)
@@ -63,7 +71,9 @@ 
             } else {
                 $result = 'inherit';
             }
-            if ($result === false) continue;
+            if ($result === false) {
+            	continue;
+            }
             $propvalues[$property] = $result;
         }
 

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/AlphaValue.php

Indentation +11 added lines, -11 removed lines

@@ -3,18 +3,18 @@
 class HTMLPurifier_AttrDef_CSS_AlphaValue extends HTMLPurifier_AttrDef_CSS_Number
 {
 
-    public function __construct() {
-        parent::__construct(false); // opacity is non-negative, but we will clamp it
-    }
+	public function __construct() {
+		parent::__construct(false); // opacity is non-negative, but we will clamp it
+	}
 
-    public function validate($number, $config, $context) {
-        $result = parent::validate($number, $config, $context);
-        if ($result === false) return $result;
-        $float = (float) $result;
-        if ($float < 0.0) $result = '0';
-        if ($float > 1.0) $result = '1';
-        return $result;
-    }
+	public function validate($number, $config, $context) {
+		$result = parent::validate($number, $config, $context);
+		if ($result === false) return $result;
+		$float = (float) $result;
+		if ($float < 0.0) $result = '0';
+		if ($float > 1.0) $result = '1';
+		return $result;
+	}
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -9,10 +9,16 @@
 
     public function validate($number, $config, $context) {
         $result = parent::validate($number, $config, $context);
-        if ($result === false) return $result;
+        if ($result === false) {
+        	return $result;
+        }
         $float = (float) $result;
-        if ($float < 0.0) $result = '0';
-        if ($float > 1.0) $result = '1';
+        if ($float < 0.0) {
+        	$result = '0';
+        }
+        if ($float > 1.0) {
+        	$result = '1';
+        }
         return $result;
     }
 

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php

Indentation +74 added lines, -74 removed lines

@@ -7,80 +7,80 @@
 class HTMLPurifier_AttrDef_CSS_Background extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Local copy of component validators.
-     * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
-     */
-    protected $info;
-
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['background-color'] = $def->info['background-color'];
-        $this->info['background-image'] = $def->info['background-image'];
-        $this->info['background-repeat'] = $def->info['background-repeat'];
-        $this->info['background-attachment'] = $def->info['background-attachment'];
-        $this->info['background-position'] = $def->info['background-position'];
-    }
-
-    public function validate($string, $config, $context) {
-
-        // regular pre-processing
-        $string = $this->parseCDATA($string);
-        if ($string === '') return false;
-
-        // munge rgb() decl if necessary
-        $string = $this->mungeRgb($string);
-
-        // assumes URI doesn't have spaces in it
-        $bits = explode(' ', strtolower($string)); // bits to process
-
-        $caught = array();
-        $caught['color']    = false;
-        $caught['image']    = false;
-        $caught['repeat']   = false;
-        $caught['attachment'] = false;
-        $caught['position'] = false;
-
-        $i = 0; // number of catches
-        $none = false;
-
-        foreach ($bits as $bit) {
-            if ($bit === '') continue;
-            foreach ($caught as $key => $status) {
-                if ($key != 'position') {
-                    if ($status !== false) continue;
-                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
-                } else {
-                    $r = $bit;
-                }
-                if ($r === false) continue;
-                if ($key == 'position') {
-                    if ($caught[$key] === false) $caught[$key] = '';
-                    $caught[$key] .= $r . ' ';
-                } else {
-                    $caught[$key] = $r;
-                }
-                $i++;
-                break;
-            }
-        }
-
-        if (!$i) return false;
-        if ($caught['position'] !== false) {
-            $caught['position'] = $this->info['background-position']->
-                validate($caught['position'], $config, $context);
-        }
-
-        $ret = array();
-        foreach ($caught as $value) {
-            if ($value === false) continue;
-            $ret[] = $value;
-        }
-
-        if (empty($ret)) return false;
-        return implode(' ', $ret);
-
-    }
+	/**
+	 * Local copy of component validators.
+	 * @note See HTMLPurifier_AttrDef_Font::$info for a similar impl.
+	 */
+	protected $info;
+
+	public function __construct($config) {
+		$def = $config->getCSSDefinition();
+		$this->info['background-color'] = $def->info['background-color'];
+		$this->info['background-image'] = $def->info['background-image'];
+		$this->info['background-repeat'] = $def->info['background-repeat'];
+		$this->info['background-attachment'] = $def->info['background-attachment'];
+		$this->info['background-position'] = $def->info['background-position'];
+	}
+
+	public function validate($string, $config, $context) {
+
+		// regular pre-processing
+		$string = $this->parseCDATA($string);
+		if ($string === '') return false;
+
+		// munge rgb() decl if necessary
+		$string = $this->mungeRgb($string);
+
+		// assumes URI doesn't have spaces in it
+		$bits = explode(' ', strtolower($string)); // bits to process
+
+		$caught = array();
+		$caught['color']    = false;
+		$caught['image']    = false;
+		$caught['repeat']   = false;
+		$caught['attachment'] = false;
+		$caught['position'] = false;
+
+		$i = 0; // number of catches
+		$none = false;
+
+		foreach ($bits as $bit) {
+			if ($bit === '') continue;
+			foreach ($caught as $key => $status) {
+				if ($key != 'position') {
+					if ($status !== false) continue;
+					$r = $this->info['background-' . $key]->validate($bit, $config, $context);
+				} else {
+					$r = $bit;
+				}
+				if ($r === false) continue;
+				if ($key == 'position') {
+					if ($caught[$key] === false) $caught[$key] = '';
+					$caught[$key] .= $r . ' ';
+				} else {
+					$caught[$key] = $r;
+				}
+				$i++;
+				break;
+			}
+		}
+
+		if (!$i) return false;
+		if ($caught['position'] !== false) {
+			$caught['position'] = $this->info['background-position']->
+				validate($caught['position'], $config, $context);
+		}
+
+		$ret = array();
+		foreach ($caught as $value) {
+			if ($value === false) continue;
+			$ret[] = $value;
+		}
+
+		if (empty($ret)) return false;
+		return implode(' ', $ret);
+
+	}
 
 }
 

Braces +24 added lines, -8 removed lines

@@ -26,7 +26,9 @@ 
 
         // regular pre-processing
         $string = $this->parseCDATA($string);
-        if ($string === '') return false;
+        if ($string === '') {
+        	return false;
+        }
 
         // munge rgb() decl if necessary
         $string = $this->mungeRgb($string);
@@ -45,17 +47,25 @@ 
         $none = false;
 
         foreach ($bits as $bit) {
-            if ($bit === '') continue;
+            if ($bit === '') {
+            	continue;
+            }
             foreach ($caught as $key => $status) {
                 if ($key != 'position') {
-                    if ($status !== false) continue;
+                    if ($status !== false) {
+                    	continue;
+                    }
                     $r = $this->info['background-' . $key]->validate($bit, $config, $context);
                 } else {
                     $r = $bit;
                 }
-                if ($r === false) continue;
+                if ($r === false) {
+                	continue;
+                }
                 if ($key == 'position') {
-                    if ($caught[$key] === false) $caught[$key] = '';
+                    if ($caught[$key] === false) {
+                    	$caught[$key] = '';
+                    }
                     $caught[$key] .= $r . ' ';
                 } else {
                     $caught[$key] = $r;
@@ -65,7 +75,9 @@ 
             }
         }
 
-        if (!$i) return false;
+        if (!$i) {
+        	return false;
+        }
         if ($caught['position'] !== false) {
             $caught['position'] = $this->info['background-position']->
                 validate($caught['position'], $config, $context);
@@ -73,11 +85,15 @@ 
 
         $ret = array();
         foreach ($caught as $value) {
-            if ($value === false) continue;
+            if ($value === false) {
+            	continue;
+            }
             $ret[] = $value;
         }
 
-        if (empty($ret)) return false;
+        if (empty($ret)) {
+        	return false;
+        }
         return implode(' ', $ret);
 
     }

Spacing +2 added lines, -2 removed lines

@@ -49,14 +49,14 @@
             foreach ($caught as $key => $status) {
                 if ($key != 'position') {
                     if ($status !== false) continue;
-                    $r = $this->info['background-' . $key]->validate($bit, $config, $context);
+                    $r = $this->info['background-'.$key]->validate($bit, $config, $context);
                 } else {
                     $r = $bit;
                 }
                 if ($r === false) continue;
                 if ($key == 'position') {
                     if ($caught[$key] === false) $caught[$key] = '';
-                    $caught[$key] .= $r . ' ';
+                    $caught[$key] .= $r.' ';
                 } else {
                     $caught[$key] = $r;
                 }

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/BackgroundPosition.php

Indentation +83 added lines, -83 removed lines

@@ -44,89 +44,89 @@
 class HTMLPurifier_AttrDef_CSS_BackgroundPosition extends HTMLPurifier_AttrDef
 {
 
-    protected $length;
-    protected $percentage;
-
-    public function __construct() {
-        $this->length     = new HTMLPurifier_AttrDef_CSS_Length();
-        $this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
-    }
-
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-        $bits = explode(' ', $string);
-
-        $keywords = array();
-        $keywords['h'] = false; // left, right
-        $keywords['v'] = false; // top, bottom
-        $keywords['ch'] = false; // center (first word)
-        $keywords['cv'] = false; // center (second word)
-        $measures = array();
-
-        $i = 0;
-
-        $lookup = array(
-            'top' => 'v',
-            'bottom' => 'v',
-            'left' => 'h',
-            'right' => 'h',
-            'center' => 'c'
-        );
-
-        foreach ($bits as $bit) {
-            if ($bit === '') continue;
-
-            // test for keyword
-            $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
-            if (isset($lookup[$lbit])) {
-                $status = $lookup[$lbit];
-                if ($status == 'c') {
-                    if ($i == 0) {
-                        $status = 'ch';
-                    } else {
-                        $status = 'cv';
-                    }
-                }
-                $keywords[$status] = $lbit;
-                $i++;
-            }
-
-            // test for length
-            $r = $this->length->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-
-            // test for percentage
-            $r = $this->percentage->validate($bit, $config, $context);
-            if ($r !== false) {
-                $measures[] = $r;
-                $i++;
-            }
-
-        }
-
-        if (!$i) return false; // no valid values were caught
-
-        $ret = array();
-
-        // first keyword
-        if     ($keywords['h'])     $ret[] = $keywords['h'];
-        elseif ($keywords['ch']) {
-            $ret[] = $keywords['ch'];
-            $keywords['cv'] = false; // prevent re-use: center = center center
-        }
-        elseif (count($measures))   $ret[] = array_shift($measures);
-
-        if     ($keywords['v'])     $ret[] = $keywords['v'];
-        elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
-
-        if (empty($ret)) return false;
-        return implode(' ', $ret);
-
-    }
+	protected $length;
+	protected $percentage;
+
+	public function __construct() {
+		$this->length     = new HTMLPurifier_AttrDef_CSS_Length();
+		$this->percentage = new HTMLPurifier_AttrDef_CSS_Percentage();
+	}
+
+	public function validate($string, $config, $context) {
+		$string = $this->parseCDATA($string);
+		$bits = explode(' ', $string);
+
+		$keywords = array();
+		$keywords['h'] = false; // left, right
+		$keywords['v'] = false; // top, bottom
+		$keywords['ch'] = false; // center (first word)
+		$keywords['cv'] = false; // center (second word)
+		$measures = array();
+
+		$i = 0;
+
+		$lookup = array(
+			'top' => 'v',
+			'bottom' => 'v',
+			'left' => 'h',
+			'right' => 'h',
+			'center' => 'c'
+		);
+
+		foreach ($bits as $bit) {
+			if ($bit === '') continue;
+
+			// test for keyword
+			$lbit = ctype_lower($bit) ? $bit : strtolower($bit);
+			if (isset($lookup[$lbit])) {
+				$status = $lookup[$lbit];
+				if ($status == 'c') {
+					if ($i == 0) {
+						$status = 'ch';
+					} else {
+						$status = 'cv';
+					}
+				}
+				$keywords[$status] = $lbit;
+				$i++;
+			}
+
+			// test for length
+			$r = $this->length->validate($bit, $config, $context);
+			if ($r !== false) {
+				$measures[] = $r;
+				$i++;
+			}
+
+			// test for percentage
+			$r = $this->percentage->validate($bit, $config, $context);
+			if ($r !== false) {
+				$measures[] = $r;
+				$i++;
+			}
+
+		}
+
+		if (!$i) return false; // no valid values were caught
+
+		$ret = array();
+
+		// first keyword
+		if     ($keywords['h'])     $ret[] = $keywords['h'];
+		elseif ($keywords['ch']) {
+			$ret[] = $keywords['ch'];
+			$keywords['cv'] = false; // prevent re-use: center = center center
+		}
+		elseif (count($measures))   $ret[] = array_shift($measures);
+
+		if     ($keywords['v'])     $ret[] = $keywords['v'];
+		elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
+		elseif (count($measures))   $ret[] = array_shift($measures);
+
+		if (empty($ret)) return false;
+		return implode(' ', $ret);
+
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -112,14 +112,14 @@
         $ret = array();
 
         // first keyword
-        if     ($keywords['h'])     $ret[] = $keywords['h'];
+        if ($keywords['h'])     $ret[] = $keywords['h'];
         elseif ($keywords['ch']) {
             $ret[] = $keywords['ch'];
             $keywords['cv'] = false; // prevent re-use: center = center center
         }
         elseif (count($measures))   $ret[] = array_shift($measures);
 
-        if     ($keywords['v'])     $ret[] = $keywords['v'];
+        if ($keywords['v'])     $ret[] = $keywords['v'];
         elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
         elseif (count($measures))   $ret[] = array_shift($measures);
 

Braces +22 added lines, -9 removed lines

@@ -74,7 +74,9 @@ 
         );
 
         foreach ($bits as $bit) {
-            if ($bit === '') continue;
+            if ($bit === '') {
+            	continue;
+            }
 
             // test for keyword
             $lbit = ctype_lower($bit) ? $bit : strtolower($bit);
@@ -107,23 +109,34 @@ 
 
         }
 
-        if (!$i) return false; // no valid values were caught
+        if (!$i) {
+        	return false;
+        }
+        // no valid values were caught
 
         $ret = array();
 
         // first keyword
-        if     ($keywords['h'])     $ret[] = $keywords['h'];
-        elseif ($keywords['ch']) {
+        if     ($keywords['h']) {
+        	$ret[] = $keywords['h'];
+        } elseif ($keywords['ch']) {
             $ret[] = $keywords['ch'];
             $keywords['cv'] = false; // prevent re-use: center = center center
+        } elseif (count($measures)) {
+        	$ret[] = array_shift($measures);
         }
-        elseif (count($measures))   $ret[] = array_shift($measures);
 
-        if     ($keywords['v'])     $ret[] = $keywords['v'];
-        elseif ($keywords['cv'])    $ret[] = $keywords['cv'];
-        elseif (count($measures))   $ret[] = array_shift($measures);
+        if     ($keywords['v']) {
+        	$ret[] = $keywords['v'];
+        } elseif ($keywords['cv']) {
+        	$ret[] = $keywords['cv'];
+        } elseif (count($measures)) {
+        	$ret[] = array_shift($measures);
+        }
 
-        if (empty($ret)) return false;
+        if (empty($ret)) {
+        	return false;
+        }
         return implode(' ', $ret);
 
     }

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Border.php

Indentation +29 added lines, -29 removed lines

@@ -6,37 +6,37 @@
 class HTMLPurifier_AttrDef_CSS_Border extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Local copy of properties this property is shorthand for.
-     */
-    protected $info = array();
+	/**
+	 * Local copy of properties this property is shorthand for.
+	 */
+	protected $info = array();
 
-    public function __construct($config) {
-        $def = $config->getCSSDefinition();
-        $this->info['border-width'] = $def->info['border-width'];
-        $this->info['border-style'] = $def->info['border-style'];
-        $this->info['border-top-color'] = $def->info['border-top-color'];
-    }
+	public function __construct($config) {
+		$def = $config->getCSSDefinition();
+		$this->info['border-width'] = $def->info['border-width'];
+		$this->info['border-style'] = $def->info['border-style'];
+		$this->info['border-top-color'] = $def->info['border-top-color'];
+	}
 
-    public function validate($string, $config, $context) {
-        $string = $this->parseCDATA($string);
-        $string = $this->mungeRgb($string);
-        $bits = explode(' ', $string);
-        $done = array(); // segments we've finished
-        $ret = ''; // return value
-        foreach ($bits as $bit) {
-            foreach ($this->info as $propname => $validator) {
-                if (isset($done[$propname])) continue;
-                $r = $validator->validate($bit, $config, $context);
-                if ($r !== false) {
-                    $ret .= $r . ' ';
-                    $done[$propname] = true;
-                    break;
-                }
-            }
-        }
-        return rtrim($ret);
-    }
+	public function validate($string, $config, $context) {
+		$string = $this->parseCDATA($string);
+		$string = $this->mungeRgb($string);
+		$bits = explode(' ', $string);
+		$done = array(); // segments we've finished
+		$ret = ''; // return value
+		foreach ($bits as $bit) {
+			foreach ($this->info as $propname => $validator) {
+				if (isset($done[$propname])) continue;
+				$r = $validator->validate($bit, $config, $context);
+				if ($r !== false) {
+					$ret .= $r . ' ';
+					$done[$propname] = true;
+					break;
+				}
+			}
+		}
+		return rtrim($ret);
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
         $ret = ''; // return value
         foreach ($bits as $bit) {
             foreach ($this->info as $propname => $validator) {
-                if (isset($done[$propname])) continue;
+                if (isset($done[$propname])) {
+                	continue;
+                }
                 $r = $validator->validate($bit, $config, $context);
                 if ($r !== false) {
                     $ret .= $r . ' ';

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
                 if (isset($done[$propname])) continue;
                 $r = $validator->validate($bit, $config, $context);
                 if ($r !== false) {
-                    $ret .= $r . ' ';
+                    $ret .= $r.' ';
                     $done[$propname] = true;
                     break;
                 }

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Color.php

Indentation +60 added lines, -60 removed lines

@@ -6,72 +6,72 @@
 class HTMLPurifier_AttrDef_CSS_Color extends HTMLPurifier_AttrDef
 {
 
-    public function validate($color, $config, $context) {
+	public function validate($color, $config, $context) {
 
-        static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
+		static $colors = null;
+		if ($colors === null) $colors = $config->get('Core.ColorKeywords');
 
-        $color = trim($color);
-        if ($color === '') return false;
+		$color = trim($color);
+		if ($color === '') return false;
 
-        $lower = strtolower($color);
-        if (isset($colors[$lower])) return $colors[$lower];
+		$lower = strtolower($color);
+		if (isset($colors[$lower])) return $colors[$lower];
 
-        if (strpos($color, 'rgb(') !== false) {
-            // rgb literal handling
-            $length = strlen($color);
-            if (strpos($color, ')') !== $length - 1) return false;
-            $triad = substr($color, 4, $length - 4 - 1);
-            $parts = explode(',', $triad);
-            if (count($parts) !== 3) return false;
-            $type = false; // to ensure that they're all the same type
-            $new_parts = array();
-            foreach ($parts as $part) {
-                $part = trim($part);
-                if ($part === '') return false;
-                $length = strlen($part);
-                if ($part[$length - 1] === '%') {
-                    // handle percents
-                    if (!$type) {
-                        $type = 'percentage';
-                    } elseif ($type !== 'percentage') {
-                        return false;
-                    }
-                    $num = (float) substr($part, 0, $length - 1);
-                    if ($num < 0) $num = 0;
-                    if ($num > 100) $num = 100;
-                    $new_parts[] = "$num%";
-                } else {
-                    // handle integers
-                    if (!$type) {
-                        $type = 'integer';
-                    } elseif ($type !== 'integer') {
-                        return false;
-                    }
-                    $num = (int) $part;
-                    if ($num < 0) $num = 0;
-                    if ($num > 255) $num = 255;
-                    $new_parts[] = (string) $num;
-                }
-            }
-            $new_triad = implode(',', $new_parts);
-            $color = "rgb($new_triad)";
-        } else {
-            // hexadecimal handling
-            if ($color[0] === '#') {
-                $hex = substr($color, 1);
-            } else {
-                $hex = $color;
-                $color = '#' . $color;
-            }
-            $length = strlen($hex);
-            if ($length !== 3 && $length !== 6) return false;
-            if (!ctype_xdigit($hex)) return false;
-        }
+		if (strpos($color, 'rgb(') !== false) {
+			// rgb literal handling
+			$length = strlen($color);
+			if (strpos($color, ')') !== $length - 1) return false;
+			$triad = substr($color, 4, $length - 4 - 1);
+			$parts = explode(',', $triad);
+			if (count($parts) !== 3) return false;
+			$type = false; // to ensure that they're all the same type
+			$new_parts = array();
+			foreach ($parts as $part) {
+				$part = trim($part);
+				if ($part === '') return false;
+				$length = strlen($part);
+				if ($part[$length - 1] === '%') {
+					// handle percents
+					if (!$type) {
+						$type = 'percentage';
+					} elseif ($type !== 'percentage') {
+						return false;
+					}
+					$num = (float) substr($part, 0, $length - 1);
+					if ($num < 0) $num = 0;
+					if ($num > 100) $num = 100;
+					$new_parts[] = "$num%";
+				} else {
+					// handle integers
+					if (!$type) {
+						$type = 'integer';
+					} elseif ($type !== 'integer') {
+						return false;
+					}
+					$num = (int) $part;
+					if ($num < 0) $num = 0;
+					if ($num > 255) $num = 255;
+					$new_parts[] = (string) $num;
+				}
+			}
+			$new_triad = implode(',', $new_parts);
+			$color = "rgb($new_triad)";
+		} else {
+			// hexadecimal handling
+			if ($color[0] === '#') {
+				$hex = substr($color, 1);
+			} else {
+				$hex = $color;
+				$color = '#' . $color;
+			}
+			$length = strlen($hex);
+			if ($length !== 3 && $length !== 6) return false;
+			if (!ctype_xdigit($hex)) return false;
+		}
 
-        return $color;
+		return $color;
 
-    }
+	}
 
 }
 

Braces +36 added lines, -12 removed lines

@@ -9,26 +9,38 @@ 
     public function validate($color, $config, $context) {
 
         static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
+        if ($colors === null) {
+        	$colors = $config->get('Core.ColorKeywords');
+        }
 
         $color = trim($color);
-        if ($color === '') return false;
+        if ($color === '') {
+        	return false;
+        }
 
         $lower = strtolower($color);
-        if (isset($colors[$lower])) return $colors[$lower];
+        if (isset($colors[$lower])) {
+        	return $colors[$lower];
+        }
 
         if (strpos($color, 'rgb(') !== false) {
             // rgb literal handling
             $length = strlen($color);
-            if (strpos($color, ')') !== $length - 1) return false;
+            if (strpos($color, ')') !== $length - 1) {
+            	return false;
+            }
             $triad = substr($color, 4, $length - 4 - 1);
             $parts = explode(',', $triad);
-            if (count($parts) !== 3) return false;
+            if (count($parts) !== 3) {
+            	return false;
+            }
             $type = false; // to ensure that they're all the same type
             $new_parts = array();
             foreach ($parts as $part) {
                 $part = trim($part);
-                if ($part === '') return false;
+                if ($part === '') {
+                	return false;
+                }
                 $length = strlen($part);
                 if ($part[$length - 1] === '%') {
                     // handle percents
@@ -38,8 +50,12 @@ 
                         return false;
                     }
                     $num = (float) substr($part, 0, $length - 1);
-                    if ($num < 0) $num = 0;
-                    if ($num > 100) $num = 100;
+                    if ($num < 0) {
+                    	$num = 0;
+                    }
+                    if ($num > 100) {
+                    	$num = 100;
+                    }
                     $new_parts[] = "$num%";
                 } else {
                     // handle integers
@@ -49,8 +65,12 @@ 
                         return false;
                     }
                     $num = (int) $part;
-                    if ($num < 0) $num = 0;
-                    if ($num > 255) $num = 255;
+                    if ($num < 0) {
+                    	$num = 0;
+                    }
+                    if ($num > 255) {
+                    	$num = 255;
+                    }
                     $new_parts[] = (string) $num;
                 }
             }
@@ -65,8 +85,12 @@ 
                 $color = '#' . $color;
             }
             $length = strlen($hex);
-            if ($length !== 3 && $length !== 6) return false;
-            if (!ctype_xdigit($hex)) return false;
+            if ($length !== 3 && $length !== 6) {
+            	return false;
+            }
+            if (!ctype_xdigit($hex)) {
+            	return false;
+            }
         }
 
         return $color;

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                 $hex = substr($color, 1);
             } else {
                 $hex = $color;
-                $color = '#' . $color;
+                $color = '#'.$color;
             }
             $length = strlen($hex);
             if ($length !== 3 && $length !== 6) return false;

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Composite.php

Indentation +18 added lines, -18 removed lines

@@ -12,26 +12,26 @@
 class HTMLPurifier_AttrDef_CSS_Composite extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * List of HTMLPurifier_AttrDef objects that may process strings
-     * @todo Make protected
-     */
-    public $defs;
+	/**
+	 * List of HTMLPurifier_AttrDef objects that may process strings
+	 * @todo Make protected
+	 */
+	public $defs;
 
-    /**
-     * @param $defs List of HTMLPurifier_AttrDef objects
-     */
-    public function __construct($defs) {
-        $this->defs = $defs;
-    }
+	/**
+	 * @param $defs List of HTMLPurifier_AttrDef objects
+	 */
+	public function __construct($defs) {
+		$this->defs = $defs;
+	}
 
-    public function validate($string, $config, $context) {
-        foreach ($this->defs as $i => $def) {
-            $result = $this->defs[$i]->validate($string, $config, $context);
-            if ($result !== false) return $result;
-        }
-        return false;
-    }
+	public function validate($string, $config, $context) {
+		foreach ($this->defs as $i => $def) {
+			$result = $this->defs[$i]->validate($string, $config, $context);
+			if ($result !== false) return $result;
+		}
+		return false;
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
     public function validate($string, $config, $context) {
         foreach ($this->defs as $i => $def) {
             $result = $this->defs[$i]->validate($string, $config, $context);
-            if ($result !== false) return $result;
+            if ($result !== false) {
+            	return $result;
+            }
         }
         return false;
     }

classes/security/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/DenyElementDecorator.php

Indentation +17 added lines, -17 removed lines

@@ -5,24 +5,24 @@
  */
 class HTMLPurifier_AttrDef_CSS_DenyElementDecorator extends HTMLPurifier_AttrDef
 {
-    public $def, $element;
+	public $def, $element;
 
-    /**
-     * @param $def Definition to wrap
-     * @param $element Element to deny
-     */
-    public function __construct($def, $element) {
-        $this->def = $def;
-        $this->element = $element;
-    }
-    /**
-     * Checks if CurrentToken is set and equal to $this->element
-     */
-    public function validate($string, $config, $context) {
-        $token = $context->get('CurrentToken', true);
-        if ($token && $token->name == $this->element) return false;
-        return $this->def->validate($string, $config, $context);
-    }
+	/**
+	 * @param $def Definition to wrap
+	 * @param $element Element to deny
+	 */
+	public function __construct($def, $element) {
+		$this->def = $def;
+		$this->element = $element;
+	}
+	/**
+	 * Checks if CurrentToken is set and equal to $this->element
+	 */
+	public function validate($string, $config, $context) {
+		$token = $context->get('CurrentToken', true);
+		if ($token && $token->name == $this->element) return false;
+		return $this->def->validate($string, $config, $context);
+	}
 }
 
 // vim: et sw=4 sts=4

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
      */
     public function validate($string, $config, $context) {
         $token = $context->get('CurrentToken', true);
-        if ($token && $token->name == $this->element) return false;
+        if ($token && $token->name == $this->element) {
+        	return false;
+        }
         return $this->def->validate($string, $config, $context);
     }
 }