mmainstreet / jodel-web

php/Requests/AbstractRequest.php

Indentation +159 added lines, -159 removed lines

@@ -2,21 +2,21 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = 'hFvMqLauMtnodakokftuKETbIsVLxpqfjAXiRoih';
-    const USERAGENT = 'Jodel/4.41.0 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.41.0';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'hFvMqLauMtnodakokftuKETbIsVLxpqfjAXiRoih';
+	const USERAGENT = 'Jodel/4.41.0 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.41.0';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = '';
-    public $version = 'v2';
-    public $hasPayload = FALSE;
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
+	public $hasPayload = FALSE;
 
-    public function execute()
-    {
-        $result = new \stdClass();
+	public function execute()
+	{
+		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = '';
@@ -25,16 +25,16 @@ 
 		}
 				
 				
-        $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 />";
@@ -45,114 +45,114 @@ 
         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->hasPayload)
-                {
-                    $result = Requests::get($url, $header, $this->payLoad);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->hasPayload)
+				{
+					$result = Requests::get($url, $header, $this->payLoad);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
 
-        http_response_code($result->status_code);
+		http_response_code($result->status_code);
 
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = 'Success';
-                http_response_code(200);
-                break;
-            case 400:
-                $result = json_decode($result->body, true);
-                error_log('Error 400 - ' . print_r($result, true));
-                break;
-            case 401:
-                $result = json_decode($result->body, true);
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = 'Success';
+				http_response_code(200);
+				break;
+			case 400:
+				$result = json_decode($result->body, true);
+				error_log('Error 400 - ' . print_r($result, true));
+				break;
+			case 401:
+				$result = json_decode($result->body, true);
 
-                if(array_key_exists('error', $result) && $result['error'] == 'length')
-                {
+				if(array_key_exists('error', $result) && $result['error'] == 'length')
+				{
 
-                }
-                else
-                {
-                    error_log('Error 401 - ' . print_r($result, true));
-                }
-                break;
-            case 404:
-                error_log('Error 404 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                break;
+				}
+				else
+				{
+					error_log('Error 401 - ' . print_r($result, true));
+				}
+				break;
+			case 404:
+				error_log('Error 404 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				break;
 			case 477:
-                $result = json_decode($result->body, true);
-                error_log('Error 477 - ' . print_r($result, true));
-                break;
-            case 429:
-                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
-                $result = json_decode($result->body, true);
-                break;
-            case 502:
-                error_log('Error 502 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                header('location:'.$_SERVER['PHP_SELF']);
-                break;
-            case 503:
-                error_log('Error 503 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+				$result = json_decode($result->body, true);
+				error_log('Error 477 - ' . print_r($result, true));
+				break;
+			case 429:
+				error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
+				$result = json_decode($result->body, true);
+				break;
+			case 502:
+				error_log('Error 502 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				header('location:'.$_SERVER['PHP_SELF']);
+				break;
+			case 503:
+				error_log('Error 503 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
 
-                if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
-                {
-                    header('location:'.$_SERVER['PHP_SELF']); 
-                }
-                break;
-            default:
-                error_log('Error '.$result->status_code.' - unknown error');
-                $result = json_decode($result->body, true);
-        }
+				if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
+				{
+					header('location:'.$_SERVER['PHP_SELF']); 
+				}
+				break;
+			default:
+				error_log('Error '.$result->status_code.' - unknown error');
+				$result = json_decode($result->body, true);
+		}
 
-        //important for account refresh
-        if($device_uid != '')
-        {
+		//important for account refresh
+		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 = "";
 			}
@@ -161,54 +161,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;
+	}
 }

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 = 'hFvMqLauMtnodakokftuKETbIsVLxpqfjAXiRoih';
@@ -20,7 +20,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'];
 		}
 				
@@ -29,7 +30,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -52,7 +54,8 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -73,7 +76,8 @@ 
 
         http_response_code($result->status_code);
 
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -153,10 +157,12 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

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

@@ -8,7 +8,7 @@ 
     const USERAGENT = 'Jodel/4.41.0 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
     const CLIENT_TYPE = 'android_4.41.0';
     
-    private $accessToken = null;
+    private $accessToken = NULL;
     private $payLoad;
     public $expects = '';
     public $version = 'v2';
@@ -75,18 +75,18 @@ 
 
         switch ($result->status_code) {
             case 200:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
                 break;
             case 204:
                 $result = 'Success';
                 http_response_code(200);
                 break;
             case 400:
-                $result = json_decode($result->body, true);
-                error_log('Error 400 - ' . print_r($result, true));
+                $result = json_decode($result->body, TRUE);
+                error_log('Error 400 - ' . print_r($result, TRUE));
                 break;
             case 401:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
 
                 if(array_key_exists('error', $result) && $result['error'] == 'length')
                 {
@@ -94,33 +94,33 @@ 
                 }
                 else
                 {
-                    error_log('Error 401 - ' . print_r($result, true));
+                    error_log('Error 401 - ' . print_r($result, TRUE));
                 }
                 break;
             case 404:
-                error_log('Error 404 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 404 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
                 break;
 			case 477:
-                $result = json_decode($result->body, true);
-                error_log('Error 477 - ' . print_r($result, true));
+                $result = json_decode($result->body, TRUE);
+                error_log('Error 477 - ' . print_r($result, TRUE));
                 break;
             case 429:
-                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
+                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, TRUE), TRUE));
             	exit("Error 429: Too Many Requests");
             	break;
             case 403:
-                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
-                $result = json_decode($result->body, true);
+                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, TRUE), TRUE));
+                $result = json_decode($result->body, TRUE);
                 break;
             case 502:
-                error_log('Error 502 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 502 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
                 header('location:'.$_SERVER['PHP_SELF']);
                 break;
             case 503:
-                error_log('Error 503 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 503 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
 
                 if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
                 {
@@ -129,7 +129,7 @@ 
                 break;
             default:
                 error_log('Error '.$result->status_code.' - unknown error');
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
         }
 
         //important for account refresh
@@ -153,7 +153,7 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == NULL) {
 				$payload_accessToken = "";
 			}
 			else {

php/View.php

Indentation +231 added lines, -231 removed lines

@@ -2,112 +2,112 @@ 
 
 class View
 {
-    public $country;
-    public $city;
-    public $hashtag;
+	public $country;
+	public $city;
+	public $hashtag;
 	public $view;
-    public $postId;
-    public $isDetailedView;
-    public $baseUrl;
-    public $rights;
+	public $postId;
+	public $isDetailedView;
+	public $baseUrl;
+	public $rights;
 
 	public $lastPostId = '';
 
-    function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
-    {
-        $this->baseUrl = $baseUrl;
-        $this->country = $country;
-        $this->city = $city;
-        $this->hashtag = urldecode($hashtag);
-        $this->view = $view;
-        $this->postId = $postId;
+	function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
+	{
+		$this->baseUrl = $baseUrl;
+		$this->country = $country;
+		$this->city = $city;
+		$this->hashtag = urldecode($hashtag);
+		$this->view = $view;
+		$this->postId = $postId;
 
-        if(isUserAdmin())
-        {
-            $this->rights = 'admin';
-        }
-        else if(isUserVoter())
-        {
-            $this->rights = 'voter';
-        }
-        else
-        {
-            $this->rights = 'user';
-        }
+		if(isUserAdmin())
+		{
+			$this->rights = 'admin';
+		}
+		else if(isUserVoter())
+		{
+			$this->rights = 'voter';
+		}
+		else
+		{
+			$this->rights = 'user';
+		}
 
-        if($postId == '')
-        {
-            $this->isDetailedView = FALSE;
-        }
-        else
-        {
-            $this->isDetailedView = TRUE;
-        }
-    }
+		if($postId == '')
+		{
+			$this->isDetailedView = FALSE;
+		}
+		else
+		{
+			$this->isDetailedView = TRUE;
+		}
+	}
 	/**
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
-        //Replace # with link
-        //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
+	{   //ToDO
+		//Replace # with link
+		//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
-        //Time to time difference
-        $now = new DateTime();
-        $d = new DateTime($post['created_at']);
-        $timediff = $now->diff($d);
+		//Time to time difference
+		$now = new DateTime();
+		$d = new DateTime($post['created_at']);
+		$timediff = $now->diff($d);
 
-        $timediff_inSeconds = (string)$timediff->format('%s');
-        $timediff_inMinutes = (string)$timediff->format('%i');
-        $timediff_inHours = (string)$timediff->format('%h');
-        $timediff_inDays = (string)$timediff->format('%d');
-        $timediff_inMonth = (string)$timediff->format('%m');
+		$timediff_inSeconds = (string)$timediff->format('%s');
+		$timediff_inMinutes = (string)$timediff->format('%i');
+		$timediff_inHours = (string)$timediff->format('%h');
+		$timediff_inDays = (string)$timediff->format('%d');
+		$timediff_inMonth = (string)$timediff->format('%m');
 
-        if($timediff_inMonth!=0)
-        {
-                $timediff = $timediff_inMonth . "m";
-        }
-        else
-        {
-            if($timediff_inDays!=0)
-            {
-                $timediff = $timediff_inDays . "d";
-            }
-            else
-            {
-                if($timediff_inHours!=0)
-                {
-                    $timediff = $timediff_inHours . "h";
-                }
-                else
-                {
-                    if($timediff_inMinutes!=0)
-                    {
-                        $timediff = $timediff_inMinutes . "m";
-                    }
-                    else
-                    {
-                        $timediff = $timediff_inSeconds . "s";
-                    }
-                }
-            }
-        }
+		if($timediff_inMonth!=0)
+		{
+				$timediff = $timediff_inMonth . "m";
+		}
+		else
+		{
+			if($timediff_inDays!=0)
+			{
+				$timediff = $timediff_inDays . "d";
+			}
+			else
+			{
+				if($timediff_inHours!=0)
+				{
+					$timediff = $timediff_inHours . "h";
+				}
+				else
+				{
+					if($timediff_inMinutes!=0)
+					{
+						$timediff = $timediff_inMinutes . "m";
+					}
+					else
+					{
+						$timediff = $timediff_inSeconds . "s";
+					}
+				}
+			}
+		}
 
 
-        ?>
+		?>
         <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
             <content>
                 <?php 
-                if(isset($post['image_url']))
-                {
-                    $regexRest = '/[^\w$ .!?-]+/u';
+				if(isset($post['image_url']))
+				{
+					$regexRest = '/[^\w$ .!?-]+/u';
 
-                    echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
-                }
-                else {
-                    echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
-                }
-                ?>
+					echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
+				}
+				else {
+					echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
+				}
+				?>
             </content>
             <aside>                    
                 <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
@@ -136,10 +136,10 @@ 
                                 <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post))
-                                    {
-                                        echo $post["child_count"];
-                                    } else echo "0";
-                                    ?>
+									{
+										echo $post["child_count"];
+									} else echo "0";
+									?>
                                 </a>
                             </span>
                             
@@ -159,18 +159,18 @@ 
 						?>
                         <span class="distance">
                             <?php
-                                if($this->isDetailedView)
-                                {
-                                    if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
-                                    {
-                                        ?>
+								if($this->isDetailedView)
+								{
+									if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
+									{
+										?>
                                         <span data-tooltip="Author">
                                             <i class="fa fa-user-o"></i> OJ |
                                         </span>
                                         <?php 
-                                    }
-                                }
-                                ?>
+									}
+								}
+								?>
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
@@ -183,7 +183,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**
@@ -220,147 +220,147 @@ 
 		return $description;
 	}
 
-    function toUrl($msg = '')
-    {
-        $url = $this->baseUrl . 'index.php?country=DE' .
-                            '&city=' . urlencode($this->city) .
-                            '&hashtag=' . urlencode($this->hashtag) . 
-                            '&view=' . $this->view;
-        if($this->postId != '')
-        {
-            $url .= '&postId=' . $this->postId . 
-                    '&getPostDetails=TRUE';
-        }
+	function toUrl($msg = '')
+	{
+		$url = $this->baseUrl . 'index.php?country=DE' .
+							'&city=' . urlencode($this->city) .
+							'&hashtag=' . urlencode($this->hashtag) . 
+							'&view=' . $this->view;
+		if($this->postId != '')
+		{
+			$url .= '&postId=' . $this->postId . 
+					'&getPostDetails=TRUE';
+		}
 
-        if($msg != '')
-        {
-            $url .= '&msg=' . urlencode($msg);
-        }
+		if($msg != '')
+		{
+			$url .= '&msg=' . urlencode($msg);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 
-    function changePostId($postId)
-    {
-        $tempView = clone $this;
-        $tempView->postId = $postId;
-        $tempView->isDetailedView = TRUE;
-        return $tempView;
-    }
+	function changePostId($postId)
+	{
+		$tempView = clone $this;
+		$tempView->postId = $postId;
+		$tempView->isDetailedView = TRUE;
+		return $tempView;
+	}
 
-    function back()
-    {
-        $tempView = clone $this;
-        $tempView->postId = '';
-        return $tempView;
-    }
+	function back()
+	{
+		$tempView = clone $this;
+		$tempView->postId = '';
+		return $tempView;
+	}
 
-    function changeView($view)
-    {
-        $tempView = clone $this;
-        $tempView->view = $view;
-        return $tempView;
-    }
+	function changeView($view)
+	{
+		$tempView = clone $this;
+		$tempView->view = $view;
+		return $tempView;
+	}
 
 	function getPosts($jodelAccount)
 	{
-        if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
-        {
-            $accountCreator = new GetChannel();
-            $accountCreator->view = $this->view;
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->channel = $this->hashtag;
-            $accountCreator->lastPostId = $this->lastPostId;
-            $data = $accountCreator->execute();
-        }
-        else
-        {
-            if($this->lastPostId == '' && $this->view == 'combo')
-            {
-                $url = "/v3/posts/location/combo";
-            }
-            else
-            {
-                if($this->view == 'discussed')
-                {
-                    $url = "/v2/posts/location/discussed/";
-                }
-                else
-                {
-                    if($this->view == 'popular')
-                    {
-                        $url = "/v2/posts/location/popular/";
-                    }
-                    else
-                    {
-                        $url = "/v2/posts/location/";
-                    }
-                }
-            }
+		if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
+		{
+			$accountCreator = new GetChannel();
+			$accountCreator->view = $this->view;
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->channel = $this->hashtag;
+			$accountCreator->lastPostId = $this->lastPostId;
+			$data = $accountCreator->execute();
+		}
+		else
+		{
+			if($this->lastPostId == '' && $this->view == 'combo')
+			{
+				$url = "/v3/posts/location/combo";
+			}
+			else
+			{
+				if($this->view == 'discussed')
+				{
+					$url = "/v2/posts/location/discussed/";
+				}
+				else
+				{
+					if($this->view == 'popular')
+					{
+						$url = "/v2/posts/location/popular/";
+					}
+					else
+					{
+						$url = "/v2/posts/location/";
+					}
+				}
+			}
 
-            $accountCreator = new GetPosts();
-            $accountCreator->setLastPostId($this->lastPostId);
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->setUrl($url);
-            $accountCreator->version = 'v3';
+			$accountCreator = new GetPosts();
+			$accountCreator->setLastPostId($this->lastPostId);
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->setUrl($url);
+			$accountCreator->version = 'v3';
 
-            $config = parse_ini_file('config/config.ini.php');
-            $location = new Location();
-            $location->setLat($config['default_lat']);
-            $location->setLng($config['default_lng']);
-            $location->setCityName($config['default_location']);
-            $accountCreator->location = $location;
-            $data = $accountCreator->execute();
-        }
-    	if(array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
-        {
-            return $data['recent'];
-        }
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
-        {
-            return $data['posts'];
-        }
-        else
-        {
-            if($this->lastPostId == '')
-            {
-                error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
-                //error_log(print_r($data, true));
+			$config = parse_ini_file('config/config.ini.php');
+			$location = new Location();
+			$location->setLat($config['default_lat']);
+			$location->setLng($config['default_lng']);
+			$location->setCityName($config['default_location']);
+			$accountCreator->location = $location;
+			$data = $accountCreator->execute();
+		}
+		if(array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
+		{
+			return $data['recent'];
+		}
+		else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+		{
+			return $data['posts'];
+		}
+		else
+		{
+			if($this->lastPostId == '')
+			{
+				error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
+				//error_log(print_r($data, true));
 
-                $notFound[0] = array(
-                    "post_id" => "0",
-                    "discovered_by" => 0,
-                    "message" => "No more Posts found",
-                    "created_at" => "2017-02-11T16:44:50.385Z",
-                    "updated_at" => "2017-02-11T16:44:50.385Z",
-                    "pin_count" => 0,
-                    "color" => "5682a3",
-                    "got_thanks" => FALSE,
-                    "post_own" => "friend",
-                    "discovered" => 0,
-                    "distance" => 9,
-                    "vote_count" => 0,
-                    "location" =>
-                    array("name" => "Berlin",
-                      "loc_coordinates" =>
-                      array(
-                        "lat" => 0,
-                        "lng" => 0
-                      ),
-                      "loc_accuracy" => 0,
-                      "country" => "",
-                      "city" => "",
-                    ),
-                    "tags" =>
-                    array(),
-                    "user_handle" => "0"
-                );
-                return $notFound;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
+				$notFound[0] = array(
+					"post_id" => "0",
+					"discovered_by" => 0,
+					"message" => "No more Posts found",
+					"created_at" => "2017-02-11T16:44:50.385Z",
+					"updated_at" => "2017-02-11T16:44:50.385Z",
+					"pin_count" => 0,
+					"color" => "5682a3",
+					"got_thanks" => FALSE,
+					"post_own" => "friend",
+					"discovered" => 0,
+					"distance" => 9,
+					"vote_count" => 0,
+					"location" =>
+					array("name" => "Berlin",
+					  "loc_coordinates" =>
+					  array(
+						"lat" => 0,
+						"lng" => 0
+					  ),
+					  "loc_accuracy" => 0,
+					  "country" => "",
+					  "city" => "",
+					),
+					"tags" =>
+					array(),
+					"user_handle" => "0"
+				);
+				return $notFound;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
 	}
 }

Spacing +15 added lines, -15 removed lines

@@ -63,25 +63,25 @@ 
         $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
         {
-            if($timediff_inDays!=0)
+            if($timediff_inDays != 0)
             {
                 $timediff = $timediff_inDays . "d";
             }
             else
             {
-                if($timediff_inHours!=0)
+                if($timediff_inHours != 0)
                 {
                     $timediff = $timediff_inHours . "h";
                 }
                 else
                 {
-                    if($timediff_inMinutes!=0)
+                    if($timediff_inMinutes != 0)
                     {
                         $timediff = $timediff_inMinutes . "m";
                     }
@@ -95,7 +95,7 @@ 
 
 
         ?>
-        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
+        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
             <content>
                 <?php 
                 if(isset($post['image_url']))
@@ -110,12 +110,12 @@ 
                 ?>
             </content>
             <aside>                    
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'up', this)">
                     <i class="fa fa-angle-up fa-3x"></i>
                 </button>    
-                <br><span><?php echo $post["vote_count"];?></span><br>
+                <br><span><?php echo $post["vote_count"]; ?></span><br>
 
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'down', this)">
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'down', this)">
                     <i class="fa fa-angle-down fa-3x"></i>
                 </button>
             </aside>
@@ -126,14 +126,14 @@ 
                         <span class="time">
                             <span class="tip" data-tooltip="Time">
                                 <i class="fa fa-clock-o"></i>
-                                <?php echo $timediff;?>
-                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
+                                <?php echo $timediff; ?>
+                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
                             </span> 
                         </span>
 						<?php if(!$this->isDetailedView) {?>
                         <span class="comments">
                             <span data-tooltip="Comments">
-                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
+                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl(); ?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post))
                                     {
@@ -174,8 +174,8 @@ 
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
-                                <?php echo $post['distance'];?> km
-                                <span class="tiptext"><?php echo $post['location']['name'];?></span>
+                                <?php echo $post['distance']; ?> km
+                                <span class="tiptext"><?php echo $post['location']['name']; ?></span>
                             </span>
                         </span>
                     
@@ -214,7 +214,7 @@ 
 
 		if($post != '' && array_key_exists('message', $post) && $post['message'] != '' && $this->isDetailedView)
 		{
-			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) .  ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
+			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) . ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
 		}
 
 		return $description;
@@ -316,7 +316,7 @@ 
         {
             return $data['recent'];
         }
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+        else if(array_key_exists('posts', $data) && array_key_exists(0, $data['posts']))
         {
             return $data['posts'];
         }