Completed
Push — master ( 24e24a...fca7db )
by mains
02:44
created
php/DatabaseConnect.php 2 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 
13 13
 }
14 14
 $db = new DatabaseConnect();
15
-if ($db->connect_errno) {
15
+if ($db->connect_errno)
16
+{
16 17
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
17 18
         Server ist hops gegangen. Wegen '.$db -> connect_error;
18 19
 }
Please login to merge, or discard this patch.
php/Requests/GetKarma.php 2 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class GetKarma extends AbstractRequest {
4
+class GetKarma extends AbstractRequest
5
+{
5 6
 		
6 7
     function getApiEndPoint()
7 8
     {
Please login to merge, or discard this patch.
php/Requests/GetPostDetails.php 2 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class GetPostDetails extends AbstractRequest {
4
+class GetPostDetails extends AbstractRequest
5
+{
5 6
 		
6 7
     function getApiEndPoint()
7 8
     {
Please login to merge, or discard this patch.
php/Requests/SetLocation.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class SetLocation extends AbstractRequest {
4
+class SetLocation extends AbstractRequest
5
+{
5 6
 		 /**
6 7
      * @var Location
7 8
      */
Please login to merge, or discard this 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/CreateUser.php 2 patches
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class CreateUser extends AbstractRequest {
3
+class CreateUser extends AbstractRequest
4
+{
4 5
     /**
5 6
      * @var Location
6 7
      */
@@ -25,7 +26,7 @@  discard block
 block discarded – undo
25 26
 		return $this->deviceUid;
26 27
 	}
27 28
 	public function setDeviceUid($deviceUid)
28
-    {
29
+	{
29 30
 			$this->deviceUid = $deviceUid;
30 31
 	}
31 32
     public function generateDeviceUid()
@@ -36,7 +37,8 @@  discard block
 block discarded – undo
36 37
     {
37 38
         $str = '';
38 39
         $max = mb_strlen($keyspace, '8bit') - 1;
39
-        for ($i = 0; $i < $length; ++$i) {
40
+        for ($i = 0; $i < $length; ++$i)
41
+        {
40 42
             $str .= $keyspace[random_int(0, $max)];
41 43
         }
42 44
         return $str;
Please login to merge, or discard this 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[rand(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[rand(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/GetPosts.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
     {
32 32
         $apiEndPoint = $this->getUrl();
33 33
         //echo $GLOBALS['lastPostId'];
34
-        if ($this->getLastPostId() != "") {
34
+        if ($this->getLastPostId() != "")
35
+        {
35 36
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
36 37
 		}
37 38
         return $apiEndPoint;
Please login to merge, or discard this patch.
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -4,25 +4,25 @@  discard block
 block discarded – undo
4 4
 {
5 5
 	public $lastPostId;
6 6
 
7
-    /**
8
-     * @var Location
9
-     */
10
-    public $location;
11
-    public $url;
7
+	/**
8
+	 * @var Location
9
+	 */
10
+	public $location;
11
+	public $url;
12 12
 
13 13
         
14
-    function setUrl ($url)
15
-    {
16
-            $this->url = $url;
17
-    }
14
+	function setUrl ($url)
15
+	{
16
+			$this->url = $url;
17
+	}
18 18
     
19
-    function getUrl ()
20
-    {
21
-        return $this->url;
22
-    }
19
+	function getUrl ()
20
+	{
21
+		return $this->url;
22
+	}
23 23
 		
24
-    function setLastPostId ($lastPostId)
25
-    {
24
+	function setLastPostId ($lastPostId)
25
+	{
26 26
 			$this->lastPostId = $lastPostId;
27 27
 	}
28 28
 	
@@ -31,38 +31,38 @@  discard block
 block discarded – undo
31 31
 		return $this->lastPostId;
32 32
 	}
33 33
     
34
-    function getApiEndPoint()
35
-    {
36
-        $apiEndPoint = $this->getUrl();
34
+	function getApiEndPoint()
35
+	{
36
+		$apiEndPoint = $this->getUrl();
37 37
 
38
-        if ($this->getLastPostId() != "") {
38
+		if ($this->getLastPostId() != "") {
39 39
 			$apiEndPoint = $this->getUrl() . '?after=' . $this->getLastPostId();
40 40
 		}
41
-        return $apiEndPoint;
42
-    }
43
-    function getPayload()
44
-    {
45
-        if($this->version == 'v3')
46
-        {
47
-            $this->location = new Location();
48
-            $this->location->setLat(52.520006);
49
-            $this->location->setLng(13.404954);
50
-            $this->location->setCityName('Berlin');
41
+		return $apiEndPoint;
42
+	}
43
+	function getPayload()
44
+	{
45
+		if($this->version == 'v3')
46
+		{
47
+			$this->location = new Location();
48
+			$this->location->setLat(52.520006);
49
+			$this->location->setLng(13.404954);
50
+			$this->location->setCityName('Berlin');
51 51
 
52 52
 
53
-            return array(
54
-                "location" => $this->location->toArray(),
55
-                "stickies" => 'false',
56
-            );
57
-        }
58
-        else
59
-        {
60
-            return array(
61
-            );
62
-        }
63
-    }
64
-    function getMethod()
65
-    {
66
-        return 'GET';
67
-    }
53
+			return array(
54
+				"location" => $this->location->toArray(),
55
+				"stickies" => 'false',
56
+			);
57
+		}
58
+		else
59
+		{
60
+			return array(
61
+			);
62
+		}
63
+	}
64
+	function getMethod()
65
+	{
66
+		return 'GET';
67
+	}
68 68
 }
Please login to merge, or discard this patch.
php/Requests/Upvote.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 
4
-class Upvote extends AbstractRequest {
4
+class Upvote extends AbstractRequest
5
+{
5 6
 		
6 7
     function getApiEndPoint()
7 8
     {
Please login to merge, or discard this patch.
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
1 1
 <?php
2 2
 class Upvote extends AbstractRequest {
3 3
 		
4
-    public $postId;
4
+	public $postId;
5 5
 
6
-    function getApiEndPoint()
7
-    {
8
-        return '/v2/posts/' . $this->postId . '/upvote';
9
-    }
10
-    function getPayload()
11
-    {
12
-        return array(
6
+	function getApiEndPoint()
7
+	{
8
+		return '/v2/posts/' . $this->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/libary/Requests/Cookie/Jar.php 1 patch
Braces   +40 added lines, -20 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@  discard block
 block discarded – undo
25 25
 	 *
26 26
 	 * @param array $cookies Existing cookie values
27 27
 	 */
28
-	public function __construct($cookies = array()) {
28
+	public function __construct($cookies = array())
29
+	{
29 30
 		$this->cookies = $cookies;
30 31
 	}
31 32
 
@@ -35,8 +36,10 @@  discard block
 block discarded – undo
35 36
 	 * @param string|Requests_Cookie $cookie
36 37
 	 * @return Requests_Cookie
37 38
 	 */
38
-	public function normalize_cookie($cookie, $key = null) {
39
-		if ($cookie instanceof Requests_Cookie) {
39
+	public function normalize_cookie($cookie, $key = null)
40
+	{
41
+		if ($cookie instanceof Requests_Cookie)
42
+		{
40 43
 			return $cookie;
41 44
 		}
42 45
 
@@ -50,7 +53,8 @@  discard block
 block discarded – undo
50 53
 	 * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
51 54
 	 * @return Requests_Cookie
52 55
 	 */
53
-	public function normalizeCookie($cookie, $key = null) {
56
+	public function normalizeCookie($cookie, $key = null)
57
+	{
54 58
 		return $this->normalize_cookie($cookie, $key);
55 59
 	}
56 60
 
@@ -60,7 +64,8 @@  discard block
 block discarded – undo
60 64
 	 * @param string $key Item key
61 65
 	 * @return boolean Does the item exist?
62 66
 	 */
63
-	public function offsetExists($key) {
67
+	public function offsetExists($key)
68
+	{
64 69
 		return isset($this->cookies[$key]);
65 70
 	}
66 71
 
@@ -70,8 +75,10 @@  discard block
 block discarded – undo
70 75
 	 * @param string $key Item key
71 76
 	 * @return string Item value
72 77
 	 */
73
-	public function offsetGet($key) {
74
-		if (!isset($this->cookies[$key])) {
78
+	public function offsetGet($key)
79
+	{
80
+		if (!isset($this->cookies[$key]))
81
+		{
75 82
 			return null;
76 83
 		}
77 84
 
@@ -86,8 +93,10 @@  discard block
 block discarded – undo
86 93
 	 * @param string $key Item name
87 94
 	 * @param string $value Item value
88 95
 	 */
89
-	public function offsetSet($key, $value) {
90
-		if ($key === null) {
96
+	public function offsetSet($key, $value)
97
+	{
98
+		if ($key === null)
99
+		{
91 100
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
92 101
 		}
93 102
 
@@ -99,7 +108,8 @@  discard block
 block discarded – undo
99 108
 	 *
100 109
 	 * @param string $key
101 110
 	 */
102
-	public function offsetUnset($key) {
111
+	public function offsetUnset($key)
112
+	{
103 113
 		unset($this->cookies[$key]);
104 114
 	}
105 115
 
@@ -108,7 +118,8 @@  discard block
 block discarded – undo
108 118
 	 *
109 119
 	 * @return ArrayIterator
110 120
 	 */
111
-	public function getIterator() {
121
+	public function getIterator()
122
+	{
112 123
 		return new ArrayIterator($this->cookies);
113 124
 	}
114 125
 
@@ -117,7 +128,8 @@  discard block
 block discarded – undo
117 128
 	 *
118 129
 	 * @param Requests_Hooker $hooks Hooking system
119 130
 	 */
120
-	public function register(Requests_Hooker $hooks) {
131
+	public function register(Requests_Hooker $hooks)
132
+	{
121 133
 		$hooks->register('requests.before_request', array($this, 'before_request'));
122 134
 		$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
123 135
 	}
@@ -133,22 +145,28 @@  discard block
 block discarded – undo
133 145
 	 * @param string $type
134 146
 	 * @param array $options
135 147
 	 */
136
-	public function before_request($url, &$headers, &$data, &$type, &$options) {
137
-		if (!$url instanceof Requests_IRI) {
148
+	public function before_request($url, &$headers, &$data, &$type, &$options)
149
+	{
150
+		if (!$url instanceof Requests_IRI)
151
+		{
138 152
 			$url = new Requests_IRI($url);
139 153
 		}
140 154
 
141
-		if (!empty($this->cookies)) {
155
+		if (!empty($this->cookies))
156
+		{
142 157
 			$cookies = array();
143
-			foreach ($this->cookies as $key => $cookie) {
158
+			foreach ($this->cookies as $key => $cookie)
159
+			{
144 160
 				$cookie = $this->normalize_cookie($cookie, $key);
145 161
 
146 162
 				// Skip expired cookies
147
-				if ($cookie->is_expired()) {
163
+				if ($cookie->is_expired())
164
+				{
148 165
 					continue;
149 166
 				}
150 167
 
151
-				if ($cookie->domain_matches($url->host)) {
168
+				if ($cookie->domain_matches($url->host))
169
+				{
152 170
 					$cookies[] = $cookie->format_for_header();
153 171
 				}
154 172
 			}
@@ -162,9 +180,11 @@  discard block
 block discarded – undo
162 180
 	 *
163 181
 	 * @var Requests_Response $response
164 182
 	 */
165
-	public function before_redirect_check(Requests_Response &$return) {
183
+	public function before_redirect_check(Requests_Response &$return)
184
+	{
166 185
 		$url = $return->url;
167
-		if (!$url instanceof Requests_IRI) {
186
+		if (!$url instanceof Requests_IRI)
187
+		{
168 188
 			$url = new Requests_IRI($url);
169 189
 		}
170 190
 
Please login to merge, or discard this patch.
php/Requests/libary/Requests/Auth.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,8 @@
 block discarded – undo
18 18
  * @package Requests
19 19
  * @subpackage Authentication
20 20
  */
21
-interface Requests_Auth {
21
+interface Requests_Auth
22
+{
22 23
 	/**
23 24
 	 * Register hooks as needed
24 25
 	 *
Please login to merge, or discard this patch.