mmainstreet / jodel-web

php/Requests/libary/Requests/Session.php

Spacing +10 added lines, -10 removed lines

@@ -69,7 +69,7 @@ 
 		$this->data = $data;
 		$this->options = $options;
 
-		if (empty($this->options['cookies'])) {
+		if(empty($this->options['cookies'])) {
 			$this->options['cookies'] = new Requests_Cookie_Jar();
 		}
 	}
@@ -81,7 +81,7 @@ 
 	 * @return mixed|null Property value, null if none found
 	 */
 	public function __get($key) {
-		if (isset($this->options[$key])) {
+		if(isset($this->options[$key])) {
 			return $this->options[$key];
 		}
 
@@ -113,7 +113,7 @@ 
 	 * @param string $key Property key
 	 */
 	public function __unset($key) {
-		if (isset($this->options[$key])) {
+		if(isset($this->options[$key])) {
 			unset($this->options[$key]);
 		}
 	}
@@ -215,7 +215,7 @@ 
 	 * @return array Responses (either Requests_Response or a Requests_Exception object)
 	 */
 	public function request_multiple($requests, $options = array()) {
-		foreach ($requests as $key => $request) {
+		foreach($requests as $key => $request) {
 			$requests[$key] = $this->merge_request($request, false);
 		}
 
@@ -235,26 +235,26 @@ 
 	 * @return array Request data
 	 */
 	protected function merge_request($request, $merge_options = true) {
-		if ($this->url !== null) {
+		if($this->url !== null) {
 			$request['url'] = Requests_IRI::absolutize($this->url, $request['url']);
 			$request['url'] = $request['url']->uri;
 		}
 
-		if (empty($request['headers'])) {
+		if(empty($request['headers'])) {
 			$request['headers'] = array();
 		}
 		$request['headers'] = array_merge($this->headers, $request['headers']);
 
-		if (empty($request['data'])) {
-			if (is_array($this->data)) {
+		if(empty($request['data'])) {
+			if(is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
 		}
-		elseif (is_array($request['data']) && is_array($this->data)) {
+		elseif(is_array($request['data']) && is_array($this->data)) {
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 
-		if ($merge_options !== false) {
+		if($merge_options !== false) {
 			$request['options'] = array_merge($this->options, $request['options']);
 
 			// Disallow forcing the type, as that's a per request setting

php/Requests/libary/Requests/Utility/CaseInsensitiveDictionary.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param array $data Dictionary/map to convert to case-insensitive
 	 */
 	public function __construct(array $data = array()) {
-		foreach ($data as $key => $value) {
+		foreach($data as $key => $value) {
 			$this->offsetSet($key, $value);
 		}
 	}
@@ -50,7 +50,7 @@ 
 	 */
 	public function offsetGet($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -66,7 +66,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');
 		}
 

php/Requests/libary/Requests/Exception/Transport/cURL.php

Spacing +3 added lines, -3 removed lines

@@ -30,15 +30,15 @@
 	protected $reason = 'Unknown';
 
 	public function __construct($message, $type, $data = null, $code = 0) {
-		if ($type !== null) {
+		if($type !== null) {
 			$this->type = $type;
 		}
 
-		if ($code !== null) {
+		if($code !== null) {
 			$this->code = $code;
 		}
 
-		if ($message !== null) {
+		if($message !== null) {
 			$this->reason = $message;
 		}
 

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

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param mixed $data Associated data
 	 */
 	public function __construct($reason = null, $data = null) {
-		if ($reason !== null) {
+		if($reason !== null) {
 			$this->reason = $reason;
 		}
 
@@ -57,12 +57,12 @@ 
 	 * @return string Exception class name to use
 	 */
 	public static function get_class($code) {
-		if (!$code) {
+		if(!$code) {
 			return 'Requests_Exception_HTTP_Unknown';
 		}
 
 		$class = sprintf('Requests_Exception_HTTP_%d', $code);
-		if (class_exists($class)) {
+		if(class_exists($class)) {
 			return $class;
 		}
 

php/Requests/libary/Requests/Exception/HTTP/Unknown.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 * @param mixed $data Associated data
 	 */
 	public function __construct($reason = null, $data = null) {
-		if ($data instanceof Requests_Response) {
+		if($data instanceof Requests_Response) {
 			$this->code = $data->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);
 			}
 		}

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

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

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