xpressengine / xe-core

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

Spacing +3 added lines, -3 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;

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++) {

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

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

Indentation +8 added lines, -8 removed lines

@@ -7,14 +7,14 @@
 class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
 {
 
-    public function validate($string, $config, $context) {
-        // no support for named mailboxes i.e. "Bob <bob@example.com>"
-        // that needs more percent encoding to be done
-        if ($string == '') return false;
-        $string = trim($string);
-        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
-        return $result ? $string : false;
-    }
+	public function validate($string, $config, $context) {
+		// no support for named mailboxes i.e. "Bob <bob@example.com>"
+		// that needs more percent encoding to be done
+		if ($string == '') return false;
+		$string = trim($string);
+		$result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
+		return $result ? $string : false;
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
     public function validate($string, $config, $context) {
         // no support for named mailboxes i.e. "Bob <bob@example.com>"
         // that needs more percent encoding to be done
-        if ($string == '') return false;
+        if ($string == '') {
+        	return false;
+        }
         $string = trim($string);
         $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
         return $result ? $string : false;

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

Indentation +79 added lines, -79 removed lines

@@ -6,95 +6,95 @@
 class HTMLPurifier_AttrDef_URI_Host extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
-     */
-    protected $ipv4;
+	/**
+	 * Instance of HTMLPurifier_AttrDef_URI_IPv4 sub-validator
+	 */
+	protected $ipv4;
 
-    /**
-     * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
-     */
-    protected $ipv6;
+	/**
+	 * Instance of HTMLPurifier_AttrDef_URI_IPv6 sub-validator
+	 */
+	protected $ipv6;
 
-    public function __construct() {
-        $this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
-        $this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
-    }
+	public function __construct() {
+		$this->ipv4 = new HTMLPurifier_AttrDef_URI_IPv4();
+		$this->ipv6 = new HTMLPurifier_AttrDef_URI_IPv6();
+	}
 
-    public function validate($string, $config, $context) {
-        $length = strlen($string);
-        // empty hostname is OK; it's usually semantically equivalent:
-        // the default host as defined by a URI scheme is used:
-        //
-        //      If the URI scheme defines a default for host, then that
-        //      default applies when the host subcomponent is undefined
-        //      or when the registered name is empty (zero length).
-        if ($string === '') return '';
-        if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
-            //IPv6
-            $ip = substr($string, 1, $length - 2);
-            $valid = $this->ipv6->validate($ip, $config, $context);
-            if ($valid === false) return false;
-            return '['. $valid . ']';
-        }
+	public function validate($string, $config, $context) {
+		$length = strlen($string);
+		// empty hostname is OK; it's usually semantically equivalent:
+		// the default host as defined by a URI scheme is used:
+		//
+		//      If the URI scheme defines a default for host, then that
+		//      default applies when the host subcomponent is undefined
+		//      or when the registered name is empty (zero length).
+		if ($string === '') return '';
+		if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
+			//IPv6
+			$ip = substr($string, 1, $length - 2);
+			$valid = $this->ipv6->validate($ip, $config, $context);
+			if ($valid === false) return false;
+			return '['. $valid . ']';
+		}
 
-        // need to do checks on unusual encodings too
-        $ipv4 = $this->ipv4->validate($string, $config, $context);
-        if ($ipv4 !== false) return $ipv4;
+		// need to do checks on unusual encodings too
+		$ipv4 = $this->ipv4->validate($string, $config, $context);
+		if ($ipv4 !== false) return $ipv4;
 
-        // A regular domain name.
+		// A regular domain name.
 
-        // This doesn't match I18N domain names, but we don't have proper IRI support,
-        // so force users to insert Punycode.
+		// This doesn't match I18N domain names, but we don't have proper IRI support,
+		// so force users to insert Punycode.
 
-        // The productions describing this are:
-        $a   = '[a-z]';     // alpha
-        $an  = '[a-z0-9]';  // alphanum
-        $and = '[a-z0-9-]'; // alphanum | "-"
-        // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
-        $domainlabel   = "$an($and*$an)?";
-        // toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
-        $toplabel      = "$a($and*$an)?";
-        // hostname    = *( domainlabel "." ) toplabel [ "." ]
-        if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
-            return $string;
-        }
+		// The productions describing this are:
+		$a   = '[a-z]';     // alpha
+		$an  = '[a-z0-9]';  // alphanum
+		$and = '[a-z0-9-]'; // alphanum | "-"
+		// domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
+		$domainlabel   = "$an($and*$an)?";
+		// toplabel    = alpha | alpha *( alphanum | "-" ) alphanum
+		$toplabel      = "$a($and*$an)?";
+		// hostname    = *( domainlabel "." ) toplabel [ "." ]
+		if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
+			return $string;
+		}
 
-        // If we have Net_IDNA2 support, we can support IRIs by
-        // punycoding them. (This is the most portable thing to do,
-        // since otherwise we have to assume browsers support
+		// If we have Net_IDNA2 support, we can support IRIs by
+		// punycoding them. (This is the most portable thing to do,
+		// since otherwise we have to assume browsers support
 
-        if ($config->get('Core.EnableIDNA')) {
-            $idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
-            // we need to encode each period separately
-            $parts = explode('.', $string);
-            try {
-                $new_parts = array();
-                foreach ($parts as $part) {
-                    $encodable = false;
-                    for ($i = 0, $c = strlen($part); $i < $c; $i++) {
-                        if (ord($part[$i]) > 0x7a) {
-                            $encodable = true;
-                            break;
-                        }
-                    }
-                    if (!$encodable) {
-                        $new_parts[] = $part;
-                    } else {
-                        $new_parts[] = $idna->encode($part);
-                    }
-                }
-                $string = implode('.', $new_parts);
-                if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
-                    return $string;
-                }
-            } catch (Exception $e) {
-                // XXX error reporting
-            }
-        }
+		if ($config->get('Core.EnableIDNA')) {
+			$idna = new Net_IDNA2(array('encoding' => 'utf8', 'overlong' => false, 'strict' => true));
+			// we need to encode each period separately
+			$parts = explode('.', $string);
+			try {
+				$new_parts = array();
+				foreach ($parts as $part) {
+					$encodable = false;
+					for ($i = 0, $c = strlen($part); $i < $c; $i++) {
+						if (ord($part[$i]) > 0x7a) {
+							$encodable = true;
+							break;
+						}
+					}
+					if (!$encodable) {
+						$new_parts[] = $part;
+					} else {
+						$new_parts[] = $idna->encode($part);
+					}
+				}
+				$string = implode('.', $new_parts);
+				if (preg_match("/^($domainlabel\.)*$toplabel\.?$/i", $string)) {
+					return $string;
+				}
+			} catch (Exception $e) {
+				// XXX error reporting
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@ 
         //      default applies when the host subcomponent is undefined
         //      or when the registered name is empty (zero length).
         if ($string === '') return '';
-        if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
+        if ($length > 1 && $string[0] === '[' && $string[$length - 1] === ']') {
             //IPv6
             $ip = substr($string, 1, $length - 2);
             $valid = $this->ipv6->validate($ip, $config, $context);
             if ($valid === false) return false;
-            return '['. $valid . ']';
+            return '[' . $valid . ']';
         }
 
         // need to do checks on unusual encodings too
@@ -48,8 +48,8 @@ 
         // so force users to insert Punycode.
 
         // The productions describing this are:
-        $a   = '[a-z]';     // alpha
-        $an  = '[a-z0-9]';  // alphanum
+        $a   = '[a-z]'; // alpha
+        $an  = '[a-z0-9]'; // alphanum
         $and = '[a-z0-9-]'; // alphanum | "-"
         // domainlabel = alphanum | alphanum *( alphanum | "-" ) alphanum
         $domainlabel   = "$an($and*$an)?";

Braces +9 added lines, -3 removed lines

@@ -29,18 +29,24 @@
         //      If the URI scheme defines a default for host, then that
         //      default applies when the host subcomponent is undefined
         //      or when the registered name is empty (zero length).
-        if ($string === '') return '';
+        if ($string === '') {
+        	return '';
+        }
         if ($length > 1 && $string[0] === '[' && $string[$length-1] === ']') {
             //IPv6
             $ip = substr($string, 1, $length - 2);
             $valid = $this->ipv6->validate($ip, $config, $context);
-            if ($valid === false) return false;
+            if ($valid === false) {
+            	return false;
+            }
             return '['. $valid . ']';
         }
 
         // need to do checks on unusual encodings too
         $ipv4 = $this->ipv4->validate($string, $config, $context);
-        if ($ipv4 !== false) return $ipv4;
+        if ($ipv4 !== false) {
+        	return $ipv4;
+        }
 
         // A regular domain name.
 

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

Indentation +20 added lines, -20 removed lines

@@ -7,32 +7,32 @@
 class HTMLPurifier_AttrDef_URI_IPv4 extends HTMLPurifier_AttrDef
 {
 
-    /**
-     * IPv4 regex, protected so that IPv6 can reuse it
-     */
-    protected $ip4;
+	/**
+	 * IPv4 regex, protected so that IPv6 can reuse it
+	 */
+	protected $ip4;
 
-    public function validate($aIP, $config, $context) {
+	public function validate($aIP, $config, $context) {
 
-        if (!$this->ip4) $this->_loadRegex();
+		if (!$this->ip4) $this->_loadRegex();
 
-        if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
-        {
-                return $aIP;
-        }
+		if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
+		{
+				return $aIP;
+		}
 
-        return false;
+		return false;
 
-    }
+	}
 
-    /**
-     * Lazy load function to prevent regex from being stuffed in
-     * cache.
-     */
-    protected function _loadRegex() {
-        $oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
-        $this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
-    }
+	/**
+	 * Lazy load function to prevent regex from being stuffed in
+	 * cache.
+	 */
+	protected function _loadRegex() {
+		$oct = '(?:25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]|[0-9])'; // 0-255
+		$this->ip4 = "(?:{$oct}\\.{$oct}\\.{$oct}\\.{$oct})";
+	}
 
 }
 

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
     public function validate($aIP, $config, $context) {
 
-        if (!$this->ip4) $this->_loadRegex();
+        if (!$this->ip4) {
+        	$this->_loadRegex();
+        }
 
         if (preg_match('#^' . $this->ip4 . '$#s', $aIP))
         {