mmainstreet / jodel-web

php/JodelAccount.php

Indentation +468 added lines, -468 removed lines

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

php/View.php

Indentation +231 added lines, -231 removed lines

@@ -2,112 +2,112 @@ 
 
 class View
 {
-    public $country;
-    public $city;
-    public $hashtag;
+	public $country;
+	public $city;
+	public $hashtag;
 	public $view;
-    public $postId;
-    public $isDetailedView;
-    public $baseUrl;
-    public $rights;
+	public $postId;
+	public $isDetailedView;
+	public $baseUrl;
+	public $rights;
 
 	public $lastPostId = '';
 
-    function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
-    {
-        $this->baseUrl = $baseUrl;
-        $this->country = $country;
-        $this->city = $city;
-        $this->hashtag = urldecode($hashtag);
-        $this->view = $view;
-        $this->postId = $postId;
+	function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
+	{
+		$this->baseUrl = $baseUrl;
+		$this->country = $country;
+		$this->city = $city;
+		$this->hashtag = urldecode($hashtag);
+		$this->view = $view;
+		$this->postId = $postId;
 
-        if(isUserAdmin())
-        {
-            $this->rights = 'admin';
-        }
-        else if(isUserVoter())
-        {
-            $this->rights = 'voter';
-        }
-        else
-        {
-            $this->rights = 'user';
-        }
+		if(isUserAdmin())
+		{
+			$this->rights = 'admin';
+		}
+		else if(isUserVoter())
+		{
+			$this->rights = 'voter';
+		}
+		else
+		{
+			$this->rights = 'user';
+		}
 
-        if($postId == '')
-        {
-            $this->isDetailedView = FALSE;
-        }
-        else
-        {
-            $this->isDetailedView = TRUE;
-        }
-    }
+		if($postId == '')
+		{
+			$this->isDetailedView = FALSE;
+		}
+		else
+		{
+			$this->isDetailedView = TRUE;
+		}
+	}
 	/**
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
-        //Replace # with link
-        //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
+	{   //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);
+		//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');
+		$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";
-                    }
-                }
-            }
-        }
+		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';
+				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'])));
-                }
-                ?>
+					echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
+				}
+				else {
+					echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
+				}
+				?>
             </content>
             <aside>                    
                 <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
@@ -136,10 +136,10 @@ 
                                 <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post))
-                                    {
-                                        echo $post["child_count"];
-                                    } else echo "0";
-                                    ?>
+									{
+										echo $post["child_count"];
+									} else echo "0";
+									?>
                                 </a>
                             </span>
                             
@@ -159,18 +159,18 @@ 
 						?>
                         <span class="distance">
                             <?php
-                                if($this->isDetailedView)
-                                {
-                                    if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
-                                    {
-                                        ?>
+								if($this->isDetailedView)
+								{
+									if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
+									{
+										?>
                                         <span data-tooltip="Author">
                                             <i class="fa fa-user-o"></i> OJ |
                                         </span>
                                         <?php 
-                                    }
-                                }
-                                ?>
+									}
+								}
+								?>
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
@@ -183,7 +183,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**
@@ -220,147 +220,147 @@ 
 		return $description;
 	}
 
-    function toUrl($msg = '')
-    {
-        $url = $this->baseUrl . 'index.php?country=DE' .
-                            '&city=' . urlencode($this->city) .
-                            '&hashtag=' . urlencode($this->hashtag) . 
-                            '&view=' . $this->view;
-        if($this->postId != '')
-        {
-            $url .= '&postId=' . $this->postId . 
-                    '&getPostDetails=TRUE';
-        }
+	function toUrl($msg = '')
+	{
+		$url = $this->baseUrl . 'index.php?country=DE' .
+							'&city=' . urlencode($this->city) .
+							'&hashtag=' . urlencode($this->hashtag) . 
+							'&view=' . $this->view;
+		if($this->postId != '')
+		{
+			$url .= '&postId=' . $this->postId . 
+					'&getPostDetails=TRUE';
+		}
 
-        if($msg != '')
-        {
-            $url .= '&msg=' . urlencode($msg);
-        }
+		if($msg != '')
+		{
+			$url .= '&msg=' . urlencode($msg);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 
-    function changePostId($postId)
-    {
-        $tempView = clone $this;
-        $tempView->postId = $postId;
-        $tempView->isDetailedView = TRUE;
-        return $tempView;
-    }
+	function changePostId($postId)
+	{
+		$tempView = clone $this;
+		$tempView->postId = $postId;
+		$tempView->isDetailedView = TRUE;
+		return $tempView;
+	}
 
-    function back()
-    {
-        $tempView = clone $this;
-        $tempView->postId = '';
-        return $tempView;
-    }
+	function back()
+	{
+		$tempView = clone $this;
+		$tempView->postId = '';
+		return $tempView;
+	}
 
-    function changeView($view)
-    {
-        $tempView = clone $this;
-        $tempView->view = $view;
-        return $tempView;
-    }
+	function changeView($view)
+	{
+		$tempView = clone $this;
+		$tempView->view = $view;
+		return $tempView;
+	}
 
 	function getPosts($jodelAccount)
 	{
-        if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
-        {
-            $accountCreator = new GetChannel();
-            $accountCreator->view = $this->view;
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->channel = $this->hashtag;
-            $accountCreator->lastPostId = $this->lastPostId;
-            $data = $accountCreator->execute();
-        }
-        else
-        {
-            if($this->lastPostId == '' && $this->view == 'combo')
-            {
-                $url = "/v3/posts/location/combo";
-            }
-            else
-            {
-                if($this->view == 'discussed')
-                {
-                    $url = "/v2/posts/location/discussed/";
-                }
-                else
-                {
-                    if($this->view == 'popular')
-                    {
-                        $url = "/v2/posts/location/popular/";
-                    }
-                    else
-                    {
-                        $url = "/v2/posts/location/";
-                    }
-                }
-            }
+		if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
+		{
+			$accountCreator = new GetChannel();
+			$accountCreator->view = $this->view;
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->channel = $this->hashtag;
+			$accountCreator->lastPostId = $this->lastPostId;
+			$data = $accountCreator->execute();
+		}
+		else
+		{
+			if($this->lastPostId == '' && $this->view == 'combo')
+			{
+				$url = "/v3/posts/location/combo";
+			}
+			else
+			{
+				if($this->view == 'discussed')
+				{
+					$url = "/v2/posts/location/discussed/";
+				}
+				else
+				{
+					if($this->view == 'popular')
+					{
+						$url = "/v2/posts/location/popular/";
+					}
+					else
+					{
+						$url = "/v2/posts/location/";
+					}
+				}
+			}
 
-            $accountCreator = new GetPosts();
-            $accountCreator->setLastPostId($this->lastPostId);
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->setUrl($url);
-            $accountCreator->version = 'v3';
+			$accountCreator = new GetPosts();
+			$accountCreator->setLastPostId($this->lastPostId);
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->setUrl($url);
+			$accountCreator->version = 'v3';
 
-            $config = parse_ini_file('config/config.ini.php');
-            $location = new Location();
-            $location->setLat($config['default_lat']);
-            $location->setLng($config['default_lng']);
-            $location->setCityName($config['default_location']);
-            $accountCreator->location = $location;
-            $data = $accountCreator->execute();
-        }
-    	if(is_array($data) && array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
-        {
-            return $data['recent'];
-        }
-        else if(is_array($data) && array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
-        {
-            return $data['posts'];
-        }
-        else
-        {
-            if($this->lastPostId == '')
-            {
-                error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
-                //error_log(print_r($data, true));
+			$config = parse_ini_file('config/config.ini.php');
+			$location = new Location();
+			$location->setLat($config['default_lat']);
+			$location->setLng($config['default_lng']);
+			$location->setCityName($config['default_location']);
+			$accountCreator->location = $location;
+			$data = $accountCreator->execute();
+		}
+		if(is_array($data) && array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
+		{
+			return $data['recent'];
+		}
+		else if(is_array($data) && array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+		{
+			return $data['posts'];
+		}
+		else
+		{
+			if($this->lastPostId == '')
+			{
+				error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
+				//error_log(print_r($data, true));
 
-                $notFound[0] = array(
-                    "post_id" => "0",
-                    "discovered_by" => 0,
-                    "message" => "No more Posts found",
-                    "created_at" => "2017-02-11T16:44:50.385Z",
-                    "updated_at" => "2017-02-11T16:44:50.385Z",
-                    "pin_count" => 0,
-                    "color" => "5682a3",
-                    "got_thanks" => FALSE,
-                    "post_own" => "friend",
-                    "discovered" => 0,
-                    "distance" => 9,
-                    "vote_count" => 0,
-                    "location" =>
-                    array("name" => "Berlin",
-                      "loc_coordinates" =>
-                      array(
-                        "lat" => 0,
-                        "lng" => 0
-                      ),
-                      "loc_accuracy" => 0,
-                      "country" => "",
-                      "city" => "",
-                    ),
-                    "tags" =>
-                    array(),
-                    "user_handle" => "0"
-                );
-                return $notFound;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
+				$notFound[0] = array(
+					"post_id" => "0",
+					"discovered_by" => 0,
+					"message" => "No more Posts found",
+					"created_at" => "2017-02-11T16:44:50.385Z",
+					"updated_at" => "2017-02-11T16:44:50.385Z",
+					"pin_count" => 0,
+					"color" => "5682a3",
+					"got_thanks" => FALSE,
+					"post_own" => "friend",
+					"discovered" => 0,
+					"distance" => 9,
+					"vote_count" => 0,
+					"location" =>
+					array("name" => "Berlin",
+					  "loc_coordinates" =>
+					  array(
+						"lat" => 0,
+						"lng" => 0
+					  ),
+					  "loc_accuracy" => 0,
+					  "country" => "",
+					  "city" => "",
+					),
+					"tags" =>
+					array(),
+					"user_handle" => "0"
+				);
+				return $notFound;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
 	}
 }

php/Requests/AbstractRequest.php

Indentation +166 added lines, -166 removed lines

@@ -2,21 +2,21 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = 'bJYlFZkrnLpLMVisrbstPDNsaYHPbzcKRSpqtjtt';
-    const USERAGENT = 'Jodel/4.42.4 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.42.4';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'bJYlFZkrnLpLMVisrbstPDNsaYHPbzcKRSpqtjtt';
+	const USERAGENT = 'Jodel/4.42.4 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.42.4';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = '';
-    public $version = 'v2';
-    public $hasPayload = FALSE;
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
+	public $hasPayload = FALSE;
 
-    public function execute()
-    {
-        $result = new \stdClass();
+	public function execute()
+	{
+		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = '';
@@ -25,16 +25,16 @@ 
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
 
-        /*
+		/*
         printf("URL: ");
         var_dump($url);
         echo "<br />";
@@ -45,124 +45,124 @@ 
         var_dump($this->payLoad);
         echo "<br />";
         */
-        /*
+		/*
         $options = array(
             'timeout' => 100,
             'connect_timeout' => 100,
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->hasPayload)
-                {
-                    $result = Requests::get($url, $header, $this->payLoad);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->hasPayload)
+				{
+					$result = Requests::get($url, $header, $this->payLoad);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
 
-        http_response_code($result->status_code);
+		http_response_code($result->status_code);
 
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = 'Success';
-                http_response_code(200);
-                break;
-            case 400:
-                $result = json_decode($result->body, true);
-                error_log('Error 400 - ' . print_r($result, true));
-                break;
-            case 401:
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = 'Success';
+				http_response_code(200);
+				break;
+			case 400:
+				$result = json_decode($result->body, true);
+				error_log('Error 400 - ' . print_r($result, true));
+				break;
+			case 401:
 
-                if($result == "Unauthorized")
-                {
-                    error_log("Error 401: Unauthorized");
-                }
-                else
-                {
-                    $result = json_decode($result->body, true);
+				if($result == "Unauthorized")
+				{
+					error_log("Error 401: Unauthorized");
+				}
+				else
+				{
+					$result = json_decode($result->body, true);
 
-                    if(is_array($result) && $result['error'] == 'length')
-                    {
+					if(is_array($result) && $result['error'] == 'length')
+					{
 
-                    }
-                    else
-                    {
-                        error_log('Error 401 - ' . print_r($result, true));
-                    }
-                }
+					}
+					else
+					{
+						error_log('Error 401 - ' . print_r($result, true));
+					}
+				}
 
 
-                break;
-            case 404:
-                error_log('Error 404 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                break;
+				break;
+			case 404:
+				error_log('Error 404 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				break;
 			case 477:
-                $result = json_decode($result->body, true);
-                error_log('Error 477 - ' . print_r($result, true));
-                break;
-            case 429:
-                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
-                $result = json_decode($result->body, true);
-                break;
-            case 502:
-                error_log('Error 502 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                header('location:'.$_SERVER['PHP_SELF']);
-                break;
-            case 503:
-                error_log('Error 503 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+				$result = json_decode($result->body, true);
+				error_log('Error 477 - ' . print_r($result, true));
+				break;
+			case 429:
+				error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
+				$result = json_decode($result->body, true);
+				break;
+			case 502:
+				error_log('Error 502 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				header('location:'.$_SERVER['PHP_SELF']);
+				break;
+			case 503:
+				error_log('Error 503 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
 
-                if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
-                {
-                    header('location:'.$_SERVER['PHP_SELF']); 
-                }
-                break;
-            default:
-                error_log('Error '.$result->status_code.' - unknown error');
-                $result = json_decode($result->body, true);
-        }
+				if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
+				{
+					header('location:'.$_SERVER['PHP_SELF']); 
+				}
+				break;
+			default:
+				error_log('Error '.$result->status_code.' - unknown error');
+				$result = json_decode($result->body, true);
+		}
 
-        //important for account refresh
-        if($device_uid != '')
-        {
+		//important for account refresh
+		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 = "";
 			}
@@ -171,54 +171,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;
+	}
 }