mmainstreet / jodel-web

php/Requests/libary/Requests/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -31,5 +31,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/Location.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-class Location{
+class Location {
 
     public $cityName;
 
@@ -37,7 +37,7 @@ 
     {
         $this->lng = $lng;
     }
-    public function toArray(){
+    public function toArray() {
         return array(
             "city" => $this->getCityName(),
             "country" => 'DE',

php/DatabaseConnect.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 }
 $db = new DatabaseConnect();
-if ($db->connect_errno) {
+if($db->connect_errno) {
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
         Server ist hops gegangen. Wegen '.$db -> connect_error;
 }

php/Requests/CreateUser.php

Spacing +1 added lines, -1 removed lines

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

php/Requests/GetPosts.php

Spacing +5 added lines, -5 removed lines

@@ -7,22 +7,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;
 	}
@@ -31,7 +31,7 @@ 
     {
         $apiEndPoint = $this->getUrl();
         //echo $GLOBALS['lastPostId'];
-        if ($this->getLastPostId() != "") {
+        if($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;

php/Requests/libary/Requests/Cookie/Jar.php

Spacing +10 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
 	 * @return Requests_Cookie
 	 */
 	public function normalize_cookie($cookie, $key = null) {
-		if ($cookie instanceof Requests_Cookie) {
+		if($cookie instanceof Requests_Cookie) {
 			return $cookie;
 		}
 
@@ -71,7 +71,7 @@ 
 	 * @return string Item value
 	 */
 	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
+		if(!isset($this->cookies[$key])) {
 			return null;
 		}
 
@@ -87,7 +87,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');
 		}
 
@@ -134,21 +134,21 @@ 
 	 * @param array $options
 	 */
 	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
+		if(!$url instanceof Requests_IRI) {
 			$url = new Requests_IRI($url);
 		}
 
-		if (!empty($this->cookies)) {
+		if(!empty($this->cookies)) {
 			$cookies = array();
-			foreach ($this->cookies as $key => $cookie) {
+			foreach($this->cookies as $key => $cookie) {
 				$cookie = $this->normalize_cookie($cookie, $key);
 
 				// Skip expired cookies
-				if ($cookie->is_expired()) {
+				if($cookie->is_expired()) {
 					continue;
 				}
 
-				if ($cookie->domain_matches($url->host)) {
+				if($cookie->domain_matches($url->host)) {
 					$cookies[] = $cookie->format_for_header();
 				}
 			}
@@ -162,9 +162,9 @@ 
 	 *
 	 * @var Requests_Response $response
 	 */
-	public function before_redirect_check(Requests_Response &$return) {
+	public function before_redirect_check(Requests_Response&$return) {
 		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
+		if(!$url instanceof Requests_IRI) {
 			$url = new Requests_IRI($url);
 		}
 

php/Requests/libary/Requests/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -31,5 +31,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/libary/Requests/Proxy/HTTP.php

Spacing +7 added lines, -7 removed lines

@@ -55,14 +55,14 @@ 
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
 	public function __construct($args = null) {
-		if (is_string($args)) {
+		if(is_string($args)) {
 			$this->proxy = $args;
 		}
-		elseif (is_array($args)) {
-			if (count($args) == 1) {
+		elseif(is_array($args)) {
+			if(count($args) == 1) {
 				list($this->proxy) = $args;
 			}
-			elseif (count($args) == 3) {
+			elseif(count($args) == 3) {
 				list($this->proxy, $this->user, $this->pass) = $args;
 				$this->use_authentication = true;
 			}
@@ -82,12 +82,12 @@ 
 	 * @see fsockopen_header
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks) {
+	public function register(Requests_Hooks&$hooks) {
 		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
 
 		$hooks->register('fsockopen.remote_socket', array(&$this, 'fsockopen_remote_socket'));
 		$hooks->register('fsockopen.remote_host_path', array(&$this, 'fsockopen_remote_host_path'));
-		if ($this->use_authentication) {
+		if($this->use_authentication) {
 			$hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header'));
 		}
 	}
@@ -102,7 +102,7 @@ 
 		curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
 		curl_setopt($handle, CURLOPT_PROXY, $this->proxy);
 
-		if ($this->use_authentication) {
+		if($this->use_authentication) {
 			curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
 			curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->get_auth_string());
 		}

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

Spacing +50 added lines, -50 removed lines

@@ -96,14 +96,14 @@ 
 
 		curl_setopt($this->handle, CURLOPT_HEADER, false);
 		curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, 1);
-		if ($this->version >= self::CURL_7_10_5) {
+		if($this->version >= self::CURL_7_10_5) {
 			curl_setopt($this->handle, CURLOPT_ENCODING, '');
 		}
-		if (defined('CURLOPT_PROTOCOLS')) {
-			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+		if(defined('CURLOPT_PROTOCOLS')) {
+			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 		}
-		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+		if(defined('CURLOPT_REDIR_PROTOCOLS')) {
+			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 		}
 	}
 
@@ -111,7 +111,7 @@ 
 	 * Destructor
 	 */
 	public function __destruct() {
-		if (is_resource($this->handle)) {
+		if(is_resource($this->handle)) {
 			curl_close($this->handle);
 		}
 	}
@@ -134,28 +134,28 @@ 
 
 		$options['hooks']->dispatch('curl.before_send', array(&$this->handle));
 
-		if ($options['filename'] !== false) {
+		if($options['filename'] !== false) {
 			$this->stream_handle = fopen($options['filename'], 'wb');
 		}
 
 		$this->response_data = '';
 		$this->response_bytes = 0;
 		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
+		if($options['max_bytes'] !== false) {
 			$this->response_byte_limit = $options['max_bytes'];
 		}
 
-		if (isset($options['verify'])) {
-			if ($options['verify'] === false) {
+		if(isset($options['verify'])) {
+			if($options['verify'] === false) {
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
 			}
-			elseif (is_string($options['verify'])) {
+			elseif(is_string($options['verify'])) {
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
 			}
 		}
 
-		if (isset($options['verifyname']) && $options['verifyname'] === false) {
+		if(isset($options['verifyname']) && $options['verifyname'] === false) {
 			curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 		}
 
@@ -164,7 +164,7 @@ 
 
 		$options['hooks']->dispatch('curl.after_send', array());
 
-		if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
+		if(curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
 			// Reset encoding and try again
 			curl_setopt($this->handle, CURLOPT_ENCODING, 'none');
 
@@ -193,7 +193,7 @@ 
 	 */
 	public function request_multiple($requests, $options) {
 		// If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
-		if (empty($requests)) {
+		if(empty($requests)) {
 			return array();
 		}
 
@@ -202,7 +202,7 @@ 
 		$subhandles = array();
 
 		$class = get_class($this);
-		foreach ($requests as $id => $request) {
+		foreach($requests as $id => $request) {
 			$subrequests[$id] = new $class();
 			$subhandles[$id] = $subrequests[$id]->get_subrequest_handle($request['url'], $request['headers'], $request['data'], $request['options']);
 			$request['options']['hooks']->dispatch('curl.before_multi_add', array(&$subhandles[$id]));
@@ -220,22 +220,22 @@ 
 			do {
 				$status = curl_multi_exec($multihandle, $active);
 			}
-			while ($status === CURLM_CALL_MULTI_PERFORM);
+			while($status === CURLM_CALL_MULTI_PERFORM);
 
 			$to_process = array();
 
 			// Read the information as needed
-			while ($done = curl_multi_info_read($multihandle)) {
+			while($done = curl_multi_info_read($multihandle)) {
 				$key = array_search($done['handle'], $subhandles, true);
-				if (!isset($to_process[$key])) {
+				if(!isset($to_process[$key])) {
 					$to_process[$key] = $done;
 				}
 			}
 
 			// Parse the finished requests before we start getting the new ones
-			foreach ($to_process as $key => $done) {
+			foreach($to_process as $key => $done) {
 				$options = $requests[$key]['options'];
-				if (CURLE_OK !== $done['result']) {
+				if(CURLE_OK !== $done['result']) {
 					//get error string for handle.
 					$reason = curl_error($done['handle']);
 					$exception = new Requests_Exception_Transport_cURL(
@@ -256,13 +256,13 @@ 
 				curl_multi_remove_handle($multihandle, $done['handle']);
 				curl_close($done['handle']);
 
-				if (!is_string($responses[$key])) {
+				if(!is_string($responses[$key])) {
 					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
 				}
 				$completed++;
 			}
 		}
-		while ($active || $completed < count($subrequests));
+		while($active || $completed < count($subrequests));
 
 		$request['options']['hooks']->dispatch('curl.after_multi_exec', array(&$multihandle));
 
@@ -283,14 +283,14 @@ 
 	public function &get_subrequest_handle($url, $headers, $data, $options) {
 		$this->setup_handle($url, $headers, $data, $options);
 
-		if ($options['filename'] !== false) {
+		if($options['filename'] !== false) {
 			$this->stream_handle = fopen($options['filename'], 'wb');
 		}
 
 		$this->response_data = '';
 		$this->response_bytes = 0;
 		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
+		if($options['max_bytes'] !== false) {
 			$this->response_byte_limit = $options['max_bytes'];
 		}
 		$this->hooks = $options['hooks'];
@@ -310,25 +310,25 @@ 
 		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
 
 		// Force closing the connection for old versions of cURL (<7.22).
-		if ( ! isset( $headers['Connection'] ) ) {
+		if(!isset($headers['Connection'])) {
 			$headers['Connection'] = 'close';
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($data)) {
+		if(!empty($data)) {
 			$data_format = $options['data_format'];
 
-			if ($data_format === 'query') {
+			if($data_format === 'query') {
 				$url = self::format_get($url, $data);
 				$data = '';
 			}
-			elseif (!is_string($data)) {
+			elseif(!is_string($data)) {
 				$data = http_build_query($data, null, '&');
 			}
 		}
 
-		switch ($options['type']) {
+		switch($options['type']) {
 			case Requests::POST:
 				curl_setopt($this->handle, CURLOPT_POST, true);
 				curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
@@ -346,7 +346,7 @@ 
 			case Requests::OPTIONS:
 			default:
 				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				if (!empty($data)) {
+				if(!empty($data)) {
 					curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
 				}
 		}
@@ -359,14 +359,14 @@ 
 		// https://github.com/curl/curl/blob/4f45240bc84a9aa648c8f7243be7b79e9f9323a5/lib/hostip.c#L606-L609
 		$timeout = max($options['timeout'], 1);
 
-		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
+		if(is_int($timeout) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
 		}
 		else {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
-		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
+		if(is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
 		}
 		else {
@@ -375,17 +375,17 @@ 
 		curl_setopt($this->handle, CURLOPT_URL, $url);
 		curl_setopt($this->handle, CURLOPT_REFERER, $url);
 		curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
-		if (!empty($headers)) {
+		if(!empty($headers)) {
 			curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
 		}
-		if ($options['protocol_version'] === 1.1) {
+		if($options['protocol_version'] === 1.1) {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		}
 		else {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
-		if (true === $options['blocking']) {
+		if(true === $options['blocking']) {
 			curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, array(&$this, 'stream_headers'));
 			curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, array(&$this, 'stream_body'));
 			curl_setopt($this->handle, CURLOPT_BUFFERSIZE, Requests::BUFFER_SIZE);
@@ -400,12 +400,12 @@ 
 	 * @return string HTTP response data including headers
 	 */
 	public function process_response($response, $options) {
-		if ($options['blocking'] === false) {
+		if($options['blocking'] === false) {
 			$fake_headers = '';
 			$options['hooks']->dispatch('curl.after_request', array(&$fake_headers));
 			return false;
 		}
-		if ($options['filename'] !== false) {
+		if($options['filename'] !== false) {
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
 		}
@@ -413,7 +413,7 @@ 
 			$this->headers .= $response;
 		}
 
-		if (curl_errno($this->handle)) {
+		if(curl_errno($this->handle)) {
 			$error = sprintf(
 				'cURL error %s: %s',
 				curl_errno($this->handle),
@@ -438,13 +438,13 @@ 
 		// Why do we do this? cURL will send both the final response and any
 		// interim responses, such as a 100 Continue. We don't need that.
 		// (We may want to keep this somewhere just in case)
-		if ($this->done_headers) {
+		if($this->done_headers) {
 			$this->headers = '';
 			$this->done_headers = false;
 		}
 		$this->headers .= $headers;
 
-		if ($headers === "\r\n") {
+		if($headers === "\r\n") {
 			$this->done_headers = true;
 		}
 		return strlen($headers);
@@ -464,20 +464,20 @@ 
 		$data_length = strlen($data);
 
 		// Are we limiting the response size?
-		if ($this->response_byte_limit) {
-			if ($this->response_bytes === $this->response_byte_limit) {
+		if($this->response_byte_limit) {
+			if($this->response_bytes === $this->response_byte_limit) {
 				// Already at maximum, move on
 				return $data_length;
 			}
 
-			if (($this->response_bytes + $data_length) > $this->response_byte_limit) {
+			if(($this->response_bytes + $data_length) > $this->response_byte_limit) {
 				// Limit the length
 				$limited_length = ($this->response_byte_limit - $this->response_bytes);
 				$data = substr($data, 0, $limited_length);
 			}
 		}
 
-		if ($this->stream_handle) {
+		if($this->stream_handle) {
 			fwrite($this->stream_handle, $data);
 		}
 		else {
@@ -496,9 +496,9 @@ 
 	 * @return string URL with data
 	 */
 	protected static function format_get($url, $data) {
-		if (!empty($data)) {
+		if(!empty($data)) {
 			$url_parts = parse_url($url);
-			if (empty($url_parts['query'])) {
+			if(empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
 			}
 			else {
@@ -508,7 +508,7 @@ 
 			$query .= '&' . http_build_query($data, null, '&');
 			$query = trim($query, '&');
 
-			if (empty($url_parts['query'])) {
+			if(empty($url_parts['query'])) {
 				$url .= '?' . $query;
 			}
 			else {
@@ -525,14 +525,14 @@ 
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
 	public static function test($capabilities = array()) {
-		if (!function_exists('curl_init') || !function_exists('curl_exec')) {
+		if(!function_exists('curl_init') || !function_exists('curl_exec')) {
 			return false;
 		}
 
 		// If needed, check that our installed curl version supports SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+		if(isset($capabilities['ssl']) && $capabilities['ssl']) {
 			$curl_version = curl_version();
-			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
+			if(!(CURL_VERSION_SSL&$curl_version['features'])) {
 				return false;
 			}
 		}