xpressengine / xe-core

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;
 

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

Indentation +50 added lines, -50 removed lines

@@ -7,66 +7,66 @@
 class HTMLPurifier_AttrDef_Lang extends HTMLPurifier_AttrDef
 {
 
-    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;
 
-        $subtags = explode('-', $string);
-        $num_subtags = count($subtags);
+		$subtags = explode('-', $string);
+		$num_subtags = count($subtags);
 
-        if ($num_subtags == 0) return false; // sanity check
+		if ($num_subtags == 0) return false; // sanity check
 
-        // process primary subtag : $subtags[0]
-        $length = strlen($subtags[0]);
-        switch ($length) {
-            case 0:
-                return false;
-            case 1:
-                if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
-                    return false;
-                }
-                break;
-            case 2:
-            case 3:
-                if (! ctype_alpha($subtags[0]) ) {
-                    return false;
-                } elseif (! ctype_lower($subtags[0]) ) {
-                    $subtags[0] = strtolower($subtags[0]);
-                }
-                break;
-            default:
-                return false;
-        }
+		// process primary subtag : $subtags[0]
+		$length = strlen($subtags[0]);
+		switch ($length) {
+			case 0:
+				return false;
+			case 1:
+				if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
+					return false;
+				}
+				break;
+			case 2:
+			case 3:
+				if (! ctype_alpha($subtags[0]) ) {
+					return false;
+				} elseif (! ctype_lower($subtags[0]) ) {
+					$subtags[0] = strtolower($subtags[0]);
+				}
+				break;
+			default:
+				return false;
+		}
 
-        $new_string = $subtags[0];
-        if ($num_subtags == 1) return $new_string;
+		$new_string = $subtags[0];
+		if ($num_subtags == 1) return $new_string;
 
-        // process second subtag : $subtags[1]
-        $length = strlen($subtags[1]);
-        if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
-            return $new_string;
-        }
-        if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
+		// process second subtag : $subtags[1]
+		$length = strlen($subtags[1]);
+		if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
+			return $new_string;
+		}
+		if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
 
-        $new_string .= '-' . $subtags[1];
-        if ($num_subtags == 2) return $new_string;
+		$new_string .= '-' . $subtags[1];
+		if ($num_subtags == 2) return $new_string;
 
-        // process all other subtags, index 2 and up
-        for ($i = 2; $i < $num_subtags; $i++) {
-            $length = strlen($subtags[$i]);
-            if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
-                return $new_string;
-            }
-            if (!ctype_lower($subtags[$i])) {
-                $subtags[$i] = strtolower($subtags[$i]);
-            }
-            $new_string .= '-' . $subtags[$i];
-        }
+		// process all other subtags, index 2 and up
+		for ($i = 2; $i < $num_subtags; $i++) {
+			$length = strlen($subtags[$i]);
+			if ($length == 0 || $length > 8 || !ctype_alnum($subtags[$i])) {
+				return $new_string;
+			}
+			if (!ctype_lower($subtags[$i])) {
+				$subtags[$i] = strtolower($subtags[$i]);
+			}
+			$new_string .= '-' . $subtags[$i];
+		}
 
-        return $new_string;
+		return $new_string;
 
-    }
+	}
 
 }
 

Braces +16 added lines, -5 removed lines

@@ -10,12 +10,17 @@ 
     public function validate($string, $config, $context) {
 
         $string = trim($string);
-        if (!$string) return false;
+        if (!$string) {
+        	return false;
+        }
 
         $subtags = explode('-', $string);
         $num_subtags = count($subtags);
 
-        if ($num_subtags == 0) return false; // sanity check
+        if ($num_subtags == 0) {
+        	return false;
+        }
+        // sanity check
 
         // process primary subtag : $subtags[0]
         $length = strlen($subtags[0]);
@@ -40,17 +45,23 @@ 
         }
 
         $new_string = $subtags[0];
-        if ($num_subtags == 1) return $new_string;
+        if ($num_subtags == 1) {
+        	return $new_string;
+        }
 
         // process second subtag : $subtags[1]
         $length = strlen($subtags[1]);
         if ($length == 0 || ($length == 1 && $subtags[1] != 'x') || $length > 8 || !ctype_alnum($subtags[1])) {
             return $new_string;
         }
-        if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
+        if (!ctype_lower($subtags[1])) {
+        	$subtags[1] = strtolower($subtags[1]);
+        }
 
         $new_string .= '-' . $subtags[1];
-        if ($num_subtags == 2) return $new_string;
+        if ($num_subtags == 2) {
+        	return $new_string;
+        }
 
         // process all other subtags, index 2 and up
         for ($i = 2; $i < $num_subtags; $i++) {

Spacing +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
             case 0:
                 return false;
             case 1:
-                if (! ($subtags[0] == 'x' || $subtags[0] == 'i') ) {
+                if (!($subtags[0] == 'x' || $subtags[0] == 'i')) {
                     return false;
                 }
                 break;
             case 2:
             case 3:
-                if (! ctype_alpha($subtags[0]) ) {
+                if (!ctype_alpha($subtags[0])) {
                     return false;
-                } elseif (! ctype_lower($subtags[0]) ) {
+                } elseif (!ctype_lower($subtags[0])) {
                     $subtags[0] = strtolower($subtags[0]);
                 }
                 break;
@@ -49,7 +49,7 @@ 
         }
         if (!ctype_lower($subtags[1])) $subtags[1] = strtolower($subtags[1]);
 
-        $new_string .= '-' . $subtags[1];
+        $new_string .= '-'.$subtags[1];
         if ($num_subtags == 2) return $new_string;
 
         // process all other subtags, index 2 and up
@@ -61,7 +61,7 @@ 
             if (!ctype_lower($subtags[$i])) {
                 $subtags[$i] = strtolower($subtags[$i]);
             }
-            $new_string .= '-' . $subtags[$i];
+            $new_string .= '-'.$subtags[$i];
         }
 
         return $new_string;

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

Indentation +20 added lines, -20 removed lines

@@ -6,28 +6,28 @@
 class HTMLPurifier_AttrDef_Switch
 {
 
-    protected $tag;
-    protected $withTag, $withoutTag;
+	protected $tag;
+	protected $withTag, $withoutTag;
 
-    /**
-     * @param string $tag Tag name to switch upon
-     * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
-     * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
-     */
-    public function __construct($tag, $with_tag, $without_tag) {
-        $this->tag = $tag;
-        $this->withTag = $with_tag;
-        $this->withoutTag = $without_tag;
-    }
+	/**
+	 * @param string $tag Tag name to switch upon
+	 * @param HTMLPurifier_AttrDef $with_tag Call if token matches tag
+	 * @param HTMLPurifier_AttrDef $without_tag Call if token doesn't match, or there is no token
+	 */
+	public function __construct($tag, $with_tag, $without_tag) {
+		$this->tag = $tag;
+		$this->withTag = $with_tag;
+		$this->withoutTag = $without_tag;
+	}
 
-    public function validate($string, $config, $context) {
-        $token = $context->get('CurrentToken', true);
-        if (!$token || $token->name !== $this->tag) {
-            return $this->withoutTag->validate($string, $config, $context);
-        } else {
-            return $this->withTag->validate($string, $config, $context);
-        }
-    }
+	public function validate($string, $config, $context) {
+		$token = $context->get('CurrentToken', true);
+		if (!$token || $token->name !== $this->tag) {
+			return $this->withoutTag->validate($string, $config, $context);
+		} else {
+			return $this->withTag->validate($string, $config, $context);
+		}
+	}
 
 }
 

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

Indentation +3 added lines, -3 removed lines

@@ -6,9 +6,9 @@
 class HTMLPurifier_AttrDef_Text extends HTMLPurifier_AttrDef
 {
 
-    public function validate($string, $config, $context) {
-        return $this->parseCDATA($string);
-    }
+	public function validate($string, $config, $context) {
+		return $this->parseCDATA($string);
+	}
 
 }
 

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

Indentation +47 added lines, -47 removed lines

@@ -7,70 +7,70 @@
 class HTMLPurifier_AttrDef_URI extends HTMLPurifier_AttrDef
 {
 
-    protected $parser;
-    protected $embedsResource;
+	protected $parser;
+	protected $embedsResource;
 
-    /**
-     * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
-     */
-    public function __construct($embeds_resource = false) {
-        $this->parser = new HTMLPurifier_URIParser();
-        $this->embedsResource = (bool) $embeds_resource;
-    }
+	/**
+	 * @param $embeds_resource_resource Does the URI here result in an extra HTTP request?
+	 */
+	public function __construct($embeds_resource = false) {
+		$this->parser = new HTMLPurifier_URIParser();
+		$this->embedsResource = (bool) $embeds_resource;
+	}
 
-    public function make($string) {
-        $embeds = ($string === 'embedded');
-        return new HTMLPurifier_AttrDef_URI($embeds);
-    }
+	public function make($string) {
+		$embeds = ($string === 'embedded');
+		return new HTMLPurifier_AttrDef_URI($embeds);
+	}
 
-    public function validate($uri, $config, $context) {
+	public function validate($uri, $config, $context) {
 
-        if ($config->get('URI.Disable')) return false;
+		if ($config->get('URI.Disable')) return false;
 
-        $uri = $this->parseCDATA($uri);
+		$uri = $this->parseCDATA($uri);
 
-        // parse the URI
-        $uri = $this->parser->parse($uri);
-        if ($uri === false) return false;
+		// parse the URI
+		$uri = $this->parser->parse($uri);
+		if ($uri === false) return false;
 
-        // add embedded flag to context for validators
-        $context->register('EmbeddedURI', $this->embedsResource);
+		// add embedded flag to context for validators
+		$context->register('EmbeddedURI', $this->embedsResource);
 
-        $ok = false;
-        do {
+		$ok = false;
+		do {
 
-            // generic validation
-            $result = $uri->validate($config, $context);
-            if (!$result) break;
+			// generic validation
+			$result = $uri->validate($config, $context);
+			if (!$result) break;
 
-            // chained filtering
-            $uri_def = $config->getDefinition('URI');
-            $result = $uri_def->filter($uri, $config, $context);
-            if (!$result) break;
+			// chained filtering
+			$uri_def = $config->getDefinition('URI');
+			$result = $uri_def->filter($uri, $config, $context);
+			if (!$result) break;
 
-            // scheme-specific validation
-            $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) break;
-            if ($this->embedsResource && !$scheme_obj->browsable) break;
-            $result = $scheme_obj->validate($uri, $config, $context);
-            if (!$result) break;
+			// scheme-specific validation
+			$scheme_obj = $uri->getSchemeObj($config, $context);
+			if (!$scheme_obj) break;
+			if ($this->embedsResource && !$scheme_obj->browsable) break;
+			$result = $scheme_obj->validate($uri, $config, $context);
+			if (!$result) break;
 
-            // Post chained filtering
-            $result = $uri_def->postFilter($uri, $config, $context);
-            if (!$result) break;
+			// Post chained filtering
+			$result = $uri_def->postFilter($uri, $config, $context);
+			if (!$result) break;
 
-            // survived gauntlet
-            $ok = true;
+			// survived gauntlet
+			$ok = true;
 
-        } while (false);
+		} while (false);
 
-        $context->destroy('EmbeddedURI');
-        if (!$ok) return false;
+		$context->destroy('EmbeddedURI');
+		if (!$ok) return false;
 
-        // back to string
-        return $uri->toString();
+		// back to string
+		return $uri->toString();
 
-    }
+	}
 
 }
 

Braces +27 added lines, -9 removed lines

@@ -25,13 +25,17 @@ 
 
     public function validate($uri, $config, $context) {
 
-        if ($config->get('URI.Disable')) return false;
+        if ($config->get('URI.Disable')) {
+        	return false;
+        }
 
         $uri = $this->parseCDATA($uri);
 
         // parse the URI
         $uri = $this->parser->parse($uri);
-        if ($uri === false) return false;
+        if ($uri === false) {
+        	return false;
+        }
 
         // add embedded flag to context for validators
         $context->register('EmbeddedURI', $this->embedsResource);
@@ -41,23 +45,35 @@ 
 
             // generic validation
             $result = $uri->validate($config, $context);
-            if (!$result) break;
+            if (!$result) {
+            	break;
+            }
 
             // chained filtering
             $uri_def = $config->getDefinition('URI');
             $result = $uri_def->filter($uri, $config, $context);
-            if (!$result) break;
+            if (!$result) {
+            	break;
+            }
 
             // scheme-specific validation
             $scheme_obj = $uri->getSchemeObj($config, $context);
-            if (!$scheme_obj) break;
-            if ($this->embedsResource && !$scheme_obj->browsable) break;
+            if (!$scheme_obj) {
+            	break;
+            }
+            if ($this->embedsResource && !$scheme_obj->browsable) {
+            	break;
+            }
             $result = $scheme_obj->validate($uri, $config, $context);
-            if (!$result) break;
+            if (!$result) {
+            	break;
+            }
 
             // Post chained filtering
             $result = $uri_def->postFilter($uri, $config, $context);
-            if (!$result) break;
+            if (!$result) {
+            	break;
+            }
 
             // survived gauntlet
             $ok = true;
@@ -65,7 +81,9 @@ 
         } while (false);
 
         $context->destroy('EmbeddedURI');
-        if (!$ok) return false;
+        if (!$ok) {
+        	return false;
+        }
 
         // back to string
         return $uri->toString();

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

Indentation +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@
 abstract class HTMLPurifier_AttrDef_URI_Email extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Unpacks a mailbox into its display-name and address
-     */
-    function unpack($string) {
-        // needs to be implemented
-    }
+	/**
+	 * Unpacks a mailbox into its display-name and address
+	 */
+	function unpack($string) {
+		// needs to be implemented
+	}
 
 }