mmainstreet / jodel-web

php/Requests/AbstractRequest.php

Braces +13 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 abstract class AbstractRequest
-{	
+{
     const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
     const APIURL = 'https://api.go-tellm.com/api';
     const SECRET = 'OFIqFvBgkccPNTVbIzkYaSmrwMlbVzRoOBBjXUIG';
@@ -19,7 +19,8 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = '';
-		if(isset($this->payLoad['device_uid'])) {
+		if(isset($this->payLoad['device_uid']))
+		{
 			$device_uid = $this->payLoad['device_uid'];
 		}
 				
@@ -28,7 +29,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -45,7 +47,8 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -63,7 +66,8 @@ 
                 $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;
@@ -114,10 +118,12 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

Indentation +129 added lines, -129 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 = 'OFIqFvBgkccPNTVbIzkYaSmrwMlbVzRoOBBjXUIG';
-    const USERAGENT = 'Jodel/4.32.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.32.2';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'OFIqFvBgkccPNTVbIzkYaSmrwMlbVzRoOBBjXUIG';
+	const USERAGENT = 'Jodel/4.32.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.32.2';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = '';
-    public $version = 'v2';
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
 
-    public function execute()
-    {
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,15 +24,15 @@ 
 		}
 				
 				
-        $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:
+		/*
         printf("URL: ");
         var_dump($url);
         echo "<br />";
@@ -43,82 +43,82 @@ 
         var_dump($this->payLoad);
         echo "<br />";
         */
-        /*
+		/*
         $options = array(
             'timeout' => 100,
             'connect_timeout' => 100,
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->version == 'v3')
-                {
-                    $result = Requests::get($url, $header);
-                }
-                else
-                {
-                    $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':
+				if($this->version == 'v3')
+				{
+					$result = Requests::get($url, $header);
+				}
+				else
+				{
+					$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');
-                error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
-                break;
-            case 404:
-                //echo "Es wurde bereits gevoted";
-                error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
+				error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+				break;
+			case 404:
+				//echo "Es wurde bereits gevoted";
+				error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
 			case 477:
-                //echo "Es wurde bereits gevoted";
-                //throw  new \Exception('Signing failed!');
-                error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
-                break;
-            case 429:
-                error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
-                exit("Error 403: Access denied");
-                break;
-            default:
-                error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
-                //throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				//echo "Es wurde bereits gevoted";
+				//throw  new \Exception('Signing failed!');
+				error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
+				break;
+			case 429:
+				error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
+				exit("Error 403: Access denied");
+				break;
+			default:
+				error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+				//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
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -127,54 +127,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;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken($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;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken($accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

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