mmainstreet / jodel-web

php/Requests/GetKarma.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetKarma extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/karma';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/users/karma';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

php/Requests/SetLocation.php

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class SetLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation(): Location
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation(): Location
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 					"location" => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

php/Requests/GetPosts.php

Indentation +27 added lines, -27 removed lines

@@ -5,20 +5,20 @@ 
 {
 	public $lastPostId;
 
-    public $url;
+	public $url;
         
-    function setUrl ($url)
-    {
-            $this->url = $url;
-    }
+	function setUrl ($url)
+	{
+			$this->url = $url;
+	}
     
-    function getUrl ()
-    {
-        return $this->url;
-    }
+	function getUrl ()
+	{
+		return $this->url;
+	}
 		
-    function setLastPostId ($lastPostId)
-    {
+	function setLastPostId ($lastPostId)
+	{
 			$this->lastPostId = $lastPostId;
 	}
 	
@@ -27,22 +27,22 @@ 
 		return $this->lastPostId;
 	}
     
-    function getApiEndPoint()
-    {
-        $apiEndPoint = $this->getUrl();
-        //echo $GLOBALS['lastPostId'];
-        if ($this->getLastPostId() != "") {
+	function getApiEndPoint()
+	{
+		$apiEndPoint = $this->getUrl();
+		//echo $GLOBALS['lastPostId'];
+		if ($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
 		}
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }

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

php/Requests/Upvote.php

Indentation +13 added lines, -13 removed lines

@@ -3,19 +3,19 @@
 
 class Upvote extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'] . '/upvote';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'] . '/upvote';
+	}
+	function getPayload()
+	{
+		return array(
 					"reason_code" => -1,
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

php/Requests/AbstractRequest.php

Indentation +110 added lines, -110 removed lines

@@ -2,19 +2,19 @@ 
 
 abstract class AbstractRequest
 {	
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    CONST APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
-    const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
-    const CLIENT_TYPE = 'android_4.27.1';
+	CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	CONST APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
+	const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
+	const CLIENT_TYPE = 'android_4.27.1';
     
-    /**
-     * @var string
-     */
-    public $accessToken = null;
-    private $payLoad;
-    public function execute()
-    {
+	/**
+	 * @var string
+	 */
+	public $accessToken = null;
+	private $payLoad;
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,71 +24,71 @@ 
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
-        /*
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
+		/*
         var_dump($url);
         var_dump($header);
         var_dump($this->payLoad);
         */
         
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                $result = Requests::get($url, $header);
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = "Success";
-                break;
-            case 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				$result = Requests::get($url, $header);
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = "Success";
+				break;
+			case 401:
 				throw new \Exception('Unauthorized');
-                break;
-            case 404:
-                echo "Es wurde bereits gevoted";
+				break;
+			case 404:
+				echo "Es wurde bereits gevoted";
 			case 477:
-                echo "Es wurde bereits gevoted";
-                throw  new \Exception('Signing failed!');
-                break;
-            default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				echo "Es wurde bereits gevoted";
+				throw  new \Exception('Signing failed!');
+				break;
+			default:
+				throw  new \Exception('Unknown Error: '.$result->status_code);
+		}
 
-        if($device_uid != "")
-        {
+		if($device_uid != "")
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
 		}
 
-        /*
+		/*
         var_dump($result);
         */
 
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    public function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	public function getSignHeaders()
+	{
 			$payload_accessToken;
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
@@ -98,54 +98,54 @@ 
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    public function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    public function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken(string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	public function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	public function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = "";
-		if(isset($this->payLoad["device_uid"])) {
+		if (isset($this->payLoad["device_uid"])) {
 			$device_uid = $this->payLoad["device_uid"];
 		}
 				
@@ -67,10 +67,10 @@ 
                 throw  new \Exception('Signing failed!');
                 break;
             default:
-                throw  new \Exception('Unknown Error: '.$result->status_code);
+                throw  new \Exception('Unknown Error: ' . $result->status_code);
         }
 
-        if($device_uid != "")
+        if ($device_uid != "")
         {
 			$result[0] = $result;
 			$result[1] = $device_uid;
@@ -90,7 +90,7 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if ($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
 			else {

Braces +1 added lines, -2 removed lines

@@ -92,8 +92,7 @@
 			$payload_accessToken;
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
-			}
-			else {
+			} else {
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

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

Spacing +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
 	 *
 	 * @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) {
 			$url = new Requests_IRI($url);

php/Requests/libary/Requests/Auth.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/libary/Requests/Proxy/HTTP.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 	 * @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'));

Braces +3 added lines, -6 removed lines

@@ -57,16 +57,13 @@
 	public function __construct($args = null) {
 		if (is_string($args)) {
 			$this->proxy = $args;
-		}
-		elseif (is_array($args)) {
+		} 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;
-			}
-			else {
+			} else {
 				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
 			}
 		}

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

Spacing +4 added lines, -4 removed lines

@@ -100,10 +100,10 @@ 
 			curl_setopt($this->handle, CURLOPT_ENCODING, '');
 		}
 		if (defined('CURLOPT_PROTOCOLS')) {
-			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+			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);
+			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 		}
 	}
 
@@ -310,7 +310,7 @@ 
 		$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';
 		}
 
@@ -532,7 +532,7 @@ 
 		// If needed, check that our installed curl version supports 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;
 			}
 		}

Braces +10 added lines, -20 removed lines

@@ -149,8 +149,7 @@ 
 			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']);
 			}
 		}
@@ -246,8 +245,7 @@ 
 								);
 					$responses[$key] = $exception;
 					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
-				}
-				else {
+				} else {
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
 
 					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
@@ -322,8 +320,7 @@ 
 			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, '&');
 			}
 		}
@@ -361,15 +358,13 @@ 
 
 		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
 		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
 		}
 		curl_setopt($this->handle, CURLOPT_URL, $url);
@@ -380,8 +375,7 @@ 
 		}
 		if ($options['protocol_version'] === 1.1) {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
@@ -408,8 +402,7 @@ 
 		if ($options['filename'] !== false) {
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
-		}
-		else {
+		} else {
 			$this->headers .= $response;
 		}
 
@@ -479,8 +472,7 @@ 
 
 		if ($this->stream_handle) {
 			fwrite($this->stream_handle, $data);
-		}
-		else {
+		} else {
 			$this->response_data .= $data;
 		}
 
@@ -500,8 +492,7 @@ 
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
-			}
-			else {
+			} else {
 				$query = $url_parts['query'];
 			}
 
@@ -510,8 +501,7 @@ 
 
 			if (empty($url_parts['query'])) {
 				$url .= '?' . $query;
-			}
-			else {
+			} else {
 				$url = str_replace($url_parts['query'], $query, $url);
 			}
 		}