mmainstreet / jodel-web

php/Requests/CreateUser.php

Doc Comments +3 added lines

@@ -33,6 +33,9 @@
         return $this->random_str(64, 'abcdef0123456789');
     }
     
+    /**
+     * @param integer $length
+     */
     private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
     {
         $str = '';

Indentation +46 added lines, -46 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    private $location;
-    private $deviceUid;
-    /**
-     * @return Location
-     */
-    private function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    private function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	private $location;
+	private $deviceUid;
+	/**
+	 * @return Location
+	 */
+	private function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	private function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    private function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
+	private function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
     
-    private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-    {
-        $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
-            $str .= $keyspace[random_int(0, $max)];
-        }
-        return $str;
-    }
-    public function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    public function getPayload()
-    {
+	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+	{
+		$str = '';
+		$max = mb_strlen($keyspace, '8bit') - 1;
+		for ($i = 0; $i < $length; ++$i) {
+			$str .= $keyspace[random_int(0, $max)];
+		}
+		return $str;
+	}
+	public function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	public function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@ 
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    public function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	public function getMethod()
+	{
+		return 'POST';
+	}
 }

get-posts-ajax.php

Braces +29 added lines, -13 removed lines

@@ -17,18 +17,22 @@ 
 require_once 'php/Requests/libary/Requests.php';
 Requests::register_autoloader();
 
-function getPosts($lastPostId, $url) {
+function getPosts($lastPostId, $url)
+{
 	$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;
 	}
 	
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
 	
-	if ($result->num_rows > 0) {
+	if ($result->num_rows > 0)
+	{
 		// output data of each row
-		while($row = $result->fetch_assoc()) {
+		while($row = $result->fetch_assoc())
+		{
 			$access_token = $row["access_token"];
 		}
 	}
@@ -66,7 +70,8 @@ 
 		}
 	}
 
-	if(isset($_GET['lastPostId'])) {
+	if(isset($_GET['lastPostId']))
+	{
 	
 		$lastPostId = $_GET['lastPostId'];
 		
@@ -76,9 +81,11 @@ 
 		?>
 		<div class="nextPosts">
 		<?php
-		for($i = 0; $i<$loops; $i++) {
+		for($i = 0; $i<$loops; $i++)
+		{
 		
-			if(isset($posts[$i])) {
+			if(isset($posts[$i]))
+			{
 				$lastPostId = $posts[$i]['post_id'];
 
 				
@@ -94,7 +101,8 @@ 
 							$timediff_inHours = (string)$timediff->format('%h');
 							$timediff_inDays = (string)$timediff->format('%d');
 							$timediff_inMonth = (string)$timediff->format('%m');
-							if($timediff_inMonth!=0) {
+							if($timediff_inMonth!=0)
+							{
 									$timediff = $timediff_inMonth . "m";
 							}
 							else
@@ -127,10 +135,12 @@ 
 				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
 					<content>
 						<?php 
-						if(isset($posts[$i]["image_url"])) {
+						if(isset($posts[$i]["image_url"]))
+						{
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
 						}
-						else {
+						else
+						{
 							echo nl2br($posts[$i]["message"]);
 						}
 						?>
@@ -156,13 +166,19 @@ 
 									</span> 
 								</td>
 								<td class="comments">
-									<?php if($showCommentIcon) {?>
+									<?php if($showCommentIcon)
+{
+?>
 									<span data-tooltip="Comments">
 										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
 											<i class="fa fa-commenting-o"></i>
-											<?php if(array_key_exists("child_count", $posts[$i])) {
+											<?php if(array_key_exists("child_count", $posts[$i]))
+{
 														echo $posts[$i]["child_count"];
-													} else echo "0";
+													}
+													else {
+														echo "0";
+													}
 											?>
 											</a>
 									</span>

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
-     */
-    private $accessToken = null;
-    private $payLoad;
-    public function execute()
-    {
+	/**
+	 * @var string
+	 */
+	private $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
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -97,54 +97,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(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;
+	}
+	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(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -2,8 +2,8 @@ 
 
 abstract class AbstractRequest
 {	
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    CONST APIURL = 'https://api.go-tellm.com/api';
+    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';
@@ -11,7 +11,7 @@ 
     /**
      * @var string
      */
-    private $accessToken = null;
+    private $accessToken = NULL;
     private $payLoad;
     public function execute()
     {
@@ -52,7 +52,7 @@ 
         }
         switch ($result->status_code) {
             case 200:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
                 break;
             case 204:
                 $result = "Success";
@@ -89,7 +89,7 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == NULL) {
 				$payload_accessToken = "";
 			}
 			else {