Completed
Push — master ( b88c26...7162ef )
by mains
02:47
created
php/jodel-web.php 2 patches
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 				}
127 127
 				else
128 128
 				{
129
-					error_log('User with JodelDeviceId:' . $deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
129
+					error_log('User with JodelDeviceId:' . $deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
130 130
 				}
131 131
 			}
132 132
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	if(isset($_POST['color']))
190 190
 	{
191 191
 		$color = $_POST['color'];
192
-		switch ($color) {
192
+		switch($color) {
193 193
 			case '8ABDB0':
194 194
 				$color = '8ABDB0';
195 195
 				break;
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 function isDeviceUidInDatabase($deviceUid)
242 242
 {
243 243
 	$db = new DatabaseConnect();  
244
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
244
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
245 245
 
246
-	if ($result->num_rows > 0)
246
+	if($result->num_rows > 0)
247 247
 	{
248 248
 		return TRUE;
249 249
 	}
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	
261 261
 	$access_token;
262 262
 
263
-	if ($result->num_rows > 0)
263
+	if($result->num_rows > 0)
264 264
 	{
265 265
 			// output data of each row
266 266
 			while($row = $result->fetch_assoc()) {
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 
278 278
 	if($expiration_date <= time()) {
279 279
 		$accountCreator = new CreateUser();
280
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
280
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
281 281
 		$accountCreator->setDeviceUid($deviceUid);
282 282
 		$accountCreator->setLocation($location);
283 283
 		$data = $accountCreator->execute();
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 									expiration_date='" . $expiration_date . "'
293 293
 								WHERE device_uid='" . $device_uid . "'");
294 294
 
295
-		if($result === false){
295
+		if($result === false) {
296 296
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
297 297
 		}	
298 298
 	}
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
 	$db = new DatabaseConnect();  
306 306
 	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
307 307
 	
308
-	if ($result->num_rows > 0)
308
+	if($result->num_rows > 0)
309 309
 	{
310 310
 			// output data of each row
311 311
 			while($row = $result->fetch_assoc()) {
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 
323 323
 	if($expiration_date <= time()) {
324 324
 		$accountCreator = new CreateUser();
325
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
325
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
326 326
 		$accountCreator->setDeviceUid($deviceUid);
327 327
 		$accountCreator->setLocation($location);
328 328
 		$data = $accountCreator->execute();
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 									expiration_date='" . $expiration_date . "'
338 338
 								WHERE device_uid='" . $device_uid . "'");
339 339
 
340
-		if($result === false){
340
+		if($result === false) {
341 341
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
342 342
 		}	
343 343
 	}
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 
353 353
 	$access_token;
354 354
 
355
-	if ($result->num_rows > 0)
355
+	if($result->num_rows > 0)
356 356
 	{
357 357
 			// output data of each row
358 358
 			while($row = $result->fetch_assoc()) {
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 									expiration_date='" . $expiration_date . "'
385 385
 								WHERE device_uid='" . $device_uid . "'");
386 386
 
387
-		if($result === false){
387
+		if($result === false) {
388 388
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
389 389
 		}	
390 390
 	}
@@ -395,11 +395,11 @@  discard block
 block discarded – undo
395 395
 function getLocationByAccessToken($accessToken)
396 396
 {
397 397
 	$db = new DatabaseConnect();
398
-	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken  . "'");
398
+	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
399 399
 	
400 400
 	$location = new Location();
401 401
 	
402
-	if ($result->num_rows > 0)
402
+	if($result->num_rows > 0)
403 403
 	{
404 404
 		// output data of each row
405 405
 		while($row = $result->fetch_assoc())
@@ -420,11 +420,11 @@  discard block
 block discarded – undo
420 420
 function getLocationByDeviceUid($deviceUid)
421 421
 {
422 422
 	$db = new DatabaseConnect();
423
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
423
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
424 424
 	
425 425
 	$location = new Location();
426 426
 	
427
-	if ($result->num_rows > 0)
427
+	if($result->num_rows > 0)
428 428
 	{
429 429
 		// output data of each row
430 430
 		while($row = $result->fetch_assoc())
@@ -445,11 +445,11 @@  discard block
 block discarded – undo
445 445
 function getDeviceUidByAccessToken($accesstoken)
446 446
 {
447 447
 	$db = new DatabaseConnect();
448
-	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken  . "'");
448
+	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken . "'");
449 449
 	
450 450
 	$deviceUid;
451 451
 	
452
-	if ($result->num_rows > 0)
452
+	if($result->num_rows > 0)
453 453
 	{
454 454
 		// output data of each row
455 455
 		while($row = $result->fetch_assoc())
@@ -468,11 +468,11 @@  discard block
 block discarded – undo
468 468
 function getAccessTokenByDeviceUid($deviceUid)
469 469
 {
470 470
 	$db = new DatabaseConnect();
471
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
471
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
472 472
 	
473 473
 	$accessToken;
474 474
 	
475
-	if ($result->num_rows > 0)
475
+	if($result->num_rows > 0)
476 476
 	{
477 477
 		// output data of each row
478 478
 		while($row = $result->fetch_assoc())
@@ -540,7 +540,7 @@  discard block
 block discarded – undo
540 540
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
541 541
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
542 542
 	
543
-	if($result === false){
543
+	if($result === false) {
544 544
 			$error = db_error();
545 545
 			echo $error;
546 546
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -568,11 +568,11 @@  discard block
 block discarded – undo
568 568
 	$result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
569 569
 					expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
570 570
 					VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
571
-					"','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
571
+					"','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
572 572
 					"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
573 573
 
574 574
 	$success = TRUE;
575
-	if($result === false){
575
+	if($result === false) {
576 576
 			$error = db_error();
577 577
 			echo $error;
578 578
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
 {
619 619
 	preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
620 620
 
621
-    return (isset($matches[0])) ? true : false;
621
+    return (isset($matches[0]))?true : false;
622 622
 }
623 623
 
624 624
 function botDeviceUidIsSet($config)
@@ -687,25 +687,25 @@  discard block
 block discarded – undo
687 687
 	$timediff_inDays = (string)$timediff->format('%d');
688 688
 	$timediff_inMonth = (string)$timediff->format('%m');
689 689
 
690
-	if($timediff_inMonth!=0)
690
+	if($timediff_inMonth != 0)
691 691
 	{
692 692
 			$timediff = $timediff_inMonth . "m";
693 693
 	}
694 694
 	else
695 695
 	{
696
-		if($timediff_inDays!=0)
696
+		if($timediff_inDays != 0)
697 697
 		{
698 698
 			$timediff = $timediff_inDays . "d";
699 699
 		}
700 700
 		else
701 701
 		{
702
-			if($timediff_inHours!=0)
702
+			if($timediff_inHours != 0)
703 703
 			{
704 704
 				$timediff = $timediff_inHours . "h";
705 705
 			}
706 706
 			else
707 707
 			{
708
-				if($timediff_inMinutes!=0)
708
+				if($timediff_inMinutes != 0)
709 709
 				{
710 710
 					$timediff = $timediff_inMinutes . "m";
711 711
 				}
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
 
720 720
 
721 721
 	?>
722
-	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
722
+	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
723 723
 		<content>
724 724
 			<?php 
725 725
 			if(isset($post['image_url']))
@@ -737,24 +737,24 @@  discard block
 block discarded – undo
737 737
 			<?php
738 738
 				if($isDetailedView)
739 739
 				{?>
740
-					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
740
+					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
741 741
 		  <?php }
742 742
 				else
743 743
 				{?>
744
-					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
744
+					<a href="index.php?vote=up&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
745 745
 		  <?php } ?>
746 746
 						<i class="fa fa-angle-up fa-3x"></i>
747 747
 					</a>	
748 748
 						<br />
749
-					<?php echo $post["vote_count"];?><br />
749
+					<?php echo $post["vote_count"]; ?><br />
750 750
 			<?php
751 751
 				if($isDetailedView)
752 752
 				{?>
753
-					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
753
+					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
754 754
 		  <?php }
755 755
 				else
756 756
 				{?>
757
-					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
757
+					<a href="index.php?vote=down&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
758 758
 		  <?php } ?>
759 759
 						<i class="fa fa-angle-down fa-3x"></i>
760 760
 					</a>
@@ -766,14 +766,14 @@  discard block
 block discarded – undo
766 766
 					<td class="time">
767 767
 						<span class="tip" data-tooltip="Time">
768 768
 							<i class="fa fa-clock-o"></i>
769
-							<?php echo $timediff;?>
770
-							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
769
+							<?php echo $timediff; ?>
770
+							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
771 771
 						</span> 
772 772
 					</td>
773 773
 					<td class="comments">
774 774
 						<?php if(!$isDetailedView) {?>
775 775
 						<span data-tooltip="Comments">
776
-							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
776
+							<a href="index.php?getPostDetails=true&view=<?php echo $view; ?>&postID=<?php echo $post["post_id"]; ?>">
777 777
 								<i class="fa fa-commenting-o"></i>
778 778
 								<?php if(array_key_exists("child_count", $post)) {
779 779
 											echo $post["child_count"];
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
 									{
803 803
 							  			?>
804 804
 							  			<span data-tooltip="Author">
805
-											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
805
+											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"]; ?> |
806 806
 										</span>
807 807
 										<?php
808 808
 									}
@@ -812,8 +812,8 @@  discard block
 block discarded – undo
812 812
 
813 813
 						<span class="tip" data-tooltip="Distance">
814 814
 							<i class="fa fa-map-marker"></i>
815
-							<?php echo $post['distance'];?> km
816
-							<span class="tiptext"><?php echo $post['location']['name'];?></span>
815
+							<?php echo $post['distance']; ?> km
816
+							<span class="tiptext"><?php echo $post['location']['name']; ?></span>
817 817
 						</span>
818 818
 					</td>
819 819
 				</tr>
Please login to merge, or discard this patch.
Braces   +51 added lines, -26 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		$channel = substr($_GET['city'], 1);
86 86
 
87 87
 		return htmlspecialchars($_GET['city']);
88
-	}                
88
+	}
89 89
 	else
90 90
 	{
91 91
 		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
@@ -189,7 +189,8 @@  discard block
 block discarded – undo
189 189
 	if(isset($_POST['color']))
190 190
 	{
191 191
 		$color = $_POST['color'];
192
-		switch ($color) {
192
+		switch ($color)
193
+		{
193 194
 			case '8ABDB0':
194 195
 				$color = '8ABDB0';
195 196
 				break;
@@ -263,7 +264,8 @@  discard block
 block discarded – undo
263 264
 	if ($result->num_rows > 0)
264 265
 	{
265 266
 			// output data of each row
266
-			while($row = $result->fetch_assoc()) {
267
+			while($row = $result->fetch_assoc())
268
+			{
267 269
 					//$access_token = $row["access_token"];
268 270
 					$expiration_date = $row["expiration_date"];
269 271
 					$deviceUid = $row["device_uid"];
@@ -275,7 +277,8 @@  discard block
 block discarded – undo
275 277
 			echo '0 results';
276 278
 	}
277 279
 
278
-	if($expiration_date <= time()) {
280
+	if($expiration_date <= time())
281
+	{
279 282
 		$accountCreator = new CreateUser();
280 283
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
281 284
 		$accountCreator->setDeviceUid($deviceUid);
@@ -292,7 +295,8 @@  discard block
 block discarded – undo
292 295
 									expiration_date='" . $expiration_date . "'
293 296
 								WHERE device_uid='" . $device_uid . "'");
294 297
 
295
-		if($result === false){
298
+		if($result === false)
299
+		{
296 300
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
297 301
 		}	
298 302
 	}
@@ -308,7 +312,8 @@  discard block
 block discarded – undo
308 312
 	if ($result->num_rows > 0)
309 313
 	{
310 314
 			// output data of each row
311
-			while($row = $result->fetch_assoc()) {
315
+			while($row = $result->fetch_assoc())
316
+			{
312 317
 					//$access_token = $row["access_token"];
313 318
 					$expiration_date = $row["expiration_date"];
314 319
 					$deviceUid = $row["device_uid"];
@@ -320,7 +325,8 @@  discard block
 block discarded – undo
320 325
 			echo '0 results';
321 326
 	}
322 327
 
323
-	if($expiration_date <= time()) {
328
+	if($expiration_date <= time())
329
+	{
324 330
 		$accountCreator = new CreateUser();
325 331
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
326 332
 		$accountCreator->setDeviceUid($deviceUid);
@@ -337,7 +343,8 @@  discard block
 block discarded – undo
337 343
 									expiration_date='" . $expiration_date . "'
338 344
 								WHERE device_uid='" . $device_uid . "'");
339 345
 
340
-		if($result === false){
346
+		if($result === false)
347
+		{
341 348
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
342 349
 		}	
343 350
 	}
@@ -355,7 +362,8 @@  discard block
 block discarded – undo
355 362
 	if ($result->num_rows > 0)
356 363
 	{
357 364
 			// output data of each row
358
-			while($row = $result->fetch_assoc()) {
365
+			while($row = $result->fetch_assoc())
366
+			{
359 367
 					//$access_token = $row["access_token"];
360 368
 					$expiration_date = $row["expiration_date"];
361 369
 					$deviceUid = $row["device_uid"];
@@ -367,7 +375,8 @@  discard block
 block discarded – undo
367 375
 			echo '0 results';
368 376
 	}
369 377
 
370
-	if($expiration_date <= time()) {
378
+	if($expiration_date <= time())
379
+	{
371 380
 		$accountCreator = new CreateUser();
372 381
 		$accountCreator->setAccessToken($access_token);
373 382
 		$accountCreator->setDeviceUid($deviceUid);
@@ -384,7 +393,8 @@  discard block
 block discarded – undo
384 393
 									expiration_date='" . $expiration_date . "'
385 394
 								WHERE device_uid='" . $device_uid . "'");
386 395
 
387
-		if($result === false){
396
+		if($result === false)
397
+		{
388 398
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
389 399
 		}	
390 400
 	}
@@ -540,14 +550,16 @@  discard block
 block discarded – undo
540 550
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
541 551
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
542 552
 	
543
-	if($result === false){
553
+	if($result === false)
554
+	{
544 555
 			$error = db_error();
545 556
 			echo $error;
546 557
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
547 558
 	}		
548 559
 }
549 560
 
550
-function registerAccount(Location $location) {
561
+function registerAccount(Location $location)
562
+{
551 563
 	$accountCreator = new CreateUser();
552 564
 	$accountCreator->setLocation($location);
553 565
 	$data = $accountCreator->execute();
@@ -572,7 +584,8 @@  discard block
 block discarded – undo
572 584
 					"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
573 585
 
574 586
 	$success = TRUE;
575
-	if($result === false){
587
+	if($result === false)
588
+	{
576 589
 			$error = db_error();
577 590
 			echo $error;
578 591
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -583,7 +596,7 @@  discard block
 block discarded – undo
583 596
 }
584 597
 
585 598
 function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
586
-{	
599
+{
587 600
 	$accountCreator = new GetPosts();
588 601
 	$accountCreator->setLastPostId($lastPostId);
589 602
 	$accountCreator->setAccessToken($accessToken);
@@ -672,7 +685,8 @@  discard block
 block discarded – undo
672 685
 }
673 686
 
674 687
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
675
-{	//ToDO
688
+{
689
+//ToDO
676 690
 	//Replace # with link
677 691
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
678 692
 
@@ -728,7 +742,8 @@  discard block
 block discarded – undo
728 742
 
729 743
 				echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
730 744
 			}
731
-			else {
745
+			else
746
+			{
732 747
 				echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
733 748
 			}
734 749
 			?>
@@ -736,11 +751,13 @@  discard block
 block discarded – undo
736 751
 		<aside>
737 752
 			<?php
738 753
 				if($isDetailedView)
739
-				{?>
754
+				{
755
+?>
740 756
 					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
741 757
 		  <?php }
742
-				else
743
-				{?>
758
+else
759
+				{
760
+?>
744 761
 					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
745 762
 		  <?php } ?>
746 763
 						<i class="fa fa-angle-up fa-3x"></i>
@@ -749,11 +766,13 @@  discard block
 block discarded – undo
749 766
 					<?php echo $post["vote_count"];?><br />
750 767
 			<?php
751 768
 				if($isDetailedView)
752
-				{?>
769
+				{
770
+?>
753 771
 					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
754 772
 		  <?php }
755
-				else
756
-				{?>
773
+else
774
+				{
775
+?>
757 776
 					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
758 777
 		  <?php } ?>
759 778
 						<i class="fa fa-angle-down fa-3x"></i>
@@ -771,13 +790,19 @@  discard block
 block discarded – undo
771 790
 						</span> 
772 791
 					</td>
773 792
 					<td class="comments">
774
-						<?php if(!$isDetailedView) {?>
793
+						<?php if(!$isDetailedView)
794
+{
795
+?>
775 796
 						<span data-tooltip="Comments">
776 797
 							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
777 798
 								<i class="fa fa-commenting-o"></i>
778
-								<?php if(array_key_exists("child_count", $post)) {
799
+								<?php if(array_key_exists("child_count", $post))
800
+{
779 801
 											echo $post["child_count"];
780
-										} else echo "0";
802
+										}
803
+										else {
804
+											echo "0";
805
+										}
781 806
 								?>
782 807
 								</a>
783 808
 						</span>
Please login to merge, or discard this patch.
index.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
37 37
 		{
38 38
 			$deviceUid = createAccount();
39
-			setcookie('JodelDeviceId', $deviceUid, time()+60*60*24*365*10);
40
-			error_log('Created account with JodelDeviceId:' . $deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
39
+			setcookie('JodelDeviceId', $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
40
+			error_log('Created account with JodelDeviceId:' . $deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
41 41
 			
42 42
 		}
43 43
 		else
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	//Set View
58 58
 	if(isset($_GET['view']))
59 59
 	{
60
-		switch ($_GET['view']) {
60
+		switch($_GET['view']) {
61 61
 			case 'comment':
62 62
 				$view = 'comment';
63 63
 				break;
@@ -244,13 +244,13 @@  discard block
 block discarded – undo
244 244
 		else
245 245
 		{
246 246
 			$version = 'v2';
247
-			if($view=='comment')
247
+			if($view == 'comment')
248 248
 			{
249 249
 				$url = "/v2/posts/location/discussed/";
250 250
 			}
251 251
 			else
252 252
 			{
253
-				if($view=='upVote')
253
+				if($view == 'upVote')
254 254
 				{
255 255
 					$url = "/v2/posts/location/popular/";
256 256
 				}
@@ -277,13 +277,13 @@  discard block
 block discarded – undo
277 277
 <!DOCTYPE html>
278 278
 <html lang="en">
279 279
 	<head>
280
-		<title><?php echo getTitle($posts[0], $view, $isDetailedView);?></title>
280
+		<title><?php echo getTitle($posts[0], $view, $isDetailedView); ?></title>
281 281
 		
282 282
 		<meta charset="utf-8">
283 283
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
284 284
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
285 285
 		
286
-		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView);?>">
286
+		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView); ?>">
287 287
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
288 288
 		
289 289
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 
366 366
 					<content id="posts">
367 367
 						<?php
368
-							for($i = 0; $i<$loops; $i++)
368
+							for($i = 0; $i < $loops; $i++)
369 369
 							{
370 370
 								if(array_key_exists($i, $posts) && array_key_exists('post_id', $posts[$i]) && isset($posts[$i]['post_id']))
371 371
 								{
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
410 410
 								<h2>Comment on Jodel</h2>
411 411
 								<form method="POST">				
412
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']);?>" />
412
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']); ?>" />
413 413
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
414 414
 									<br />
415 415
 									<input type="submit" value="SEND" /> 
@@ -446,13 +446,13 @@  discard block
 block discarded – undo
446 446
 				<div class="col-xs-12">
447 447
 					<div class="row">
448 448
 						<div class="col-xs-3">
449
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
449
+							<a href="index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
450 450
 						</div>
451 451
 						<div class="col-xs-3">
452
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
452
+							<a href="index.php?view=comment" <?php if($view == 'comment') echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
453 453
 						</div>
454 454
 						<div class="col-xs-3">
455
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
455
+							<a href="index.php?view=upVote" <?php if($view == 'upVote') echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
456 456
 						</div>
457 457
 						<div class="col-xs-3">
458 458
 							<nav>
Please login to merge, or discard this patch.
Braces   +42 added lines, -11 removed lines patch added patch discarded remove patch
@@ -57,7 +57,8 @@  discard block
 block discarded – undo
57 57
 	//Set View
58 58
 	if(isset($_GET['view']))
59 59
 	{
60
-		switch ($_GET['view']) {
60
+		switch ($_GET['view'])
61
+		{
61 62
 			case 'comment':
62 63
 				$view = 'comment';
63 64
 				break;
@@ -212,7 +213,8 @@  discard block
 block discarded – undo
212 213
 			$data = $accountCreator->execute();
213 214
 			
214 215
 			$posts[0] = $data;
215
-			if(array_key_exists('children', $data)) {
216
+			if(array_key_exists('children', $data))
217
+			{
216 218
 				foreach($data['children'] as $key => $child)
217 219
 				{
218 220
 					
@@ -350,7 +352,11 @@  discard block
 block discarded – undo
350 352
 
351 353
 					<div id="location_mobile" class="hidden-sm-up">
352 354
 						<form method="get">
353
-							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
355
+							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus))
356
+{
357
+	echo $newPositionStatus;
358
+}
359
+?>" required>
354 360
 
355 361
 							<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
356 362
 						</form>
@@ -377,7 +383,9 @@  discard block
 block discarded – undo
377 383
 
378 384
 					</content>
379 385
 					
380
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
386
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
387
+{
388
+?>
381 389
 						<p id="loading">
382 390
 							Loading…
383 391
 						</p>
@@ -390,7 +398,11 @@  discard block
 block discarded – undo
390 398
 							<div>
391 399
 								<h2>Position / Hashtag</h2>
392 400
 								<form method="get">
393
-									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
401
+									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
402
+{
403
+	echo $newPositionStatus;
404
+}
405
+?>" required>
394 406
 									<label>try: #jhj</label><br>
395 407
 									<input type="submit" value="Set Location" /> 
396 408
 								</form>
@@ -406,7 +418,9 @@  discard block
 block discarded – undo
406 418
 
407 419
 						<article>
408 420
 							<div>
409
-								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
421
+								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails']))
422
+{
423
+?>
410 424
 								<h2>Comment on Jodel</h2>
411 425
 								<form method="POST">				
412 426
 										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']);?>" />
@@ -414,7 +428,10 @@  discard block
 block discarded – undo
414 428
 									<br />
415 429
 									<input type="submit" value="SEND" /> 
416 430
 								</form>
417
-									<?php } else { ?>
431
+									<?php }
432
+else
433
+{
434
+?>
418 435
 								<h2>New Jodel</h2>
419 436
 								<form method="POST">
420 437
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 
@@ -446,13 +463,25 @@  discard block
 block discarded – undo
446 463
 				<div class="col-xs-12">
447 464
 					<div class="row">
448 465
 						<div class="col-xs-3">
449
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
466
+							<a href="index.php" <?php if($view=='time')
467
+{
468
+	echo 'class="active"';
469
+}
470
+?>><i class="fa fa-clock-o fa-3x"></i></a>
450 471
 						</div>
451 472
 						<div class="col-xs-3">
452
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
473
+							<a href="index.php?view=comment" <?php if($view=='comment')
474
+{
475
+	echo 'class="active"';
476
+}
477
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
453 478
 						</div>
454 479
 						<div class="col-xs-3">
455
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
480
+							<a href="index.php?view=upVote" <?php if($view=='upVote')
481
+{
482
+	echo 'class="active"';
483
+}
484
+?>><i class="fa fa-angle-up fa-3x"></i></a>
456 485
 						</div>
457 486
 						<div class="col-xs-3">
458 487
 							<nav>
@@ -493,7 +522,9 @@  discard block
 block discarded – undo
493 522
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
494 523
 				}
495 524
 
496
-				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
525
+				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
526
+{
527
+?>
497 528
 
498 529
 				
499 530
 
Please login to merge, or discard this patch.