mmainstreet / jodel-web

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)

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')

Braces +4 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 function isUserVoter()
 {
 	if(isset($_COOKIE['JodelVoterPassword']))
-	{	
+	{
 		$db = new DatabaseConnect();
 		$result = $db->query("SELECT id FROM users WHERE user_token = '" . $_COOKIE['JodelVoterPassword'] . "'");
 		if($result->num_rows == 0)
@@ -147,7 +147,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -220,7 +220,8 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'discussed':
 				$view = 'discussed';
 				break;

Indentation +31 added lines, -31 removed lines

@@ -49,27 +49,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 isUserVoter()
@@ -110,19 +110,19 @@ 
 
 function isDeviceUidInDatabase($deviceUid)
 {
-    $db = new DatabaseConnect();  
-    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$db = new DatabaseConnect();  
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
 
-    if ($result->num_rows > 0)
-    {
-    	$db->close();
-        return TRUE;
-    }
-    else
-    {
-    	$db->close();
-        return FALSE;
-    }
+	if ($result->num_rows > 0)
+	{
+		$db->close();
+		return TRUE;
+	}
+	else
+	{
+		$db->close();
+		return FALSE;
+	}
 }
 
 	//Check if it's a Spider or Google Bot
@@ -149,14 +149,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

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,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);
 }
 
@@ -57,7 +57,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)
@@ -98,7 +98,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;
 	}
@@ -111,9 +111,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)
     {
     	$db->close();
         return TRUE;
@@ -137,8 +137,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
@@ -167,7 +167,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) === "#")
 		{
@@ -222,7 +222,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);

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
         {
             $this->refreshToken();
         }
-        $this->accessToken  = $this->getAccessToken();
+        $this->accessToken = $this->getAccessToken();
 
        /* if($this->isAccountVerified() != 1)
         {
@@ -106,11 +106,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())
@@ -182,7 +182,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);
                     }
                 }
 
@@ -194,11 +194,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())
@@ -321,7 +321,7 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch($color) {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -389,7 +389,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())
@@ -428,7 +428,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);
         }   
     }
@@ -438,11 +438,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())
@@ -508,7 +508,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;
@@ -536,11 +536,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;

Indentation +467 added lines, -467 removed lines

@@ -2,47 +2,47 @@ 
 
 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;
+	// array of voted Jodels
+	public $votes;
 
-    //Location of the Account
-    public $location;
+	//Location of the Account
+	public $location;
 
-    function __construct($deviceUid = NULL, $isBot = FALSE)
-    {
-        if($deviceUid == NULL)
-        {
-            $this->deviceUid = $this->createAccount();
-        }
-        else
-        {
-            $this->deviceUid = $deviceUid;
-        }
+	function __construct($deviceUid = NULL, $isBot = FALSE)
+	{
+		if($deviceUid == NULL)
+		{
+			$this->deviceUid = $this->createAccount();
+		}
+		else
+		{
+			$this->deviceUid = $deviceUid;
+		}
 
-        $this->isBot        = $isBot;
-        $this->location     = $this->getLocation();
+		$this->isBot        = $isBot;
+		$this->location     = $this->getLocation();
 
-        if(!$this->isTokenFresh())
-        {
-            $this->refreshToken();
-        }
-        $this->accessToken  = $this->getAccessToken();
+		if(!$this->isTokenFresh())
+		{
+			$this->refreshToken();
+		}
+		$this->accessToken  = $this->getAccessToken();
 
-       /* if($this->isAccountVerified() != 1)
+	   /* if($this->isAccountVerified() != 1)
         {
             $this->showCaptcha();
             //$this->verifyCaptcha();
         }*/
-    }
+	}
 
 /*
     function showCaptcha()
@@ -71,518 +71,518 @@ 
     }
     */
 
-    function getCaptcha()
-    {
-        $accountCreator = new GetCaptcha();
-        $accountCreator->setAccessToken($this->accessToken);
-        $captcha = $accountCreator->execute();
+	function getCaptcha()
+	{
+		$accountCreator = new GetCaptcha();
+		$accountCreator->setAccessToken($this->accessToken);
+		$captcha = $accountCreator->execute();
 
-        return array("image_url" => $captcha['image_url'], "key" => $captcha['key']);
-    }
+		return array("image_url" => $captcha['image_url'], "key" => $captcha['key']);
+	}
 
-    function isAccountVerified()
-    {
-        $accountCreator = new GetUserConfig();
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
+	function isAccountVerified()
+	{
+		$accountCreator = new GetUserConfig();
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
 
-        //error_log(print_r($data, true));
+		//error_log(print_r($data, true));
 
-        return $data['verified'];
-    }
+		return $data['verified'];
+	}
 
-    function getGeocodingToken()
-    {
-        if(!isset($config['geocodingToken']) ||
-            $config['geocodingToken'] == NULL ||
-            $config['geocodingToken'] == '' ||
-            $config['geocodingToken'] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-        {
-            error_log("Please set a Google Maps Geocoding Token!");
-        }
-        else
-        {
-            return $config['geocodingToken'];
-        }
-    }
+	function getGeocodingToken()
+	{
+		if(!isset($config['geocodingToken']) ||
+			$config['geocodingToken'] == NULL ||
+			$config['geocodingToken'] == '' ||
+			$config['geocodingToken'] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+		{
+			error_log("Please set a Google Maps Geocoding Token!");
+		}
+		else
+		{
+			return $config['geocodingToken'];
+		}
+	}
 
-    function locationEquals($city)
-    {
-        $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=' . $this->getGeocodingToken();
-        $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'];
-        }
+	function locationEquals($city)
+	{
+		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=' . $this->getGeocodingToken();
+		$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  . "'");
+		$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
-        {
-            error_log("Error no Location found - getLocation");
-        }
+		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
+		{
+			error_log("Error no Location found - getLocation");
+		}
 
-        if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
-        {
-            return TRUE;
-        }  
-        else
-        {
-            return FALSE;
-        }
-    }
+		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=' . $this->getGeocodingToken();
-            $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 
+	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=' . $this->getGeocodingToken();
+			$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;
-            }
-        }
-    }
+					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  . "'");
+	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");
-        }
+		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;
-    }
+		return $location;
+	}
 
-    function verifyCaptcha()
-    {
-        if(isset($_GET['deviceUid']))
-        {
-            $deviceUid = $_GET['deviceUid'];
-            $jodelAccountForVerify = new JodelAccount($deviceUid);
-        }
-        else if(isset($_POST['deviceUid']))
-        {
-            $deviceUid = $_POST['deviceUid'];
-            $jodelAccountForVerify = new JodelAccount($deviceUid);
-        }
-        else
-        {
-            $deviceUid = $this->deviceUid;
-            $jodelAccountForVerify = $this;
-        }
+	function verifyCaptcha()
+	{
+		if(isset($_GET['deviceUid']))
+		{
+			$deviceUid = $_GET['deviceUid'];
+			$jodelAccountForVerify = new JodelAccount($deviceUid);
+		}
+		else if(isset($_POST['deviceUid']))
+		{
+			$deviceUid = $_POST['deviceUid'];
+			$jodelAccountForVerify = new JodelAccount($deviceUid);
+		}
+		else
+		{
+			$deviceUid = $this->deviceUid;
+			$jodelAccountForVerify = $this;
+		}
 
-        $solution = $_GET['solution'];
-        $solution = array_map('intval', explode('-', $solution));
+		$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();
+		$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'];
-    }
+		if(isset($verified->status_code))
+		{
+			return $verified->status_code;
+		}
+		return $verified['verified'];
+	}
 
-    //ToDo Spider Check
-    function votePostId($postId, $vote)
-    {
-        if(!$this->isBot)
-        {
-            if(!$this->isAccountVerified())
-            {
+	//ToDo Spider Check
+	function votePostId($postId, $vote)
+	{
+		if(!$this->isBot)
+		{
+			if(!$this->isAccountVerified())
+			{
                 
-            }
-
-            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();
-
-                user_log('User voted: ' . print_r($data, true));
-
-                if(array_key_exists('post', $data))
-                {
-                    $this->addVoteWithPostIdAndType($postId, $vote);
-                    return TRUE;
-                }
-                else if(array_key_exists('error', $data))
-                {
-                    error_log('Could not vote - Error: ' . $data['error']);
-                }
-                else
-                {
-                    error_log('Could not vote: ' . print_r($data, true));
-                    return FALSE;
-                } 
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
-
-        return FALSE;
-    }
+			}
+
+			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();
+
+				user_log('User voted: ' . print_r($data, true));
+
+				if(array_key_exists('post', $data))
+				{
+					$this->addVoteWithPostIdAndType($postId, $vote);
+					return TRUE;
+				}
+				else if(array_key_exists('error', $data))
+				{
+					error_log('Could not vote - Error: ' . $data['error']);
+				}
+				else
+				{
+					error_log('Could not vote: ' . print_r($data, true));
+					return FALSE;
+				} 
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
 
-    //ToDo Spider Check
-    function sendJodel($location, $view)
-    {
-        if($this->isAccountVerified() != 1)
-        {
-            $this->showCaptcha();
-            //$this->verifyCaptcha();
-        }
+		return FALSE;
+	}
 
-        $accountCreator = new SendJodel();
+	//ToDo Spider Check
+	function sendJodel($location, $view)
+	{
+		if($this->isAccountVerified() != 1)
+		{
+			$this->showCaptcha();
+			//$this->verifyCaptcha();
+		}
 
-        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 = 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($data != 'Success')
 		{
 			error_log('Could not set location befor Post: ' . print_r($data, true));
 		}
 
-        $accountCreator->location = $this->location;
+		$accountCreator->location = $this->location;
 
-        $image = '';
-        if(isset($_FILES['image']) && $_FILES['image']['size'] > 0)
-        {
-            $image = file_get_contents($_FILES['image']['tmp_name']);
-        }
+		$image = '';
+		if(isset($_FILES['image']) && $_FILES['image']['size'] > 0)
+		{
+			$image = file_get_contents($_FILES['image']['tmp_name']);
+		}
         
-        $accountCreator->image = $image;
+		$accountCreator->image = $image;
         
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
 
-        if(isset($data['error']) && $data['error'] == 'length')
-        {
-            $errorMsg = 'Error: The input was to long';
-            return $errorMsg;
-        }
+		if(isset($data['error']) && $data['error'] == 'length')
+		{
+			$errorMsg = 'Error: The input was to long';
+			return $errorMsg;
+		}
 
-        user_log('User posted: ' . print_r($data, true));
+		user_log('User posted: ' . print_r($data, true));
 
-        if(isset($_POST['ancestor']))
-        {
-            header('Location: ' . $view->toUrl());
-            exit;
-        }
-        else
-        {
-            header('Location: ' . $view->baseUrl);
-            exit;
-        }
-    }
+		if(isset($_POST['ancestor']))
+		{
+			header('Location: ' . $view->toUrl());
+			exit;
+		}
+		else
+		{
+			header('Location: ' . $view->baseUrl);
+			exit;
+		}
+	}
 
-    function isTokenFresh()
-    {
-        $db = new DatabaseConnect();  
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
+	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 ($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;
-        }
+		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');
-        }
+		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;
-    }
+		return $accessToken;
+	}
 
 
-    function getKarma()
-    {
-        $accountCreator = new GetKarma();
-        $accountCreator->setAccessToken($this->accessToken);
-        $data = $accountCreator->execute();
+	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 === 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;
-        }
-    }
+		if($result->num_rows == 0)
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
 
-    function addVoteWithPostIdAndType($postId, $voteType)
-    {
-        $db = new DatabaseConnect();
+	function addVoteWithPostIdAndType($postId, $voteType)
+	{
+		$db = new DatabaseConnect();
 
-        $postId = $db->real_escape_string($postId);
-        $voteType = $db->real_escape_string($voteType);
+		$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

Braces +12 added lines, -7 removed lines

@@ -145,7 +145,7 @@ 
         if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
         {
             return TRUE;
-        }  
+        }
         else
         {
             return FALSE;
@@ -158,7 +158,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=' . $this->getGeocodingToken();
@@ -338,7 +338,8 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch ($color)
+            {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -451,7 +452,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);
         }   
     }
@@ -531,14 +533,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();
@@ -563,7 +567,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 +17 added lines, -17 removed lines

@@ -110,16 +110,16 @@ 
     {
         $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=' . $this->getGeocodingToken();
         $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();
@@ -163,15 +163,15 @@ 
         {
             $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=' . $this->getGeocodingToken();
             $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);
@@ -193,7 +193,7 @@ 
                                 lng='" . $lng . "'
                             WHERE access_token='" . $this->accessToken . "'");
 
-                    if($result === false)
+                    if($result === FALSE)
                     {
                             echo "Updating location failed: (" . $db->errno . ") " . $db->error;
                     }
@@ -293,7 +293,7 @@ 
                 $accountCreator->postId = htmlspecialchars($postId);
                 $data = $accountCreator->execute();
 
-                user_log('User voted: ' . print_r($data, true));
+                user_log('User voted: ' . print_r($data, TRUE));
 
                 if(array_key_exists('post', $data))
                 {
@@ -306,7 +306,7 @@ 
                 }
                 else
                 {
-                    error_log('Could not vote: ' . print_r($data, true));
+                    error_log('Could not vote: ' . print_r($data, TRUE));
                     return FALSE;
                 } 
             }
@@ -371,7 +371,7 @@ 
         
 		if($data != 'Success')
 		{
-			error_log('Could not set location befor Post: ' . print_r($data, true));
+			error_log('Could not set location befor Post: ' . print_r($data, TRUE));
 		}
 
         $accountCreator->location = $this->location;
@@ -393,7 +393,7 @@ 
             return $errorMsg;
         }
 
-        user_log('User posted: ' . print_r($data, true));
+        user_log('User posted: ' . print_r($data, TRUE));
 
         if(isset($_POST['ancestor']))
         {
@@ -451,7 +451,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);
         }   
     }
@@ -499,7 +499,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;
@@ -531,7 +531,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;
@@ -563,7 +563,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;

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';
+	}
 }

templates/nav-bottom.php

Braces +15 added lines, -3 removed lines

@@ -1,12 +1,24 @@
 <div id="sortJodelBy" class="row">
 	<div class="col-3">
-		<a <?php if($view->view == 'combo')echo 'class="active"';?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
+		<a <?php if($view->view == 'combo')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'discussed') echo 'class="active"';?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
+		<a <?php if($view->view == 'discussed')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'popular') echo 'class="active"';?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
+		<a <?php if($view->view == 'popular')
+{
+	echo 'class="active"';
+}
+?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
 	</div>
 	<div class="col-3">
 		<nav>

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <div id="sortJodelBy" class="row">
 	<div class="col-3">
-		<a <?php if($view->view == 'combo')echo 'class="active"';?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
+		<a <?php if($view->view == 'combo')echo 'class="active"'; ?> href="<?php echo $view->changeView('combo')->back()->toUrl(); ?>"><i class="fa fa-clock-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'discussed') echo 'class="active"';?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
+		<a <?php if($view->view == 'discussed') echo 'class="active"'; ?> href="<?php echo $view->changeView('discussed')->back()->toUrl(); ?>"><i class="fa fa-commenting-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'popular') echo 'class="active"';?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
+		<a <?php if($view->view == 'popular') echo 'class="active"'; ?> href="<?php echo $view->changeView('popular')->back()->toUrl(); ?>"><i class="fa fa-angle-up fa-3x"></i></a>
 	</div>
 	<div class="col-3">
 		<nav>
-			<a href="<?php echo $baseUrl;?>about-us.php">about</a>
+			<a href="<?php echo $baseUrl; ?>about-us.php">about</a>
 		</nav>
 	</div>
 </div>

templates/header.php

Braces +5 added lines, -1 removed lines

@@ -74,7 +74,11 @@
 
 				<div id="location_mobile" class="hidden-sm-up">
 					<form method="get">
-						<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+						<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 
 						<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
 					</form>

Spacing +32 added lines, -32 removed lines

@@ -1,53 +1,53 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title><?php echo $title;?></title>
+		<title><?php echo $title; ?></title>
 		
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		
-		<meta name="description" content="<?php echo $description;?>">
+		<meta name="description" content="<?php echo $description; ?>">
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
 		
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.1.1/ekko-lightbox.min.css" integrity="sha256-8aNQFtmxcOMVoOhLD4mrHqaKC2Ui++LmlQsoKTqxwIE=" crossorigin="anonymous" />
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
 		
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
 		<meta name="msapplication-TileColor" content="#5682a3"> 
 		<meta name="msapplication-navbutton-color" content="#5682a3"> 
 		<meta name="application-name" content="JodelBlue"/> 
 		<meta name="msapplication-tooltip" content="JodelBlue"/> 
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/> 
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png"> 
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png"> 
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png"> 
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png"> 
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png"> 
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png"> 
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png"> 
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png"> 
 	</head>
 
 	<body>

about-us.php

Spacing +2 added lines, -2 removed lines

@@ -47,6 +47,6 @@
 			</content>
 		</article>
 	</div>
-	<?php include 'templates/nav-bottom.php';?>
+	<?php include 'templates/nav-bottom.php'; ?>
 </div>
-<?php include 'templates/footer.php';?>
\ No newline at end of file
+<?php include 'templates/footer.php'; ?>
\ No newline at end of file

templates/footer.php

Indentation +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 		<?php  
 			if(is_file(realpath(__DIR__ . '/..') . '/piwik-script.html'))
 			{
-			    include(realpath(__DIR__ . '/..') . '/piwik-script.html');
+				include(realpath(__DIR__ . '/..') . '/piwik-script.html');
 			}
 		?>
 

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 			  crossorigin="anonymous"></script>
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
 	    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-	    <script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script>
+	    <script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script>
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.1.1/ekko-lightbox.min.js" integrity="sha256-1odJPEl+KoMUaA1T7QNMGSSU/r5LCKCRC6SL8P0r2gY=" crossorigin="anonymous"></script>
 
 		<script>
@@ -37,7 +37,7 @@ 
 			console.log(solution);
 			$.ajax({
 			  type: "POST",
-			  url: "<?php echo $baseUrl;?>vote-ajax.php?solution=" + solution + "&key="+key,
+			  url: "<?php echo $baseUrl; ?>vote-ajax.php?solution=" + solution + "&key="+key,
 			  data: {"deviceUid" : deviceUid},
 			  success: function(result){
 				  	var response = JSON.parse(result);
@@ -61,12 +61,12 @@ 
 			{
 				window.history.back();
 			}
-		<?php if(isset($includeEmojiAndAjax)){ ?>
+		<?php if(isset($includeEmojiAndAjax)) { ?>
 
 			function vote(postId, vote, obj)
 			{
 				$.ajax({
-					url: '<?php echo $baseUrl;?>vote-ajax.php?postId=' + postId + '&vote=' + vote,
+					url: '<?php echo $baseUrl; ?>vote-ajax.php?postId=' + postId + '&vote=' + vote,
 					dataType: 'json',
 					async: true,
 					success: function(json)
@@ -93,9 +93,9 @@ 
 			{
 				<?php if(isset($errorMsg)) { ?>
 				//Error Msg
-				if('<?php echo $errorMsg;?>' != '')
+				if('<?php echo $errorMsg; ?>' != '')
 				{
-					alert('<?php echo $errorMsg;?>');
+					alert('<?php echo $errorMsg; ?>');
 				}
 				<?php } ?>
 
@@ -128,7 +128,7 @@ 
 				function getMorePosts(lastPostId, view, hashtag, old_lastPostId)
 				{
 					$.ajax({
-						url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
+						url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
 						dataType: 'html',
 						async: false,
 						success: function(html) {

Braces +9 added lines, -3 removed lines

@@ -61,7 +61,9 @@ 
 			{
 				window.history.back();
 			}
-		<?php if(isset($includeEmojiAndAjax)){ ?>
+		<?php if(isset($includeEmojiAndAjax))
+{
+?>
 
 			function vote(postId, vote, obj)
 			{
@@ -91,7 +93,9 @@ 
 
 			$(document).ready(function()
 			{
-				<?php if(isset($errorMsg)) { ?>
+				<?php if(isset($errorMsg))
+{
+?>
 				//Error Msg
 				if('<?php echo $errorMsg;?>' != '')
 				{
@@ -155,7 +159,9 @@ 
 					return {"lastPostId":lastPostId, "old_lastPostId":old_lastPostId};
 				}
 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 
 				if(window.location.hash)
 				{