xpressengine / xe-core

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

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $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) $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
 
         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;
+
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -39,12 +39,12 @@
             // 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 '.
+            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;
         }
 

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

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) . '%';
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
             'rev' => 'AllowedRev'
         );
         if (!isset($configLookup[$name])) {
-            trigger_error('Unrecognized attribute name for link '.
+            trigger_error('Unrecognized attribute name for link ' .
                 'relationship.', E_USER_ERROR);
             return;
         }

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;

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

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

Spacing +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
         // 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]*)'.
+        $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];

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