mmainstreet / jodel-web

admin.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 $config = parse_ini_file('config/config.ini.php');
 if(!isset($_GET['pw']) || $config['pw'] != $_GET['pw'])
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on admin.php');
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on admin.php');
 	die();
 }
 

Braces +4 added lines, -2 removed lines

@@ -40,10 +40,12 @@
 			$accessToken = isTokenFreshByAccessToken($location, $accessToken);
 
 
-			if($_POST['vote'] == "up") {
+			if($_POST['vote'] == "up")
+			{
 				$accountCreator = new Upvote();
 			}
-			else if($_POST['vote'] == "down") {
+			else if($_POST['vote'] == "down")
+			{
 				$accountCreator = new Downvote();
 			}
 

php/Requests/Upvote.php

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <?php
-class Upvote extends AbstractRequest {
+class Upvote extends AbstractRequest
+{
 		
     public $postId;
 

Indentation +14 added lines, -14 removed lines

@@ -1,21 +1,21 @@
 <?php
 class Upvote extends AbstractRequest {
 		
-    public $postId;
+	public $postId;
 
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $this->postId . '/upvote';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $this->postId . '/upvote';
+	}
+	function getPayload()
+	{
+		return array(
 			//		"reason_code" => -1,
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

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 +129 added lines, -129 removed lines

@@ -2,19 +2,19 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = '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';
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
 
-    public function execute()
-    {
+	public function execute()
+	{
 		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
@@ -24,16 +24,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 />";
@@ -44,82 +44,82 @@ 
         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->version == 'v3')
-                {
-                    $result = Requests::get($url, $header);
-                }
-                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 401:
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->version == 'v3')
+				{
+					$result = Requests::get($url, $header);
+				}
+				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 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 = "";
 			}
@@ -128,54 +128,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;
+	}
 }

php/jodel-web.php

Indentation +4 added lines, -4 removed lines

@@ -297,11 +297,11 @@ 
 
 	if($result->num_rows == 0)
 	{
-	    return FALSE;
+		return FALSE;
 	}
 	else
 	{
-	    return TRUE;
+		return TRUE;
 	}
 }
 
@@ -398,7 +398,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 botDeviceUidIsSet($config)
@@ -504,7 +504,7 @@ 
 			<?php 
 			if(isset($post['image_url']))
 			{
-			    $regexRest = '/[^\w$ .!?-]+/u';
+				$regexRest = '/[^\w$ .!?-]+/u';
 
 				echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
 			}

Spacing +40 added lines, -40 removed lines

@@ -107,7 +107,7 @@ 
 			}
 			else
 			{
-				error_log('User with JodelDeviceId:' . $deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+				error_log('User with JodelDeviceId:' . $deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
 			}
 		}
 
@@ -169,7 +169,7 @@ 
 	if(isset($_POST['color']))
 	{
 		$color = $_POST['color'];
-		switch ($color) {
+		switch($color) {
 			case '8ABDB0':
 				$color = '8ABDB0';
 				break;
@@ -221,9 +221,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;
 	}
@@ -240,7 +240,7 @@ 
 	
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -257,7 +257,7 @@ 
 
 	if($expiration_date <= time()) {
 		$accountCreator = new CreateUser();
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
 		$accountCreator->setLocation($location);
 		$data = $accountCreator->execute();
@@ -272,7 +272,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -285,7 +285,7 @@ 
 	$db = new DatabaseConnect();  
 	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -302,7 +302,7 @@ 
 
 	if($expiration_date <= time()) {
 		$accountCreator = new CreateUser();
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
 		$accountCreator->setLocation($location);
 		$data = $accountCreator->execute();
@@ -317,7 +317,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -332,7 +332,7 @@ 
 
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -364,7 +364,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -375,11 +375,11 @@ 
 function getLocationByAccessToken($accessToken)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
 	
 	$location = new Location();
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -400,11 +400,11 @@ 
 function getLocationByDeviceUid($deviceUid)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 	
 	$location = new Location();
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -425,11 +425,11 @@ 
 function getDeviceUidByAccessToken($accesstoken)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken  . "'");
+	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken . "'");
 	
 	$deviceUid;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -448,11 +448,11 @@ 
 function getAccessTokenByDeviceUid($deviceUid)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 	
 	$accessToken;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -520,7 +520,7 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
 	
-	if($result === false){
+	if($result === false) {
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -548,11 +548,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;
@@ -598,7 +598,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 botDeviceUidIsSet($config)
@@ -667,25 +667,25 @@ 
 	$timediff_inDays = (string)$timediff->format('%d');
 	$timediff_inMonth = (string)$timediff->format('%m');
 
-	if($timediff_inMonth!=0)
+	if($timediff_inMonth != 0)
 	{
 			$timediff = $timediff_inMonth . "m";
 	}
 	else
 	{
-		if($timediff_inDays!=0)
+		if($timediff_inDays != 0)
 		{
 			$timediff = $timediff_inDays . "d";
 		}
 		else
 		{
-			if($timediff_inHours!=0)
+			if($timediff_inHours != 0)
 			{
 				$timediff = $timediff_inHours . "h";
 			}
 			else
 			{
-				if($timediff_inMinutes!=0)
+				if($timediff_inMinutes != 0)
 				{
 					$timediff = $timediff_inMinutes . "m";
 				}
@@ -699,7 +699,7 @@ 
 
 
 	?>
-	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
+	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
 		<content>
 			<?php 
 			if(isset($post['image_url']))
@@ -717,24 +717,24 @@ 
 			<?php
 				if($isDetailedView)
 				{?>
-					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
+					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
+					<a href="index.php?vote=up&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-up fa-3x"></i>
 					</a>	
 						<br />
-					<?php echo $post["vote_count"];?><br />
+					<?php echo $post["vote_count"]; ?><br />
 			<?php
 				if($isDetailedView)
 				{?>
-					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
+					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
+					<a href="index.php?vote=down&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-down fa-3x"></i>
 					</a>
@@ -746,14 +746,14 @@ 
 					<td class="time">
 						<span class="tip" data-tooltip="Time">
 							<i class="fa fa-clock-o"></i>
-							<?php echo $timediff;?>
-							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
+							<?php echo $timediff; ?>
+							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
 						</span> 
 					</td>
 					<td class="comments">
 						<?php if(!$isDetailedView) {?>
 						<span data-tooltip="Comments">
-							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
+							<a href="index.php?getPostDetails=true&view=<?php echo $view; ?>&postID=<?php echo $post["post_id"]; ?>">
 								<i class="fa fa-commenting-o"></i>
 								<?php if(array_key_exists("child_count", $post)) {
 											echo $post["child_count"];
@@ -782,7 +782,7 @@ 
 									{
 							  			?>
 							  			<span data-tooltip="Author">
-											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
+											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"]; ?> |
 										</span>
 										<?php
 									}
@@ -792,8 +792,8 @@ 
 
 						<span class="tip" data-tooltip="Distance">
 							<i class="fa fa-map-marker"></i>
-							<?php echo $post['distance'];?> km
-							<span class="tiptext"><?php echo $post['location']['name'];?></span>
+							<?php echo $post['distance']; ?> km
+							<span class="tiptext"><?php echo $post['location']['name']; ?></span>
 						</span>
 					</td>
 				</tr>

Braces +50 added lines, -25 removed lines

@@ -169,7 +169,8 @@ 
 	if(isset($_POST['color']))
 	{
 		$color = $_POST['color'];
-		switch ($color) {
+		switch ($color)
+		{
 			case '8ABDB0':
 				$color = '8ABDB0';
 				break;
@@ -243,7 +244,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"];
@@ -255,7 +257,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -272,7 +275,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -288,7 +292,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"];
@@ -300,7 +305,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -317,7 +323,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -335,7 +342,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"];
@@ -347,7 +355,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);
 		$accountCreator->setDeviceUid($deviceUid);
@@ -364,7 +373,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -520,14 +530,16 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
 	
-	if($result === false){
+	if($result === false)
+	{
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
 	}		
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -552,7 +564,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;
@@ -563,7 +576,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -652,7 +665,8 @@ 
 }
 
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
-{	//ToDO
+{
+//ToDO
 	//Replace # with link
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -708,7 +722,8 @@ 
 
 				echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
 			}
-			else {
+			else
+			{
 				echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
 			}
 			?>
@@ -716,11 +731,13 @@ 
 		<aside>
 			<?php
 				if($isDetailedView)
-				{?>
+				{
+?>
 					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
 		  <?php }
-				else
-				{?>
+else
+				{
+?>
 					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-up fa-3x"></i>
@@ -729,11 +746,13 @@ 
 					<?php echo $post["vote_count"];?><br />
 			<?php
 				if($isDetailedView)
-				{?>
+				{
+?>
 					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
 		  <?php }
-				else
-				{?>
+else
+				{
+?>
 					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-down fa-3x"></i>
@@ -751,13 +770,19 @@ 
 						</span> 
 					</td>
 					<td class="comments">
-						<?php if(!$isDetailedView) {?>
+						<?php if(!$isDetailedView)
+{
+?>
 						<span data-tooltip="Comments">
 							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
 								<i class="fa fa-commenting-o"></i>
-								<?php if(array_key_exists("child_count", $post)) {
+								<?php if(array_key_exists("child_count", $post))
+{
 											echo $post["child_count"];
-										} else echo "0";
+										}
+										else {
+											echo "0";
+										}
 								?>
 								</a>
 						</span>

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

@@ -71,15 +71,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);
@@ -101,7 +101,7 @@ 
 						lng='" . $lng . "'
 					WHERE access_token='" . $accessToken . "'");
 
-			if($result === false)
+			if($result === FALSE)
 			{
 					echo "Updating location failed: (" . $db->errno . ") " . $db->error;
 			}
@@ -272,7 +272,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,7 +317,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === FALSE){
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -364,7 +364,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === FALSE){
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -488,7 +488,7 @@ 
 						  FROM votes
 						  WHERE (postId = '" . $postId . "' AND device_uid = '" . $deviceUid . "')");
 	
-	if($result === false)
+	if($result === FALSE)
 	{
 		$error = db_error();
 		echo $error;
@@ -520,7 +520,7 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
 	
-	if($result === false){
+	if($result === FALSE){
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -552,7 +552,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;
@@ -598,7 +598,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 botDeviceUidIsSet($config)

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/';

index.php

Doc Comments +1 added lines, -101 removed lines

@@ -416,104 +416,4 @@
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

Indentation +1 added lines, -101 removed lines

@@ -416,104 +416,4 @@
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

Switch Indentation +1 added lines, -101 removed lines

@@ -416,104 +416,4 @@
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

Spacing +5 added lines, -105 removed lines

@@ -36,8 +36,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$deviceUid = createAccount();
-			setcookie('JodelDeviceId', $deviceUid, time()+60*60*24*365*10);
-			error_log('Created account with JodelDeviceId:' . $deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			error_log('Created account with JodelDeviceId:' . $deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -57,7 +57,7 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -91,7 +91,7 @@ 
 	//Vote
 	if(isset($_GET['vote']) && isset($_GET['postID']))
 	{
-<<<<<<< HEAD
+<< << <<< HEAD
 		if(!deviceUidHasVotedThisPostId($deviceUid_forId1, $_GET['postID']))
 		{
 			if($_GET['vote'] == "up")
@@ -416,104 +416,4 @@ 
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

Braces +3 added lines, -102 removed lines

@@ -57,7 +57,8 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -416,104 +417,4 @@ 
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

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

@@ -416,104 +416,4 @@
 
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";
-				var view = "<?php echo $view; ?>"
-				var old_lastPostId = "";
-				var morePostsAvailable = true;
-
-				if(window.location.hash)
-				{
-					var hash = window.location.hash.slice(1);
-
-					if(!$("article[id='"+ hash +"']").length)
-					{
-						for (var i = 5; i >= 0; i--)
-						{
-							if(!$("article[id='"+ hash +"']").length)
-							{
-								$.ajax({
-									url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-									dataType: 'html',
-									async: false,
-									success: function(html) {
-										var div = document.createElement('div');
-										div.innerHTML = html;
-										var elements = div.childNodes;
-										old_lastPostId = lastPostId;
-										lastPostId = elements[3].textContent;
-										lastPostId = lastPostId.replace(/\s+/g, '');
-										//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-										if(lastPostId == old_lastPostId) {
-											
-											//morePostsAvailable = false;
-										}
-										else {
-											//alert(elements[3].textContent);
-											$('#posts').append(elements[1].innerHTML);
-											$('#posts').hide().show(0);
-										}
-										$('#loading').hide();
-									}
-								});
-
-								$('.jodel > content').Emoji();
-							}
-							
-						}
-						scrollToAnchor(hash);
-
-					}						
-				}
-
-				// Each time the user scrolls
-				win.scroll(function() {
-
-
-					// End of the document reached?
-					if ($(window).scrollTop() + $(window).height() > $(document).height() - 100 && morePostsAvailable)
-					{
-						$('#loading').show();
-
-						$.ajax({
-							url: 'get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
-							dataType: 'html',
-							async: false,
-							success: function(html) {
-								var div = document.createElement('div');
-								div.innerHTML = html;
-								var elements = div.childNodes;
-								old_lastPostId = lastPostId;
-								lastPostId = elements[3].textContent;
-								lastPostId = lastPostId.replace(/\s+/g, '');
-								//alert('Neu: ' + lastPostId + " Alt: " + old_lastPostId);
-								if(lastPostId == old_lastPostId)
-								{
-									
-									//morePostsAvailable = false;
-								}
-								else
-								{
-									//alert(elements[3].textContent);
-									$('#posts').append(elements[1].innerHTML);
-								}
-								$('#loading').hide();
-							}
-						});
-
-						$('.jodel > content').Emoji();
-					}
-				});
-			<?php } ?>
-			});	
-
-		</script>
-
-		<?php  
-			if(is_file('./piwik-script.html'))
-			{
-			    require_once('./piwik-script.html');
-			}
-		?>
-
-	</body>
-</html>
-
+				var view = "<?php echo $view
\ No newline at end of file

vote-ajax.php

Spacing +3 added lines, -3 removed lines

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

Braces +7 added lines, -4 removed lines

@@ -40,17 +40,20 @@ 
 				$token = $accessToken;
 				$success = false;
 			}
-			else {
+			else
+			{
 				
 				$location = getLocationByAccessToken($accessToken);
 
 				$accessToken = isTokenFreshByAccessToken($location, $accessToken);
 
 
-				if($_POST['vote'] == "up") {
+				if($_POST['vote'] == "up")
+				{
 					$accountCreator = new Upvote();
 				}
-				else if($_POST['vote'] == "down") {
+				else if($_POST['vote'] == "down")
+				{
 					$accountCreator = new Downvote();
 				}
 
@@ -74,7 +77,7 @@ 
 {
 	$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "accessToken" => $token);
 }
-else 
+else
 {
 	$response = array("success" => $success, "message" => $message);
 }

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

@@ -4,7 +4,7 @@ 
 if(!isset($_GET['pw']) || $config['pw'] != $_GET['pw'])
 {
 	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	$respone = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => FALSE);
 	echo json_encode($response);
 	
 	die();
@@ -20,7 +20,7 @@ 
 }
 
 $message = "";
-$success = true;
+$success = TRUE;
 $token = "";
 	if(isset($_POST['vote']) && isset($_POST['postId']))
 	{
@@ -38,7 +38,7 @@ 
 				$message = "This account is not verified. Please verify this account first.";
 				$captcha = getCaptcha($accessToken);
 				$token = $accessToken;
-				$success = false;
+				$success = FALSE;
 			}
 			else {
 				
@@ -66,7 +66,7 @@ 
 		else
 		{
 			$message = 'There is no account available for this jodel. Please create at least one new account to vote this jodel.';
-			$success = false;
+			$success = FALSE;
 		}
 	}