Completed
Push — master ( 3d5f6a...91f378 )
by mains
03:51 queued 01:03
created
php/DatabaseConnect.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,6 +40,6 @@
 block discarded – undo
40 40
 			 ) DEFAULT CHARSET=utf8";
41 41
   if(!$db->query($query))
42 42
   {
43
-    throw new Exception($db->error($mysqli));
43
+	throw new Exception($db->error($mysqli));
44 44
   }
45 45
 
Please login to merge, or discard this patch.
php/Requests/GetKarma.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 GetKarma extends AbstractRequest {
5 5
 		
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/users/karma';
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/users/karma';
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/GetPosts.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@  discard block
 block discarded – undo
5 5
 {
6 6
 	public $lastPostId;
7 7
 
8
-    public $url;
8
+	public $url;
9 9
         
10
-    function setUrl ($url)
11
-    {
12
-            $this->url = $url;
13
-    }
10
+	function setUrl ($url)
11
+	{
12
+			$this->url = $url;
13
+	}
14 14
     
15
-    function getUrl ()
16
-    {
17
-        return $this->url;
18
-    }
15
+	function getUrl ()
16
+	{
17
+		return $this->url;
18
+	}
19 19
 		
20
-    function setLastPostId ($lastPostId)
21
-    {
20
+	function setLastPostId ($lastPostId)
21
+	{
22 22
 			$this->lastPostId = $lastPostId;
23 23
 	}
24 24
 	
@@ -27,22 +27,22 @@  discard block
 block discarded – undo
27 27
 		return $this->lastPostId;
28 28
 	}
29 29
     
30
-    function getApiEndPoint()
31
-    {
32
-        $apiEndPoint = $this->getUrl();
33
-        //echo $GLOBALS['lastPostId'];
34
-        if ($this->getLastPostId() != "") {
30
+	function getApiEndPoint()
31
+	{
32
+		$apiEndPoint = $this->getUrl();
33
+		//echo $GLOBALS['lastPostId'];
34
+		if ($this->getLastPostId() != "") {
35 35
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
36 36
 		}
37
-        return $apiEndPoint;
38
-    }
39
-    function getPayload()
40
-    {
41
-        return array(
42
-        );
43
-    }
44
-    function getMethod()
45
-    {
46
-        return 'GET';
47
-    }
37
+		return $apiEndPoint;
38
+	}
39
+	function getPayload()
40
+	{
41
+		return array(
42
+		);
43
+	}
44
+	function getMethod()
45
+	{
46
+		return 'GET';
47
+	}
48 48
 }
Please login to merge, or discard this patch.
php/Requests/Upvote.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -3,19 +3,19 @@
 block discarded – undo
3 3
 
4 4
 class Upvote extends AbstractRequest {
5 5
 		
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/posts/' . $_GET['postID'] . '/upvote';
9
-    }
10
-    function getPayload()
11
-    {
12
-        return array(
6
+	function getApiEndPoint()
7
+	{
8
+		return '/v2/posts/' . $_GET['postID'] . '/upvote';
9
+	}
10
+	function getPayload()
11
+	{
12
+		return array(
13 13
 					"reason_code" => -1,
14
-        );
15
-    }
16
-    function getMethod()
17
-    {
18
-        return 'PUT';
19
-    }
14
+		);
15
+	}
16
+	function getMethod()
17
+	{
18
+		return 'PUT';
19
+	}
20 20
 }
21 21
 
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/Downvote.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 Downvote extends AbstractRequest {
5 5
 		
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/posts/' . $_GET['postID'] . '/downvote';
9
-    }
10
-    function getPayload()
11
-    {
12
-        return array(
13
-        );
14
-    }
15
-    function getMethod()
16
-    {
17
-        return 'PUT';
18
-    }
6
+	function getApiEndPoint()
7
+	{
8
+		return '/v2/posts/' . $_GET['postID'] . '/downvote';
9
+	}
10
+	function getPayload()
11
+	{
12
+		return array(
13
+		);
14
+	}
15
+	function getMethod()
16
+	{
17
+		return 'PUT';
18
+	}
19 19
 }
20 20
 
Please login to merge, or discard this patch.
php/Requests/SetLocation.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(): Location
13
-    {
14
-        return $this->location;
15
-    }
16
-    /**
17
-     * @param Location $location
18
-     */
19
-    public function setLocation(Location $location)
20
-    {
21
-        $this->location = $location;
22
-    }
6
+		  * @var Location
7
+		  */
8
+	public $location;
9
+	/**
10
+	 * @return Location
11
+	 */
12
+	public function getLocation(): Location
13
+	{
14
+		return $this->location;
15
+	}
16
+	/**
17
+	 * @param Location $location
18
+	 */
19
+	public function setLocation(Location $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/CreateUser.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -1,53 +1,53 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 class CreateUser extends AbstractRequest {
4
-    /**
5
-     * @var Location
6
-     */
7
-    private $location;
8
-    private $deviceUid;
9
-    /**
10
-     * @return Location
11
-     */
12
-    private function getLocation()
13
-    {
14
-        return $this->location;
15
-    }
16
-    /**
17
-     * @param Location $location
18
-     */
19
-    public function setLocation(Location $location)
20
-    {
21
-        $this->location = $location;
22
-    }
23
-    private function getDeviceUid()
24
-    {
4
+	/**
5
+	 * @var Location
6
+	 */
7
+	private $location;
8
+	private $deviceUid;
9
+	/**
10
+	 * @return Location
11
+	 */
12
+	private function getLocation()
13
+	{
14
+		return $this->location;
15
+	}
16
+	/**
17
+	 * @param Location $location
18
+	 */
19
+	public function setLocation(Location $location)
20
+	{
21
+		$this->location = $location;
22
+	}
23
+	private function getDeviceUid()
24
+	{
25 25
 		return $this->deviceUid;
26 26
 	}
27 27
 	public function setDeviceUid($deviceUid)
28
-    {
28
+	{
29 29
 			$this->deviceUid = $deviceUid;
30 30
 	}
31
-    private function generateDeviceUid()
32
-    {
33
-        return $this->random_str(64, 'abcdef0123456789');
34
-    }
31
+	private function generateDeviceUid()
32
+	{
33
+		return $this->random_str(64, 'abcdef0123456789');
34
+	}
35 35
     
36
-    private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
37
-    {
38
-        $str = '';
39
-        $max = mb_strlen($keyspace, '8bit') - 1;
40
-        for ($i = 0; $i < $length; ++$i) {
41
-            $str .= $keyspace[random_int(0, $max)];
42
-        }
43
-        return $str;
44
-    }
45
-    public function getApiEndPoint()
46
-    {
47
-        return '/v2/users';
48
-    }
49
-    public function getPayload()
50
-    {
36
+	private function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
37
+	{
38
+		$str = '';
39
+		$max = mb_strlen($keyspace, '8bit') - 1;
40
+		for ($i = 0; $i < $length; ++$i) {
41
+			$str .= $keyspace[random_int(0, $max)];
42
+		}
43
+		return $str;
44
+	}
45
+	public function getApiEndPoint()
46
+	{
47
+		return '/v2/users';
48
+	}
49
+	public function getPayload()
50
+	{
51 51
 			if(!isset($this->deviceUid))
52 52
 			{
53 53
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@  discard block
 block discarded – undo
58 58
 					"client_id" => self::CLIENTID,
59 59
 					"device_uid" => $this->getDeviceUid(),
60 60
 			);
61
-    }
62
-    public function getMethod()
63
-    {
64
-        return 'POST';
65
-    }
61
+	}
62
+	public function getMethod()
63
+	{
64
+		return 'POST';
65
+	}
66 66
 }
Please login to merge, or discard this patch.
php/Requests/AbstractRequest.php 1 patch
Indentation   +110 added lines, -110 removed lines patch added patch discarded remove patch
@@ -2,19 +2,19 @@  discard block
 block discarded – undo
2 2
 
3 3
 abstract class AbstractRequest
4 4
 {	
5
-    CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6
-    CONST APIURL = 'https://api.go-tellm.com/api';
7
-    const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
8
-    const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
9
-    const CLIENT_TYPE = 'android_4.27.1';
5
+	CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6
+	CONST APIURL = 'https://api.go-tellm.com/api';
7
+	const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
8
+	const USERAGENT = "Jodel/4.27.1 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )";
9
+	const CLIENT_TYPE = 'android_4.27.1';
10 10
     
11
-    /**
12
-     * @var string
13
-     */
14
-    private $accessToken = null;
15
-    private $payLoad;
16
-    public function execute()
17
-    {
11
+	/**
12
+	 * @var string
13
+	 */
14
+	private $accessToken = null;
15
+	private $payLoad;
16
+	public function execute()
17
+	{
18 18
 		$result = new \stdClass();
19 19
 		        
20 20
 		$this->payLoad = $this->getPayload();
@@ -24,71 +24,71 @@  discard block
 block discarded – undo
24 24
 		}
25 25
 				
26 26
 				
27
-        $this->payLoad = json_encode($this->payLoad);
28
-        $header = $this->getSignHeaders();
29
-        $url = $this->getFullUrl();
27
+		$this->payLoad = json_encode($this->payLoad);
28
+		$header = $this->getSignHeaders();
29
+		$url = $this->getFullUrl();
30 30
 
31
-        if ($this->getAccessToken()) {
32
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
33
-        }
34
-        //Comment out to debug the Request:
35
-        /*
31
+		if ($this->getAccessToken()) {
32
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
33
+		}
34
+		//Comment out to debug the Request:
35
+		/*
36 36
         *var_dump($url);
37 37
         *var_dump($header);
38 38
         *var_dump($this->payLoad);
39 39
         */
40 40
         
41 41
 
42
-        switch ($this->getMethod()) {
43
-            case 'POST':
44
-                $result = Requests::post($url, $header, $this->payLoad);
45
-                break;
46
-            case 'GET':
47
-                $result = Requests::get($url, $header);
48
-                break;
49
-            case 'PUT':
50
-                $result = Requests::put($url, $header, $this->payLoad);
51
-                break;
52
-        }
53
-        switch ($result->status_code) {
54
-            case 200:
55
-                $result = json_decode($result->body, true);
56
-                break;
57
-            case 204:
58
-                $result = "Success";
59
-                break;
60
-            case 401:
42
+		switch ($this->getMethod()) {
43
+			case 'POST':
44
+				$result = Requests::post($url, $header, $this->payLoad);
45
+				break;
46
+			case 'GET':
47
+				$result = Requests::get($url, $header);
48
+				break;
49
+			case 'PUT':
50
+				$result = Requests::put($url, $header, $this->payLoad);
51
+				break;
52
+		}
53
+		switch ($result->status_code) {
54
+			case 200:
55
+				$result = json_decode($result->body, true);
56
+				break;
57
+			case 204:
58
+				$result = "Success";
59
+				break;
60
+			case 401:
61 61
 				throw new \Exception('Unauthorized');
62
-                break;
63
-            case 404:
64
-                echo "Es wurde bereits gevoted";
62
+				break;
63
+			case 404:
64
+				echo "Es wurde bereits gevoted";
65 65
 			case 477:
66
-                echo "Es wurde bereits gevoted";
67
-                throw  new \Exception('Signing failed!');
68
-                break;
69
-            default:
70
-                throw  new \Exception('Unknown Error: '.$result->status_code);
71
-        }
66
+				echo "Es wurde bereits gevoted";
67
+				throw  new \Exception('Signing failed!');
68
+				break;
69
+			default:
70
+				throw  new \Exception('Unknown Error: '.$result->status_code);
71
+		}
72 72
 
73
-        if($device_uid != "")
74
-        {
73
+		if($device_uid != "")
74
+		{
75 75
 			$result[0] = $result;
76 76
 			$result[1] = $device_uid;
77 77
 		}
78 78
 
79
-        /*
79
+		/*
80 80
         var_dump($result);
81 81
         */
82 82
 
83
-        return $result;
84
-    }
85
-    abstract function getPayload();
86
-    /**
87
-     * Gets Sign headers
88
-     * @return array headers
89
-     */
90
-    private function getSignHeaders()
91
-    {
83
+		return $result;
84
+	}
85
+	abstract function getPayload();
86
+	/**
87
+	 * Gets Sign headers
88
+	 * @return array headers
89
+	 */
90
+	private function getSignHeaders()
91
+	{
92 92
 			if($this->getAccessToken() == null) {
93 93
 				$payload_accessToken = "";
94 94
 			}
@@ -97,54 +97,54 @@  discard block
 block discarded – undo
97 97
 			}
98 98
 			
99 99
 			
100
-        $headers = array(
101
-            "Connection" => "keep-alive",
102
-            "Accept-Encoding" => "gzip",
103
-            "Content-Type" => "application/json; charset=UTF-8",
104
-            "User-Agent" => self::USERAGENT
105
-        );
106
-        $timestamp = new DateTime();
107
-        $timestamp = $timestamp->format(DateTime::ATOM);
108
-        $timestamp = substr($timestamp, 0, -6);
109
-        $timestamp .= "Z";
110
-        $urlParts = parse_url($this->getFullUrl());
111
-        $url2 = "";
112
-        $req = [$this->getMethod(),
113
-            $urlParts['host'],
114
-            "443",
115
-            $urlParts['path'],
116
-            $payload_accessToken,
117
-            $timestamp,
118
-            $url2,
119
-            $this->payLoad];
120
-        $reqString = implode("%", $req);
121
-        $secret = self::SECRET;
122
-        $signature = hash_hmac('sha1', $reqString, $secret);
123
-        $signature = strtoupper($signature);
124
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
125
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
126
-        $headers['X-Timestamp'] = $timestamp;
127
-        $headers['X-Api-Version'] = '0.2';
128
-        return $headers;
129
-    }
130
-    private function getFullUrl()
131
-    {
132
-        return self::APIURL . $this->getApiEndPoint();
133
-    }
134
-    abstract function getApiEndPoint();
135
-    abstract function getMethod();
136
-    /**
137
-     * @return string
138
-     */
139
-    private function getAccessToken()
140
-    {
141
-        return $this->accessToken;
142
-    }
143
-    /**
144
-     * @param string $accessToken
145
-     */
146
-    public function setAccessToken(string $accessToken)
147
-    {
148
-        $this->accessToken = $accessToken;
149
-    }
100
+		$headers = array(
101
+			"Connection" => "keep-alive",
102
+			"Accept-Encoding" => "gzip",
103
+			"Content-Type" => "application/json; charset=UTF-8",
104
+			"User-Agent" => self::USERAGENT
105
+		);
106
+		$timestamp = new DateTime();
107
+		$timestamp = $timestamp->format(DateTime::ATOM);
108
+		$timestamp = substr($timestamp, 0, -6);
109
+		$timestamp .= "Z";
110
+		$urlParts = parse_url($this->getFullUrl());
111
+		$url2 = "";
112
+		$req = [$this->getMethod(),
113
+			$urlParts['host'],
114
+			"443",
115
+			$urlParts['path'],
116
+			$payload_accessToken,
117
+			$timestamp,
118
+			$url2,
119
+			$this->payLoad];
120
+		$reqString = implode("%", $req);
121
+		$secret = self::SECRET;
122
+		$signature = hash_hmac('sha1', $reqString, $secret);
123
+		$signature = strtoupper($signature);
124
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
125
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
126
+		$headers['X-Timestamp'] = $timestamp;
127
+		$headers['X-Api-Version'] = '0.2';
128
+		return $headers;
129
+	}
130
+	private function getFullUrl()
131
+	{
132
+		return self::APIURL . $this->getApiEndPoint();
133
+	}
134
+	abstract function getApiEndPoint();
135
+	abstract function getMethod();
136
+	/**
137
+	 * @return string
138
+	 */
139
+	private function getAccessToken()
140
+	{
141
+		return $this->accessToken;
142
+	}
143
+	/**
144
+	 * @param string $accessToken
145
+	 */
146
+	public function setAccessToken(string $accessToken)
147
+	{
148
+		$this->accessToken = $accessToken;
149
+	}
150 150
 }
Please login to merge, or discard this patch.