mmainstreet / jodel-web

php/Requests/PostCaptcha.php

Indentation +16 added lines, -16 removed lines

@@ -2,22 +2,22 @@
 class PostCaptcha extends AbstractRequest
 {
 	public $captchaKey;
-    public $captchaSolution;
+	public $captchaSolution;
 
-    function getApiEndPoint()
-    {
-        return '/v3/user/verification/imageCaptcha/';
-    }
-    function getPayload()
-    {
-        return array(
-            'key' => $this->captchaKey,
-            'answer' => $this->captchaSolution,
-        );
-    }
-    function getMethod()
-    {
-        return 'POST';
-    }
+	function getApiEndPoint()
+	{
+		return '/v3/user/verification/imageCaptcha/';
+	}
+	function getPayload()
+	{
+		return array(
+			'key' => $this->captchaKey,
+			'answer' => $this->captchaSolution,
+		);
+	}
+	function getMethod()
+	{
+		return 'POST';
+	}
 }
 

php/Requests/GetUserConfig.php

Indentation +13 added lines, -13 removed lines

@@ -2,18 +2,18 @@
 class GetUserConfig extends AbstractRequest
 {
 		
-    function getApiEndPoint()
-    {
-        return '/v3/user/config/';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v3/user/config/';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

php/Requests/GetCaptcha.php

Indentation +13 added lines, -13 removed lines

@@ -1,18 +1,18 @@
 <?php
 class GetCaptcha extends AbstractRequest
 {		
-    function getApiEndPoint()
-    {
-        return '/v3/user/verification/imageCaptcha/';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v3/user/verification/imageCaptcha/';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

Braces +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 class GetCaptcha extends AbstractRequest
-{		
+{
     function getApiEndPoint()
     {
         return '/v3/user/verification/imageCaptcha/';

php/Jodel.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 class Jodel
 {
-    public $jodel;
+	public $jodel;
 
    
 }
\ No newline at end of file

php/jodel-web.php

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

@@ -43,7 +43,7 @@
 {
     preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
 
-    return (isset($matches[0])) ? true : false;
+    return (isset($matches[0])) ? TRUE : FALSE;
 }
 
 function configPropertyExists($config, $property)

Braces +6 added lines, -4 removed lines

@@ -55,7 +55,8 @@ 
         return TRUE;
     }
 }
-function isUserAdmin() {
+function isUserAdmin()
+{
 	global $config;
 	if (isset($_COOKIE['JodelAdminPassword']) && configPropertyExists($config, 'pw') && $config['pw'] == $_COOKIE['JodelAdminPassword'])
 	{
@@ -106,7 +107,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -176,7 +177,8 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'discussed':
 				$view = 'discussed';
 				break;
@@ -223,7 +225,7 @@ 
 	{
 		$jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
 		if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails']))
-        {
+		{
             header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
         }
         else

Doc Comments +6 added lines

@@ -37,6 +37,9 @@ 
 	die();
 }
 
+/**
+ * @param string $msg
+ */
 function user_log($msg)
 {
     $log  = $msg . PHP_EOL;
@@ -51,6 +54,9 @@ 
     return (isset($matches[0])) ? true : false;
 }
 
+/**
+ * @param string $property
+ */
 function configPropertyExists($config, $property)
 {
     if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')

Indentation +38 added lines, -38 removed lines

@@ -39,27 +39,27 @@ 
 
 function user_log($msg)
 {
-    $log  = $msg . PHP_EOL;
-    file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND);
+	$log  = $msg . PHP_EOL;
+	file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND);
 }
 
 function isUserBot()
 {
-    preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
+	preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
 
-    return (isset($matches[0])) ? true : false;
+	return (isset($matches[0])) ? true : false;
 }
 
 function configPropertyExists($config, $property)
 {
-    if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-    {
-        return FALSE;
-    }
-    else
-    {
-        return TRUE;
-    }
+	if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+	{
+		return FALSE;
+	}
+	else
+	{
+		return TRUE;
+	}
 }
 function isUserAdmin() {
 	global $config;
@@ -75,17 +75,17 @@ 
 
 function isDeviceUidInDatabase($deviceUid)
 {
-    $db = new DatabaseConnect();  
-    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
-
-    if ($result->num_rows > 0)
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+	$db = new DatabaseConnect();  
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+
+	if ($result->num_rows > 0)
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
 }
 
 	//Check if it's a Spider or Google Bot
@@ -112,14 +112,14 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
-    	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
-    }
-    else
-    {
-    	error_log("No Karma deviceUid set in config file");
+	{
+		$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
+	}
+	else
+	{
+		error_log("No Karma deviceUid set in config file");
 		$jodelAccountForKarma = new JodelAccount($deviceUid);
-    }
+	}
 
 	/*
 	 * Cunstruct View
@@ -229,14 +229,14 @@ 
 	{
 		$jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
 		if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails']))
-        {
-            header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
-        }
-        else
-        {
-            header("Location: index.php#postId-" . htmlspecialchars($_GET['postId']));
-        }   
-        die();
+		{
+			header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
+		}
+		else
+		{
+			header("Location: index.php#postId-" . htmlspecialchars($_GET['postId']));
+		}   
+		die();
 	}
 	
 	//SendJodel

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
 
 function user_log($msg)
 {
-    $log  = $msg . PHP_EOL;
+    $log = $msg . PHP_EOL;
     file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND);
 }
 
@@ -47,7 +47,7 @@ 
 {
     preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
 
-    return (isset($matches[0])) ? true : false;
+    return (isset($matches[0]))?true : false;
 }
 
 function configPropertyExists($config, $property)
@@ -63,7 +63,7 @@ 
 }
 function isUserAdmin() {
 	global $config;
-	if (isset($_COOKIE['JodelAdminPassword']) && configPropertyExists($config, 'pw') && $config['pw'] == $_COOKIE['JodelAdminPassword'])
+	if(isset($_COOKIE['JodelAdminPassword']) && configPropertyExists($config, 'pw') && $config['pw'] == $_COOKIE['JodelAdminPassword'])
 	{
 		return TRUE;
 	}
@@ -76,9 +76,9 @@ 
 function isDeviceUidInDatabase($deviceUid)
 {
     $db = new DatabaseConnect();  
-    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 
-    if ($result->num_rows > 0)
+    if($result->num_rows > 0)
     {
         return TRUE;
     }
@@ -100,8 +100,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$jodelAccountForView = new JodelAccount();
-			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time()+60*60*24*365*10);
-			user_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			user_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -130,7 +130,7 @@ 
 	if(isset($_GET['search']))
 	{
 
-		user_log('User with JodelDeviceId:' . $jodelAccountForView->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] searched for ' . $_GET['search']);
+		user_log('User with JodelDeviceId:' . $jodelAccountForView->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] searched for ' . $_GET['search']);
 
 		if(substr($_GET['search'], 0, 1) === "#")
 		{
@@ -185,7 +185,7 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'discussed':
 				$view = 'discussed';
 				break;

php/JodelAccount.php

Doc Comments +3 added lines

@@ -385,6 +385,9 @@
         }       
     }
 
+    /**
+     * @param Location $location
+     */
     function registerAccount($location) {
         $accountCreator = new CreateUser();
         $accountCreator->setLocation($location);

Braces +12 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
         if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
         {
             return TRUE;
-        }  
+        }
         else
         {
             return FALSE;
@@ -100,7 +100,7 @@ 
         if(substr($_GET['city'], 0, 1) === '#')
         {
             return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
-        }                
+        }
         else
         {
             $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
@@ -262,7 +262,8 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch ($color)
+            {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -355,7 +356,8 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === false)
+        {
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -435,14 +437,16 @@ 
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
+        if($result === false)
+        {
                 $error = db_error();
                 echo $error;
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
         }       
     }
 
-    function registerAccount($location) {
+    function registerAccount($location)
+    {
         $accountCreator = new CreateUser();
         $accountCreator->setLocation($location);
         $data = $accountCreator->execute();
@@ -467,7 +471,8 @@ 
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
         $success = TRUE;
-        if($result === false){
+        if($result === false)
+        {
                 $error = db_error();
                 echo $error;
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;

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

@@ -51,16 +51,16 @@ 
     {
         $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
         $result = Requests::post($url);
-        if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
+        if(json_decode($result->body, TRUE)['status'] == 'ZERO_RESULTS' || json_decode($result->body, TRUE)['status'] == 'INVALID_REQUEST')
         {
             error_log('Error locationEquals');
             return FALSE;
         }
         else
         {
-            $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
-            $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
-            $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
+            $name = json_decode($result->body, TRUE)['results']['0']['address_components']['0']['long_name'];
+            $lat = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lat'];
+            $lng = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lng'];
         }
 
         $db = new DatabaseConnect();
@@ -105,15 +105,15 @@ 
         {
             $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
             $result = Requests::post($url);
-            if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
+            if(json_decode($result->body, TRUE)['status'] == 'ZERO_RESULTS' || json_decode($result->body, TRUE)['status'] == 'INVALID_REQUEST')
             {
                 return "0 results";
             }
             else
             {
-                $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
-                $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
-                $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
+                $name = json_decode($result->body, TRUE)['results']['0']['address_components']['0']['long_name'];
+                $lat = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lat'];
+                $lng = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lng'];
 
                 $location = new Location();
                 $location->setLat($lat);
@@ -135,7 +135,7 @@ 
                                 lng='" . $lng . "'
                             WHERE access_token='" . $this->accessToken . "'");
 
-                    if($result === false)
+                    if($result === FALSE)
                     {
                             echo "Updating location failed: (" . $db->errno . ") " . $db->error;
                     }
@@ -355,7 +355,7 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === FALSE){
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -403,7 +403,7 @@ 
 
         $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
         
-        if($result === false)
+        if($result === FALSE)
         {
             $error = db_error();
             echo $error;
@@ -435,7 +435,7 @@ 
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
+        if($result === FALSE){
                 $error = db_error();
                 echo $error;
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -467,7 +467,7 @@ 
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
         $success = TRUE;
-        if($result === false){
+        if($result === FALSE){
                 $error = db_error();
                 echo $error;
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;

Indentation +446 added lines, -446 removed lines

@@ -2,490 +2,490 @@
 
 class JodelAccount
 {
-    public $accessToken;
-    public $expirationDate;
-    public $refreshToken;
-    public $distinctId;
-    public $deviceUid;
-
-    //is the Account a Bot or Spider?
-    public $isBot;
+	public $accessToken;
+	public $expirationDate;
+	public $refreshToken;
+	public $distinctId;
+	public $deviceUid;
+
+	//is the Account a Bot or Spider?
+	public $isBot;
     
-    // array of voted Jodels
-    public $votes;
-
-    //Location of the Account
-    public $location;
-
-    function __construct($deviceUid = NULL, $isBot = FALSE)
-    {
-        if($deviceUid == NULL)
-        {
-            $this->deviceUid = $this->createAccount();
-        }
-        else
-        {
-            $this->deviceUid = $deviceUid;
-        }
-
-        $this->isBot        = $isBot;
-        $this->location     = $this->getLocation();
-
-        if(!$this->isTokenFresh())
-        {
-            $this->refreshToken();
-        }
-        $this->accessToken  = $this->getAccessToken();
-    }
-
-    function isAccountVerified()
-    {
-        $accountCreator = new GetUserConfig();
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
-
-        return $data['verified'];
-    }
-
-    function locationEquals($city)
-    {
-        $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
-        $result = Requests::post($url);
-        if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
-        {
-            error_log('Error locationEquals');
-            return FALSE;
-        }
-        else
-        {
-            $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
-            $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
-            $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
-        }
-
-        $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+	// array of voted Jodels
+	public $votes;
+
+	//Location of the Account
+	public $location;
+
+	function __construct($deviceUid = NULL, $isBot = FALSE)
+	{
+		if($deviceUid == NULL)
+		{
+			$this->deviceUid = $this->createAccount();
+		}
+		else
+		{
+			$this->deviceUid = $deviceUid;
+		}
+
+		$this->isBot        = $isBot;
+		$this->location     = $this->getLocation();
+
+		if(!$this->isTokenFresh())
+		{
+			$this->refreshToken();
+		}
+		$this->accessToken  = $this->getAccessToken();
+	}
+
+	function isAccountVerified()
+	{
+		$accountCreator = new GetUserConfig();
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
+
+		return $data['verified'];
+	}
+
+	function locationEquals($city)
+	{
+		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
+		$result = Requests::post($url);
+		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
+		{
+			error_log('Error locationEquals');
+			return FALSE;
+		}
+		else
+		{
+			$name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
+			$lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
+			$lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
+		}
+
+		$db = new DatabaseConnect();
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
         
-        $location = new Location();
+		$location = new Location();
         
-        if ($result->num_rows > 0)
-        {
-            // output data of each row
-            while($row = $result->fetch_assoc())
-            {
-                $location->setLat($row['lat']);
-                $location->setLng($row['lng']);
-                $location->setCityName($row['name']);
-            }
-        }
-        else
-        {
-            echo "Error: 0 results";
-            error_log("Error no Location found - getLocation");
-        }
-
-        if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
-        {
-            return TRUE;
-        }  
-        else
-        {
-            return FALSE;
-        }
-    }
-
-    function setLocation()
-    {
-        //Is Channel or City
-        if(substr($_GET['city'], 0, 1) === '#')
-        {
-            return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
-        }                
-        else
-        {
-            $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
-            $result = Requests::post($url);
-            if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
-            {
-                return "0 results";
-            }
-            else
-            {
-                $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
-                $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
-                $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
-
-                $location = new Location();
-                $location->setLat($lat);
-                $location->setLng($lng);
-                $location->setCityName($name);
-                $accountCreator = new UpdateLocation();
-                $accountCreator->setLocation($location);
-                $accountCreator->setAccessToken($this->accessToken);
-                $data = $accountCreator->execute();
-
-                //safe location to db
-                $db = new DatabaseConnect();
-
-                if($data == 'Success')
-                {
-                    $result = $db->query("UPDATE accounts 
+		if ($result->num_rows > 0)
+		{
+			// output data of each row
+			while($row = $result->fetch_assoc())
+			{
+				$location->setLat($row['lat']);
+				$location->setLng($row['lng']);
+				$location->setCityName($row['name']);
+			}
+		}
+		else
+		{
+			echo "Error: 0 results";
+			error_log("Error no Location found - getLocation");
+		}
+
+		if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
+		{
+			return TRUE;
+		}  
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	function setLocation()
+	{
+		//Is Channel or City
+		if(substr($_GET['city'], 0, 1) === '#')
+		{
+			return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
+		}                
+		else
+		{
+			$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
+			$result = Requests::post($url);
+			if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
+			{
+				return "0 results";
+			}
+			else
+			{
+				$name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
+				$lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
+				$lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
+
+				$location = new Location();
+				$location->setLat($lat);
+				$location->setLng($lng);
+				$location->setCityName($name);
+				$accountCreator = new UpdateLocation();
+				$accountCreator->setLocation($location);
+				$accountCreator->setAccessToken($this->accessToken);
+				$data = $accountCreator->execute();
+
+				//safe location to db
+				$db = new DatabaseConnect();
+
+				if($data == 'Success')
+				{
+					$result = $db->query("UPDATE accounts 
                             SET name='" . $name . "',
                                 lat='" . $lat . "',
                                 lng='" . $lng . "'
                             WHERE access_token='" . $this->accessToken . "'");
 
-                    if($result === false)
-                    {
-                            echo "Updating location failed: (" . $db->errno . ") " . $db->error;
-                    }
-                    else
-                    {
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
-                    }
-                }
-
-                return $name;
-            }
-        }
-    }
-
-    function getLocation()
-    {
-        $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+					if($result === false)
+					{
+							echo "Updating location failed: (" . $db->errno . ") " . $db->error;
+					}
+					else
+					{
+						user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+					}
+				}
+
+				return $name;
+			}
+		}
+	}
+
+	function getLocation()
+	{
+		$db = new DatabaseConnect();
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
         
-        $location = new Location();
+		$location = new Location();
         
-        if ($result->num_rows > 0)
-        {
-            // output data of each row
-            while($row = $result->fetch_assoc())
-            {
-                $location->setLat($row['lat']);
-                $location->setLng($row['lng']);
-                $location->setCityName($row['name']);
-            }
-        }
-        else
-        {
-            echo "Error: 0 results";
-            error_log("Error no Location found - getLocation");
-        }
-
-        return $location;
-    }
-
-    function verifyCaptcha()
-    {
-        if(isset($_GET['deviceUid']))
-        {
-            $deviceUid = $_GET['deviceUid'];
-        }
-        if(isset($_POST['deviceUid']))
-        {
-            $deviceUid = $_POST['deviceUid'];
-        }
-        $jodelAccountForVerify = new JodelAccount($deviceUid);
-
-        $solution = $_GET['solution'];
-        $solution = array_map('intval', explode('-', $solution));
-
-        $accountCreator = new PostCaptcha();
-        $accountCreator->setAccessToken($jodelAccountForVerify->accessToken);
-        $accountCreator->captchaKey = $_GET['key'];
-        $accountCreator->captchaSolution = $solution;
-        $verified = $accountCreator->execute();
-
-        if(isset($verified->status_code))
-        {
-            return $verified->status_code;
-        }
-        return $verified['verified'];
-    }
-
-    //ToDo Spider Check
-    function votePostId($postId, $vote)
-    {
-        if(!$this->isAccountVerified())
-        {
-            $view = new View();
-            $view->showCaptcha($this->accessToken, $this->deviceUid);
-        }
-
-        if(!$this->hasVoted($postId))
-        {
-            if($vote == "up")
-            {
-                $accountCreator = new Upvote();
-            }
-            else if($vote == "down")
-            {
-                $accountCreator = new Downvote();
-            }
-            $accountCreator->setAccessToken($this->accessToken);
-            $accountCreator->postId = htmlspecialchars($postId);
-            $data = $accountCreator->execute();
-
-            if(array_key_exists('post', $data))
-            {
-                $this->addVoteWithPostIdAndType($postId, $vote);
-                return TRUE;
-            }
-            else
-            {
-                error_log("Could not vote: " . var_dump($data));
-                return FALSE;
-            } 
-        }
-        else
-        {
-            return FALSE;
-        }
-    }
-
-    //ToDo Spider Check
-    function sendJodel($location, $view)
-    {
-        if(!$this->isAccountVerified())
-        {
-            showCaptcha($this->accessToken);
-        }
-
-        $accountCreator = new SendJodel();
-
-        if(isset($_POST['ancestor']))
-        {
-            $ancestor = $_POST['ancestor'];
-            $accountCreator->ancestor = $ancestor;
-        }
-        if(isset($_POST['color']))
-        {
-            $color = $_POST['color'];
-            switch ($color) {
-                case '8ABDB0':
-                    $color = '8ABDB0';
-                    break;
-                case '9EC41C':
-                    $color = '9EC41C';
-                    break;
-                case '06A3CB':
-                    $color = '06A3CB';
-                    break;
-                case 'FFBA00':
-                    $color = 'FFBA00';
-                    break;
-                case 'DD5F5F':
-                    $color = 'DD5F5F';
-                    break;
-                case 'FF9908':
-                    $color = 'FF9908';
-                    break;
-                default:
-                    $color = '8ABDB0';
-                    break;
-            }
-            $accountCreator->color = $color;
-        }
-
-        $accountCreatorLocation = new UpdateLocation();
-        $accountCreatorLocation->setLocation($location);
-        $accountCreatorLocation->setAccessToken($this->accessToken);
-        $data = $accountCreatorLocation->execute();
+		if ($result->num_rows > 0)
+		{
+			// output data of each row
+			while($row = $result->fetch_assoc())
+			{
+				$location->setLat($row['lat']);
+				$location->setLng($row['lng']);
+				$location->setCityName($row['name']);
+			}
+		}
+		else
+		{
+			echo "Error: 0 results";
+			error_log("Error no Location found - getLocation");
+		}
+
+		return $location;
+	}
+
+	function verifyCaptcha()
+	{
+		if(isset($_GET['deviceUid']))
+		{
+			$deviceUid = $_GET['deviceUid'];
+		}
+		if(isset($_POST['deviceUid']))
+		{
+			$deviceUid = $_POST['deviceUid'];
+		}
+		$jodelAccountForVerify = new JodelAccount($deviceUid);
+
+		$solution = $_GET['solution'];
+		$solution = array_map('intval', explode('-', $solution));
+
+		$accountCreator = new PostCaptcha();
+		$accountCreator->setAccessToken($jodelAccountForVerify->accessToken);
+		$accountCreator->captchaKey = $_GET['key'];
+		$accountCreator->captchaSolution = $solution;
+		$verified = $accountCreator->execute();
+
+		if(isset($verified->status_code))
+		{
+			return $verified->status_code;
+		}
+		return $verified['verified'];
+	}
+
+	//ToDo Spider Check
+	function votePostId($postId, $vote)
+	{
+		if(!$this->isAccountVerified())
+		{
+			$view = new View();
+			$view->showCaptcha($this->accessToken, $this->deviceUid);
+		}
+
+		if(!$this->hasVoted($postId))
+		{
+			if($vote == "up")
+			{
+				$accountCreator = new Upvote();
+			}
+			else if($vote == "down")
+			{
+				$accountCreator = new Downvote();
+			}
+			$accountCreator->setAccessToken($this->accessToken);
+			$accountCreator->postId = htmlspecialchars($postId);
+			$data = $accountCreator->execute();
+
+			if(array_key_exists('post', $data))
+			{
+				$this->addVoteWithPostIdAndType($postId, $vote);
+				return TRUE;
+			}
+			else
+			{
+				error_log("Could not vote: " . var_dump($data));
+				return FALSE;
+			} 
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
+
+	//ToDo Spider Check
+	function sendJodel($location, $view)
+	{
+		if(!$this->isAccountVerified())
+		{
+			showCaptcha($this->accessToken);
+		}
+
+		$accountCreator = new SendJodel();
+
+		if(isset($_POST['ancestor']))
+		{
+			$ancestor = $_POST['ancestor'];
+			$accountCreator->ancestor = $ancestor;
+		}
+		if(isset($_POST['color']))
+		{
+			$color = $_POST['color'];
+			switch ($color) {
+				case '8ABDB0':
+					$color = '8ABDB0';
+					break;
+				case '9EC41C':
+					$color = '9EC41C';
+					break;
+				case '06A3CB':
+					$color = '06A3CB';
+					break;
+				case 'FFBA00':
+					$color = 'FFBA00';
+					break;
+				case 'DD5F5F':
+					$color = 'DD5F5F';
+					break;
+				case 'FF9908':
+					$color = 'FF9908';
+					break;
+				default:
+					$color = '8ABDB0';
+					break;
+			}
+			$accountCreator->color = $color;
+		}
+
+		$accountCreatorLocation = new UpdateLocation();
+		$accountCreatorLocation->setLocation($location);
+		$accountCreatorLocation->setAccessToken($this->accessToken);
+		$data = $accountCreatorLocation->execute();
         
-        $accountCreator->location = $this->location;
+		$accountCreator->location = $this->location;
         
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
-
-        if(isset($_POST['ancestor']))
-        {
-            header('Location: ' . $view->toUrl());
-            exit;
-        }
-        else
-        {
-            header('Location: ' . $baseUrl);
-            exit;
-        }
-    }
-
-    function isTokenFresh()
-    {
-        $db = new DatabaseConnect();  
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
-
-        if ($result->num_rows > 0)
-        {
-            // output data of each row
-            while($row = $result->fetch_assoc())
-            {
-                    $expiration_date = $row["expiration_date"];
-            }
-        }
-        else
-        {
-            error_log('0 results');
-        }
-
-        if($expiration_date <= time())
-        {
-           return FALSE;
-        }
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
+
+		if(isset($_POST['ancestor']))
+		{
+			header('Location: ' . $view->toUrl());
+			exit;
+		}
+		else
+		{
+			header('Location: ' . $baseUrl);
+			exit;
+		}
+	}
+
+	function isTokenFresh()
+	{
+		$db = new DatabaseConnect();  
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
+
+		if ($result->num_rows > 0)
+		{
+			// output data of each row
+			while($row = $result->fetch_assoc())
+			{
+					$expiration_date = $row["expiration_date"];
+			}
+		}
+		else
+		{
+			error_log('0 results');
+		}
+
+		if($expiration_date <= time())
+		{
+		   return FALSE;
+		}
         
-        return TRUE;
-    }
-
-    function refreshToken()
-    {
-        $accountCreator = new CreateUser();
-        $accountCreator->setAccessToken($this->accessToken);
-        $accountCreator->setDeviceUid($this->deviceUid);
-        $accountCreator->setLocation($this->location);
-        $data = $accountCreator->execute();
-
-        $access_token = (string)$data[0]['access_token'];
-        $expiration_date = $data[0]['expiration_date'];
-        $device_uid = (string)$data[1];
+		return TRUE;
+	}
+
+	function refreshToken()
+	{
+		$accountCreator = new CreateUser();
+		$accountCreator->setAccessToken($this->accessToken);
+		$accountCreator->setDeviceUid($this->deviceUid);
+		$accountCreator->setLocation($this->location);
+		$data = $accountCreator->execute();
+
+		$access_token = (string)$data[0]['access_token'];
+		$expiration_date = $data[0]['expiration_date'];
+		$device_uid = (string)$data[1];
         
-        $db = new DatabaseConnect();  
-        $result = $db->query("UPDATE accounts 
+		$db = new DatabaseConnect();  
+		$result = $db->query("UPDATE accounts 
                                 SET access_token='" . $access_token . "',
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
-                error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
-        }   
-    }
+		if($result === false){
+				error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
+		}   
+	}
 
 
 
-    function getAccessToken()
-    {
-        $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+	function getAccessToken()
+	{
+		$db = new DatabaseConnect();
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
         
-        $accessToken;
+		$accessToken;
         
-        if ($result->num_rows > 0)
-        {
-            // output data of each row
-            while($row = $result->fetch_assoc())
-            {
-                $accessToken = $row['access_token'];
-            }
-        }
-        else
-        {
-            error_log('Error: 0 results');
-        }
-
-        return $accessToken;
-    }
-
-
-    function getKarma()
-    {
-        $accountCreator = new GetKarma();
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
+		if ($result->num_rows > 0)
+		{
+			// output data of each row
+			while($row = $result->fetch_assoc())
+			{
+				$accessToken = $row['access_token'];
+			}
+		}
+		else
+		{
+			error_log('Error: 0 results');
+		}
+
+		return $accessToken;
+	}
+
+
+	function getKarma()
+	{
+		$accountCreator = new GetKarma();
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
         
-        return $data["karma"];
-    }
+		return $data["karma"];
+	}
 
-    function hasVoted($postId)
-    {
-        $db = new DatabaseConnect();
+	function hasVoted($postId)
+	{
+		$db = new DatabaseConnect();
 
-        $postId = $db->real_escape_string($postId);
+		$postId = $db->real_escape_string($postId);
 
-        $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
+		$result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
         
-        if($result === false)
-        {
-            $error = db_error();
-            echo $error;
-            error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error);
-        }
-
-        if($result->num_rows == 0)
-        {
-            return FALSE;
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function addVoteWithPostIdAndType($postId, $voteType)
-    {
-        $db = new DatabaseConnect();  
-
-        $postId = $db->real_escape_string($postId);
-        $voteType = $db->real_escape_string($voteType);
+		if($result === false)
+		{
+			$error = db_error();
+			echo $error;
+			error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error);
+		}
+
+		if($result->num_rows == 0)
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+
+	function addVoteWithPostIdAndType($postId, $voteType)
+	{
+		$db = new DatabaseConnect();  
+
+		$postId = $db->real_escape_string($postId);
+		$voteType = $db->real_escape_string($voteType);
         
-        if($this->hasVoted($postId))
-        {
-            return "Already voted";
-        }
+		if($this->hasVoted($postId))
+		{
+			return "Already voted";
+		}
 
-        $result = $db->query("INSERT INTO votes (device_uid, postId, type)
+		$result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
-                $error = db_error();
-                echo $error;
-                echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
-        }       
-    }
-
-    function registerAccount($location) {
-        $accountCreator = new CreateUser();
-        $accountCreator->setLocation($location);
-        $data = $accountCreator->execute();
+		if($result === false){
+				$error = db_error();
+				echo $error;
+				echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
+		}       
+	}
+
+	function registerAccount($location) {
+		$accountCreator = new CreateUser();
+		$accountCreator->setLocation($location);
+		$data = $accountCreator->execute();
         
-        $access_token = (string)$data[0]['access_token'];
-        $refresh_token = (string)$data[0]['refresh_token'];
-        $token_type = (string)$data[0]['token_type'];
-        $expires_in = $data[0]['expires_in'];
-        $expiration_date = $data[0]['expiration_date'];
-        $distinct_id = (string)$data[0]['distinct_id'];
-        $device_uid = (string)$data[1];
-
-        $name = $location->cityName;
-        $lat = $location->lat;
-        $lng = $location->lng;
+		$access_token = (string)$data[0]['access_token'];
+		$refresh_token = (string)$data[0]['refresh_token'];
+		$token_type = (string)$data[0]['token_type'];
+		$expires_in = $data[0]['expires_in'];
+		$expiration_date = $data[0]['expiration_date'];
+		$distinct_id = (string)$data[0]['distinct_id'];
+		$device_uid = (string)$data[1];
+
+		$name = $location->cityName;
+		$lat = $location->lat;
+		$lng = $location->lng;
         
-        $db = new DatabaseConnect();  
-        $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
+		$db = new DatabaseConnect();  
+		$result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
-                        "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
-
-        $success = TRUE;
-        if($result === false){
-                $error = db_error();
-                echo $error;
-                echo "Adding account failed: (" . $result->errno . ") " . $result->error;
-                $success = FALSE;
-        }   
+						"','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+						"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
+
+		$success = TRUE;
+		if($result === false){
+				$error = db_error();
+				echo $error;
+				echo "Adding account failed: (" . $result->errno . ") " . $result->error;
+				$success = FALSE;
+		}   
         
-        return $device_uid;
-    }
+		return $device_uid;
+	}
 
-    function createAccount()
-    {
-        $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']);
+	function createAccount()
+	{
+		$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']);
 
-        $deviceUid = $this->registerAccount($location);
+		$deviceUid = $this->registerAccount($location);
 
-        return $deviceUid;
-    }
+		return $deviceUid;
+	}
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
         {
             $this->refreshToken();
         }
-        $this->accessToken  = $this->getAccessToken();
+        $this->accessToken = $this->getAccessToken();
     }
 
     function isAccountVerified()
@@ -64,11 +64,11 @@ 
         }
 
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -141,7 +141,7 @@ 
                     }
                     else
                     {
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+                        user_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
                     }
                 }
 
@@ -153,11 +153,11 @@ 
     function getLocation()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -262,7 +262,7 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch($color) {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -315,7 +315,7 @@ 
         $db = new DatabaseConnect();  
         $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
 
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -354,7 +354,7 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === false) {
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -364,11 +364,11 @@ 
     function getAccessToken()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $accessToken;
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -434,7 +434,7 @@ 
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
+        if($result === false) {
                 $error = db_error();
                 echo $error;
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -462,11 +462,11 @@ 
         $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+                        "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
         $success = TRUE;
-        if($result === false){
+        if($result === false) {
                 $error = db_error();
                 echo $error;
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;

php/View.php

Doc Comments +3 added lines

@@ -204,6 +204,9 @@
 		return array("image_url" => $captcha['image_url'], "key" => $captcha['key']);
 	}
 
+	/**
+	 * @param string $deviceUid
+	 */
 	function showCaptcha($accessToken, $deviceUid)
 	{
 		$accountCreator = new GetCaptcha();

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

@@ -313,7 +313,7 @@
         else
         {
             error_log('Fehler View getPosts ');
-            error_log(print_r($data, true));
+            error_log(print_r($data, TRUE));
 
             $notFound[0] = array(
                 "post_id" => "0",

Indentation +236 added lines, -236 removed lines

@@ -2,107 +2,107 @@ 
 
 class View
 {
-    public $country;
-    public $city;
-    public $hashtag;
+	public $country;
+	public $city;
+	public $hashtag;
 	public $view;
-    public $postId;
-    public $isDetailedView;
-    public $baseUrl;
+	public $postId;
+	public $isDetailedView;
+	public $baseUrl;
 
 	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;
-
-        if($postId == '')
-        {
-            $this->isDetailedView = FALSE;
-        }
-        else
-        {
-            $this->isDetailedView = TRUE;
-        }
-    }
+	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($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);
-
-        //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');
-
-        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";
-                    }
-                }
-            }
-        }
-
-
-        ?>
+	{   //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);
+
+		$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";
+					}
+				}
+			}
+		}
+
+
+		?>
         <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';
-
-                    echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
-                }
-                else {
-                    echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
-                }
-                ?>
+				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'])));
+				}
+				?>
             </content>
             <aside>
                 <?php
-                    if($this->isDetailedView)
-                    {?>
+					if($this->isDetailedView)
+					{?>
                         <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+					else
+					{?>
                         <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
@@ -110,12 +110,12 @@ 
                             <br />
                         <?php echo $post["vote_count"];?><br />
                 <?php
-                    if($this->isDetailedView)
-                    {?>
+					if($this->isDetailedView)
+					{?>
                         <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+					else
+					{?>
                         <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
@@ -138,9 +138,9 @@ 
                                 <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>
                             
@@ -160,30 +160,30 @@ 
 						?>
                         <span class="distance">
                             <?php
-                                if($this->isDetailedView)
-                                {
-                                    if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
-                                    {
-                                        ?>
+								if($this->isDetailedView)
+								{
+									if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
+									{
+										?>
                                         <span data-tooltip="Author">
                                             <i class="fa fa-user-o"></i> OJ |
                                         </span>
                                         <?php 
-                                    }
-                                    else
-                                    {
-                                        //Is not parent Jodel in detailed View
-                                        if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
-                                        {
-                                            ?>
+									}
+									else
+									{
+										//Is not parent Jodel in detailed View
+										if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
+										{
+											?>
                                             <span data-tooltip="Author">
                                                 <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
                                             </span>
                                             <?php
-                                        }
-                                    }
-                                }
-                                ?>
+										}
+									}
+								}
+								?>
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
@@ -196,7 +196,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**
@@ -267,135 +267,135 @@ 
 		
 	}
 
-    function toUrl()
-    {
-        $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';
-        }
-
-        return $url;
-    }
-
-    function changePostId($postId)
-    {
-        $tempView = clone $this;
-        $tempView->postId = $postId;
-        $tempView->isDetailedView = TRUE;
-        return $tempView;
-    }
-
-    function back()
-    {
-        $tempView = clone $this;
-        $tempView->postId = '';
-        return $tempView;
-    }
-
-    function changeView($view)
-    {
-        $tempView = clone $this;
-        $tempView->view = $view;
-        return $tempView;
-    }
+	function toUrl()
+	{
+		$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';
+		}
+
+		return $url;
+	}
+
+	function changePostId($postId)
+	{
+		$tempView = clone $this;
+		$tempView->postId = $postId;
+		$tempView->isDetailedView = TRUE;
+		return $tempView;
+	}
+
+	function back()
+	{
+		$tempView = clone $this;
+		$tempView->postId = '';
+		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/";
-                    }
-                }
-            }
-
-            $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))
-        {
-            return $data['recent'];
-        }
-        else if(array_key_exists('posts', $data))
-        {
-            return $data['posts'];
-        }
-        else
-        {
-            error_log('Fehler View getPosts ');
-            error_log(print_r($data, true));
-
-            $notFound[0] = array(
-                "post_id" => "0",
-                "discovered_by" => 0,
-                "message" => "Not found",
-                "created_at" => "2017-02-11T16:44:50.385Z",
-                "updated_at" => "2017-02-11T16:44:50.385Z",
-                "pin_count" => 0,
-                "color" => "FFBA00",
-                "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;
-        }
+		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';
+
+			$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))
+		{
+			return $data['recent'];
+		}
+		else if(array_key_exists('posts', $data))
+		{
+			return $data['posts'];
+		}
+		else
+		{
+			error_log('Fehler View getPosts ');
+			error_log(print_r($data, true));
+
+			$notFound[0] = array(
+				"post_id" => "0",
+				"discovered_by" => 0,
+				"message" => "Not found",
+				"created_at" => "2017-02-11T16:44:50.385Z",
+				"updated_at" => "2017-02-11T16:44:50.385Z",
+				"pin_count" => 0,
+				"color" => "FFBA00",
+				"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;
+		}
 	}
 }
\ No newline at end of file

Spacing +17 added lines, -17 removed lines

@@ -49,25 +49,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";
                     }
@@ -81,7 +81,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']))
@@ -99,24 +99,24 @@ 
                 <?php
                     if($this->isDetailedView)
                     {?>
-                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
+                        <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
               <?php }
                     else
                     {?>
-                        <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=up&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
                         </a>    
                             <br />
-                        <?php echo $post["vote_count"];?><br />
+                        <?php echo $post["vote_count"]; ?><br />
                 <?php
                     if($this->isDetailedView)
                     {?>
-                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
+                        <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id']; ?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']); ?>" rel="nofollow">
               <?php }
                     else
                     {?>
-                        <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=down&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
                         </a>
@@ -128,14 +128,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)) {
                                                 echo $post["child_count"];
@@ -147,7 +147,7 @@ 
                         </span>
 						<?php
 						}															  
-						if (isUserAdmin())
+						if(isUserAdmin())
 						{
 						?>
 						<span class="voting">
@@ -177,7 +177,7 @@ 
                                         {
                                             ?>
                                             <span data-tooltip="Author">
-                                                <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
+                                                <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"]; ?> |
                                             </span>
                                             <?php
                                         }
@@ -187,8 +187,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>
                     

Braces +24 added lines, -12 removed lines

@@ -34,7 +34,8 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
+ 	{
+//ToDO
         //Replace # with link
         //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -90,7 +91,8 @@ 
 
                     echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
                 }
-                else {
+                else
+                {
                     echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
                 }
                 ?>
@@ -98,11 +100,13 @@ 
             <aside>
                 <?php
                     if($this->isDetailedView)
-                    {?>
+                    {
+?>
                         <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
@@ -111,11 +115,13 @@ 
                         <?php echo $post["vote_count"];?><br />
                 <?php
                     if($this->isDetailedView)
-                    {?>
+                    {
+?>
                         <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
@@ -132,14 +138,20 @@ 
                                 <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
                             </span> 
                         </span>
-						<?php if(!$this->isDetailedView) {?>
+						<?php if(!$this->isDetailedView)
+{
+?>
                         <span class="comments">
                             <span data-tooltip="Comments">
                                 <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)) {
+                                    <?php if(array_key_exists("child_count", $post))
+{
                                                 echo $post["child_count"];
-                                            } else echo "0";
+                                            }
+                                            else {
+                                            	echo "0";
+                                            }
                                     ?>
                                 </a>
                             </span>
@@ -355,7 +367,7 @@ 
             $data = $accountCreator->execute();
         }
     	if(array_key_exists('recent', $data))
-        {
+    	{
             return $data['recent'];
         }
         else if(array_key_exists('posts', $data))

vote-ajax.php

Braces +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 {
 	$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
 }
-else 
+else
 {
 	$response = array("success" => $success, "message" => $message);
 }

Spacing +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 
 if((!isset($_GET['pw']) || $config['pw'] != $_GET['pw']) && !isUserAdmin())
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php');
+	$respone = array("message" => $_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php', "success" => false);
 	echo json_encode($response);
 	die();
 }
@@ -54,7 +54,7 @@ 
 		}
 	}
 
-if (isset($captcha))
+if(isset($captcha))
 {
 	$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
 }

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

@@ -5,7 +5,7 @@ 
 if((!isset($_GET['pw']) || $config['pw'] != $_GET['pw']) && !isUserAdmin())
 {
 	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => FALSE);
 	echo json_encode($response);
 	die();
 }
@@ -21,7 +21,7 @@ 
 }
 
 $message = "";
-$success = true;
+$success = TRUE;
 $token = "";
 	if(isset($_POST['vote']) && isset($_POST['postId']))
 	{
@@ -89,7 +89,7 @@ 
 					$response = array("success" => $jodelAccount->verifyCaptcha());
 					echo json_encode($response);
 					die();
-				$success = false;
+				$success = FALSE;
 			}
 			else
 			{
@@ -99,7 +99,7 @@ 
 		else
 		{
 			$message = 'There is no account available for this jodel. Please create at least one new account to vote this jodel.';
-			$success = false;
+			$success = FALSE;
 		}
 	}
 

php/Requests/GetChannel.php

Indentation +36 added lines, -36 removed lines

@@ -2,41 +2,41 @@
 
 class GetChannel extends AbstractRequest
 {
-    /**
-     * @var Location
-     */
-    public $location;
-    public $channel;
-    public $hasPayload = FALSE;
-    public $lastPostId = '';
-    public $view = 'combo';
+	/**
+	 * @var Location
+	 */
+	public $location;
+	public $channel;
+	public $hasPayload = FALSE;
+	public $lastPostId = '';
+	public $view = 'combo';
 		
-    function getApiEndPoint()
-    {
-        if($this->lastPostId == '')
-        {
-            $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
-        }
-        else
-        {
-            if($this->view == 'combo')
-            {
-                $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
-            }
-            else
-            {
-                $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
-            }
-        }
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		if($this->lastPostId == '')
+		{
+			$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
+		}
+		else
+		{
+			if($this->view == 'combo')
+			{
+				$apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
+			}
+			else
+			{
+				$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
+			}
+		}
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }