xpressengine / xe-core

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

Indentation +57 added lines, -57 removed lines

@@ -6,63 +6,63 @@
 class HTMLPurifier_AttrDef_CSS_Number extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Bool indicating whether or not only positive values allowed.
-     */
-    protected $non_negative = false;
-
-    /**
-     * @param $non_negative Bool indicating whether negatives are forbidden
-     */
-    public function __construct($non_negative = false) {
-        $this->non_negative = $non_negative;
-    }
-
-    /**
-     * @warning Some contexts do not pass $config, $context. These
-     *          variables should not be used without checking HTMLPurifier_Length
-     */
-    public function validate($number, $config, $context) {
-
-        $number = $this->parseCDATA($number);
-
-        if ($number === '') return false;
-        if ($number === '0') return '0';
-
-        $sign = '';
-        switch ($number[0]) {
-            case '-':
-                if ($this->non_negative) return false;
-                $sign = '-';
-            case '+':
-                $number = substr($number, 1);
-        }
-
-        if (ctype_digit($number)) {
-            $number = ltrim($number, '0');
-            return $number ? $sign . $number : '0';
-        }
-
-        // Period is the only non-numeric character allowed
-        if (strpos($number, '.') === false) return false;
-
-        list($left, $right) = explode('.', $number, 2);
-
-        if ($left === '' && $right === '') return false;
-        if ($left !== '' && !ctype_digit($left)) return false;
-
-        $left  = ltrim($left,  '0');
-        $right = rtrim($right, '0');
-
-        if ($right === '') {
-            return $left ? $sign . $left : '0';
-        } elseif (!ctype_digit($right)) {
-            return false;
-        }
-
-        return $sign . $left . '.' . $right;
-
-    }
+	/**
+	 * Bool indicating whether or not only positive values allowed.
+	 */
+	protected $non_negative = false;
+
+	/**
+	 * @param $non_negative Bool indicating whether negatives are forbidden
+	 */
+	public function __construct($non_negative = false) {
+		$this->non_negative = $non_negative;
+	}
+
+	/**
+	 * @warning Some contexts do not pass $config, $context. These
+	 *          variables should not be used without checking HTMLPurifier_Length
+	 */
+	public function validate($number, $config, $context) {
+
+		$number = $this->parseCDATA($number);
+
+		if ($number === '') return false;
+		if ($number === '0') return '0';
+
+		$sign = '';
+		switch ($number[0]) {
+			case '-':
+				if ($this->non_negative) return false;
+				$sign = '-';
+			case '+':
+				$number = substr($number, 1);
+		}
+
+		if (ctype_digit($number)) {
+			$number = ltrim($number, '0');
+			return $number ? $sign . $number : '0';
+		}
+
+		// Period is the only non-numeric character allowed
+		if (strpos($number, '.') === false) return false;
+
+		list($left, $right) = explode('.', $number, 2);
+
+		if ($left === '' && $right === '') return false;
+		if ($left !== '' && !ctype_digit($left)) return false;
+
+		$left  = ltrim($left,  '0');
+		$right = rtrim($right, '0');
+
+		if ($right === '') {
+			return $left ? $sign . $left : '0';
+		} elseif (!ctype_digit($right)) {
+			return false;
+		}
+
+		return $sign . $left . '.' . $right;
+
+	}
 
 }
 

Braces +18 added lines, -6 removed lines

@@ -26,13 +26,19 @@ 
 
         $number = $this->parseCDATA($number);
 
-        if ($number === '') return false;
-        if ($number === '0') return '0';
+        if ($number === '') {
+        	return false;
+        }
+        if ($number === '0') {
+        	return '0';
+        }
 
         $sign = '';
         switch ($number[0]) {
             case '-':
-                if ($this->non_negative) return false;
+                if ($this->non_negative) {
+                	return false;
+                }
                 $sign = '-';
             case '+':
                 $number = substr($number, 1);
@@ -44,12 +50,18 @@ 
         }
 
         // Period is the only non-numeric character allowed
-        if (strpos($number, '.') === false) return false;
+        if (strpos($number, '.') === false) {
+        	return false;
+        }
 
         list($left, $right) = explode('.', $number, 2);
 
-        if ($left === '' && $right === '') return false;
-        if ($left !== '' && !ctype_digit($left)) return false;
+        if ($left === '' && $right === '') {
+        	return false;
+        }
+        if ($left !== '' && !ctype_digit($left)) {
+        	return false;
+        }
 
         $left  = ltrim($left,  '0');
         $right = rtrim($right, '0');

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
 
         if (ctype_digit($number)) {
             $number = ltrim($number, '0');
-            return $number ? $sign . $number : '0';
+            return $number ? $sign.$number : '0';
         }
 
         // Period is the only non-numeric character allowed
@@ -51,16 +51,16 @@ 
         if ($left === '' && $right === '') return false;
         if ($left !== '' && !ctype_digit($left)) return false;
 
-        $left  = ltrim($left,  '0');
+        $left  = ltrim($left, '0');
         $right = rtrim($right, '0');
 
         if ($right === '') {
-            return $left ? $sign . $left : '0';
+            return $left ? $sign.$left : '0';
         } elseif (!ctype_digit($right)) {
             return false;
         }
 
-        return $sign . $left . '.' . $right;
+        return $sign.$left.'.'.$right;
 
     }
 

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

Indentation +21 added lines, -21 removed lines

@@ -6,34 +6,34 @@
 class HTMLPurifier_AttrDef_CSS_Percentage extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
-     */
-    protected $number_def;
+	/**
+	 * Instance of HTMLPurifier_AttrDef_CSS_Number to defer number validation
+	 */
+	protected $number_def;
 
-    /**
-     * @param Bool indicating whether to forbid negative values
-     */
-    public function __construct($non_negative = false) {
-        $this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
-    }
+	/**
+	 * @param Bool indicating whether to forbid negative values
+	 */
+	public function __construct($non_negative = false) {
+		$this->number_def = new HTMLPurifier_AttrDef_CSS_Number($non_negative);
+	}
 
-    public function validate($string, $config, $context) {
+	public function validate($string, $config, $context) {
 
-        $string = $this->parseCDATA($string);
+		$string = $this->parseCDATA($string);
 
-        if ($string === '') return false;
-        $length = strlen($string);
-        if ($length === 1) return false;
-        if ($string[$length - 1] !== '%') return false;
+		if ($string === '') return false;
+		$length = strlen($string);
+		if ($length === 1) return false;
+		if ($string[$length - 1] !== '%') return false;
 
-        $number = substr($string, 0, $length - 1);
-        $number = $this->number_def->validate($number, $config, $context);
+		$number = substr($string, 0, $length - 1);
+		$number = $this->number_def->validate($number, $config, $context);
 
-        if ($number === false) return false;
-        return "$number%";
+		if ($number === false) return false;
+		return "$number%";
 
-    }
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -22,15 +22,23 @@
 
         $string = $this->parseCDATA($string);
 
-        if ($string === '') return false;
+        if ($string === '') {
+        	return false;
+        }
         $length = strlen($string);
-        if ($length === 1) return false;
-        if ($string[$length - 1] !== '%') return false;
+        if ($length === 1) {
+        	return false;
+        }
+        if ($string[$length - 1] !== '%') {
+        	return false;
+        }
 
         $number = substr($string, 0, $length - 1);
         $number = $this->number_def->validate($number, $config, $context);
 
-        if ($number === false) return false;
+        if ($number === false) {
+        	return false;
+        }
         return "$number%";
 
     }

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

Indentation +24 added lines, -24 removed lines

@@ -8,30 +8,30 @@
 class HTMLPurifier_AttrDef_CSS_TextDecoration extends HTMLPurifier_AttrDef
 {
 
-    public function validate($string, $config, $context) {
-
-        static $allowed_values = array(
-            'line-through' => true,
-            'overline' => true,
-            'underline' => true,
-        );
-
-        $string = strtolower($this->parseCDATA($string));
-
-        if ($string === 'none') return $string;
-
-        $parts = explode(' ', $string);
-        $final = '';
-        foreach ($parts as $part) {
-            if (isset($allowed_values[$part])) {
-                $final .= $part . ' ';
-            }
-        }
-        $final = rtrim($final);
-        if ($final === '') return false;
-        return $final;
-
-    }
+	public function validate($string, $config, $context) {
+
+		static $allowed_values = array(
+			'line-through' => true,
+			'overline' => true,
+			'underline' => true,
+		);
+
+		$string = strtolower($this->parseCDATA($string));
+
+		if ($string === 'none') return $string;
+
+		$parts = explode(' ', $string);
+		$final = '';
+		foreach ($parts as $part) {
+			if (isset($allowed_values[$part])) {
+				$final .= $part . ' ';
+			}
+		}
+		$final = rtrim($final);
+		if ($final === '') return false;
+		return $final;
+
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -18,7 +18,9 @@ 
 
         $string = strtolower($this->parseCDATA($string));
 
-        if ($string === 'none') return $string;
+        if ($string === 'none') {
+        	return $string;
+        }
 
         $parts = explode(' ', $string);
         $final = '';
@@ -28,7 +30,9 @@ 
             }
         }
         $final = rtrim($final);
-        if ($final === '') return false;
+        if ($final === '') {
+        	return false;
+        }
         return $final;
 
     }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         $final = '';
         foreach ($parts as $part) {
             if (isset($allowed_values[$part])) {
-                $final .= $part . ' ';
+                $final .= $part.' ';
             }
         }
         $final = rtrim($final);

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

Indentation +32 added lines, -32 removed lines

@@ -12,49 +12,49 @@
 class HTMLPurifier_AttrDef_CSS_URI extends HTMLPurifier_AttrDef_URI
 {
 
-    public function __construct() {
-        parent::__construct(true); // always embedded
-    }
+	public function __construct() {
+		parent::__construct(true); // always embedded
+	}
 
-    public function validate($uri_string, $config, $context) {
-        // parse the URI out of the string and then pass it onto
-        // the parent object
+	public function validate($uri_string, $config, $context) {
+		// parse the URI out of the string and then pass it onto
+		// the parent object
 
-        $uri_string = $this->parseCDATA($uri_string);
-        if (strpos($uri_string, 'url(') !== 0) return false;
-        $uri_string = substr($uri_string, 4);
-        $new_length = strlen($uri_string) - 1;
-        if ($uri_string[$new_length] != ')') return false;
-        $uri = trim(substr($uri_string, 0, $new_length));
+		$uri_string = $this->parseCDATA($uri_string);
+		if (strpos($uri_string, 'url(') !== 0) return false;
+		$uri_string = substr($uri_string, 4);
+		$new_length = strlen($uri_string) - 1;
+		if ($uri_string[$new_length] != ')') return false;
+		$uri = trim(substr($uri_string, 0, $new_length));
 
-        if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
-            $quote = $uri[0];
-            $new_length = strlen($uri) - 1;
-            if ($uri[$new_length] !== $quote) return false;
-            $uri = substr($uri, 1, $new_length - 1);
-        }
+		if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
+			$quote = $uri[0];
+			$new_length = strlen($uri) - 1;
+			if ($uri[$new_length] !== $quote) return false;
+			$uri = substr($uri, 1, $new_length - 1);
+		}
 
-        $uri = $this->expandCSSEscape($uri);
+		$uri = $this->expandCSSEscape($uri);
 
-        $result = parent::validate($uri, $config, $context);
+		$result = parent::validate($uri, $config, $context);
 
-        if ($result === false) return false;
+		if ($result === false) return false;
 
-        // extra sanity check; should have been done by URI
-        $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
+		// extra sanity check; should have been done by URI
+		$result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);
 
-        // suspicious characters are ()'; we're going to percent encode
-        // them for safety.
-        $result = str_replace(array('(', ')', "'"), array('%28', '%29', '%27'), $result);
+		// suspicious characters are ()'; we're going to percent encode
+		// them for safety.
+		$result = str_replace(array('(', ')', "'"), array('%28', '%29', '%27'), $result);
 
-        // there's an extra bug where ampersands lose their escaping on
-        // an innerHTML cycle, so a very unlucky query parameter could
-        // then change the meaning of the URL.  Unfortunately, there's
-        // not much we can do about that...
+		// there's an extra bug where ampersands lose their escaping on
+		// an innerHTML cycle, so a very unlucky query parameter could
+		// then change the meaning of the URL.  Unfortunately, there's
+		// not much we can do about that...
 
-        return "url(\"$result\")";
+		return "url(\"$result\")";
 
-    }
+	}
 
 }
 

Braces +12 added lines, -4 removed lines

@@ -21,16 +21,22 @@ 
         // the parent object
 
         $uri_string = $this->parseCDATA($uri_string);
-        if (strpos($uri_string, 'url(') !== 0) return false;
+        if (strpos($uri_string, 'url(') !== 0) {
+        	return false;
+        }
         $uri_string = substr($uri_string, 4);
         $new_length = strlen($uri_string) - 1;
-        if ($uri_string[$new_length] != ')') return false;
+        if ($uri_string[$new_length] != ')') {
+        	return false;
+        }
         $uri = trim(substr($uri_string, 0, $new_length));
 
         if (!empty($uri) && ($uri[0] == "'" || $uri[0] == '"')) {
             $quote = $uri[0];
             $new_length = strlen($uri) - 1;
-            if ($uri[$new_length] !== $quote) return false;
+            if ($uri[$new_length] !== $quote) {
+            	return false;
+            }
             $uri = substr($uri, 1, $new_length - 1);
         }
 
@@ -38,7 +44,9 @@ 
 
         $result = parent::validate($uri, $config, $context);
 
-        if ($result === false) return false;
+        if ($result === false) {
+        	return false;
+        }
 
         // extra sanity check; should have been done by URI
         $result = str_replace(array('"', "\\", "\n", "\x0c", "\r"), "", $result);

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

Indentation +13 added lines, -13 removed lines

@@ -6,22 +6,22 @@
  */
 class HTMLPurifier_AttrDef_Clone extends HTMLPurifier_AttrDef
 {
-    /**
-     * What we're cloning
-     */
-    protected $clone;
+	/**
+	 * What we're cloning
+	 */
+	protected $clone;
 
-    public function __construct($clone) {
-        $this->clone = $clone;
-    }
+	public function __construct($clone) {
+		$this->clone = $clone;
+	}
 
-    public function validate($v, $config, $context) {
-        return $this->clone->validate($v, $config, $context);
-    }
+	public function validate($v, $config, $context) {
+		return $this->clone->validate($v, $config, $context);
+	}
 
-    public function make($string) {
-        return clone $this->clone;
-    }
+	public function make($string) {
+		return clone $this->clone;
+	}
 
 }
 

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

Indentation +44 added lines, -44 removed lines

@@ -10,55 +10,55 @@
 class HTMLPurifier_AttrDef_Enum extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Lookup table of valid values.
-     * @todo Make protected
-     */
-    public $valid_values   = array();
+	/**
+	 * Lookup table of valid values.
+	 * @todo Make protected
+	 */
+	public $valid_values   = array();
 
-    /**
-     * Bool indicating whether or not enumeration is case sensitive.
-     * @note In general this is always case insensitive.
-     */
-    protected $case_sensitive = false; // values according to W3C spec
+	/**
+	 * Bool indicating whether or not enumeration is case sensitive.
+	 * @note In general this is always case insensitive.
+	 */
+	protected $case_sensitive = false; // values according to W3C spec
 
-    /**
-     * @param $valid_values List of valid values
-     * @param $case_sensitive Bool indicating whether or not case sensitive
-     */
-    public function __construct(
-        $valid_values = array(), $case_sensitive = false
-    ) {
-        $this->valid_values = array_flip($valid_values);
-        $this->case_sensitive = $case_sensitive;
-    }
+	/**
+	 * @param $valid_values List of valid values
+	 * @param $case_sensitive Bool indicating whether or not case sensitive
+	 */
+	public function __construct(
+		$valid_values = array(), $case_sensitive = false
+	) {
+		$this->valid_values = array_flip($valid_values);
+		$this->case_sensitive = $case_sensitive;
+	}
 
-    public function validate($string, $config, $context) {
-        $string = trim($string);
-        if (!$this->case_sensitive) {
-            // we may want to do full case-insensitive libraries
-            $string = ctype_lower($string) ? $string : strtolower($string);
-        }
-        $result = isset($this->valid_values[$string]);
+	public function validate($string, $config, $context) {
+		$string = trim($string);
+		if (!$this->case_sensitive) {
+			// we may want to do full case-insensitive libraries
+			$string = ctype_lower($string) ? $string : strtolower($string);
+		}
+		$result = isset($this->valid_values[$string]);
 
-        return $result ? $string : false;
-    }
+		return $result ? $string : false;
+	}
 
-    /**
-     * @param $string In form of comma-delimited list of case-insensitive
-     *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
-     *      case sensitive
-     */
-    public function make($string) {
-        if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
-            $string = substr($string, 2);
-            $sensitive = true;
-        } else {
-            $sensitive = false;
-        }
-        $values = explode(',', $string);
-        return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
-    }
+	/**
+	 * @param $string In form of comma-delimited list of case-insensitive
+	 *      valid values. Example: "foo,bar,baz". Prepend "s:" to make
+	 *      case sensitive
+	 */
+	public function make($string) {
+		if (strlen($string) > 2 && $string[0] == 's' && $string[1] == ':') {
+			$string = substr($string, 2);
+			$sensitive = true;
+		} else {
+			$sensitive = false;
+		}
+		$values = explode(',', $string);
+		return new HTMLPurifier_AttrDef_Enum($values, $sensitive);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * Lookup table of valid values.
      * @todo Make protected
      */
-    public $valid_values   = array();
+    public $valid_values = array();
 
     /**
      * Bool indicating whether or not enumeration is case sensitive.

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

Indentation +13 added lines, -13 removed lines

@@ -6,22 +6,22 @@
 class HTMLPurifier_AttrDef_HTML_Bool extends HTMLPurifier_AttrDef
 {
 
-    protected $name;
-    public $minimized = true;
+	protected $name;
+	public $minimized = true;
 
-    public function __construct($name = false) {$this->name = $name;}
+	public function __construct($name = false) {$this->name = $name;}
 
-    public function validate($string, $config, $context) {
-        if (empty($string)) return false;
-        return $this->name;
-    }
+	public function validate($string, $config, $context) {
+		if (empty($string)) return false;
+		return $this->name;
+	}
 
-    /**
-     * @param $string Name of attribute
-     */
-    public function make($string) {
-        return new HTMLPurifier_AttrDef_HTML_Bool($string);
-    }
+	/**
+	 * @param $string Name of attribute
+	 */
+	public function make($string) {
+		return new HTMLPurifier_AttrDef_HTML_Bool($string);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     protected $name;
     public $minimized = true;
 
-    public function __construct($name = false) {$this->name = $name;}
+    public function __construct($name = false) {$this->name = $name; }
 
     public function validate($string, $config, $context) {
         if (empty($string)) return false;

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
     public function __construct($name = false) {$this->name = $name;}
 
     public function validate($string, $config, $context) {
-        if (empty($string)) return false;
+        if (empty($string)) {
+        	return false;
+        }
         return $this->name;
     }
 

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

Indentation +26 added lines, -26 removed lines

@@ -5,30 +5,30 @@
  */
 class HTMLPurifier_AttrDef_HTML_Class extends HTMLPurifier_AttrDef_HTML_Nmtokens
 {
-    protected function split($string, $config, $context) {
-        // really, this twiddle should be lazy loaded
-        $name = $config->getDefinition('HTML')->doctype->name;
-        if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
-            return parent::split($string, $config, $context);
-        } else {
-            return preg_split('/\s+/', $string);
-        }
-    }
-    protected function filter($tokens, $config, $context) {
-        $allowed = $config->get('Attr.AllowedClasses');
-        $forbidden = $config->get('Attr.ForbiddenClasses');
-        $ret = array();
-        foreach ($tokens as $token) {
-            if (
-                ($allowed === null || isset($allowed[$token])) &&
-                !isset($forbidden[$token]) &&
-                // We need this O(n) check because of PHP's array
-                // implementation that casts -0 to 0.
-                !in_array($token, $ret, true)
-            ) {
-                $ret[] = $token;
-            }
-        }
-        return $ret;
-    }
+	protected function split($string, $config, $context) {
+		// really, this twiddle should be lazy loaded
+		$name = $config->getDefinition('HTML')->doctype->name;
+		if ($name == "XHTML 1.1" || $name == "XHTML 2.0") {
+			return parent::split($string, $config, $context);
+		} else {
+			return preg_split('/\s+/', $string);
+		}
+	}
+	protected function filter($tokens, $config, $context) {
+		$allowed = $config->get('Attr.AllowedClasses');
+		$forbidden = $config->get('Attr.ForbiddenClasses');
+		$ret = array();
+		foreach ($tokens as $token) {
+			if (
+				($allowed === null || isset($allowed[$token])) &&
+				!isset($forbidden[$token]) &&
+				// We need this O(n) check because of PHP's array
+				// implementation that casts -0 to 0.
+				!in_array($token, $ret, true)
+			) {
+				$ret[] = $token;
+			}
+		}
+		return $ret;
+	}
 }

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

Indentation +14 added lines, -14 removed lines

@@ -6,26 +6,26 @@
 class HTMLPurifier_AttrDef_HTML_Color extends HTMLPurifier_AttrDef
 {
 
-    public function validate($string, $config, $context) {
+	public function validate($string, $config, $context) {
 
-        static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
+		static $colors = null;
+		if ($colors === null) $colors = $config->get('Core.ColorKeywords');
 
-        $string = trim($string);
+		$string = trim($string);
 
-        if (empty($string)) return false;
-        if (isset($colors[strtolower($string)])) return $colors[$string];
-        if ($string[0] === '#') $hex = substr($string, 1);
-        else $hex = $string;
+		if (empty($string)) return false;
+		if (isset($colors[strtolower($string)])) return $colors[$string];
+		if ($string[0] === '#') $hex = substr($string, 1);
+		else $hex = $string;
 
-        $length = strlen($hex);
-        if ($length !== 3 && $length !== 6) return false;
-        if (!ctype_xdigit($hex)) return false;
-        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+		$length = strlen($hex);
+		if ($length !== 3 && $length !== 6) return false;
+		if (!ctype_xdigit($hex)) return false;
+		if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
 
-        return "#$hex";
+		return "#$hex";
 
-    }
+	}
 
 }
 

Braces +23 added lines, -8 removed lines

@@ -9,19 +9,34 @@
     public function validate($string, $config, $context) {
 
         static $colors = null;
-        if ($colors === null) $colors = $config->get('Core.ColorKeywords');
+        if ($colors === null) {
+        	$colors = $config->get('Core.ColorKeywords');
+        }
 
         $string = trim($string);
 
-        if (empty($string)) return false;
-        if (isset($colors[strtolower($string)])) return $colors[$string];
-        if ($string[0] === '#') $hex = substr($string, 1);
-        else $hex = $string;
+        if (empty($string)) {
+        	return false;
+        }
+        if (isset($colors[strtolower($string)])) {
+        	return $colors[$string];
+        }
+        if ($string[0] === '#') {
+        	$hex = substr($string, 1);
+        } else {
+        	$hex = $string;
+        }
 
         $length = strlen($hex);
-        if ($length !== 3 && $length !== 6) return false;
-        if (!ctype_xdigit($hex)) return false;
-        if ($length === 3) $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+        if ($length !== 3 && $length !== 6) {
+        	return false;
+        }
+        if (!ctype_xdigit($hex)) {
+        	return false;
+        }
+        if ($length === 3) {
+        	$hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
+        }
 
         return "#$hex";