Completed
Push — master ( 39ee05...f34b37 )
by mains
02:48
created
php/Requests/libary/Requests/Proxy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,5 +31,5 @@
 block discarded – undo
31 31
 	 * @see Requests_Hooks::register
32 32
 	 * @param Requests_Hooks $hooks Hook system
33 33
 	 */
34
-	public function register(Requests_Hooks &$hooks);
34
+	public function register(Requests_Hooks&$hooks);
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
php/Location.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class Location{
3
+class Location {
4 4
 
5 5
     public $cityName;
6 6
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     {
38 38
         $this->lng = $lng;
39 39
     }
40
-    public function toArray(){
40
+    public function toArray() {
41 41
         return array(
42 42
             "city" => $this->getCityName(),
43 43
             "country" => 'DE',
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	$accessToken;
15 15
 	$newPostionStatus;
16 16
 	
17
-	if ($result->num_rows > 0)
17
+	if($result->num_rows > 0)
18 18
 	{
19 19
 		// output data of each row
20 20
 		while($row = $result->fetch_assoc())
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 			<a href="index.php">
114 114
 				<h1>
115 115
 					Jodel WebClient
116
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>';?>
116
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>'; ?>
117 117
 				</h1>					
118 118
 			</a>
119 119
 			<div class="clear"></div>
@@ -131,11 +131,11 @@  discard block
 block discarded – undo
131 131
 							if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) {
132 132
 								//Header Nav in Comment View
133 133
 								?>
134
-								<a id="comment-back" href="index.php#postId-<?php echo $_GET['postID'];?>">
134
+								<a id="comment-back" href="index.php#postId-<?php echo $_GET['postID']; ?>">
135 135
 									<i class="fa fa-angle-left fa-3x"></i>
136 136
 								</a>
137 137
 
138
-								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails'];?>&postID=<?php echo $_GET['postID'];?>">
138
+								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails']; ?>&postID=<?php echo $_GET['postID']; ?>">
139 139
 									<i class="fa fa-refresh fa-2x"></i>
140 140
 								</a>
141 141
 								<?php
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 							}
183 183
 							
184 184
 
185
-							for($i = 0; $i<$loops; $i++) {
185
+							for($i = 0; $i < $loops; $i++) {
186 186
 							
187 187
 							if(isset($posts[$i])) {
188 188
 							$lastPostId = $posts[$i]['post_id'];
@@ -200,24 +200,24 @@  discard block
 block discarded – undo
200 200
 							$timediff_inHours = (string)$timediff->format('%h');
201 201
 							$timediff_inDays = (string)$timediff->format('%d');
202 202
 							$timediff_inMonth = (string)$timediff->format('%m');
203
-							if($timediff_inMonth!=0) {
203
+							if($timediff_inMonth != 0) {
204 204
 									$timediff = $timediff_inMonth . "m";
205 205
 							}
206 206
 							else
207 207
 							{
208
-								if($timediff_inDays!=0)
208
+								if($timediff_inDays != 0)
209 209
 								{
210 210
 									$timediff = $timediff_inDays . "d";
211 211
 								}
212 212
 								else
213 213
 								{
214
-									if($timediff_inHours!=0)
214
+									if($timediff_inHours != 0)
215 215
 									{
216 216
 										$timediff = $timediff_inHours . "h";
217 217
 									}
218 218
 									else
219 219
 									{
220
-										if($timediff_inMinutes!=0)
220
+										if($timediff_inMinutes != 0)
221 221
 										{
222 222
 											$timediff = $timediff_inMinutes . "m";
223 223
 										}
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 							}
231 231
 						?>
232 232
 						
233
-						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
233
+						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;">
234 234
 							<content>
235 235
 								<?php 
236 236
 								if(isset($posts[$i]["image_url"])) {
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
242 242
 								?>
243 243
 							</content>
244 244
 							<aside>
245
-								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
245
+								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
246 246
 									<i class="fa fa-angle-up fa-3x"></i>
247 247
 								</a>	
248 248
 									<br />
249
-								<?php echo $posts[$i]["vote_count"];?><br />
250
-								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
249
+								<?php echo $posts[$i]["vote_count"]; ?><br />
250
+								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
251 251
 									<i class="fa fa-angle-down fa-3x"></i>
252 252
 								</a>
253 253
 							</aside>
@@ -258,13 +258,13 @@  discard block
 block discarded – undo
258 258
 										<td class="time">
259 259
 											<span data-tooltip="Time">
260 260
 												<i class="fa fa-clock-o"></i>
261
-												<?php echo $timediff;?>
261
+												<?php echo $timediff; ?>
262 262
 											</span> 
263 263
 										</td>
264 264
 										<td class="comments">
265 265
 											<?php if($showCommentIcon) {?>
266 266
 											<span data-tooltip="Comments">
267
-												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
267
+												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
268 268
 													<i class="fa fa-commenting-o"></i>
269 269
 													<?php if(array_key_exists("child_count", $posts[$i])) {
270 270
 																echo $posts[$i]["child_count"];
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 										<td class="distance">
278 278
 											<span data-tooltip="Distance">
279 279
 												<i class="fa fa-map-marker"></i>
280
-												<?php echo $posts[$i]["distance"];?> km
280
+												<?php echo $posts[$i]["distance"]; ?> km
281 281
 											</span>
282 282
 										</td>
283 283
 									</tr>
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
 				</p>
299 299
 				<?php } ?>
300 300
 				<nav id="sortJodelBy">
301
-					<a href="index.php" <?php if(isset($timeView)) echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
302
-					<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
303
-					<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
301
+					<a href="index.php" <?php if(isset($timeView)) echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
302
+					<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
303
+					<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
304 304
 				</nav>
305 305
 			</div>
306 306
 			
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 					<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
325 325
 					<h2>Comment on Jodel</h2>
326 326
 					<form method="POST">				
327
-							<input type="hidden" name="ancestor" value="<?php echo $_GET['postID'];?>" />
327
+							<input type="hidden" name="ancestor" value="<?php echo $_GET['postID']; ?>" />
328 328
 							<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
329 329
 						<br />
330 330
 						<input type="submit" value="SEND" /> 
Please login to merge, or discard this patch.
get-posts-ajax.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 function getPosts($lastPostId, $url) {
21 21
 	$db = new DatabaseConnect();
22
-	if ($db->connect_errno) {
22
+	if($db->connect_errno) {
23 23
 		echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
24 24
 					Server ist hops gegangen. Wegen '. $db -> connect_error;
25 25
 	}
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	
29 29
 	$access_token;
30 30
 	
31
-	if ($result->num_rows > 0) {
31
+	if($result->num_rows > 0) {
32 32
 			// output data of each row
33 33
 			while($row = $result->fetch_assoc()) {
34 34
 					$access_token = $row["access_token"];
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 		?>
77 77
 		<div class="nextPosts">
78 78
 		<?php
79
-		for($i = 0; $i<$loops; $i++) {
79
+		for($i = 0; $i < $loops; $i++) {
80 80
 		
81 81
 			if(isset($posts[$i])) {
82 82
 				$lastPostId = $posts[$i]['post_id'];
@@ -94,24 +94,24 @@  discard block
 block discarded – undo
94 94
 							$timediff_inHours = (string)$timediff->format('%h');
95 95
 							$timediff_inDays = (string)$timediff->format('%d');
96 96
 							$timediff_inMonth = (string)$timediff->format('%m');
97
-							if($timediff_inMonth!=0) {
97
+							if($timediff_inMonth != 0) {
98 98
 									$timediff = $timediff_inMonth . "m";
99 99
 							}
100 100
 							else
101 101
 							{
102
-								if($timediff_inDays!=0)
102
+								if($timediff_inDays != 0)
103 103
 								{
104 104
 									$timediff = $timediff_inDays . "d";
105 105
 								}
106 106
 								else
107 107
 								{
108
-									if($timediff_inHours!=0)
108
+									if($timediff_inHours != 0)
109 109
 									{
110 110
 										$timediff = $timediff_inHours . "h";
111 111
 									}
112 112
 									else
113 113
 									{
114
-										if($timediff_inMinutes!=0)
114
+										if($timediff_inMinutes != 0)
115 115
 										{
116 116
 											$timediff = $timediff_inMinutes . "m";
117 117
 										}
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 							}
125 125
 						?>
126 126
 
127
-				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
127
+				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;">
128 128
 					<content>
129 129
 						<?php 
130 130
 						if(isset($posts[$i]["image_url"])) {
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 						?>
137 137
 					</content>
138 138
 					<aside>
139
-						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
139
+						<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
140 140
 							<i class="fa fa-angle-up fa-3x"></i>
141 141
 						</a>	
142 142
 							<br />
143
-						<?php echo $posts[$i]["vote_count"];?><br />
144
-						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
143
+						<?php echo $posts[$i]["vote_count"]; ?><br />
144
+						<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
145 145
 							<i class="fa fa-angle-down fa-3x"></i>
146 146
 						</a>
147 147
 					</aside>
@@ -152,13 +152,13 @@  discard block
 block discarded – undo
152 152
 								<td class="time">
153 153
 									<span data-tooltip="Time">
154 154
 										<i class="fa fa-clock-o"></i>
155
-										<?php echo $timediff;?>
155
+										<?php echo $timediff; ?>
156 156
 									</span> 
157 157
 								</td>
158 158
 								<td class="comments">
159 159
 									<?php if($showCommentIcon) {?>
160 160
 									<span data-tooltip="Comments">
161
-										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
161
+										<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
162 162
 											<i class="fa fa-commenting-o"></i>
163 163
 											<?php if(array_key_exists("child_count", $posts[$i])) {
164 164
 														echo $posts[$i]["child_count"];
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 								<td class="distance">
172 172
 									<span data-tooltip="Distance">
173 173
 										<i class="fa fa-map-marker"></i>
174
-										<?php echo $posts[$i]["distance"];?> km
174
+										<?php echo $posts[$i]["distance"]; ?> km
175 175
 									</span>
176 176
 								</td>
177 177
 							</tr>
Please login to merge, or discard this patch.
php/DatabaseConnect.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 
13 13
 }
14 14
 $db = new DatabaseConnect();
15
-if ($db->connect_errno) {
15
+if($db->connect_errno) {
16 16
   echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
17 17
         Server ist hops gegangen. Wegen '.$db -> connect_error;
18 18
 }
Please login to merge, or discard this patch.
php/Requests/CreateUser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     {
37 37
         $str = '';
38 38
         $max = mb_strlen($keyspace, '8bit') - 1;
39
-        for ($i = 0; $i < $length; ++$i) {
39
+        for($i = 0; $i < $length; ++$i) {
40 40
             $str .= $keyspace[random_int(0, $max)];
41 41
         }
42 42
         return $str;
Please login to merge, or discard this patch.
php/Requests/GetPosts.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -7,22 +7,22 @@  discard block
 block discarded – undo
7 7
 
8 8
     public $url;
9 9
         
10
-    function setUrl ($url)
10
+    function setUrl($url)
11 11
     {
12 12
             $this->url = $url;
13 13
     }
14 14
     
15
-    function getUrl ()
15
+    function getUrl()
16 16
     {
17 17
         return $this->url;
18 18
     }
19 19
 		
20
-    function setLastPostId ($lastPostId)
20
+    function setLastPostId($lastPostId)
21 21
     {
22 22
 			$this->lastPostId = $lastPostId;
23 23
 	}
24 24
 	
25
-	function getlastPostId ()
25
+	function getlastPostId()
26 26
 	{
27 27
 		return $this->lastPostId;
28 28
 	}
@@ -31,7 +31,7 @@  discard block
 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
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
36 36
 		}
37 37
         return $apiEndPoint;
Please login to merge, or discard this patch.
php/Requests/AbstractRequest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
         $header = $this->getSignHeaders();
29 29
         $url = $this->getFullUrl();
30 30
 
31
-        if ($this->getAccessToken()) {
31
+        if($this->getAccessToken()) {
32 32
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
33 33
         }
34 34
         //Comment out to debug the Request:
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         */
40 40
         
41 41
 
42
-        switch ($this->getMethod()) {
42
+        switch($this->getMethod()) {
43 43
             case 'POST':
44 44
                 $result = Requests::post($url, $header, $this->payLoad);
45 45
                 break;
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
                 $result = Requests::put($url, $header, $this->payLoad);
51 51
                 break;
52 52
         }
53
-        switch ($result->status_code) {
53
+        switch($result->status_code) {
54 54
             case 200:
55 55
                 $result = json_decode($result->body, true);
56 56
                 break;
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
                 throw  new \Exception('Signing failed!');
68 68
                 break;
69 69
             default:
70
-                throw  new \Exception('Unknown Error: '.$result->status_code);
70
+                throw  new \Exception('Unknown Error: ' . $result->status_code);
71 71
         }
72 72
 
73 73
         if($device_uid != "")
Please login to merge, or discard this patch.
php/Requests/libary/Requests/Cookie/Jar.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 	 * @return Requests_Cookie
37 37
 	 */
38 38
 	public function normalize_cookie($cookie, $key = null) {
39
-		if ($cookie instanceof Requests_Cookie) {
39
+		if($cookie instanceof Requests_Cookie) {
40 40
 			return $cookie;
41 41
 		}
42 42
 
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * @return string Item value
72 72
 	 */
73 73
 	public function offsetGet($key) {
74
-		if (!isset($this->cookies[$key])) {
74
+		if(!isset($this->cookies[$key])) {
75 75
 			return null;
76 76
 		}
77 77
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 * @param string $value Item value
88 88
 	 */
89 89
 	public function offsetSet($key, $value) {
90
-		if ($key === null) {
90
+		if($key === null) {
91 91
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
92 92
 		}
93 93
 
@@ -134,21 +134,21 @@  discard block
 block discarded – undo
134 134
 	 * @param array $options
135 135
 	 */
136 136
 	public function before_request($url, &$headers, &$data, &$type, &$options) {
137
-		if (!$url instanceof Requests_IRI) {
137
+		if(!$url instanceof Requests_IRI) {
138 138
 			$url = new Requests_IRI($url);
139 139
 		}
140 140
 
141
-		if (!empty($this->cookies)) {
141
+		if(!empty($this->cookies)) {
142 142
 			$cookies = array();
143
-			foreach ($this->cookies as $key => $cookie) {
143
+			foreach($this->cookies as $key => $cookie) {
144 144
 				$cookie = $this->normalize_cookie($cookie, $key);
145 145
 
146 146
 				// Skip expired cookies
147
-				if ($cookie->is_expired()) {
147
+				if($cookie->is_expired()) {
148 148
 					continue;
149 149
 				}
150 150
 
151
-				if ($cookie->domain_matches($url->host)) {
151
+				if($cookie->domain_matches($url->host)) {
152 152
 					$cookies[] = $cookie->format_for_header();
153 153
 				}
154 154
 			}
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 	 *
163 163
 	 * @var Requests_Response $response
164 164
 	 */
165
-	public function before_redirect_check(Requests_Response &$return) {
165
+	public function before_redirect_check(Requests_Response&$return) {
166 166
 		$url = $return->url;
167
-		if (!$url instanceof Requests_IRI) {
167
+		if(!$url instanceof Requests_IRI) {
168 168
 			$url = new Requests_IRI($url);
169 169
 		}
170 170
 
Please login to merge, or discard this patch.