mmainstreet / jodel-web

php/Requests/libary/Requests/Exception/HTTP/400.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_400 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_400 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Exception/HTTP/404.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_404 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_404 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Exception/HTTP/417.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_417 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_417 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Exception/HTTP/305.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_305 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_305 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Hooks.php

Spacing +5 added lines, -5 removed lines

@@ -35,10 +35,10 @@ 
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
 	 */
 	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
+		if(!isset($this->hooks[$hook])) {
 			$this->hooks[$hook] = array();
 		}
-		if (!isset($this->hooks[$hook][$priority])) {
+		if(!isset($this->hooks[$hook][$priority])) {
 			$this->hooks[$hook][$priority] = array();
 		}
 
@@ -53,12 +53,12 @@ 
 	 * @return boolean Successfulness
 	 */
 	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
+		if(empty($this->hooks[$hook])) {
 			return false;
 		}
 
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
+		foreach($this->hooks[$hook] as $priority => $hooked) {
+			foreach($hooked as $callback) {
 				call_user_func_array($callback, $parameters);
 			}
 		}

Braces +18 added lines, -9 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_Hooks implements Requests_Hooker {
+class Requests_Hooks implements Requests_Hooker
+{
 	/**
 	 * Registered callbacks for each hook
 	 *
@@ -23,7 +24,8 @@ 
 	/**
 	 * Constructor
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		// pass
 	}
 
@@ -34,11 +36,14 @@ 
 	 * @param callback $callback Function/method to call on event
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
 	 */
-	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
+	public function register($hook, $callback, $priority = 0)
+	{
+		if (!isset($this->hooks[$hook]))
+		{
 			$this->hooks[$hook] = array();
 		}
-		if (!isset($this->hooks[$hook][$priority])) {
+		if (!isset($this->hooks[$hook][$priority]))
+		{
 			$this->hooks[$hook][$priority] = array();
 		}
 
@@ -52,13 +57,17 @@ 
 	 * @param array $parameters Parameters to pass to callbacks
 	 * @return boolean Successfulness
 	 */
-	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
+	public function dispatch($hook, $parameters = array())
+	{
+		if (empty($this->hooks[$hook]))
+		{
 			return false;
 		}
 
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
+		foreach ($this->hooks[$hook] as $priority => $hooked)
+		{
+			foreach ($hooked as $callback)
+			{
 				call_user_func_array($callback, $parameters);
 			}
 		}

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	public function dispatch($hook, $parameters = array()) {
 		if (empty($this->hooks[$hook])) {
-			return false;
+			return FALSE;
 		}
 
 		foreach ($this->hooks[$hook] as $priority => $hooked) {
@@ -63,6 +63,6 @@ 
 			}
 		}
 
-		return true;
+		return TRUE;
 	}
 }
\ No newline at end of file

php/Requests/libary/Requests/SSL.php

Spacing +16 added lines, -16 removed lines

@@ -32,7 +32,7 @@ 
 	public static function verify_certificate($host, $cert) {
 		// Calculate the valid wildcard match if the host is not an IP address
 		$parts = explode('.', $host);
-		if (ip2long($host) === false) {
+		if(ip2long($host) === false) {
 			$parts[0] = '*';
 		}
 		$wildcard = implode('.', $parts);
@@ -40,11 +40,11 @@ 
 		$has_dns_alt = false;
 
 		// Check the subjectAltName
-		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
+		if(!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
 			$altnames = explode(',', $cert['extensions']['subjectAltName']);
-			foreach ($altnames as $altname) {
+			foreach($altnames as $altname) {
 				$altname = trim($altname);
-				if (strpos($altname, 'DNS:') !== 0) {
+				if(strpos($altname, 'DNS:') !== 0) {
 					continue;
 				}
 
@@ -54,7 +54,7 @@ 
 				$altname = trim(substr($altname, 4));
 
 				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
+				if(self::match_domain($host, $altname) === true) {
 					return true;
 				}
 			}
@@ -62,9 +62,9 @@ 
 
 		// Fall back to checking the common name if we didn't get any dNSName
 		// alt names, as per RFC2818
-		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
+		if(!$has_dns_alt && !empty($cert['subject']['CN'])) {
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
+			if(self::match_domain($host, $cert['subject']['CN']) === true) {
 				return true;
 			}
 		}
@@ -94,21 +94,21 @@ 
 		// Check the first part of the name
 		$first = array_shift($parts);
 
-		if (strpos($first, '*') !== false) {
+		if(strpos($first, '*') !== false) {
 			// Check that the wildcard is the full part
-			if ($first !== '*') {
+			if($first !== '*') {
 				return false;
 			}
 
 			// Check that we have at least 3 components (including first)
-			if (count($parts) < 2) {
+			if(count($parts) < 2) {
 				return false;
 			}
 		}
 
 		// Check the remaining parts
-		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
+		foreach($parts as $part) {
+			if(strpos($part, '*') !== false) {
 				return false;
 			}
 		}
@@ -126,23 +126,23 @@ 
 	 */
 	public static function match_domain($host, $reference) {
 		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
+		if(self::verify_reference_name($reference) !== true) {
 			return false;
 		}
 
 		// Check for a direct match
-		if ($host === $reference) {
+		if($host === $reference) {
 			return true;
 		}
 
 		// Calculate the valid wildcard match if the host is not an IP address
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
-		if (ip2long($host) === false) {
+		if(ip2long($host) === false) {
 			$parts = explode('.', $host);
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if($wildcard === $reference) {
 				return true;
 			}
 		}

Braces +40 added lines, -20 removed lines

@@ -14,7 +14,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_SSL {
+class Requests_SSL
+{
 	/**
 	 * Verify the certificate against common name and subject alternative names
 	 *
@@ -29,10 +30,12 @@ 
 	 * @param array $cert Certificate data from openssl_x509_parse()
 	 * @return bool
 	 */
-	public static function verify_certificate($host, $cert) {
+	public static function verify_certificate($host, $cert)
+	{
 		// Calculate the valid wildcard match if the host is not an IP address
 		$parts = explode('.', $host);
-		if (ip2long($host) === false) {
+		if (ip2long($host) === false)
+		{
 			$parts[0] = '*';
 		}
 		$wildcard = implode('.', $parts);
@@ -40,11 +43,14 @@ 
 		$has_dns_alt = false;
 
 		// Check the subjectAltName
-		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
+		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName']))
+		{
 			$altnames = explode(',', $cert['extensions']['subjectAltName']);
-			foreach ($altnames as $altname) {
+			foreach ($altnames as $altname)
+			{
 				$altname = trim($altname);
-				if (strpos($altname, 'DNS:') !== 0) {
+				if (strpos($altname, 'DNS:') !== 0)
+				{
 					continue;
 				}
 
@@ -54,7 +60,8 @@ 
 				$altname = trim(substr($altname, 4));
 
 				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
+				if (self::match_domain($host, $altname) === true)
+				{
 					return true;
 				}
 			}
@@ -62,9 +69,11 @@ 
 
 		// Fall back to checking the common name if we didn't get any dNSName
 		// alt names, as per RFC2818
-		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
+		if (!$has_dns_alt && !empty($cert['subject']['CN']))
+		{
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
+			if (self::match_domain($host, $cert['subject']['CN']) === true)
+			{
 				return true;
 			}
 		}
@@ -88,27 +97,33 @@ 
 	 * @param string $reference Reference dNSName
 	 * @return boolean Is the name valid?
 	 */
-	public static function verify_reference_name($reference) {
+	public static function verify_reference_name($reference)
+	{
 		$parts = explode('.', $reference);
 
 		// Check the first part of the name
 		$first = array_shift($parts);
 
-		if (strpos($first, '*') !== false) {
+		if (strpos($first, '*') !== false)
+		{
 			// Check that the wildcard is the full part
-			if ($first !== '*') {
+			if ($first !== '*')
+			{
 				return false;
 			}
 
 			// Check that we have at least 3 components (including first)
-			if (count($parts) < 2) {
+			if (count($parts) < 2)
+			{
 				return false;
 			}
 		}
 
 		// Check the remaining parts
-		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
+		foreach ($parts as $part)
+		{
+			if (strpos($part, '*') !== false)
+			{
 				return false;
 			}
 		}
@@ -124,25 +139,30 @@ 
 	 * @param string $reference dNSName to match against
 	 * @return boolean Does the domain match?
 	 */
-	public static function match_domain($host, $reference) {
+	public static function match_domain($host, $reference)
+	{
 		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
+		if (self::verify_reference_name($reference) !== true)
+		{
 			return false;
 		}
 
 		// Check for a direct match
-		if ($host === $reference) {
+		if ($host === $reference)
+		{
 			return true;
 		}
 
 		// Calculate the valid wildcard match if the host is not an IP address
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
-		if (ip2long($host) === false) {
+		if (ip2long($host) === false)
+		{
 			$parts = explode('.', $host);
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if ($wildcard === $reference)
+			{
 				return true;
 			}
 		}

Upper-Lower-Casing +20 added lines, -20 removed lines

@@ -32,12 +32,12 @@ 
 	public static function verify_certificate($host, $cert) {
 		// Calculate the valid wildcard match if the host is not an IP address
 		$parts = explode('.', $host);
-		if (ip2long($host) === false) {
+		if (ip2long($host) === FALSE) {
 			$parts[0] = '*';
 		}
 		$wildcard = implode('.', $parts);
 
-		$has_dns_alt = false;
+		$has_dns_alt = FALSE;
 
 		// Check the subjectAltName
 		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
@@ -48,14 +48,14 @@ 
 					continue;
 				}
 
-				$has_dns_alt = true;
+				$has_dns_alt = TRUE;
 
 				// Strip the 'DNS:' prefix and trim whitespace
 				$altname = trim(substr($altname, 4));
 
 				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
-					return true;
+				if (self::match_domain($host, $altname) === TRUE) {
+					return TRUE;
 				}
 			}
 		}
@@ -64,12 +64,12 @@ 
 		// alt names, as per RFC2818
 		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
-				return true;
+			if (self::match_domain($host, $cert['subject']['CN']) === TRUE) {
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -94,27 +94,27 @@ 
 		// Check the first part of the name
 		$first = array_shift($parts);
 
-		if (strpos($first, '*') !== false) {
+		if (strpos($first, '*') !== FALSE) {
 			// Check that the wildcard is the full part
 			if ($first !== '*') {
-				return false;
+				return FALSE;
 			}
 
 			// Check that we have at least 3 components (including first)
 			if (count($parts) < 2) {
-				return false;
+				return FALSE;
 			}
 		}
 
 		// Check the remaining parts
 		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
-				return false;
+			if (strpos($part, '*') !== FALSE) {
+				return FALSE;
 			}
 		}
 
 		// Nothing found, verified!
-		return true;
+		return TRUE;
 	}
 
 	/**
@@ -126,27 +126,27 @@ 
 	 */
 	public static function match_domain($host, $reference) {
 		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
-			return false;
+		if (self::verify_reference_name($reference) !== TRUE) {
+			return FALSE;
 		}
 
 		// Check for a direct match
 		if ($host === $reference) {
-			return true;
+			return TRUE;
 		}
 
 		// Calculate the valid wildcard match if the host is not an IP address
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
-		if (ip2long($host) === false) {
+		if (ip2long($host) === FALSE) {
 			$parts = explode('.', $host);
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
 			if ($wildcard === $reference) {
-				return true;
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 }
\ No newline at end of file

php/Requests/libary/Requests/IPv6.php

Spacing +22 added lines, -22 removed lines

@@ -35,28 +35,28 @@ 
 	 * @return string The uncompressed IPv6 address
 	 */
 	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
+		if(substr_count($ip, '::') !== 1) {
 			return $ip;
 		}
 
 		list($ip1, $ip2) = explode('::', $ip);
-		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
-		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
+		$c1 = ($ip1 === '')? -1 : substr_count($ip1, ':');
+		$c2 = ($ip2 === '')? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
+		if(strpos($ip2, '.') !== false) {
 			$c2++;
 		}
 		// ::
-		if ($c1 === -1 && $c2 === -1) {
+		if($c1 === -1 && $c2 === -1) {
 			$ip = '0:0:0:0:0:0:0:0';
 		}
 		// ::xxx
-		else if ($c1 === -1) {
+		else if($c1 === -1) {
 			$fill = str_repeat('0:', 7 - $c2);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		// xxx::
-		else if ($c2 === -1) {
+		else if($c2 === -1) {
 			$fill = str_repeat(':0', 7 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
@@ -91,11 +91,11 @@ 
 		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
 
 		// Find bunches of zeros
-		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+		if(preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
 			$max = 0;
 			$pos = null;
-			foreach ($matches[0] as $match) {
-				if (strlen($match[0]) > $max) {
+			foreach($matches[0] as $match) {
+				if(strlen($match[0]) > $max) {
 					$max = strlen($match[0]);
 					$pos = $match[1];
 				}
@@ -104,7 +104,7 @@ 
 			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
 		}
 
-		if ($ip_parts[1] !== '') {
+		if($ip_parts[1] !== '') {
 			return implode(':', $ip_parts);
 		}
 		else {
@@ -125,7 +125,7 @@ 
 	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
 	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
+		if(strpos($ip, '.') !== false) {
 			$pos = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
@@ -149,34 +149,34 @@ 
 		list($ipv6, $ipv4) = self::split_v6_v4($ip);
 		$ipv6 = explode(':', $ipv6);
 		$ipv4 = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
-			foreach ($ipv6 as $ipv6_part) {
+		if(count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
+			foreach($ipv6 as $ipv6_part) {
 				// The section can't be empty
-				if ($ipv6_part === '') {
+				if($ipv6_part === '') {
 					return false;
 				}
 
 				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4) {
+				if(strlen($ipv6_part) > 4) {
 					return false;
 				}
 
 				// Remove leading zeros (this is safe because of the above)
 				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '') {
+				if($ipv6_part === '') {
 					$ipv6_part = '0';
 				}
 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+				if(dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
 					return false;
 				}
 			}
-			if (count($ipv4) === 4) {
-				foreach ($ipv4 as $ipv4_part) {
-					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+			if(count($ipv4) === 4) {
+				foreach($ipv4 as $ipv4_part) {
+					$value = (int)$ipv4_part;
+					if((string)$value !== $ipv4_part || $value < 0 || $value > 0xFF) {
 						return false;
 					}
 				}

Braces +56 added lines, -28 removed lines

@@ -15,7 +15,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_IPv6 {
+class Requests_IPv6
+{
 	/**
 	 * Uncompresses an IPv6 address
 	 *
@@ -34,8 +35,10 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string The uncompressed IPv6 address
 	 */
-	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
+	public static function uncompress($ip)
+	{
+		if (substr_count($ip, '::') !== 1)
+		{
 			return $ip;
 		}
 
@@ -43,25 +46,30 @@ 
 		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
 		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
+		if (strpos($ip2, '.') !== false)
+		{
 			$c2++;
 		}
 		// ::
-		if ($c1 === -1 && $c2 === -1) {
+		if ($c1 === -1 && $c2 === -1)
+		{
 			$ip = '0:0:0:0:0:0:0:0';
 		}
 		// ::xxx
-		else if ($c1 === -1) {
+		else if ($c1 === -1)
+		{
 			$fill = str_repeat('0:', 7 - $c2);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		// xxx::
-		else if ($c2 === -1) {
+		else if ($c2 === -1)
+		{
 			$fill = str_repeat(':0', 7 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		// xxx::xxx
-		else {
+		else
+		{
 			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
@@ -82,7 +90,8 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string The compressed IPv6 address
 	 */
-	public static function compress($ip) {
+	public static function compress($ip)
+	{
 		// Prepare the IP to be compressed
 		$ip = self::uncompress($ip);
 		$ip_parts = self::split_v6_v4($ip);
@@ -91,11 +100,14 @@ 
 		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
 
 		// Find bunches of zeros
-		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE))
+		{
 			$max = 0;
 			$pos = null;
-			foreach ($matches[0] as $match) {
-				if (strlen($match[0]) > $max) {
+			foreach ($matches[0] as $match)
+			{
+				if (strlen($match[0]) > $max)
+				{
 					$max = strlen($match[0]);
 					$pos = $match[1];
 				}
@@ -104,10 +116,12 @@ 
 			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
 		}
 
-		if ($ip_parts[1] !== '') {
+		if ($ip_parts[1] !== '')
+		{
 			return implode(':', $ip_parts);
 		}
-		else {
+		else
+		{
 			return $ip_parts[0];
 		}
 	}
@@ -124,14 +138,17 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
-	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
+	protected static function split_v6_v4($ip)
+	{
+		if (strpos($ip, '.') !== false)
+		{
 			$pos = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
 		}
-		else {
+		else
+		{
 			return array($ip, '');
 		}
 	}
@@ -144,46 +161,57 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return bool true if $ip is a valid IPv6 address
 	 */
-	public static function check_ipv6($ip) {
+	public static function check_ipv6($ip)
+	{
 		$ip = self::uncompress($ip);
 		list($ipv6, $ipv4) = self::split_v6_v4($ip);
 		$ipv6 = explode(':', $ipv6);
 		$ipv4 = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
-			foreach ($ipv6 as $ipv6_part) {
+		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4)
+		{
+			foreach ($ipv6 as $ipv6_part)
+			{
 				// The section can't be empty
-				if ($ipv6_part === '') {
+				if ($ipv6_part === '')
+				{
 					return false;
 				}
 
 				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4) {
+				if (strlen($ipv6_part) > 4)
+				{
 					return false;
 				}
 
 				// Remove leading zeros (this is safe because of the above)
 				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '') {
+				if ($ipv6_part === '')
+				{
 					$ipv6_part = '0';
 				}
 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
+				{
 					return false;
 				}
 			}
-			if (count($ipv4) === 4) {
-				foreach ($ipv4 as $ipv4_part) {
+			if (count($ipv4) === 4)
+			{
+				foreach ($ipv4 as $ipv4_part)
+				{
 					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
+					{
 						return false;
 					}
 				}
 			}
 			return true;
 		}
-		else {
+		else
+		{
 			return false;
 		}
 	}

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
 		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
+		if (strpos($ip2, '.') !== FALSE) {
 			$c2++;
 		}
 		// ::
@@ -93,7 +93,7 @@ 
 		// Find bunches of zeros
 		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
 			$max = 0;
-			$pos = null;
+			$pos = NULL;
 			foreach ($matches[0] as $match) {
 				if (strlen($match[0]) > $max) {
 					$max = strlen($match[0]);
@@ -125,7 +125,7 @@ 
 	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
 	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
+		if (strpos($ip, '.') !== FALSE) {
 			$pos = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
@@ -153,12 +153,12 @@ 
 			foreach ($ipv6 as $ipv6_part) {
 				// The section can't be empty
 				if ($ipv6_part === '') {
-					return false;
+					return FALSE;
 				}
 
 				// Nor can it be over four characters
 				if (strlen($ipv6_part) > 4) {
-					return false;
+					return FALSE;
 				}
 
 				// Remove leading zeros (this is safe because of the above)
@@ -170,21 +170,21 @@ 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
 				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
-					return false;
+					return FALSE;
 				}
 			}
 			if (count($ipv4) === 4) {
 				foreach ($ipv4 as $ipv4_part) {
 					$value = (int) $ipv4_part;
 					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
-						return false;
+						return FALSE;
 					}
 				}
 			}
-			return true;
+			return TRUE;
 		}
 		else {
-			return false;
+			return FALSE;
 		}
 	}
 }

php/Requests/libary/Requests/Response/Headers.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function offsetGet($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -41,13 +41,13 @@ 
 	 * @param string $value Item value
 	 */
 	public function offsetSet($key, $value) {
-		if ($key === null) {
+		if($key === null) {
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
 		$key = strtolower($key);
 
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			$this->data[$key] = array();
 		}
 
@@ -62,7 +62,7 @@ 
 	 */
 	public function getValues($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -79,7 +79,7 @@ 
 	 * @return string Flattened value
 	 */
 	public function flatten($value) {
-		if (is_array($value)) {
+		if(is_array($value)) {
 			$value = implode(',', $value);
 		}
 

Braces +22 added lines, -11 removed lines

@@ -10,7 +10,8 @@ 
  *
  * @package Requests
  */
-class Requests_Response_Headers extends Requests_Utility_CaseInsensitiveDictionary {
+class Requests_Response_Headers extends Requests_Utility_CaseInsensitiveDictionary
+{
 	/**
 	 * Get the given header
 	 *
@@ -23,9 +24,11 @@ 
 	 * @param string $key
 	 * @return string Header value
 	 */
-	public function offsetGet($key) {
+	public function offsetGet($key)
+	{
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			return null;
 		}
 
@@ -40,14 +43,17 @@ 
 	 * @param string $key Item name
 	 * @param string $value Item value
 	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($key, $value)
+	{
+		if ($key === null)
+		{
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
 		$key = strtolower($key);
 
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			$this->data[$key] = array();
 		}
 
@@ -60,9 +66,11 @@ 
 	 * @param string $key
 	 * @return array Header values
 	 */
-	public function getValues($key) {
+	public function getValues($key)
+	{
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			return null;
 		}
 
@@ -78,8 +86,10 @@ 
 	 * @param string|array $value Value to flatten
 	 * @return string Flattened value
 	 */
-	public function flatten($value) {
-		if (is_array($value)) {
+	public function flatten($value)
+	{
+		if (is_array($value))
+		{
 			$value = implode(',', $value);
 		}
 
@@ -92,7 +102,8 @@ 
 	 * Converts the internal
 	 * @return ArrayIterator
 	 */
-	public function getIterator() {
+	public function getIterator()
+	{
 		return new Requests_Utility_FilteredIterator($this->data, array($this, 'flatten'));
 	}
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	public function offsetGet($key) {
 		$key = strtolower($key);
 		if (!isset($this->data[$key])) {
-			return null;
+			return NULL;
 		}
 
 		return $this->flatten($this->data[$key]);
@@ -41,7 +41,7 @@ 
 	 * @param string $value Item value
 	 */
 	public function offsetSet($key, $value) {
-		if ($key === null) {
+		if ($key === NULL) {
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
@@ -63,7 +63,7 @@ 
 	public function getValues($key) {
 		$key = strtolower($key);
 		if (!isset($this->data[$key])) {
-			return null;
+			return NULL;
 		}
 
 		return $this->data[$key];

php/Requests/libary/Requests/Response.php

Spacing +3 added lines, -3 removed lines

@@ -108,12 +108,12 @@
 	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
 	 */
 	public function throw_for_status($allow_redirects = true) {
-		if ($this->is_redirect()) {
-			if (!$allow_redirects) {
+		if($this->is_redirect()) {
+			if(!$allow_redirects) {
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
 			}
 		}
-		elseif (!$this->success) {
+		elseif(!$this->success) {
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
 			throw new $exception(null, $this);
 		}

Braces +14 added lines, -7 removed lines

@@ -12,11 +12,13 @@ 
  * Contains a response from Requests::request()
  * @package Requests
  */
-class Requests_Response {
+class Requests_Response
+{
 	/**
 	 * Constructor
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->headers = new Requests_Response_Headers();
 		$this->cookies = new Requests_Cookie_Jar();
 	}
@@ -95,7 +97,8 @@ 
 	 *
 	 * @return boolean True if redirect (3xx status), false if not.
 	 */
-	public function is_redirect() {
+	public function is_redirect()
+	{
 		$code = $this->status_code;
 		return in_array($code, array(300, 301, 302, 303, 307)) || $code > 307 && $code < 400;
 	}
@@ -107,13 +110,17 @@ 
 	 * @throws Requests_Exception_HTTP On non-successful status code. Exception class corresponds to code (e.g. {@see Requests_Exception_HTTP_404})
 	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
 	 */
-	public function throw_for_status($allow_redirects = true) {
-		if ($this->is_redirect()) {
-			if (!$allow_redirects) {
+	public function throw_for_status($allow_redirects = true)
+	{
+		if ($this->is_redirect())
+		{
+			if (!$allow_redirects)
+			{
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
 			}
 		}
-		elseif (!$this->success) {
+		elseif (!$this->success)
+		{
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
 			throw new $exception(null, $this);
 		}

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -47,20 +47,20 @@ 
 	 *
 	 * @var integer|boolean
 	 */
-	public $status_code = false;
+	public $status_code = FALSE;
 
 	/**
 	 * Protocol version, false if non-blocking
 	 * @var float|boolean
 	 */
-	public $protocol_version = false;
+	public $protocol_version = FALSE;
 
 	/**
 	 * Whether the request succeeded or not
 	 *
 	 * @var boolean
 	 */
-	public $success = false;
+	public $success = FALSE;
 
 	/**
 	 * Number of redirects the request used
@@ -107,7 +107,7 @@ 
 	 * @throws Requests_Exception_HTTP On non-successful status code. Exception class corresponds to code (e.g. {@see Requests_Exception_HTTP_404})
 	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
 	 */
-	public function throw_for_status($allow_redirects = true) {
+	public function throw_for_status($allow_redirects = TRUE) {
 		if ($this->is_redirect()) {
 			if (!$allow_redirects) {
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
@@ -115,7 +115,7 @@ 
 		}
 		elseif (!$this->success) {
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
-			throw new $exception(null, $this);
+			throw new $exception(NULL, $this);
 		}
 	}
 }