Completed
Push — master ( 3c0e9a...ccb03a )
by mains
02:54
created
php/Requests/UpdateLocation.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -3,37 +3,37 @@
 block discarded – undo
3 3
 
4 4
 class UpdateLocation extends AbstractRequest {
5 5
 		 /**
6
-     * @var Location
7
-     */
8
-    public $location;
9
-    /**
10
-     * @return Location
11
-     */
12
-    public function getLocation()
13
-    {
14
-        return $this->location;
15
-    }
16
-    /**
17
-     * @param Location $location
18
-     */
19
-    public function setLocation($location)
20
-    {
21
-        $this->location = $location;
22
-    }
6
+		  * @var Location
7
+		  */
8
+	public $location;
9
+	/**
10
+	 * @return Location
11
+	 */
12
+	public function getLocation()
13
+	{
14
+		return $this->location;
15
+	}
16
+	/**
17
+	 * @param Location $location
18
+	 */
19
+	public function setLocation($location)
20
+	{
21
+		$this->location = $location;
22
+	}
23 23
 		
24
-    function getApiEndPoint()
25
-    {
26
-        return '/v2/users/location';
27
-    }
28
-    function getPayload()
29
-    {
30
-        return array(
24
+	function getApiEndPoint()
25
+	{
26
+		return '/v2/users/location';
27
+	}
28
+	function getPayload()
29
+	{
30
+		return array(
31 31
 			'location' => $this->getLocation()->toArray(),
32
-        );
33
-    }
34
-    function getMethod()
35
-    {
36
-        return 'PUT';
37
-    }
32
+		);
33
+	}
34
+	function getMethod()
35
+	{
36
+		return 'PUT';
37
+	}
38 38
 }
39 39
 
Please login to merge, or discard this patch.
php/Requests/GetCaptcha.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
1 1
 <?php
2 2
 class GetCaptcha extends AbstractRequest
3 3
 {		
4
-    function getApiEndPoint()
5
-    {
6
-        return '/v3/user/verification/imageCaptcha/';
7
-    }
8
-    function getPayload()
9
-    {
10
-        return array(
11
-        );
12
-    }
13
-    function getMethod()
14
-    {
15
-        return 'GET';
16
-    }
4
+	function getApiEndPoint()
5
+	{
6
+		return '/v3/user/verification/imageCaptcha/';
7
+	}
8
+	function getPayload()
9
+	{
10
+		return array(
11
+		);
12
+	}
13
+	function getMethod()
14
+	{
15
+		return 'GET';
16
+	}
17 17
 }
18 18
 
Please login to merge, or discard this patch.
php/Jodel.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 class Jodel
4 4
 {
5
-    public $jodel;
5
+	public $jodel;
6 6
 
7 7
    
8 8
 }
9 9
\ No newline at end of file
Please login to merge, or discard this patch.
php/Requests/GetPostDetails.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,18 +3,18 @@
 block discarded – undo
3 3
 
4 4
 class GetPostDetails extends AbstractRequest {
5 5
 		
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/posts/' . $_GET['postId'];
9
-    }
10
-    function getPayload()
11
-    {
12
-        return array(
13
-        );
14
-    }
15
-    function getMethod()
16
-    {
17
-        return 'GET';
18
-    }
6
+	function getApiEndPoint()
7
+	{
8
+		return '/v2/posts/' . $_GET['postId'];
9
+	}
10
+	function getPayload()
11
+	{
12
+		return array(
13
+		);
14
+	}
15
+	function getMethod()
16
+	{
17
+		return 'GET';
18
+	}
19 19
 }
20 20
 
Please login to merge, or discard this patch.
php/Requests/GetChannel.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -2,41 +2,41 @@
 block discarded – undo
2 2
 
3 3
 class GetChannel extends AbstractRequest
4 4
 {
5
-    /**
6
-     * @var Location
7
-     */
8
-    public $location;
9
-    public $channel;
10
-    public $hasPayload = FALSE;
11
-    public $lastPostId = '';
12
-    public $view = 'combo';
5
+	/**
6
+	 * @var Location
7
+	 */
8
+	public $location;
9
+	public $channel;
10
+	public $hasPayload = FALSE;
11
+	public $lastPostId = '';
12
+	public $view = 'combo';
13 13
 		
14
-    function getApiEndPoint()
15
-    {
16
-        if($this->lastPostId == '')
17
-        {
18
-            $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
19
-        }
20
-        else
21
-        {
22
-            if($this->view == 'combo')
23
-            {
24
-                $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
25
-            }
26
-            else
27
-            {
28
-                $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
29
-            }
30
-        }
31
-        return $apiEndPoint;
32
-    }
33
-    function getPayload()
34
-    {
35
-        return array(
36
-        );
37
-    }
38
-    function getMethod()
39
-    {
40
-        return 'GET';
41
-    }
14
+	function getApiEndPoint()
15
+	{
16
+		if($this->lastPostId == '')
17
+		{
18
+			$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
19
+		}
20
+		else
21
+		{
22
+			if($this->view == 'combo')
23
+			{
24
+				$apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
25
+			}
26
+			else
27
+			{
28
+				$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
29
+			}
30
+		}
31
+		return $apiEndPoint;
32
+	}
33
+	function getPayload()
34
+	{
35
+		return array(
36
+		);
37
+	}
38
+	function getMethod()
39
+	{
40
+		return 'GET';
41
+	}
42 42
 }
Please login to merge, or discard this patch.
templates/footer.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
 		<?php  
130 130
 			if(is_file(realpath(__DIR__ . '/..') . '/piwik-script.html'))
131 131
 			{
132
-			    include(realpath(__DIR__ . '/..') . '/piwik-script.html');
132
+				include(realpath(__DIR__ . '/..') . '/piwik-script.html');
133 133
 			}
134 134
 		?>
135 135
 
Please login to merge, or discard this patch.
php/CustomError.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,17 +13,17 @@
 block discarded – undo
13 13
 	public $varsToDump;
14 14
 
15 15
 	function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set')
16
-    {
17
-        $this->view = $view;
18
-        $this->actions = $actions;
19
-        $this->accountId = $accountId;
20
-        $this->isVerified = $isVerified;
21
-        $this->isTokenFresh = $isTokenFresh;
22
-        $this->page = $page;
23
-        $this->referrer = $referrer;
24
-        $this->msg = $msg;
25
-        $this->varsToDump = $varsToDump;
26
-    }
16
+	{
17
+		$this->view = $view;
18
+		$this->actions = $actions;
19
+		$this->accountId = $accountId;
20
+		$this->isVerified = $isVerified;
21
+		$this->isTokenFresh = $isTokenFresh;
22
+		$this->page = $page;
23
+		$this->referrer = $referrer;
24
+		$this->msg = $msg;
25
+		$this->varsToDump = $varsToDump;
26
+	}
27 27
 
28 28
 	function writeErrorToLog()
29 29
 	{
Please login to merge, or discard this patch.
php/Requests/SendJodel.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -1,41 +1,41 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 class SendJodel extends AbstractRequest {
4
-    public $location;
5
-    public $ancestor = "";
6
-    public $color = "";
7
-    public $image = '';
4
+	public $location;
5
+	public $ancestor = "";
6
+	public $color = "";
7
+	public $image = '';
8 8
     
9
-    function getApiEndPoint()
10
-    {
11
-        return '/v3/posts/';
12
-    }
9
+	function getApiEndPoint()
10
+	{
11
+		return '/v3/posts/';
12
+	}
13 13
 
14
-    function getPayload()
15
-    {
16
-        if($this->image != '')
17
-        {
18
-            return array(
19
-            "ancestor" => $this->ancestor,
20
-            "color" => $this->color,
21
-            "location" => $this->location->toArray(),
22
-            "message" => $_POST['message'],
23
-            'image' => base64_encode($this->image),
24
-            );
25
-        }
26
-        else
27
-        {
28
-            return array(
29
-            "ancestor" => $this->ancestor,
30
-            "color" => $this->color,
31
-            "location" => $this->location->toArray(),
32
-            "message" => $_POST['message'],
33
-            );
34
-        }
14
+	function getPayload()
15
+	{
16
+		if($this->image != '')
17
+		{
18
+			return array(
19
+			"ancestor" => $this->ancestor,
20
+			"color" => $this->color,
21
+			"location" => $this->location->toArray(),
22
+			"message" => $_POST['message'],
23
+			'image' => base64_encode($this->image),
24
+			);
25
+		}
26
+		else
27
+		{
28
+			return array(
29
+			"ancestor" => $this->ancestor,
30
+			"color" => $this->color,
31
+			"location" => $this->location->toArray(),
32
+			"message" => $_POST['message'],
33
+			);
34
+		}
35 35
 
36
-    }
37
-    function getMethod()
38
-    {
39
-        return 'POST';
40
-    }
36
+	}
37
+	function getMethod()
38
+	{
39
+		return 'POST';
40
+	}
41 41
 }
Please login to merge, or discard this patch.
php/JodelAccount.php 1 patch
Indentation   +474 added lines, -474 removed lines patch added patch discarded remove patch
@@ -2,565 +2,565 @@
 block discarded – undo
2 2
 
3 3
 class JodelAccount
4 4
 {
5
-    public $accessToken;
6
-    public $expirationDate;
7
-    public $refreshToken;
8
-    public $distinctId;
9
-    public $deviceUid;
10
-
11
-    //is the Account a Bot or Spider?
12
-    public $isBot;
5
+	public $accessToken;
6
+	public $expirationDate;
7
+	public $refreshToken;
8
+	public $distinctId;
9
+	public $deviceUid;
10
+
11
+	//is the Account a Bot or Spider?
12
+	public $isBot;
13 13
     
14
-    // array of voted Jodels
15
-    public $votes;
14
+	// array of voted Jodels
15
+	public $votes;
16 16
 
17
-    //Location of the Account
18
-    public $location;
17
+	//Location of the Account
18
+	public $location;
19 19
 
20
-    function __construct($deviceUid = NULL, $isBot = FALSE)
21
-    {
22
-        if($deviceUid == NULL)
23
-        {
24
-            $this->deviceUid = $this->createAccount();
25
-        }
26
-        else
27
-        {
28
-            $this->deviceUid = $deviceUid;
29
-        }
20
+	function __construct($deviceUid = NULL, $isBot = FALSE)
21
+	{
22
+		if($deviceUid == NULL)
23
+		{
24
+			$this->deviceUid = $this->createAccount();
25
+		}
26
+		else
27
+		{
28
+			$this->deviceUid = $deviceUid;
29
+		}
30 30
 
31
-        $this->isBot        = $isBot;
32
-        $this->location     = $this->getLocation();
31
+		$this->isBot        = $isBot;
32
+		$this->location     = $this->getLocation();
33 33
 
34
-        if(!$this->isTokenFresh())
35
-        {
36
-            $this->refreshToken();
37
-        }
38
-        $this->accessToken  = $this->getAccessToken();
34
+		if(!$this->isTokenFresh())
35
+		{
36
+			$this->refreshToken();
37
+		}
38
+		$this->accessToken  = $this->getAccessToken();
39 39
 
40
-       /* if($this->isAccountVerified() != 1)
40
+	   /* if($this->isAccountVerified() != 1)
41 41
         {
42 42
             $this->showCaptcha();
43 43
             //$this->verifyCaptcha();
44 44
         }*/
45
-    }
45
+	}
46 46
 
47
-    function showCaptcha()
48
-    {
49
-        $accountCreator = new GetCaptcha();
50
-        $accountCreator->setAccessToken($this->accessToken);
51
-        $captcha = $accountCreator->execute();
47
+	function showCaptcha()
48
+	{
49
+		$accountCreator = new GetCaptcha();
50
+		$accountCreator->setAccessToken($this->accessToken);
51
+		$captcha = $accountCreator->execute();
52 52
 
53
-        echo $captcha['image_url'];
54
-        echo('<br><img width="100%" src="' . $captcha['image_url'] . '">');
55
-        echo "<br>Key: " . $captcha['key'];
56
-        echo "<br>";
53
+		echo $captcha['image_url'];
54
+		echo('<br><img width="100%" src="' . $captcha['image_url'] . '">');
55
+		echo "<br>Key: " . $captcha['key'];
56
+		echo "<br>";
57 57
 
58
-        //Form
58
+		//Form
59 59
         
60
-        echo '<form method="get">';
61
-        echo    '<p>Enter Key (copy pasta from top): <input type="text" value="' . $captcha['key'] . '" name="key" /></p>';
62
-        echo    '<p>Find the Coons (example: they are on picture 3, 4 and 5. You enter 2-3-4. Becouse we start counting at 0): <input type="text" name="solution" /></p>';
63
-        echo    '<input type="hidden" name="deviceUid" value="' . $this->deviceUid . '">';
64
-        echo    '<input type="hidden" name="pw" value="upVote">';
65
-        echo    '<p><input type="submit" /></p>';
66
-        echo '</form>';
67
-
68
-        die();
60
+		echo '<form method="get">';
61
+		echo    '<p>Enter Key (copy pasta from top): <input type="text" value="' . $captcha['key'] . '" name="key" /></p>';
62
+		echo    '<p>Find the Coons (example: they are on picture 3, 4 and 5. You enter 2-3-4. Becouse we start counting at 0): <input type="text" name="solution" /></p>';
63
+		echo    '<input type="hidden" name="deviceUid" value="' . $this->deviceUid . '">';
64
+		echo    '<input type="hidden" name="pw" value="upVote">';
65
+		echo    '<p><input type="submit" /></p>';
66
+		echo '</form>';
67
+
68
+		die();
69 69
         
70
-    }
70
+	}
71 71
 
72
-    function getCaptcha()
73
-    {
74
-        $accountCreator = new GetCaptcha();
75
-        $accountCreator->setAccessToken($this->accessToken);
76
-        $captcha = $accountCreator->execute();
72
+	function getCaptcha()
73
+	{
74
+		$accountCreator = new GetCaptcha();
75
+		$accountCreator->setAccessToken($this->accessToken);
76
+		$captcha = $accountCreator->execute();
77 77
 
78
-        return array("image_url" => $captcha['image_url'], "key" => $captcha['key']);
79
-    }
78
+		return array("image_url" => $captcha['image_url'], "key" => $captcha['key']);
79
+	}
80 80
 
81
-    function isAccountVerified()
82
-    {
83
-        $accountCreator = new GetUserConfig();
84
-        $accountCreator->setAccessToken($this->accessToken);
85
-        $data = $accountCreator->execute();
81
+	function isAccountVerified()
82
+	{
83
+		$accountCreator = new GetUserConfig();
84
+		$accountCreator->setAccessToken($this->accessToken);
85
+		$data = $accountCreator->execute();
86 86
 
87
-        //error_log(print_r($data, true));
87
+		//error_log(print_r($data, true));
88 88
 
89
-        return $data['verified'];
90
-    }
89
+		return $data['verified'];
90
+	}
91 91
 
92
-    function locationEquals($city)
93
-    {
94
-        $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
95
-        $result = Requests::post($url);
96
-        if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
97
-        {
98
-            error_log('Error locationEquals');
99
-            return FALSE;
100
-        }
101
-        else
102
-        {
103
-            $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
104
-            $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
105
-            $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
106
-        }
92
+	function locationEquals($city)
93
+	{
94
+		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
95
+		$result = Requests::post($url);
96
+		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
97
+		{
98
+			error_log('Error locationEquals');
99
+			return FALSE;
100
+		}
101
+		else
102
+		{
103
+			$name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
104
+			$lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
105
+			$lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
106
+		}
107 107
 
108
-        $db = new DatabaseConnect();
109
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
108
+		$db = new DatabaseConnect();
109
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
110 110
         
111
-        $location = new Location();
111
+		$location = new Location();
112 112
         
113
-        if ($result->num_rows > 0)
114
-        {
115
-            // output data of each row
116
-            while($row = $result->fetch_assoc())
117
-            {
118
-                $location->setLat($row['lat']);
119
-                $location->setLng($row['lng']);
120
-                $location->setCityName($row['name']);
121
-            }
122
-        }
123
-        else
124
-        {
125
-            error_log("Error no Location found - getLocation");
126
-        }
113
+		if ($result->num_rows > 0)
114
+		{
115
+			// output data of each row
116
+			while($row = $result->fetch_assoc())
117
+			{
118
+				$location->setLat($row['lat']);
119
+				$location->setLng($row['lng']);
120
+				$location->setCityName($row['name']);
121
+			}
122
+		}
123
+		else
124
+		{
125
+			error_log("Error no Location found - getLocation");
126
+		}
127 127
 
128
-        if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
129
-        {
130
-            return TRUE;
131
-        }  
132
-        else
133
-        {
134
-            return FALSE;
135
-        }
136
-    }
137
-
138
-    function setLocation()
139
-    {
140
-        //Is Channel or City
141
-        if(substr($_GET['city'], 0, 1) === '#')
142
-        {
143
-            return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
144
-        }                
145
-        else
146
-        {
147
-            $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
148
-            $result = Requests::post($url);
149
-            if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
150
-            {
151
-                return "0 results";
152
-            }
153
-            else
154
-            {
155
-                $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
156
-                $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
157
-                $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
158
-
159
-                $location = new Location();
160
-                $location->setLat($lat);
161
-                $location->setLng($lng);
162
-                $location->setCityName($name);
163
-                $accountCreator = new UpdateLocation();
164
-                $accountCreator->setLocation($location);
165
-                $accountCreator->setAccessToken($this->accessToken);
166
-                $data = $accountCreator->execute();
167
-
168
-                //safe location to db
169
-                $db = new DatabaseConnect();
170
-
171
-                if($data == 'Success')
172
-                {
173
-                    $result = $db->query("UPDATE accounts 
128
+		if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name)
129
+		{
130
+			return TRUE;
131
+		}  
132
+		else
133
+		{
134
+			return FALSE;
135
+		}
136
+	}
137
+
138
+	function setLocation()
139
+	{
140
+		//Is Channel or City
141
+		if(substr($_GET['city'], 0, 1) === '#')
142
+		{
143
+			return htmlspecialchars($_GET['city']) . " " . $this->location->cityName;
144
+		}                
145
+		else
146
+		{
147
+			$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
148
+			$result = Requests::post($url);
149
+			if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
150
+			{
151
+				return "0 results";
152
+			}
153
+			else
154
+			{
155
+				$name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name'];
156
+				$lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat'];
157
+				$lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng'];
158
+
159
+				$location = new Location();
160
+				$location->setLat($lat);
161
+				$location->setLng($lng);
162
+				$location->setCityName($name);
163
+				$accountCreator = new UpdateLocation();
164
+				$accountCreator->setLocation($location);
165
+				$accountCreator->setAccessToken($this->accessToken);
166
+				$data = $accountCreator->execute();
167
+
168
+				//safe location to db
169
+				$db = new DatabaseConnect();
170
+
171
+				if($data == 'Success')
172
+				{
173
+					$result = $db->query("UPDATE accounts 
174 174
                             SET name='" . $name . "',
175 175
                                 lat='" . $lat . "',
176 176
                                 lng='" . $lng . "'
177 177
                             WHERE access_token='" . $this->accessToken . "'");
178 178
 
179
-                    if($result === false)
180
-                    {
181
-                            echo "Updating location failed: (" . $db->errno . ") " . $db->error;
182
-                    }
183
-                    else
184
-                    {
185
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
186
-                    }
187
-                }
188
-
189
-                return $name;
190
-            }
191
-        }
192
-    }
193
-
194
-    function getLocation()
195
-    {
196
-        $db = new DatabaseConnect();
197
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
179
+					if($result === false)
180
+					{
181
+							echo "Updating location failed: (" . $db->errno . ") " . $db->error;
182
+					}
183
+					else
184
+					{
185
+						user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
186
+					}
187
+				}
188
+
189
+				return $name;
190
+			}
191
+		}
192
+	}
193
+
194
+	function getLocation()
195
+	{
196
+		$db = new DatabaseConnect();
197
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
198 198
         
199
-        $location = new Location();
199
+		$location = new Location();
200 200
         
201
-        if ($result->num_rows > 0)
202
-        {
203
-            // output data of each row
204
-            while($row = $result->fetch_assoc())
205
-            {
206
-                $location->setLat($row['lat']);
207
-                $location->setLng($row['lng']);
208
-                $location->setCityName($row['name']);
209
-            }
210
-        }
211
-        else
212
-        {
213
-            echo "Error: 0 results";
214
-            error_log("Error no Location found - getLocation");
215
-        }
201
+		if ($result->num_rows > 0)
202
+		{
203
+			// output data of each row
204
+			while($row = $result->fetch_assoc())
205
+			{
206
+				$location->setLat($row['lat']);
207
+				$location->setLng($row['lng']);
208
+				$location->setCityName($row['name']);
209
+			}
210
+		}
211
+		else
212
+		{
213
+			echo "Error: 0 results";
214
+			error_log("Error no Location found - getLocation");
215
+		}
216 216
 
217
-        return $location;
218
-    }
217
+		return $location;
218
+	}
219 219
 
220
-    function verifyCaptcha()
221
-    {
222
-        if(isset($_GET['deviceUid']))
223
-        {
224
-            $deviceUid = $_GET['deviceUid'];
225
-            $jodelAccountForVerify = new JodelAccount($deviceUid);
226
-        }
227
-        else if(isset($_POST['deviceUid']))
228
-        {
229
-            $deviceUid = $_POST['deviceUid'];
230
-            $jodelAccountForVerify = new JodelAccount($deviceUid);
231
-        }
232
-        else
233
-        {
234
-            $deviceUid = $this->deviceUid;
235
-            $jodelAccountForVerify = $this;
236
-        }
220
+	function verifyCaptcha()
221
+	{
222
+		if(isset($_GET['deviceUid']))
223
+		{
224
+			$deviceUid = $_GET['deviceUid'];
225
+			$jodelAccountForVerify = new JodelAccount($deviceUid);
226
+		}
227
+		else if(isset($_POST['deviceUid']))
228
+		{
229
+			$deviceUid = $_POST['deviceUid'];
230
+			$jodelAccountForVerify = new JodelAccount($deviceUid);
231
+		}
232
+		else
233
+		{
234
+			$deviceUid = $this->deviceUid;
235
+			$jodelAccountForVerify = $this;
236
+		}
237 237
 
238
-        $solution = $_GET['solution'];
239
-        $solution = array_map('intval', explode('-', $solution));
238
+		$solution = $_GET['solution'];
239
+		$solution = array_map('intval', explode('-', $solution));
240 240
 
241
-        $accountCreator = new PostCaptcha();
242
-        $accountCreator->setAccessToken($jodelAccountForVerify->accessToken);
243
-        $accountCreator->captchaKey = $_GET['key'];
244
-        $accountCreator->captchaSolution = $solution;
245
-        $verified = $accountCreator->execute();
241
+		$accountCreator = new PostCaptcha();
242
+		$accountCreator->setAccessToken($jodelAccountForVerify->accessToken);
243
+		$accountCreator->captchaKey = $_GET['key'];
244
+		$accountCreator->captchaSolution = $solution;
245
+		$verified = $accountCreator->execute();
246 246
 
247
-        if(isset($verified->status_code))
248
-        {
249
-            return $verified->status_code;
250
-        }
251
-        return $verified['verified'];
252
-    }
253
-
254
-    //ToDo Spider Check
255
-    function votePostId($postId, $vote)
256
-    {
257
-        if(!$this->isBot)
258
-        {
259
-            if(!$this->isAccountVerified())
260
-            {
261
-                $view = new View();
262
-                $this->showCaptcha();
263
-            }
264
-
265
-            if(!$this->hasVoted($postId))
266
-            {
267
-                if($vote == "up")
268
-                {
269
-                    $accountCreator = new Upvote();
270
-                }
271
-                else if($vote == "down")
272
-                {
273
-                    $accountCreator = new Downvote();
274
-                }
275
-
276
-                $accountCreator->setAccessToken($this->accessToken);
277
-                $accountCreator->postId = htmlspecialchars($postId);
278
-                $data = $accountCreator->execute();
279
-
280
-                error_log('Could not vote: ' . print_r($data, true));
281
-
282
-                if(array_key_exists('post', $data))
283
-                {
284
-                    $this->addVoteWithPostIdAndType($postId, $vote);
285
-                    return TRUE;
286
-                }
287
-                else if(array_key_exists('error', $data))
288
-                {
289
-                    error_log('Could not vote - Error: ' . $data['error']);
290
-                }
291
-                else
292
-                {
293
-                    error_log('Could not vote: ' . print_r($data, true));
294
-                    return FALSE;
295
-                } 
296
-            }
297
-            else
298
-            {
299
-                return FALSE;
300
-            }
301
-        }
302
-
303
-        return FALSE;
304
-    }
305
-
306
-    //ToDo Spider Check
307
-    function sendJodel($location, $view)
308
-    {
309
-        if($this->isAccountVerified() != 1)
310
-        {
311
-            $this->showCaptcha();
312
-            //$this->verifyCaptcha();
313
-        }
247
+		if(isset($verified->status_code))
248
+		{
249
+			return $verified->status_code;
250
+		}
251
+		return $verified['verified'];
252
+	}
314 253
 
315
-        $accountCreator = new SendJodel();
254
+	//ToDo Spider Check
255
+	function votePostId($postId, $vote)
256
+	{
257
+		if(!$this->isBot)
258
+		{
259
+			if(!$this->isAccountVerified())
260
+			{
261
+				$view = new View();
262
+				$this->showCaptcha();
263
+			}
264
+
265
+			if(!$this->hasVoted($postId))
266
+			{
267
+				if($vote == "up")
268
+				{
269
+					$accountCreator = new Upvote();
270
+				}
271
+				else if($vote == "down")
272
+				{
273
+					$accountCreator = new Downvote();
274
+				}
275
+
276
+				$accountCreator->setAccessToken($this->accessToken);
277
+				$accountCreator->postId = htmlspecialchars($postId);
278
+				$data = $accountCreator->execute();
279
+
280
+				error_log('Could not vote: ' . print_r($data, true));
281
+
282
+				if(array_key_exists('post', $data))
283
+				{
284
+					$this->addVoteWithPostIdAndType($postId, $vote);
285
+					return TRUE;
286
+				}
287
+				else if(array_key_exists('error', $data))
288
+				{
289
+					error_log('Could not vote - Error: ' . $data['error']);
290
+				}
291
+				else
292
+				{
293
+					error_log('Could not vote: ' . print_r($data, true));
294
+					return FALSE;
295
+				} 
296
+			}
297
+			else
298
+			{
299
+				return FALSE;
300
+			}
301
+		}
316 302
 
317
-        if(isset($_POST['ancestor']))
318
-        {
319
-            $ancestor = $_POST['ancestor'];
320
-            $accountCreator->ancestor = $ancestor;
321
-        }
322
-        if(isset($_POST['color']))
323
-        {
324
-            $color = $_POST['color'];
325
-            switch ($color) {
326
-                case '8ABDB0':
327
-                    $color = '8ABDB0';
328
-                    break;
329
-                case '9EC41C':
330
-                    $color = '9EC41C';
331
-                    break;
332
-                case '06A3CB':
333
-                    $color = '06A3CB';
334
-                    break;
335
-                case 'FFBA00':
336
-                    $color = 'FFBA00';
337
-                    break;
338
-                case 'DD5F5F':
339
-                    $color = 'DD5F5F';
340
-                    break;
341
-                case 'FF9908':
342
-                    $color = 'FF9908';
343
-                    break;
344
-                default:
345
-                    $color = '8ABDB0';
346
-                    break;
347
-            }
348
-            $accountCreator->color = $color;
349
-        }
350
-
351
-        $accountCreatorLocation = new UpdateLocation();
352
-        $accountCreatorLocation->setLocation($location);
353
-        $accountCreatorLocation->setAccessToken($this->accessToken);
354
-        $data = $accountCreatorLocation->execute();
303
+		return FALSE;
304
+	}
305
+
306
+	//ToDo Spider Check
307
+	function sendJodel($location, $view)
308
+	{
309
+		if($this->isAccountVerified() != 1)
310
+		{
311
+			$this->showCaptcha();
312
+			//$this->verifyCaptcha();
313
+		}
314
+
315
+		$accountCreator = new SendJodel();
316
+
317
+		if(isset($_POST['ancestor']))
318
+		{
319
+			$ancestor = $_POST['ancestor'];
320
+			$accountCreator->ancestor = $ancestor;
321
+		}
322
+		if(isset($_POST['color']))
323
+		{
324
+			$color = $_POST['color'];
325
+			switch ($color) {
326
+				case '8ABDB0':
327
+					$color = '8ABDB0';
328
+					break;
329
+				case '9EC41C':
330
+					$color = '9EC41C';
331
+					break;
332
+				case '06A3CB':
333
+					$color = '06A3CB';
334
+					break;
335
+				case 'FFBA00':
336
+					$color = 'FFBA00';
337
+					break;
338
+				case 'DD5F5F':
339
+					$color = 'DD5F5F';
340
+					break;
341
+				case 'FF9908':
342
+					$color = 'FF9908';
343
+					break;
344
+				default:
345
+					$color = '8ABDB0';
346
+					break;
347
+			}
348
+			$accountCreator->color = $color;
349
+		}
350
+
351
+		$accountCreatorLocation = new UpdateLocation();
352
+		$accountCreatorLocation->setLocation($location);
353
+		$accountCreatorLocation->setAccessToken($this->accessToken);
354
+		$data = $accountCreatorLocation->execute();
355 355
         
356 356
 		if($data != 'Success')
357 357
 		{
358 358
 			error_log('Could not set location befor Post: ' . print_r($data, true));
359 359
 		}
360 360
 
361
-        $accountCreator->location = $this->location;
361
+		$accountCreator->location = $this->location;
362 362
 
363
-        $image = '';
364
-        if(isset($_FILES['image']) && $_FILES['image']['size'] > 0)
365
-        {
366
-            $image = file_get_contents($_FILES['image']['tmp_name']);
367
-        }
363
+		$image = '';
364
+		if(isset($_FILES['image']) && $_FILES['image']['size'] > 0)
365
+		{
366
+			$image = file_get_contents($_FILES['image']['tmp_name']);
367
+		}
368 368
         
369
-        $accountCreator->image = $image;
369
+		$accountCreator->image = $image;
370 370
         
371
-        $accountCreator->setAccessToken($this->accessToken);
372
-        $data = $accountCreator->execute();
371
+		$accountCreator->setAccessToken($this->accessToken);
372
+		$data = $accountCreator->execute();
373 373
 
374
-        error_log(print_r($data, true));
374
+		error_log(print_r($data, true));
375 375
 
376
-        if(isset($_POST['ancestor']))
377
-        {
378
-            header('Location: ' . $view->toUrl());
379
-            exit;
380
-        }
381
-        else
382
-        {
383
-            header('Location: ' . $view->baseUrl);
384
-            exit;
385
-        }
386
-    }
376
+		if(isset($_POST['ancestor']))
377
+		{
378
+			header('Location: ' . $view->toUrl());
379
+			exit;
380
+		}
381
+		else
382
+		{
383
+			header('Location: ' . $view->baseUrl);
384
+			exit;
385
+		}
386
+	}
387 387
 
388
-    function isTokenFresh()
389
-    {
390
-        $db = new DatabaseConnect();  
391
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
388
+	function isTokenFresh()
389
+	{
390
+		$db = new DatabaseConnect();  
391
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
392 392
 
393
-        if ($result->num_rows > 0)
394
-        {
395
-            // output data of each row
396
-            while($row = $result->fetch_assoc())
397
-            {
398
-                    $expiration_date = $row["expiration_date"];
399
-            }
400
-        }
401
-        else
402
-        {
403
-            error_log('0 results');
404
-        }
393
+		if ($result->num_rows > 0)
394
+		{
395
+			// output data of each row
396
+			while($row = $result->fetch_assoc())
397
+			{
398
+					$expiration_date = $row["expiration_date"];
399
+			}
400
+		}
401
+		else
402
+		{
403
+			error_log('0 results');
404
+		}
405 405
 
406
-        if($expiration_date <= time())
407
-        {
408
-           return FALSE;
409
-        }
406
+		if($expiration_date <= time())
407
+		{
408
+		   return FALSE;
409
+		}
410 410
         
411
-        return TRUE;
412
-    }
413
-
414
-    function refreshToken()
415
-    {
416
-        $accountCreator = new CreateUser();
417
-        $accountCreator->setAccessToken($this->accessToken);
418
-        $accountCreator->setDeviceUid($this->deviceUid);
419
-        $accountCreator->setLocation($this->location);
420
-        $data = $accountCreator->execute();
421
-
422
-        $access_token = (string)$data[0]['access_token'];
423
-        $expiration_date = $data[0]['expiration_date'];
424
-        $device_uid = (string)$data[1];
411
+		return TRUE;
412
+	}
413
+
414
+	function refreshToken()
415
+	{
416
+		$accountCreator = new CreateUser();
417
+		$accountCreator->setAccessToken($this->accessToken);
418
+		$accountCreator->setDeviceUid($this->deviceUid);
419
+		$accountCreator->setLocation($this->location);
420
+		$data = $accountCreator->execute();
421
+
422
+		$access_token = (string)$data[0]['access_token'];
423
+		$expiration_date = $data[0]['expiration_date'];
424
+		$device_uid = (string)$data[1];
425 425
         
426
-        $db = new DatabaseConnect();  
427
-        $result = $db->query("UPDATE accounts 
426
+		$db = new DatabaseConnect();  
427
+		$result = $db->query("UPDATE accounts 
428 428
                                 SET access_token='" . $access_token . "',
429 429
                                     expiration_date='" . $expiration_date . "'
430 430
                                 WHERE device_uid='" . $device_uid . "'");
431 431
 
432
-        if($result === false){
433
-                error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
434
-        }   
435
-    }
432
+		if($result === false){
433
+				error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
434
+		}   
435
+	}
436 436
 
437 437
 
438 438
 
439
-    function getAccessToken()
440
-    {
441
-        $db = new DatabaseConnect();
442
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
439
+	function getAccessToken()
440
+	{
441
+		$db = new DatabaseConnect();
442
+		$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
443 443
         
444
-        $accessToken;
444
+		$accessToken;
445 445
         
446
-        if ($result->num_rows > 0)
447
-        {
448
-            // output data of each row
449
-            while($row = $result->fetch_assoc())
450
-            {
451
-                $accessToken = $row['access_token'];
452
-            }
453
-        }
454
-        else
455
-        {
456
-            error_log('Error: 0 results');
457
-        }
446
+		if ($result->num_rows > 0)
447
+		{
448
+			// output data of each row
449
+			while($row = $result->fetch_assoc())
450
+			{
451
+				$accessToken = $row['access_token'];
452
+			}
453
+		}
454
+		else
455
+		{
456
+			error_log('Error: 0 results');
457
+		}
458 458
 
459
-        return $accessToken;
460
-    }
459
+		return $accessToken;
460
+	}
461 461
 
462 462
 
463
-    function getKarma()
464
-    {
465
-        $accountCreator = new GetKarma();
466
-        $accountCreator->setAccessToken($this->accessToken);
467
-        $data = $accountCreator->execute();
463
+	function getKarma()
464
+	{
465
+		$accountCreator = new GetKarma();
466
+		$accountCreator->setAccessToken($this->accessToken);
467
+		$data = $accountCreator->execute();
468 468
         
469
-        return $data['karma'];
470
-    }
469
+		return $data['karma'];
470
+	}
471 471
 
472
-    function hasVoted($postId)
473
-    {
474
-        $db = new DatabaseConnect();
472
+	function hasVoted($postId)
473
+	{
474
+		$db = new DatabaseConnect();
475 475
 
476
-        $postId = $db->real_escape_string($postId);
476
+		$postId = $db->real_escape_string($postId);
477 477
 
478
-        $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
478
+		$result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')");
479 479
         
480
-        if($result === false)
481
-        {
482
-            $error = db_error();
483
-            echo $error;
484
-            error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error);
485
-        }
480
+		if($result === false)
481
+		{
482
+			$error = db_error();
483
+			echo $error;
484
+			error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error);
485
+		}
486 486
 
487
-        if($result->num_rows == 0)
488
-        {
489
-            return FALSE;
490
-        }
491
-        else
492
-        {
493
-            return TRUE;
494
-        }
495
-    }
487
+		if($result->num_rows == 0)
488
+		{
489
+			return FALSE;
490
+		}
491
+		else
492
+		{
493
+			return TRUE;
494
+		}
495
+	}
496 496
 
497
-    function addVoteWithPostIdAndType($postId, $voteType)
498
-    {
499
-        $db = new DatabaseConnect();  
497
+	function addVoteWithPostIdAndType($postId, $voteType)
498
+	{
499
+		$db = new DatabaseConnect();  
500 500
 
501
-        $postId = $db->real_escape_string($postId);
502
-        $voteType = $db->real_escape_string($voteType);
501
+		$postId = $db->real_escape_string($postId);
502
+		$voteType = $db->real_escape_string($voteType);
503 503
         
504
-        if($this->hasVoted($postId))
505
-        {
506
-            return "Already voted";
507
-        }
504
+		if($this->hasVoted($postId))
505
+		{
506
+			return "Already voted";
507
+		}
508 508
 
509
-        $result = $db->query("INSERT INTO votes (device_uid, postId, type)
509
+		$result = $db->query("INSERT INTO votes (device_uid, postId, type)
510 510
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
511 511
         
512
-        if($result === false){
513
-                $error = db_error();
514
-                echo $error;
515
-                echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
516
-        }       
517
-    }
518
-
519
-    function registerAccount($location) {
520
-        $accountCreator = new CreateUser();
521
-        $accountCreator->setLocation($location);
522
-        $data = $accountCreator->execute();
512
+		if($result === false){
513
+				$error = db_error();
514
+				echo $error;
515
+				echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
516
+		}       
517
+	}
518
+
519
+	function registerAccount($location) {
520
+		$accountCreator = new CreateUser();
521
+		$accountCreator->setLocation($location);
522
+		$data = $accountCreator->execute();
523 523
         
524
-        $access_token = (string)$data[0]['access_token'];
525
-        $refresh_token = (string)$data[0]['refresh_token'];
526
-        $token_type = (string)$data[0]['token_type'];
527
-        $expires_in = $data[0]['expires_in'];
528
-        $expiration_date = $data[0]['expiration_date'];
529
-        $distinct_id = (string)$data[0]['distinct_id'];
530
-        $device_uid = (string)$data[1];
531
-
532
-        $name = $location->cityName;
533
-        $lat = $location->lat;
534
-        $lng = $location->lng;
524
+		$access_token = (string)$data[0]['access_token'];
525
+		$refresh_token = (string)$data[0]['refresh_token'];
526
+		$token_type = (string)$data[0]['token_type'];
527
+		$expires_in = $data[0]['expires_in'];
528
+		$expiration_date = $data[0]['expiration_date'];
529
+		$distinct_id = (string)$data[0]['distinct_id'];
530
+		$device_uid = (string)$data[1];
531
+
532
+		$name = $location->cityName;
533
+		$lat = $location->lat;
534
+		$lng = $location->lng;
535 535
         
536
-        $db = new DatabaseConnect();  
537
-        $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
536
+		$db = new DatabaseConnect();  
537
+		$result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
538 538
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
539 539
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
540
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
541
-                        "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
542
-
543
-        $success = TRUE;
544
-        if($result === false){
545
-                $error = $db->error();
546
-                echo $error;
547
-                echo "Adding account failed: (" . $result->errno . ") " . $result->error;
548
-                $success = FALSE;
549
-        }   
540
+						"','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
541
+						"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
542
+
543
+		$success = TRUE;
544
+		if($result === false){
545
+				$error = $db->error();
546
+				echo $error;
547
+				echo "Adding account failed: (" . $result->errno . ") " . $result->error;
548
+				$success = FALSE;
549
+		}   
550 550
         
551
-        return $device_uid;
552
-    }
551
+		return $device_uid;
552
+	}
553 553
 
554
-    function createAccount()
555
-    {
556
-        $config = parse_ini_file('config/config.ini.php');
557
-        $location = new Location();
558
-        $location->setLat($config['default_lat']);
559
-        $location->setLng($config['default_lng']);
560
-        $location->setCityName($config['default_location']);
554
+	function createAccount()
555
+	{
556
+		$config = parse_ini_file('config/config.ini.php');
557
+		$location = new Location();
558
+		$location->setLat($config['default_lat']);
559
+		$location->setLng($config['default_lng']);
560
+		$location->setCityName($config['default_location']);
561 561
 
562
-        $deviceUid = $this->registerAccount($location);
562
+		$deviceUid = $this->registerAccount($location);
563 563
 
564
-        return $deviceUid;
565
-    }
564
+		return $deviceUid;
565
+	}
566 566
 }
567 567
\ No newline at end of file
Please login to merge, or discard this patch.