mmainstreet / jodel-web

php/Requests/AbstractRequest.php

Braces +13 added lines, -7 removed lines

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

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

@@ -8,7 +8,7 @@ 
     const USERAGENT = 'Jodel/4.32.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
     const CLIENT_TYPE = 'android_4.32.2';
     
-    private $accessToken = null;
+    private $accessToken = NULL;
     private $payLoad;
     public $expects = '';
     public $version = 'v2';
@@ -65,7 +65,7 @@ 
         }
         switch ($result->status_code) {
             case 200:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
                 break;
             case 204:
                 $result = "Success";
@@ -114,7 +114,7 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == NULL) {
 				$payload_accessToken = "";
 			}
 			else {

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if($this->getAccessToken()) {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -50,7 +50,7 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch($this->getMethod()) {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -68,7 +68,7 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch($result->status_code) {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -96,7 +96,7 @@ 
                 exit("Error 403: Access denied");
                 break;
             default:
-                error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+                error_log('Error ' . $result->status_code . ' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
                 //throw  new \Exception('Unknown Error: '.$result->status_code);
         }
 

Indentation +134 added lines, -134 removed lines

@@ -2,20 +2,20 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = 'OFIqFvBgkccPNTVbIzkYaSmrwMlbVzRoOBBjXUIG';
-    const USERAGENT = 'Jodel/4.32.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.32.2';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'OFIqFvBgkccPNTVbIzkYaSmrwMlbVzRoOBBjXUIG';
+	const USERAGENT = 'Jodel/4.32.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.32.2';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = '';
-    public $version = 'v2';
-    public $hasPayload = FALSE;
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
+	public $hasPayload = FALSE;
 
-    public function execute()
-    {
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -25,16 +25,16 @@ 
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
 
-        /*
+		/*
         printf("URL: ");
         var_dump($url);
         echo "<br />";
@@ -45,86 +45,86 @@ 
         var_dump($this->payLoad);
         echo "<br />";
         */
-        /*
+		/*
         $options = array(
             'timeout' => 100,
             'connect_timeout' => 100,
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->hasPayload)
-                {
-                    $result = Requests::get($url, $header, $this->payLoad);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = "Success";
-                break;
-            case 400:
-                //throw new \Exception('Unauthorized');
-                error_log('Error 400 - Fehlerhafte Anfrage'); // - JodelDeviceId:' . $deviceUid);
-                break;
-            case 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->hasPayload)
+				{
+					$result = Requests::get($url, $header, $this->payLoad);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = "Success";
+				break;
+			case 400:
+				//throw new \Exception('Unauthorized');
+				error_log('Error 400 - Fehlerhafte Anfrage'); // - JodelDeviceId:' . $deviceUid);
+				break;
+			case 401:
 				//throw new \Exception('Unauthorized');
-                error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
-                break;
-            case 404:
-                //echo "Es wurde bereits gevoted";
-                error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
+				error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+				break;
+			case 404:
+				//echo "Es wurde bereits gevoted";
+				error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
 			case 477:
-                //echo "Es wurde bereits gevoted";
-                //throw  new \Exception('Signing failed!');
-                error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
-                break;
-            case 429:
-                error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
-                exit("Error 403: Access denied");
-                break;
-            default:
-                error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
-                //throw  new \Exception('Unknown Error: '.$result->status_code);
-        }
+				//echo "Es wurde bereits gevoted";
+				//throw  new \Exception('Signing failed!');
+				error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
+				break;
+			case 429:
+				error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
+				exit("Error 403: Access denied");
+				break;
+			default:
+				error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
+				//throw  new \Exception('Unknown Error: '.$result->status_code);
+		}
 
-        if($device_uid != '')
-        {
+		if($device_uid != '')
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
 	}
 
-        /*
+		/*
         var_dump($result);
         */
 
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -133,54 +133,54 @@ 
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken($accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

index.php

Indentation +1 added lines, -1 removed lines

@@ -616,7 +616,7 @@
 		<?php  
 			if(is_file('./piwik-script.html'))
 			{
-			    require_once('./piwik-script.html');
+				require_once('./piwik-script.html');
 			}
 		?>
 

Spacing +8 added lines, -8 removed lines

@@ -1,14 +1,14 @@ 
-<?php include 'php/jodel-web.php';?>
+<?php include 'php/jodel-web.php'; ?>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title><?php echo $viewTest::getTitle($posts[0], $view, $isDetailedView);?></title>
+		<title><?php echo $viewTest::getTitle($posts[0], $view, $isDetailedView); ?></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 $viewTest::getMetaDescription($posts[0], $view, $isDetailedView);?>">
+		<meta name="description" content="<?php echo $viewTest::getMetaDescription($posts[0], $view, $isDetailedView); ?>">
 		<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.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
@@ -90,7 +90,7 @@ 
 
 					<content id="posts">
 						<?php
-							for($i = 0; $i<$loops; $i++)
+							for($i = 0; $i < $loops; $i++)
 							{
 								if(array_key_exists($i, $posts) && array_key_exists('post_id', $posts[$i]) && isset($posts[$i]['post_id']))
 								{
@@ -134,7 +134,7 @@ 
 								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
 								<h2>Comment on Jodel</h2>
 								<form method="POST">				
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" />
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
 									<br />
 									<input type="submit" value="SEND" /> 
@@ -171,13 +171,13 @@ 
 				<div class="col-xs-12">
 					<div class="row">
 						<div class="col-xs-3">
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?view=comment" <?php if($view == 'comment') echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?view=upVote" <?php if($view == 'upVote') echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
 							<nav>

Braces +38 added lines, -9 removed lines

@@ -75,7 +75,11 @@ 
 
 					<div id="location_mobile" class="hidden-sm-up">
 						<form method="get">
-							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 
 							<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
 						</form>
@@ -102,7 +106,9 @@ 
 
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -115,7 +121,11 @@ 
 							<div>
 								<h2>Position / Hashtag</h2>
 								<form method="get">
-									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 									<label>try: #jhj</label><br>
 									<input type="submit" value="Set Location" /> 
 								</form>
@@ -131,7 +141,9 @@ 
 
 						<article>
 							<div>
-								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
+								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails']))
+{
+?>
 								<h2>Comment on Jodel</h2>
 								<form method="POST">				
 										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
@@ -139,7 +151,10 @@ 
 									<br />
 									<input type="submit" value="SEND" /> 
 								</form>
-									<?php } else { ?>
+									<?php }
+else
+{
+?>
 								<h2>New Jodel</h2>
 								<form method="POST">
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 
@@ -171,13 +186,25 @@ 
 				<div class="col-xs-12">
 					<div class="row">
 						<div class="col-xs-3">
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if($view=='time')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?view=comment" <?php if($view=='comment')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?view=upVote" <?php if($view=='upVote')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
 							<nav>
@@ -218,7 +245,9 @@ 
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
 				}
 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 
 				
 

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/Requests/GetChannel.php

Indentation +20 added lines, -20 removed lines

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

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)

Spacing +8 added lines, -8 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)
@@ -61,9 +61,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;
     }
@@ -85,8 +85,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$jodelAccountForView = new JodelAccount();
-			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time()+60*60*24*365*10);
-			error_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			error_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -114,7 +114,7 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -312,13 +312,13 @@ 
 		else
 		{
 			$version = 'v2';
-			if($view=='comment')
+			if($view == 'comment')
 			{
 				$url = "/v2/posts/location/discussed/";
 			}
 			else
 			{
-				if($view=='upVote')
+				if($view == 'upVote')
 				{
 					$url = "/v2/posts/location/popular/";
 				}

Indentation +87 added lines, -87 removed lines

@@ -41,36 +41,36 @@ 
 
 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 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)
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+	if ($result->num_rows > 0)
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
 }
 
 	//Check if it's a Spider or Google Bot
@@ -97,14 +97,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);
-    }
+	}
 
 	$newPositionStatus = $jodelAccountForView->location->getCityName();
 
@@ -151,14 +151,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
@@ -203,32 +203,32 @@ 
 			if(!array_key_exists(0, $posts))
 			{
 				$posts[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"
+				"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"
 			 );
 			}
 		}
@@ -237,32 +237,32 @@ 
 			$posts = array();
 			$posts[0] = 
 			array(
-			    "post_id" => "0",
-			    "discovered_by" => 0,
-			    "message" => "Bad Request",
-			    "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"
+				"post_id" => "0",
+				"discovered_by" => 0,
+				"message" => "Bad Request",
+				"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"
 			 );
 
 

Braces +7 added lines, -5 removed lines

@@ -97,7 +97,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -114,7 +114,8 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -151,7 +152,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
@@ -169,7 +170,7 @@ 
 
 
 	function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
-	{	
+	{
 		$accountCreator = new GetPosts();
 		$accountCreator->setLastPostId($lastPostId);
 		$accountCreator->setAccessToken($accessToken);
@@ -290,7 +291,8 @@ 
 
 			$posts[0] = $data;
 
-			if(array_key_exists('children', $data)) {
+			if(array_key_exists('children', $data))
+			{
 				foreach($data['children'] as $key => $child)
 				{
 					

php/JodelAccount.php

Braces +15 added lines, -8 removed lines

@@ -56,7 +56,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';
@@ -203,7 +203,8 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch ($color)
+            {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -262,7 +263,8 @@ 
         if ($result->num_rows > 0)
         {
                 // output data of each row
-                while($row = $result->fetch_assoc()) {
+                while($row = $result->fetch_assoc())
+                {
                         //$access_token = $row["access_token"];
                         $expiration_date = $row["expiration_date"];
                         $deviceUid = $row["device_uid"];
@@ -274,7 +276,8 @@ 
                 echo '0 results';
         }
 
-        if($expiration_date <= time()) {
+        if($expiration_date <= time())
+        {
             $accountCreator = new CreateUser();
             $accountCreator->setAccessToken($access_token);
             $accountCreator->setDeviceUid($deviceUid);
@@ -291,7 +294,8 @@ 
                                         expiration_date='" . $expiration_date . "'
                                     WHERE device_uid='" . $device_uid . "'");
 
-            if($result === false){
+            if($result === false)
+            {
                     echo "Adding account failed: (" . $db->errno . ") " . $db->error;
             }   
         }
@@ -381,14 +385,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();
@@ -413,7 +419,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;

Doc Comments +3 added lines

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

Spacing +12 added lines, -12 removed lines

@@ -35,7 +35,7 @@ 
         {
             $this->refreshToken();
         }
-        $this->accessToken  = $this->getAccessToken();
+        $this->accessToken = $this->getAccessToken();
     }
 
     function isAccountVerified()
@@ -94,7 +94,7 @@ 
                     }
                     else
                     {
-                        error_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+                        error_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
                     }
                 }
 
@@ -106,11 +106,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())
@@ -211,7 +211,7 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch($color) {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -267,7 +267,7 @@ 
 
         $access_token;
 
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
                 // output data of each row
                 while($row = $result->fetch_assoc()) {
@@ -299,7 +299,7 @@ 
                                         expiration_date='" . $expiration_date . "'
                                     WHERE device_uid='" . $device_uid . "'");
 
-            if($result === false){
+            if($result === false) {
                     echo "Adding account failed: (" . $db->errno . ") " . $db->error;
             }   
         }
@@ -317,11 +317,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())
@@ -389,7 +389,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;
@@ -417,11 +417,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 +403 added lines, -403 removed lines

@@ -2,447 +2,447 @@
 
 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 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 
+	// 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 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
-                    {
-                        error_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
+					{
+						error_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()
-    {
-        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($this->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()
+	{
+		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($this->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']))
-        {
-            $actual_link = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-            header('Location: ' . $actual_link . '#postId-' . htmlspecialchars($data['post_id']));
-            exit;
-        }
-        else
-        {
-            header('Location: ./#');
-            exit;
-        }
-    }
-
-    function isTokenFresh()
-    {
-        $db = new DatabaseConnect();  
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
-
-        $access_token;
-
-        if ($result->num_rows > 0)
-        {
-                // output data of each row
-                while($row = $result->fetch_assoc()) {
-                        //$access_token = $row["access_token"];
-                        $expiration_date = $row["expiration_date"];
-                        $deviceUid = $row["device_uid"];
-                        $access_token = $row["access_token"];
-                }
-        }
-        else
-        {
-                echo '0 results';
-        }
-
-        if($expiration_date <= time()) {
-            $accountCreator = new CreateUser();
-            $accountCreator->setAccessToken($access_token);
-            $accountCreator->setDeviceUid($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];
+		$accountCreator->setAccessToken($this->accessToken);
+		$data = $accountCreator->execute();
+
+		if(isset($_POST['ancestor']))
+		{
+			$actual_link = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+			header('Location: ' . $actual_link . '#postId-' . htmlspecialchars($data['post_id']));
+			exit;
+		}
+		else
+		{
+			header('Location: ./#');
+			exit;
+		}
+	}
+
+	function isTokenFresh()
+	{
+		$db = new DatabaseConnect();  
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
+
+		$access_token;
+
+		if ($result->num_rows > 0)
+		{
+				// output data of each row
+				while($row = $result->fetch_assoc()) {
+						//$access_token = $row["access_token"];
+						$expiration_date = $row["expiration_date"];
+						$deviceUid = $row["device_uid"];
+						$access_token = $row["access_token"];
+				}
+		}
+		else
+		{
+				echo '0 results';
+		}
+
+		if($expiration_date <= time()) {
+			$accountCreator = new CreateUser();
+			$accountCreator->setAccessToken($access_token);
+			$accountCreator->setDeviceUid($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){
-                    echo "Adding account failed: (" . $db->errno . ") " . $db->error;
-            }   
-        }
+			if($result === false){
+					echo "Adding account failed: (" . $db->errno . ") " . $db->error;
+			}   
+		}
         
-        return $access_token;
-    }
+		return $access_token;
+	}
 
-    function refreshToken()
-    {
+	function refreshToken()
+	{
 
-    }
+	}
 
 
 
-    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
-        {
-            echo "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
+		{
+			echo "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

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

@@ -58,15 +58,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);
@@ -88,7 +88,7 @@ 
                                 lng='" . $lng . "'
                             WHERE access_token='" . $this->accessToken . "'");
 
-                    if($result === false)
+                    if($result === FALSE)
                     {
                             echo "Updating location failed: (" . $db->errno . ") " . $db->error;
                     }
@@ -303,7 +303,7 @@ 
                                         expiration_date='" . $expiration_date . "'
                                     WHERE device_uid='" . $device_uid . "'");
 
-            if($result === false){
+            if($result === FALSE){
                     echo "Adding account failed: (" . $db->errno . ") " . $db->error;
             }   
         }
@@ -359,7 +359,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;
@@ -391,7 +391,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;
@@ -423,7 +423,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;