mmainstreet / jodel-web

php/Requests/libary/Requests/Cookie.php

Spacing +43 added lines, -43 removed lines

@@ -77,7 +77,7 @@ 
 		$this->flags = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
-		if ($reference_time !== null) {
+		if($reference_time !== null) {
 			$this->reference_time = $reference_time;
 		}
 
@@ -97,12 +97,12 @@ 
 		// If a cookie has both the Max-Age and the Expires attribute, the Max-
 		// Age attribute has precedence and controls the expiration date of the
 		// cookie.
-		if (isset($this->attributes['max-age'])) {
+		if(isset($this->attributes['max-age'])) {
 			$max_age = $this->attributes['max-age'];
 			return $max_age < $this->reference_time;
 		}
 
-		if (isset($this->attributes['expires'])) {
+		if(isset($this->attributes['expires'])) {
 			$expires = $this->attributes['expires'];
 			return $expires < $this->reference_time;
 		}
@@ -117,11 +117,11 @@ 
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
 	public function uri_matches(Requests_IRI $uri) {
-		if (!$this->domain_matches($uri->host)) {
+		if(!$this->domain_matches($uri->host)) {
 			return false;
 		}
 
-		if (!$this->path_matches($uri->path)) {
+		if(!$this->path_matches($uri->path)) {
 			return false;
 		}
 
@@ -135,37 +135,37 @@ 
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
 	public function domain_matches($string) {
-		if (!isset($this->attributes['domain'])) {
+		if(!isset($this->attributes['domain'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
 		}
 
 		$domain_string = $this->attributes['domain'];
-		if ($domain_string === $string) {
+		if($domain_string === $string) {
 			// The domain string and the string are identical.
 			return true;
 		}
 
 		// If the cookie is marked as host-only and we don't have an exact
 		// match, reject the cookie
-		if ($this->flags['host-only'] === true) {
+		if($this->flags['host-only'] === true) {
 			return false;
 		}
 
-		if (strlen($string) <= strlen($domain_string)) {
+		if(strlen($string) <= strlen($domain_string)) {
 			// For obvious reasons, the string cannot be a suffix if the domain
 			// is shorter than the domain string
 			return false;
 		}
 
-		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
+		if(substr($string, -1 * strlen($domain_string)) !== $domain_string) {
 			// The domain string should be a suffix of the string.
 			return false;
 		}
 
 		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
-		if (substr($prefix, -1) !== '.') {
+		if(substr($prefix, -1) !== '.') {
 			// The last character of the string that is not included in the
 			// domain string should be a %x2E (".") character.
 			return false;
@@ -184,12 +184,12 @@ 
 	 * @return boolean Whether the cookie is valid for the given path
 	 */
 	public function path_matches($request_path) {
-		if (empty($request_path)) {
+		if(empty($request_path)) {
 			// Normalize empty path to root
 			$request_path = '/';
 		}
 
-		if (!isset($this->attributes['path'])) {
+		if(!isset($this->attributes['path'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
 			return true;
@@ -197,19 +197,19 @@ 
 
 		$cookie_path = $this->attributes['path'];
 
-		if ($cookie_path === $request_path) {
+		if($cookie_path === $request_path) {
 			// The cookie-path and the request-path are identical.
 			return true;
 		}
 
-		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
-			if (substr($cookie_path, -1) === '/') {
+		if(strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
+			if(substr($cookie_path, -1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the last
 				// character of the cookie-path is %x2F ("/").
 				return true;
 			}
 
-			if (substr($request_path, strlen($cookie_path), 1) === '/') {
+			if(substr($request_path, strlen($cookie_path), 1) === '/') {
 				// The cookie-path is a prefix of the request-path, and the
 				// first character of the request-path that is not included in
 				// the cookie-path is a %x2F ("/") character.
@@ -226,15 +226,15 @@ 
 	 * @return boolean Whether the cookie was successfully normalized
 	 */
 	public function normalize() {
-		foreach ($this->attributes as $key => $value) {
+		foreach($this->attributes as $key => $value) {
 			$orig_value = $value;
 			$value = $this->normalize_attribute($key, $value);
-			if ($value === null) {
+			if($value === null) {
 				unset($this->attributes[$key]);
 				continue;
 			}
 
-			if ($value !== $orig_value) {
+			if($value !== $orig_value) {
 				$this->attributes[$key] = $value;
 			}
 		}
@@ -252,15 +252,15 @@ 
 	 * @return mixed Value if available, or null if the attribute value is invalid (and should be skipped)
 	 */
 	protected function normalize_attribute($name, $value) {
-		switch (strtolower($name)) {
+		switch(strtolower($name)) {
 			case 'expires':
 				// Expiration parsing, as per RFC 6265 section 5.2.1
-				if (is_int($value)) {
+				if(is_int($value)) {
 					return $value;
 				}
 
 				$expiry_time = strtotime($value);
-				if ($expiry_time === false) {
+				if($expiry_time === false) {
 					return null;
 				}
 
@@ -268,17 +268,17 @@ 
 
 			case 'max-age':
 				// Expiration parsing, as per RFC 6265 section 5.2.2
-				if (is_int($value)) {
+				if(is_int($value)) {
 					return $value;
 				}
 
 				// Check that we have a valid age
-				if (!preg_match('/^-?\d+$/', $value)) {
+				if(!preg_match('/^-?\d+$/', $value)) {
 					return null;
 				}
 
-				$delta_seconds = (int) $value;
-				if ($delta_seconds <= 0) {
+				$delta_seconds = (int)$value;
+				if($delta_seconds <= 0) {
 					$expiry_time = 0;
 				}
 				else {
@@ -289,7 +289,7 @@ 
 
 			case 'domain':
 				// Domain normalization, as per RFC 6265 section 5.2.3
-				if ($value[0] === '.') {
+				if($value[0] === '.') {
 					$value = substr($value, 1);
 				}
 
@@ -332,11 +332,11 @@ 
 	 */
 	public function format_for_set_cookie() {
 		$header_value = $this->format_for_header();
-		if (!empty($this->attributes)) {
+		if(!empty($this->attributes)) {
 			$parts = array();
-			foreach ($this->attributes as $key => $value) {
+			foreach($this->attributes as $key => $value) {
 				// Ignore non-associative attributes
-				if (is_numeric($key)) {
+				if(is_numeric($key)) {
 					$parts[] = $value;
 				}
 				else {
@@ -383,10 +383,10 @@ 
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
-		if (!empty($name)) {
+		if(!empty($name)) {
 			$value = $string;
 		}
-		elseif (strpos($kvparts, '=') === false) {
+		elseif(strpos($kvparts, '=') === false) {
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -404,9 +404,9 @@ 
 		// Attribute key are handled case-insensitively
 		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
 
-		if (!empty($parts)) {
-			foreach ($parts as $part) {
-				if (strpos($part, '=') === false) {
+		if(!empty($parts)) {
+			foreach($parts as $part) {
+				if(strpos($part, '=') === false) {
 					$part_key = $part;
 					$part_value = true;
 				}
@@ -433,16 +433,16 @@ 
 	 */
 	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
 		$cookie_headers = $headers->getValues('Set-Cookie');
-		if (empty($cookie_headers)) {
+		if(empty($cookie_headers)) {
 			return array();
 		}
 
 		$cookies = array();
-		foreach ($cookie_headers as $header) {
+		foreach($cookie_headers as $header) {
 			$parsed = self::parse($header, '', $time);
 
 			// Default domain/path attributes
-			if (empty($parsed->attributes['domain']) && !empty($origin)) {
+			if(empty($parsed->attributes['domain']) && !empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
 			}
@@ -451,17 +451,17 @@ 
 			}
 
 			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
-			if (!$path_is_valid && !empty($origin)) {
+			if(!$path_is_valid && !empty($origin)) {
 				$path = $origin->path;
 
 				// Default path normalization as per RFC 6265 section 5.1.4
-				if (substr($path, 0, 1) !== '/') {
+				if(substr($path, 0, 1) !== '/') {
 					// If the uri-path is empty or if the first character of
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
 				}
-				elseif (substr_count($path, '/') === 1) {
+				elseif(substr_count($path, '/') === 1) {
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
@@ -477,7 +477,7 @@ 
 			}
 
 			// Reject invalid cookie domains
-			if (!empty($origin) && !$parsed->domain_matches($origin->host)) {
+			if(!empty($origin) && !$parsed->domain_matches($origin->host)) {
 				continue;
 			}
 

php/Requests/libary/Requests.php

Spacing +89 added lines, -89 removed lines

@@ -137,12 +137,12 @@ 
 	 */
 	public static function autoloader($class) {
 		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
+		if(strpos($class, 'Requests') !== 0) {
 			return;
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
+		if(file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
 			require_once(dirname(__FILE__) . '/' . $file . '.php');
 		}
 	}
@@ -162,7 +162,7 @@ 
 	 * @param string $transport Transport class to add, must support the Requests_Transport interface
 	 */
 	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -186,12 +186,12 @@ 
 		$cap_string = serialize($capabilities);
 
 		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+		if(isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
 			return new self::$transport[$cap_string]();
 		}
 		// @codeCoverageIgnoreEnd
 
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -199,18 +199,18 @@ 
 		}
 
 		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+		foreach(self::$transports as $class) {
+			if(!class_exists($class)) {
 				continue;
 			}
 
 			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
+			if($result) {
 				self::$transport[$cap_string] = $class;
 				break;
 			}
 		}
-		if (self::$transport[$cap_string] === null) {
+		if(self::$transport[$cap_string] === null) {
 			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
 		}
 
@@ -355,7 +355,7 @@ 
 	 * @return Requests_Response
 	 */
 	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
+		if(empty($options['type'])) {
 			$options['type'] = $type;
 		}
 		$options = array_merge(self::get_default_options(), $options);
@@ -364,10 +364,10 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -427,29 +427,29 @@ 
 	public static function request_multiple($requests, $options = array()) {
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if(!empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if(!empty($options['complete'])) {
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+		foreach($requests as $id => &$request) {
+			if(!isset($request['headers'])) {
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if(!isset($request['data'])) {
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if(!isset($request['type'])) {
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if(!isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
 			else {
-				if (empty($request['options']['type'])) {
+				if(empty($request['options']['type'])) {
 					$request['options']['type'] = $request['type'];
 				}
 				$request['options'] = array_merge($options, $request['options']);
@@ -458,19 +458,19 @@ 
 			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
 
 			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
+			if($request['options']['hooks'] !== $options['hooks']) {
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if(!empty($request['options']['complete'])) {
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -479,10 +479,10 @@ 
 		}
 		$responses = $transport->request_multiple($requests, $options);
 
-		foreach ($responses as $id => &$response) {
+		foreach($responses as $id => &$response) {
 			// If our hook got messed with somehow, ensure we end up with the
 			// correct response
-			if (is_string($response)) {
+			if(is_string($response)) {
 				$request = $requests[$id];
 				self::parse_multiple($response, $request);
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
@@ -521,7 +521,7 @@ 
 			'verify' => Requests::get_certificate_path(),
 			'verifyname' => true,
 		);
-		if ($multirequest !== false) {
+		if($multirequest !== false) {
 			$defaults['complete'] = null;
 		}
 		return $defaults;
@@ -533,7 +533,7 @@ 
 	 * @return string Default certificate path.
 	 */
 	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+		if(!empty(Requests::$certificate_path)) {
 			return Requests::$certificate_path;
 		}
 
@@ -545,7 +545,7 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path($path) {
 		Requests::$certificate_path = $path;
 	}
 
@@ -560,39 +560,39 @@ 
 	 * @return array $options
 	 */
 	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+		if(!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
-		if (empty($options['hooks'])) {
+		if(empty($options['hooks'])) {
 			$options['hooks'] = new Requests_Hooks();
 		}
 
-		if (is_array($options['auth'])) {
+		if(is_array($options['auth'])) {
 			$options['auth'] = new Requests_Auth_Basic($options['auth']);
 		}
-		if ($options['auth'] !== false) {
+		if($options['auth'] !== false) {
 			$options['auth']->register($options['hooks']);
 		}
 
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
+		if(is_string($options['proxy']) || is_array($options['proxy'])) {
 			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
 		}
-		if ($options['proxy'] !== false) {
+		if($options['proxy'] !== false) {
 			$options['proxy']->register($options['hooks']);
 		}
 
-		if (is_array($options['cookies'])) {
+		if(is_array($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
 		}
-		elseif (empty($options['cookies'])) {
+		elseif(empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
-		if ($options['cookies'] !== false) {
+		if($options['cookies'] !== false) {
 			$options['cookies']->register($options['hooks']);
 		}
 
-		if ($options['idn'] !== false) {
+		if($options['idn'] !== false) {
 			$iri = new Requests_IRI($url);
 			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
 			$url = $iri->uri;
@@ -601,8 +601,8 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
+		if(!isset($options['data_format'])) {
+			if(in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
 			}
 			else {
@@ -627,15 +627,15 @@ 
 	 */
 	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if(!$options['blocking']) {
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+		if(!$options['filename']) {
+			if(($pos = strpos($headers, "\r\n\r\n")) === false) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
 			}
@@ -652,44 +652,44 @@ 
 		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
 		$headers = explode("\n", $headers);
 		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
+		if(empty($matches)) {
 			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
 		}
-		$return->protocol_version = (float) $matches[1];
-		$return->status_code = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
+		$return->protocol_version = (float)$matches[1];
+		$return->status_code = (int)$matches[2];
+		if($return->status_code >= 200 && $return->status_code < 300) {
 			$return->success = true;
 		}
 
-		foreach ($headers as $header) {
+		foreach($headers as $header) {
 			list($key, $value) = explode(':', $header, 2);
 			$value = trim($value);
 			preg_replace('#(\s+)#i', ' ', $value);
 			$return->headers[$key] = $value;
 		}
-		if (isset($return->headers['transfer-encoding'])) {
+		if(isset($return->headers['transfer-encoding'])) {
 			$return->body = self::decode_chunked($return->body);
 			unset($return->headers['transfer-encoding']);
 		}
-		if (isset($return->headers['content-encoding'])) {
+		if(isset($return->headers['content-encoding'])) {
 			$return->body = self::decompress($return->body);
 		}
 
 		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
+		if(isset($return->headers['connection'])) {
 			unset($return->headers['connection']);
 		}
 
 		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
 
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
+		if($return->is_redirect() && $options['follow_redirects'] === true) {
+			if(isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
+				if($return->status_code === 303) {
 					$options['type'] = self::GET;
 				}
 				$options['redirected']++;
 				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+				if(strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
 					// relative redirect, for compatibility make it absolute
 					$location = Requests_IRI::absolutize($url, $location);
 					$location = $location->uri;
@@ -707,7 +707,7 @@ 
 				$redirected->history[] = $return;
 				return $redirected;
 			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			elseif($options['redirected'] >= $options['redirects']) {
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -736,7 +736,7 @@ 
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
 		}
-		catch (Requests_Exception $e) {
+		catch(Requests_Exception $e) {
 			$response = $e;
 		}
 	}
@@ -749,7 +749,7 @@ 
 	 * @return string Decoded body
 	 */
 	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+		if(!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
 			return $data;
 		}
 
@@ -758,15 +758,15 @@ 
 		$decoded = '';
 		$encoded = $data;
 
-		while (true) {
-			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+		while(true) {
+			$is_chunked = (bool)preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
+			if(!$is_chunked) {
 				// Looks like it's not chunked after all
 				return $data;
 			}
 
 			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
+			if($length === 0) {
 				// Ignore trailer headers
 				return $decoded;
 			}
@@ -775,7 +775,7 @@ 
 			$decoded .= substr($encoded, $chunk_length, $length);
 			$encoded = substr($encoded, $chunk_length + $length + 2);
 
-			if (trim($encoded) === '0' || empty($encoded)) {
+			if(trim($encoded) === '0' || empty($encoded)) {
 				return $decoded;
 			}
 		}
@@ -793,7 +793,7 @@ 
 	 */
 	public static function flatten($array) {
 		$return = array();
-		foreach ($array as $key => $value) {
+		foreach($array as $key => $value) {
 			$return[] = sprintf('%s: %s', $key, $value);
 		}
 		return $return;
@@ -821,21 +821,21 @@ 
 	 * @return string Decompressed string
 	 */
 	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
+		if(substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
 			// Not actually compressed. Probably cURL ruining this for us.
 			return $data;
 		}
 
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+		if(function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		elseif(function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		elseif(($decoded = self::compatible_gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		elseif(function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
 			return $decoded;
 		}
 
@@ -865,26 +865,26 @@ 
 	public static function compatible_gzinflate($gzData) {
 		// Compressed data might contain a full zlib header, if so strip it for
 		// gzinflate()
-		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
+		if(substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
 			$flg = ord(substr($gzData, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
+			if($flg > 0) {
+				if($flg&4) {
 					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ($flg & 8) {
+				if($flg&8) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 16) {
+				if($flg&16) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 2) {
+				if($flg&2) {
 					$i = $i + 2;
 				}
 			}
 			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
+			if(false !== $decompressed) {
 				return $decompressed;
 			}
 		}
@@ -905,17 +905,17 @@ 
 		// First 2 bytes should be divisible by 0x1F
 		list(, $first_two_bytes) = unpack('n', $gzData);
 
-		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
+		if(0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
 			$huffman_encoded = true;
 		}
 
-		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if($huffman_encoded) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 				return $decompressed;
 			}
 		}
 
-		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
+		if("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
 			// ZIP file format header
 			// Offset 6: 2 bytes, General-purpose field
 			// Offset 26: 2 bytes, filename length
@@ -927,9 +927,9 @@ 
 			// If the file has been compressed on the fly, 0x08 bit is set of
 			// the general purpose field. We can use this to differentiate
 			// between a compressed document, and a ZIP file
-			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
+			$zip_compressed_on_the_fly = (0x08 == (0x08&$general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if(!$zip_compressed_on_the_fly) {
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}
@@ -937,20 +937,20 @@ 
 			// Determine the first byte of data, based on the above ZIP header
 			// offsets:
 			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
 				return $decompressed;
 			}
 			return false;
 		}
 
 		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
+		if(false !== ($decompressed = @gzinflate($gzData))) {
 			return $decompressed;
 		}
 
 		// Fallback for all above failing, not expected, but included for
 		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 			return $decompressed;
 		}
 
@@ -959,7 +959,7 @@ 
 
 	public static function match_domain($host, $reference) {
 		// Check for a direct match
-		if ($host === $reference) {
+		if($host === $reference) {
 			return true;
 		}
 
@@ -967,10 +967,10 @@ 
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
 		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
+		if(ip2long($host) === false && count($parts) >= 3) {
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if($wildcard === $reference) {
 				return true;
 			}
 		}

admin.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $config = parse_ini_file('config/config.ini.php');
 if(!isset($_GET['pw']) || $config['pw'] != $_GET['pw'])
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on admin.php');
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on admin.php');
 	die();
 }
 

php/Requests/libary/Requests/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks);
+	public function register(Requests_Hooks&$hooks);
 }
\ No newline at end of file

php/Requests/CreateUser.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
     {
         $str = '';
         $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
+        for($i = 0; $i < $length; ++$i) {
             $str .= $keyspace[rand(0, $max)];
         }
         return $str;

php/Requests/GetPosts.php

Spacing +5 added lines, -5 removed lines

@@ -11,22 +11,22 @@ 
     public $url;
 
         
-    function setUrl ($url)
+    function setUrl($url)
     {
             $this->url = $url;
     }
     
-    function getUrl ()
+    function getUrl()
     {
         return $this->url;
     }
 		
-    function setLastPostId ($lastPostId)
+    function setLastPostId($lastPostId)
     {
 			$this->lastPostId = $lastPostId;
 	}
 	
-	function getlastPostId ()
+	function getlastPostId()
 	{
 		return $this->lastPostId;
 	}
@@ -35,7 +35,7 @@ 
     {
         $apiEndPoint = $this->getUrl();
 
-        if ($this->getLastPostId() != "") {
+        if($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;

get-posts-ajax.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 if(!isset($_COOKIE["JodelDeviceId"]))
 {
 	$deviceUid = createAccount();
-	setcookie("JodelDeviceId", $deviceUid, time()+60*60*24*365*10);
+	setcookie("JodelDeviceId", $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
 	
 }
 else
@@ -37,7 +37,7 @@ 
 
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -56,13 +56,13 @@ 
 		$view = 'time';
 	}
 
-	if($view=='comment')
+	if($view == 'comment')
 	{
 		$url = "/v2/posts/location/discussed/";
 	}
 	else
 	{
-		if($view=='upVote')
+		if($view == 'upVote')
 		{
 			$url = "/v2/posts/location/popular/";
 		}
@@ -82,7 +82,7 @@ 
 		?>
 		<div class="nextPosts">
 		<?php
-		for($i = 0; $i<$loops; $i++)
+		for($i = 0; $i < $loops; $i++)
 		{
 			if(isset($posts[$i]))
 			{

php/Requests/AbstractRequest.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if($this->getAccessToken()) {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -50,7 +50,7 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch($this->getMethod()) {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -68,7 +68,7 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch($result->status_code) {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -96,7 +96,7 @@ 
                 exit("Error 403: Access denied");
                 break;
             default:
-                error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+                error_log('Error ' . $result->status_code . ' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
                 //throw  new \Exception('Unknown Error: '.$result->status_code);
         }
 

index.php

Spacing +14 added lines, -14 removed lines

@@ -39,8 +39,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($db->real_escape_string($_COOKIE['JodelDeviceId'])))
 		{
 			$deviceUid = createAccount();
-			setcookie('JodelDeviceId', $deviceUid, time()+60*60*24*365*10);
-			error_log('Created account with JodelDeviceId:' . $deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			error_log('Created account with JodelDeviceId:' . $deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -61,7 +61,7 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -119,7 +119,7 @@ 
 				else
 				{
 					$newPositionStatus = $name;
-					error_log('User with JodelDeviceId:' . $deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+					error_log('User with JodelDeviceId:' . $deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
 				}
 			}
 		}
@@ -172,7 +172,7 @@ 
 		if(isset($_POST['color']))
 		{
 			$color = $_POST['color'];
-			switch ($color) {
+			switch($color) {
 				case '8ABDB0':
 					$color = '8ABDB0';
 					break;
@@ -267,13 +267,13 @@ 
 	else
 	{
 		$version = 'v2';
-		if($view=='comment')
+		if($view == 'comment')
 		{
 			$url = "/v2/posts/location/discussed/";
 		}
 		else
 		{
-			if($view=='upVote')
+			if($view == 'upVote')
 			{
 				$url = "/v2/posts/location/popular/";
 			}
@@ -299,13 +299,13 @@ 
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title><?php echo getTitle($posts[0], $view, $isDetailedView);?></title>
+		<title><?php echo getTitle($posts[0], $view, $isDetailedView); ?></title>
 		
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		
-		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView);?>">
+		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView); ?>">
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
 		
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
@@ -386,7 +386,7 @@ 
 
 					<content id="posts">
 						<?php
-							for($i = 0; $i<$loops; $i++)
+							for($i = 0; $i < $loops; $i++)
 							{
 								if(array_key_exists($i, $posts) && array_key_exists('post_id', $posts[$i]) && isset($posts[$i]['post_id']))
 								{
@@ -430,7 +430,7 @@ 
 								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
 								<h2>Comment on Jodel</h2>
 								<form method="POST">				
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']);?>" />
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']); ?>" />
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
 									<br />
 									<input type="submit" value="SEND" /> 
@@ -467,13 +467,13 @@ 
 				<div class="col-xs-12">
 					<div class="row">
 						<div class="col-xs-3">
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?view=comment" <?php if($view == 'comment') echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?view=upVote" <?php if($view == 'upVote') echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
 							<nav>