mmainstreet / jodel-web

php/JodelAccount.php

Indentation +399 added lines, -399 removed lines

@@ -2,445 +2,445 @@
 
 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->deviceUidHasVotedThisPostId($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->addVoteWithPostIdAndTypeToDeviceUid($postId, $vote);
-                return TRUE;
-            }
-            else
-            {
-                return FALSE;
-                error_log("Could not vote: " . var_dump($data));
-            } 
-        }
-    }
-
-    //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->deviceUidHasVotedThisPostId($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->addVoteWithPostIdAndTypeToDeviceUid($postId, $vote);
+				return TRUE;
+			}
+			else
+			{
+				return FALSE;
+				error_log("Could not vote: " . var_dump($data));
+			} 
+		}
+	}
+
+	//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 deviceUidHasVotedThisPostId($postId)
-    {
-        $db = new DatabaseConnect();
+	function deviceUidHasVotedThisPostId($postId)
+	{
+		$db = new DatabaseConnect();
 
-        $postId = $db->real_escape_string($postId);
+		$postId = $db->real_escape_string($postId);
 
-        $result = $db->query("SELECT id
+		$result = $db->query("SELECT id
                               FROM votes
                               WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
         
-        if($result === false)
-        {
-            $error = db_error();
-            echo $error;
-            echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
-        }
-
-        if($result->num_rows == 0)
-        {
-            return FALSE;
-        }
-        else
-        {
-            return TRUE;
-        }
-    }
-
-    function addVoteWithPostIdAndTypeToDeviceUid($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;
+			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
+		}
+
+		if($result->num_rows == 0)
+		{
+			return FALSE;
+		}
+		else
+		{
+			return TRUE;
+		}
+	}
+
+	function addVoteWithPostIdAndTypeToDeviceUid($postId, $voteType)
+	{
+		$db = new DatabaseConnect();  
+
+		$postId = $db->real_escape_string($postId);
+		$voteType = $db->real_escape_string($voteType);
         
-        if($this->deviceUidHasVotedThisPostId($postId))
-        {
-            return "Already voted";
-        }
+		if($this->deviceUidHasVotedThisPostId($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

php/View.php

Indentation +85 added lines, -85 removed lines

@@ -9,75 +9,75 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
-    {   //ToDO
-        //Replace # with link
-        //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
-
-        //Time to time difference
-        $now = new DateTime();
-        $d = new DateTime($post['created_at']);
-        $timediff = $now->diff($d);
-
-        $timediff_inSeconds = (string)$timediff->format('%s');
-        $timediff_inMinutes = (string)$timediff->format('%i');
-        $timediff_inHours = (string)$timediff->format('%h');
-        $timediff_inDays = (string)$timediff->format('%d');
-        $timediff_inMonth = (string)$timediff->format('%m');
-
-        if($timediff_inMonth!=0)
-        {
-                $timediff = $timediff_inMonth . "m";
-        }
-        else
-        {
-            if($timediff_inDays!=0)
-            {
-                $timediff = $timediff_inDays . "d";
-            }
-            else
-            {
-                if($timediff_inHours!=0)
-                {
-                    $timediff = $timediff_inHours . "h";
-                }
-                else
-                {
-                    if($timediff_inMinutes!=0)
-                    {
-                        $timediff = $timediff_inMinutes . "m";
-                    }
-                    else
-                    {
-                        $timediff = $timediff_inSeconds . "s";
-                    }
-                }
-            }
-        }
-
-
-        ?>
+	{   //ToDO
+		//Replace # with link
+		//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
+
+		//Time to time difference
+		$now = new DateTime();
+		$d = new DateTime($post['created_at']);
+		$timediff = $now->diff($d);
+
+		$timediff_inSeconds = (string)$timediff->format('%s');
+		$timediff_inMinutes = (string)$timediff->format('%i');
+		$timediff_inHours = (string)$timediff->format('%h');
+		$timediff_inDays = (string)$timediff->format('%d');
+		$timediff_inMonth = (string)$timediff->format('%m');
+
+		if($timediff_inMonth!=0)
+		{
+				$timediff = $timediff_inMonth . "m";
+		}
+		else
+		{
+			if($timediff_inDays!=0)
+			{
+				$timediff = $timediff_inDays . "d";
+			}
+			else
+			{
+				if($timediff_inHours!=0)
+				{
+					$timediff = $timediff_inHours . "h";
+				}
+				else
+				{
+					if($timediff_inMinutes!=0)
+					{
+						$timediff = $timediff_inMinutes . "m";
+					}
+					else
+					{
+						$timediff = $timediff_inSeconds . "s";
+					}
+				}
+			}
+		}
+
+
+		?>
         <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
             <content>
                 <?php 
-                if(isset($post['image_url']))
-                {
-                    $regexRest = '/[^\w$ .!?-]+/u';
-
-                    echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
-                }
-                else {
-                    echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
-                }
-                ?>
+				if(isset($post['image_url']))
+				{
+					$regexRest = '/[^\w$ .!?-]+/u';
+
+					echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
+				}
+				else {
+					echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
+				}
+				?>
             </content>
             <aside>
                 <?php
-                    if($isDetailedView)
-                    {?>
+					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>
@@ -85,12 +85,12 @@ 
                             <br />
                         <?php echo $post["vote_count"];?><br />
                 <?php
-                    if($isDetailedView)
-                    {?>
+					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>
@@ -113,39 +113,39 @@ 
                                 <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"];
-                                            } else echo "0";
-                                    ?>
+												echo $post["child_count"];
+											} else echo "0";
+									?>
                                     </a>
                             </span>
                             <?php } ?>
                         </td>
                         <td class="distance">
                             <?php
-                                if($isDetailedView)
-                                {
-                                    if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
-                                    {
-                                        ?>
+								if($isDetailedView)
+								{
+									if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
+									{
+										?>
                                         <span data-tooltip="Author">
                                             <i class="fa fa-user-o"></i> OJ |
                                         </span>
                                         <?php 
-                                    }
-                                    else
-                                    {
-                                        //Is not parent Jodel in detailed View
-                                        if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
-                                        {
-                                            ?>
+									}
+									else
+									{
+										//Is not parent Jodel in detailed View
+										if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
+										{
+											?>
                                             <span data-tooltip="Author">
                                                 <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
                                             </span>
                                             <?php
-                                        }
-                                    }
-                                }
-                                ?>
+										}
+									}
+								}
+								?>
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
@@ -158,7 +158,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**

php/Requests/GetPostDetails.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetPostDetails extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postId'];
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postId'];
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

php/jodel-web.php

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"
 			 );