xpressengine / xe-core

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

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

Indentation +7 added lines, -7 removed lines

@@ -6,15 +6,15 @@
 class HTMLPurifier_AttrDef_HTML_FrameTarget extends HTMLPurifier_AttrDef_Enum
 {
 
-    public $valid_values = false; // uninitialized value
-    protected $case_sensitive = false;
+	public $valid_values = false; // uninitialized value
+	protected $case_sensitive = false;
 
-    public function __construct() {}
+	public function __construct() {}
 
-    public function validate($string, $config, $context) {
-        if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
-        return parent::validate($string, $config, $context);
-    }
+	public function validate($string, $config, $context) {
+		if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
+		return parent::validate($string, $config, $context);
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
     public function __construct() {}
 
     public function validate($string, $config, $context) {
-        if ($this->valid_values === false) $this->valid_values = $config->get('Attr.AllowedFrameTargets');
+        if ($this->valid_values === false) {
+        	$this->valid_values = $config->get('Attr.AllowedFrameTargets');
+        }
         return parent::validate($string, $config, $context);
     }
 

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

Indentation +62 added lines, -62 removed lines

@@ -12,68 +12,68 @@
 class HTMLPurifier_AttrDef_HTML_ID extends HTMLPurifier_AttrDef
 {
 
-    // selector is NOT a valid thing to use for IDREFs, because IDREFs
-    // *must* target IDs that exist, whereas selector #ids do not.
-
-    /**
-     * Determines whether or not we're validating an ID in a CSS
-     * selector context.
-     */
-    protected $selector;
-
-    public function __construct($selector = false) {
-        $this->selector = $selector;
-    }
-
-    public function validate($id, $config, $context) {
-
-        if (!$this->selector && !$config->get('Attr.EnableID')) return false;
-
-        $id = trim($id); // trim it first
-
-        if ($id === '') return false;
-
-        $prefix = $config->get('Attr.IDPrefix');
-        if ($prefix !== '') {
-            $prefix .= $config->get('Attr.IDPrefixLocal');
-            // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
-        } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
-            trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
-                '%Attr.IDPrefix is set', E_USER_WARNING);
-        }
-
-        if (!$this->selector) {
-            $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) return false;
-        }
-
-        // we purposely avoid using regex, hopefully this is faster
-
-        if (ctype_alpha($id)) {
-            $result = true;
-        } else {
-            if (!ctype_alpha(@$id[0])) return false;
-            $trim = trim( // primitive style of regexps, I suppose
-                $id,
-                'A..Za..z0..9:-._'
-              );
-            $result = ($trim === '');
-        }
-
-        $regexp = $config->get('Attr.IDBlacklistRegexp');
-        if ($regexp && preg_match($regexp, $id)) {
-            return false;
-        }
-
-        if (!$this->selector && $result) $id_accumulator->add($id);
-
-        // if no change was made to the ID, return the result
-        // else, return the new id if stripping whitespace made it
-        //     valid, or return false.
-        return $result ? $id : false;
-
-    }
+	// selector is NOT a valid thing to use for IDREFs, because IDREFs
+	// *must* target IDs that exist, whereas selector #ids do not.
+
+	/**
+	 * Determines whether or not we're validating an ID in a CSS
+	 * selector context.
+	 */
+	protected $selector;
+
+	public function __construct($selector = false) {
+		$this->selector = $selector;
+	}
+
+	public function validate($id, $config, $context) {
+
+		if (!$this->selector && !$config->get('Attr.EnableID')) return false;
+
+		$id = trim($id); // trim it first
+
+		if ($id === '') return false;
+
+		$prefix = $config->get('Attr.IDPrefix');
+		if ($prefix !== '') {
+			$prefix .= $config->get('Attr.IDPrefixLocal');
+			// prevent re-appending the prefix
+			if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
+		} elseif ($config->get('Attr.IDPrefixLocal') !== '') {
+			trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
+				'%Attr.IDPrefix is set', E_USER_WARNING);
+		}
+
+		if (!$this->selector) {
+			$id_accumulator =& $context->get('IDAccumulator');
+			if (isset($id_accumulator->ids[$id])) return false;
+		}
+
+		// we purposely avoid using regex, hopefully this is faster
+
+		if (ctype_alpha($id)) {
+			$result = true;
+		} else {
+			if (!ctype_alpha(@$id[0])) return false;
+			$trim = trim( // primitive style of regexps, I suppose
+				$id,
+				'A..Za..z0..9:-._'
+			  );
+			$result = ($trim === '');
+		}
+
+		$regexp = $config->get('Attr.IDBlacklistRegexp');
+		if ($regexp && preg_match($regexp, $id)) {
+			return false;
+		}
+
+		if (!$this->selector && $result) $id_accumulator->add($id);
+
+		// if no change was made to the ID, return the result
+		// else, return the new id if stripping whitespace made it
+		//     valid, or return false.
+		return $result ? $id : false;
+
+	}
 
 }
 

Braces +18 added lines, -6 removed lines

@@ -27,17 +27,23 @@ 
 
     public function validate($id, $config, $context) {
 
-        if (!$this->selector && !$config->get('Attr.EnableID')) return false;
+        if (!$this->selector && !$config->get('Attr.EnableID')) {
+        	return false;
+        }
 
         $id = trim($id); // trim it first
 
-        if ($id === '') return false;
+        if ($id === '') {
+        	return false;
+        }
 
         $prefix = $config->get('Attr.IDPrefix');
         if ($prefix !== '') {
             $prefix .= $config->get('Attr.IDPrefixLocal');
             // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
+            if (strpos($id, $prefix) !== 0) {
+            	$id = $prefix . $id;
+            }
         } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
             trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
                 '%Attr.IDPrefix is set', E_USER_WARNING);
@@ -45,7 +51,9 @@ 
 
         if (!$this->selector) {
             $id_accumulator =& $context->get('IDAccumulator');
-            if (isset($id_accumulator->ids[$id])) return false;
+            if (isset($id_accumulator->ids[$id])) {
+            	return false;
+            }
         }
 
         // we purposely avoid using regex, hopefully this is faster
@@ -53,7 +61,9 @@ 
         if (ctype_alpha($id)) {
             $result = true;
         } else {
-            if (!ctype_alpha(@$id[0])) return false;
+            if (!ctype_alpha(@$id[0])) {
+            	return false;
+            }
             $trim = trim( // primitive style of regexps, I suppose
                 $id,
                 'A..Za..z0..9:-._'
@@ -66,7 +76,9 @@ 
             return false;
         }
 
-        if (!$this->selector && $result) $id_accumulator->add($id);
+        if (!$this->selector && $result) {
+        	$id_accumulator->add($id);
+        }
 
         // if no change was made to the ID, return the result
         // else, return the new id if stripping whitespace made it

Spacing +2 added lines, -2 removed lines

@@ -37,14 +37,14 @@
         if ($prefix !== '') {
             $prefix .= $config->get('Attr.IDPrefixLocal');
             // prevent re-appending the prefix
-            if (strpos($id, $prefix) !== 0) $id = $prefix . $id;
+            if (strpos($id, $prefix) !== 0) $id = $prefix.$id;
         } elseif ($config->get('Attr.IDPrefixLocal') !== '') {
             trigger_error('%Attr.IDPrefixLocal cannot be used unless '.
                 '%Attr.IDPrefix is set', E_USER_WARNING);
         }
 
         if (!$this->selector) {
-            $id_accumulator =& $context->get('IDAccumulator');
+            $id_accumulator = & $context->get('IDAccumulator');
             if (isset($id_accumulator->ids[$id])) return false;
         }
 

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

Indentation +15 added lines, -15 removed lines

@@ -10,31 +10,31 @@
 class HTMLPurifier_AttrDef_HTML_Length extends HTMLPurifier_AttrDef_HTML_Pixels
 {
 
-    public function validate($string, $config, $context) {
+	public function validate($string, $config, $context) {
 
-        $string = trim($string);
-        if ($string === '') return false;
+		$string = trim($string);
+		if ($string === '') return false;
 
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
+		$parent_result = parent::validate($string, $config, $context);
+		if ($parent_result !== false) return $parent_result;
 
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
+		$length = strlen($string);
+		$last_char = $string[$length - 1];
 
-        if ($last_char !== '%') return false;
+		if ($last_char !== '%') return false;
 
-        $points = substr($string, 0, $length - 1);
+		$points = substr($string, 0, $length - 1);
 
-        if (!is_numeric($points)) return false;
+		if (!is_numeric($points)) return false;
 
-        $points = (int) $points;
+		$points = (int) $points;
 
-        if ($points < 0) return '0%';
-        if ($points > 100) return '100%';
+		if ($points < 0) return '0%';
+		if ($points > 100) return '100%';
 
-        return ((string) $points) . '%';
+		return ((string) $points) . '%';
 
-    }
+	}
 
 }
 

Braces +18 added lines, -6 removed lines

@@ -13,24 +13,36 @@
     public function validate($string, $config, $context) {
 
         $string = trim($string);
-        if ($string === '') return false;
+        if ($string === '') {
+        	return false;
+        }
 
         $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
+        if ($parent_result !== false) {
+        	return $parent_result;
+        }
 
         $length = strlen($string);
         $last_char = $string[$length - 1];
 
-        if ($last_char !== '%') return false;
+        if ($last_char !== '%') {
+        	return false;
+        }
 
         $points = substr($string, 0, $length - 1);
 
-        if (!is_numeric($points)) return false;
+        if (!is_numeric($points)) {
+        	return false;
+        }
 
         $points = (int) $points;
 
-        if ($points < 0) return '0%';
-        if ($points > 100) return '100%';
+        if ($points < 0) {
+        	return '0%';
+        }
+        if ($points > 100) {
+        	return '100%';
+        }
 
         return ((string) $points) . '%';
 

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if ($points < 0) return '0%';
         if ($points > 100) return '100%';
 
-        return ((string) $points) . '%';
+        return ((string) $points).'%';
 
     }
 

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

Indentation +38 added lines, -38 removed lines

@@ -9,44 +9,44 @@
 class HTMLPurifier_AttrDef_HTML_LinkTypes extends HTMLPurifier_AttrDef
 {
 
-    /** Name config attribute to pull. */
-    protected $name;
-
-    public function __construct($name) {
-        $configLookup = array(
-            'rel' => 'AllowedRel',
-            'rev' => 'AllowedRev'
-        );
-        if (!isset($configLookup[$name])) {
-            trigger_error('Unrecognized attribute name for link '.
-                'relationship.', E_USER_ERROR);
-            return;
-        }
-        $this->name = $configLookup[$name];
-    }
-
-    public function validate($string, $config, $context) {
-
-        $allowed = $config->get('Attr.' . $this->name);
-        if (empty($allowed)) return false;
-
-        $string = $this->parseCDATA($string);
-        $parts = explode(' ', $string);
-
-        // lookup to prevent duplicates
-        $ret_lookup = array();
-        foreach ($parts as $part) {
-            $part = strtolower(trim($part));
-            if (!isset($allowed[$part])) continue;
-            $ret_lookup[$part] = true;
-        }
-
-        if (empty($ret_lookup)) return false;
-        $string = implode(' ', array_keys($ret_lookup));
-
-        return $string;
-
-    }
+	/** Name config attribute to pull. */
+	protected $name;
+
+	public function __construct($name) {
+		$configLookup = array(
+			'rel' => 'AllowedRel',
+			'rev' => 'AllowedRev'
+		);
+		if (!isset($configLookup[$name])) {
+			trigger_error('Unrecognized attribute name for link '.
+				'relationship.', E_USER_ERROR);
+			return;
+		}
+		$this->name = $configLookup[$name];
+	}
+
+	public function validate($string, $config, $context) {
+
+		$allowed = $config->get('Attr.' . $this->name);
+		if (empty($allowed)) return false;
+
+		$string = $this->parseCDATA($string);
+		$parts = explode(' ', $string);
+
+		// lookup to prevent duplicates
+		$ret_lookup = array();
+		foreach ($parts as $part) {
+			$part = strtolower(trim($part));
+			if (!isset($allowed[$part])) continue;
+			$ret_lookup[$part] = true;
+		}
+
+		if (empty($ret_lookup)) return false;
+		$string = implode(' ', array_keys($ret_lookup));
+
+		return $string;
+
+	}
 
 }
 

Braces +9 added lines, -3 removed lines

@@ -28,7 +28,9 @@ 
     public function validate($string, $config, $context) {
 
         $allowed = $config->get('Attr.' . $this->name);
-        if (empty($allowed)) return false;
+        if (empty($allowed)) {
+        	return false;
+        }
 
         $string = $this->parseCDATA($string);
         $parts = explode(' ', $string);
@@ -37,11 +39,15 @@ 
         $ret_lookup = array();
         foreach ($parts as $part) {
             $part = strtolower(trim($part));
-            if (!isset($allowed[$part])) continue;
+            if (!isset($allowed[$part])) {
+            	continue;
+            }
             $ret_lookup[$part] = true;
         }
 
-        if (empty($ret_lookup)) return false;
+        if (empty($ret_lookup)) {
+        	return false;
+        }
         $string = implode(' ', array_keys($ret_lookup));
 
         return $string;

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
     public function validate($string, $config, $context) {
 
-        $allowed = $config->get('Attr.' . $this->name);
+        $allowed = $config->get('Attr.'.$this->name);
         if (empty($allowed)) return false;
 
         $string = $this->parseCDATA($string);

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

Indentation +17 added lines, -17 removed lines

@@ -9,32 +9,32 @@
 class HTMLPurifier_AttrDef_HTML_MultiLength extends HTMLPurifier_AttrDef_HTML_Length
 {
 
-    public function validate($string, $config, $context) {
+	public function validate($string, $config, $context) {
 
-        $string = trim($string);
-        if ($string === '') return false;
+		$string = trim($string);
+		if ($string === '') return false;
 
-        $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
+		$parent_result = parent::validate($string, $config, $context);
+		if ($parent_result !== false) return $parent_result;
 
-        $length = strlen($string);
-        $last_char = $string[$length - 1];
+		$length = strlen($string);
+		$last_char = $string[$length - 1];
 
-        if ($last_char !== '*') return false;
+		if ($last_char !== '*') return false;
 
-        $int = substr($string, 0, $length - 1);
+		$int = substr($string, 0, $length - 1);
 
-        if ($int == '') return '*';
-        if (!is_numeric($int)) return false;
+		if ($int == '') return '*';
+		if (!is_numeric($int)) return false;
 
-        $int = (int) $int;
+		$int = (int) $int;
 
-        if ($int < 0) return false;
-        if ($int == 0) return '0';
-        if ($int == 1) return '*';
-        return ((string) $int) . '*';
+		if ($int < 0) return false;
+		if ($int == 0) return '0';
+		if ($int == 1) return '*';
+		return ((string) $int) . '*';
 
-    }
+	}
 
 }
 

Braces +24 added lines, -8 removed lines

@@ -12,26 +12,42 @@
     public function validate($string, $config, $context) {
 
         $string = trim($string);
-        if ($string === '') return false;
+        if ($string === '') {
+        	return false;
+        }
 
         $parent_result = parent::validate($string, $config, $context);
-        if ($parent_result !== false) return $parent_result;
+        if ($parent_result !== false) {
+        	return $parent_result;
+        }
 
         $length = strlen($string);
         $last_char = $string[$length - 1];
 
-        if ($last_char !== '*') return false;
+        if ($last_char !== '*') {
+        	return false;
+        }
 
         $int = substr($string, 0, $length - 1);
 
-        if ($int == '') return '*';
-        if (!is_numeric($int)) return false;
+        if ($int == '') {
+        	return '*';
+        }
+        if (!is_numeric($int)) {
+        	return false;
+        }
 
         $int = (int) $int;
 
-        if ($int < 0) return false;
-        if ($int == 0) return '0';
-        if ($int == 1) return '*';
+        if ($int < 0) {
+        	return false;
+        }
+        if ($int == 0) {
+        	return '0';
+        }
+        if ($int == 1) {
+        	return '*';
+        }
         return ((string) $int) . '*';
 
     }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         if ($int < 0) return false;
         if ($int == 0) return '0';
         if ($int == 1) return '*';
-        return ((string) $int) . '*';
+        return ((string) $int).'*';
 
     }
 

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

Indentation +40 added lines, -40 removed lines

@@ -6,46 +6,46 @@
 class HTMLPurifier_AttrDef_HTML_Nmtokens extends HTMLPurifier_AttrDef
 {
 
-    public function validate($string, $config, $context) {
-
-        $string = trim($string);
-
-        // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) return false;
-
-        $tokens = $this->split($string, $config, $context);
-        $tokens = $this->filter($tokens, $config, $context);
-        if (empty($tokens)) return false;
-        return implode(' ', $tokens);
-
-    }
-
-    /**
-     * Splits a space separated list of tokens into its constituent parts.
-     */
-    protected function split($string, $config, $context) {
-        // OPTIMIZABLE!
-        // do the preg_match, capture all subpatterns for reformulation
-
-        // we don't support U+00A1 and up codepoints or
-        // escaping because I don't know how to do that with regexps
-        // and plus it would complicate optimization efforts (you never
-        // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
-                   '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
-                   '(?:(?=\s)|\z)/'; // look ahead for space or string end
-        preg_match_all($pattern, $string, $matches);
-        return $matches[1];
-    }
-
-    /**
-     * Template method for removing certain tokens based on arbitrary criteria.
-     * @note If we wanted to be really functional, we'd do an array_filter
-     *       with a callback. But... we're not.
-     */
-    protected function filter($tokens, $config, $context) {
-        return $tokens;
-    }
+	public function validate($string, $config, $context) {
+
+		$string = trim($string);
+
+		// early abort: '' and '0' (strings that convert to false) are invalid
+		if (!$string) return false;
+
+		$tokens = $this->split($string, $config, $context);
+		$tokens = $this->filter($tokens, $config, $context);
+		if (empty($tokens)) return false;
+		return implode(' ', $tokens);
+
+	}
+
+	/**
+	 * Splits a space separated list of tokens into its constituent parts.
+	 */
+	protected function split($string, $config, $context) {
+		// OPTIMIZABLE!
+		// do the preg_match, capture all subpatterns for reformulation
+
+		// we don't support U+00A1 and up codepoints or
+		// escaping because I don't know how to do that with regexps
+		// and plus it would complicate optimization efforts (you never
+		// see that anyway).
+		$pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
+				   '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
+				   '(?:(?=\s)|\z)/'; // look ahead for space or string end
+		preg_match_all($pattern, $string, $matches);
+		return $matches[1];
+	}
+
+	/**
+	 * Template method for removing certain tokens based on arbitrary criteria.
+	 * @note If we wanted to be really functional, we'd do an array_filter
+	 *       with a callback. But... we're not.
+	 */
+	protected function filter($tokens, $config, $context) {
+		return $tokens;
+	}
 
 }
 

Braces +6 added lines, -2 removed lines

@@ -11,11 +11,15 @@
         $string = trim($string);
 
         // early abort: '' and '0' (strings that convert to false) are invalid
-        if (!$string) return false;
+        if (!$string) {
+        	return false;
+        }
 
         $tokens = $this->split($string, $config, $context);
         $tokens = $this->filter($tokens, $config, $context);
-        if (empty($tokens)) return false;
+        if (empty($tokens)) {
+        	return false;
+        }
         return implode(' ', $tokens);
 
     }

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         // escaping because I don't know how to do that with regexps
         // and plus it would complicate optimization efforts (you never
         // see that anyway).
-        $pattern = '/(?:(?<=\s)|\A)'. // look behind for space or string start
+        $pattern = '/(?:(?<=\s)|\A)'.// look behind for space or string start
                    '((?:--|-?[A-Za-z_])[A-Za-z_\-0-9]*)'.
                    '(?:(?=\s)|\z)/'; // look ahead for space or string end
         preg_match_all($pattern, $string, $matches);

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

Indentation +27 added lines, -27 removed lines

@@ -6,42 +6,42 @@
 class HTMLPurifier_AttrDef_HTML_Pixels extends HTMLPurifier_AttrDef
 {
 
-    protected $max;
+	protected $max;
 
-    public function __construct($max = null) {
-        $this->max = $max;
-    }
+	public function __construct($max = null) {
+		$this->max = $max;
+	}
 
-    public function validate($string, $config, $context) {
+	public function validate($string, $config, $context) {
 
-        $string = trim($string);
-        if ($string === '0') return $string;
-        if ($string === '')  return false;
-        $length = strlen($string);
-        if (substr($string, $length - 2) == 'px') {
-            $string = substr($string, 0, $length - 2);
-        }
-        if (!is_numeric($string)) return false;
-        $int = (int) $string;
+		$string = trim($string);
+		if ($string === '0') return $string;
+		if ($string === '')  return false;
+		$length = strlen($string);
+		if (substr($string, $length - 2) == 'px') {
+			$string = substr($string, 0, $length - 2);
+		}
+		if (!is_numeric($string)) return false;
+		$int = (int) $string;
 
-        if ($int < 0) return '0';
+		if ($int < 0) return '0';
 
-        // upper-bound value, extremely high values can
-        // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
-        // WARNING, above link WILL crash you if you're using Windows
+		// upper-bound value, extremely high values can
+		// crash operating systems, see <http://ha.ckers.org/imagecrash.html>
+		// WARNING, above link WILL crash you if you're using Windows
 
-        if ($this->max !== null && $int > $this->max) return (string) $this->max;
+		if ($this->max !== null && $int > $this->max) return (string) $this->max;
 
-        return (string) $int;
+		return (string) $int;
 
-    }
+	}
 
-    public function make($string) {
-        if ($string === '') $max = null;
-        else $max = (int) $string;
-        $class = get_class($this);
-        return new $class($max);
-    }
+	public function make($string) {
+		if ($string === '') $max = null;
+		else $max = (int) $string;
+		$class = get_class($this);
+		return new $class($max);
+	}
 
 }
 

Braces +20 added lines, -7 removed lines

@@ -15,30 +15,43 @@
     public function validate($string, $config, $context) {
 
         $string = trim($string);
-        if ($string === '0') return $string;
-        if ($string === '')  return false;
+        if ($string === '0') {
+        	return $string;
+        }
+        if ($string === '') {
+        	return false;
+        }
         $length = strlen($string);
         if (substr($string, $length - 2) == 'px') {
             $string = substr($string, 0, $length - 2);
         }
-        if (!is_numeric($string)) return false;
+        if (!is_numeric($string)) {
+        	return false;
+        }
         $int = (int) $string;
 
-        if ($int < 0) return '0';
+        if ($int < 0) {
+        	return '0';
+        }
 
         // upper-bound value, extremely high values can
         // crash operating systems, see <http://ha.ckers.org/imagecrash.html>
         // WARNING, above link WILL crash you if you're using Windows
 
-        if ($this->max !== null && $int > $this->max) return (string) $this->max;
+        if ($this->max !== null && $int > $this->max) {
+        	return (string) $this->max;
+        }
 
         return (string) $int;
 
     }
 
     public function make($string) {
-        if ($string === '') $max = null;
-        else $max = (int) $string;
+        if ($string === '') {
+        	$max = null;
+        } else {
+        	$max = (int) $string;
+        }
         $class = get_class($this);
         return new $class($max);
     }

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

Indentation +46 added lines, -46 removed lines

@@ -10,63 +10,63 @@
 class HTMLPurifier_AttrDef_Integer extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Bool indicating whether or not negative values are allowed
-     */
-    protected $negative = true;
+	/**
+	 * Bool indicating whether or not negative values are allowed
+	 */
+	protected $negative = true;
 
-    /**
-     * Bool indicating whether or not zero is allowed
-     */
-    protected $zero = true;
+	/**
+	 * Bool indicating whether or not zero is allowed
+	 */
+	protected $zero = true;
 
-    /**
-     * Bool indicating whether or not positive values are allowed
-     */
-    protected $positive = true;
+	/**
+	 * Bool indicating whether or not positive values are allowed
+	 */
+	protected $positive = true;
 
-    /**
-     * @param $negative Bool indicating whether or not negative values are allowed
-     * @param $zero Bool indicating whether or not zero is allowed
-     * @param $positive Bool indicating whether or not positive values are allowed
-     */
-    public function __construct(
-        $negative = true, $zero = true, $positive = true
-    ) {
-        $this->negative = $negative;
-        $this->zero     = $zero;
-        $this->positive = $positive;
-    }
+	/**
+	 * @param $negative Bool indicating whether or not negative values are allowed
+	 * @param $zero Bool indicating whether or not zero is allowed
+	 * @param $positive Bool indicating whether or not positive values are allowed
+	 */
+	public function __construct(
+		$negative = true, $zero = true, $positive = true
+	) {
+		$this->negative = $negative;
+		$this->zero     = $zero;
+		$this->positive = $positive;
+	}
 
-    public function validate($integer, $config, $context) {
+	public function validate($integer, $config, $context) {
 
-        $integer = $this->parseCDATA($integer);
-        if ($integer === '') return false;
+		$integer = $this->parseCDATA($integer);
+		if ($integer === '') return false;
 
-        // we could possibly simply typecast it to integer, but there are
-        // certain fringe cases that must not return an integer.
+		// we could possibly simply typecast it to integer, but there are
+		// certain fringe cases that must not return an integer.
 
-        // clip leading sign
-        if ( $this->negative && $integer[0] === '-' ) {
-            $digits = substr($integer, 1);
-            if ($digits === '0') $integer = '0'; // rm minus sign for zero
-        } elseif( $this->positive && $integer[0] === '+' ) {
-            $digits = $integer = substr($integer, 1); // rm unnecessary plus
-        } else {
-            $digits = $integer;
-        }
+		// clip leading sign
+		if ( $this->negative && $integer[0] === '-' ) {
+			$digits = substr($integer, 1);
+			if ($digits === '0') $integer = '0'; // rm minus sign for zero
+		} elseif( $this->positive && $integer[0] === '+' ) {
+			$digits = $integer = substr($integer, 1); // rm unnecessary plus
+		} else {
+			$digits = $integer;
+		}
 
-        // test if it's numeric
-        if (!ctype_digit($digits)) return false;
+		// test if it's numeric
+		if (!ctype_digit($digits)) return false;
 
-        // perform scope tests
-        if (!$this->zero     && $integer == 0) return false;
-        if (!$this->positive && $integer > 0) return false;
-        if (!$this->negative && $integer < 0) return false;
+		// perform scope tests
+		if (!$this->zero     && $integer == 0) return false;
+		if (!$this->positive && $integer > 0) return false;
+		if (!$this->negative && $integer < 0) return false;
 
-        return $integer;
+		return $integer;
 
-    }
+	}
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -47,10 +47,10 @@ 
         // certain fringe cases that must not return an integer.
 
         // clip leading sign
-        if ( $this->negative && $integer[0] === '-' ) {
+        if ($this->negative && $integer[0] === '-') {
             $digits = substr($integer, 1);
             if ($digits === '0') $integer = '0'; // rm minus sign for zero
-        } elseif( $this->positive && $integer[0] === '+' ) {
+        } elseif ($this->positive && $integer[0] === '+') {
             $digits = $integer = substr($integer, 1); // rm unnecessary plus
         } else {
             $digits = $integer;
@@ -60,7 +60,7 @@ 
         if (!ctype_digit($digits)) return false;
 
         // perform scope tests
-        if (!$this->zero     && $integer == 0) return false;
+        if (!$this->zero && $integer == 0) return false;
         if (!$this->positive && $integer > 0) return false;
         if (!$this->negative && $integer < 0) return false;
 

Braces +19 added lines, -6 removed lines

@@ -41,7 +41,9 @@ 
     public function validate($integer, $config, $context) {
 
         $integer = $this->parseCDATA($integer);
-        if ($integer === '') return false;
+        if ($integer === '') {
+        	return false;
+        }
 
         // we could possibly simply typecast it to integer, but there are
         // certain fringe cases that must not return an integer.
@@ -49,7 +51,10 @@ 
         // clip leading sign
         if ( $this->negative && $integer[0] === '-' ) {
             $digits = substr($integer, 1);
-            if ($digits === '0') $integer = '0'; // rm minus sign for zero
+            if ($digits === '0') {
+            	$integer = '0';
+            }
+            // rm minus sign for zero
         } elseif( $this->positive && $integer[0] === '+' ) {
             $digits = $integer = substr($integer, 1); // rm unnecessary plus
         } else {
@@ -57,12 +62,20 @@ 
         }
 
         // test if it's numeric
-        if (!ctype_digit($digits)) return false;
+        if (!ctype_digit($digits)) {
+        	return false;
+        }
 
         // perform scope tests
-        if (!$this->zero     && $integer == 0) return false;
-        if (!$this->positive && $integer > 0) return false;
-        if (!$this->negative && $integer < 0) return false;
+        if (!$this->zero     && $integer == 0) {
+        	return false;
+        }
+        if (!$this->positive && $integer > 0) {
+        	return false;
+        }
+        if (!$this->negative && $integer < 0) {
+        	return false;
+        }
 
         return $integer;