Completed
Push — master ( cfb98e...efb3f2 )
by Yannick
71:32 queued 43:08
created
table-output.php 1 patch
Braces   +68 added lines, -25 removed lines patch added patch discarded remove patch
@@ -7,7 +7,9 @@  discard block
 block discarded – undo
7 7
 $showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop');
8 8
 $showDuration = $Common->multiKeyExists($spotter_array,'duration');
9 9
 
10
-if (!isset($type)) $type = 'aircraft';
10
+if (!isset($type)) {
11
+	$type = 'aircraft';
12
+}
11 13
 
12 14
 if (!isset($_GET['sort'])) 
13 15
 {
@@ -492,7 +494,9 @@  discard block
 block discarded – undo
492 494
 	if (isset($globalTimezone))
493 495
 	{
494 496
 		date_default_timezone_set($globalTimezone);
495
-	} else date_default_timezone_set('UTC');
497
+	} else {
498
+		date_default_timezone_set('UTC');
499
+	}
496 500
 	if ($showSpecial === true)
497 501
 	{
498 502
 		print '<tr class="special">'."\n";
@@ -507,7 +511,9 @@  discard block
 block discarded – undo
507 511
 			print '<tr class="active">';
508 512
 		} elseif (isset($spotter_item['spotted_registration'])) {
509 513
 			print '<tr class="info">';
510
-		} else print '<tr>';
514
+		} else {
515
+			print '<tr>';
516
+		}
511 517
 	}
512 518
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive" || strtolower($current_page) == "currently" || strtolower($current_page) == "accident-latest" || strtolower($current_page) == "incident-latest" || strtolower($current_page) == "accident-detailed" || strtolower($current_page) == "incident-detailed") {
513 519
 		if ($type == 'aircraft') {
@@ -515,8 +521,9 @@  discard block
 block discarded – undo
515 521
 			{
516 522
 				print '<td class="aircraft_thumbnail">'."\n";
517 523
 				if ($spotter_item['image_source'] == 'planespotters') {
518
-					if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
519
-					else {
524
+					if ($spotter_item['image_source_website'] != '') {
525
+						$image_src = $spotter_item['image_source_website'];
526
+					} else {
520 527
 						$planespotter_url_array = explode("_", $spotter_item['image']);
521 528
 						$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
522 529
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -529,7 +536,9 @@  discard block
 block discarded – undo
529 536
 				} else {
530 537
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
531 538
 						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
532
-					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
539
+					} else {
540
+						$image_thumbnail = $spotter_item['image_thumbnail'];
541
+					}
533 542
 					if (isset($spotter_item['airline_name'])) {
534 543
 						print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
535 544
 					} else {
@@ -548,7 +557,9 @@  discard block
 block discarded – undo
548 557
 				print '<td class="aircraft_thumbnail">'."\n";
549 558
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
550 559
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
551
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
560
+				} else {
561
+					$image_thumbnail = $spotter_item['image_thumbnail'];
562
+				}
552 563
 				if (isset($spotter_item['airline_name'])) {
553 564
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
554 565
 				} else {
@@ -566,7 +577,9 @@  discard block
 block discarded – undo
566 577
 				print '<td class="aircraft_thumbnail">'."\n";
567 578
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
568 579
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
569
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
580
+				} else {
581
+					$image_thumbnail = $spotter_item['image_thumbnail'];
582
+				}
570 583
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
571 584
 				print '</td>'."\n";
572 585
 			} else {
@@ -619,8 +632,9 @@  discard block
 block discarded – undo
619 632
 				print '<td class="aircraft_thumbnail">'."\n";
620 633
 				//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
621 634
 				if ($spotter_item['image_source'] == 'planespotters') {
622
-					if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
623
-					else {
635
+					if ($spotter_item['image_source_website'] != '') {
636
+						$image_src = $spotter_item['image_source_website'];
637
+					} else {
624 638
 						$planespotter_url_array = explode("_", $spotter_array[0]['image']);
625 639
 						$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
626 640
 						$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -637,7 +651,9 @@  discard block
 block discarded – undo
637 651
 				} else {
638 652
 					if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
639 653
 						$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
640
-					} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
654
+					} else {
655
+						$image_thumbnail = $spotter_item['image_thumbnail'];
656
+					}
641 657
 					if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
642 658
 						print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
643 659
 					} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -670,7 +686,9 @@  discard block
 block discarded – undo
670 686
 				print '<td class="aircraft_thumbnail">'."\n";
671 687
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
672 688
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
673
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
689
+				} else {
690
+					$image_thumbnail = $spotter_item['image_thumbnail'];
691
+				}
674 692
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
675 693
 				print '</td>'."\n";
676 694
 			} else {
@@ -684,7 +702,9 @@  discard block
 block discarded – undo
684 702
 				print '<td class="aircraft_thumbnail">'."\n";
685 703
 				if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
686 704
 					$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
687
-				} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
705
+				} else {
706
+					$image_thumbnail = $spotter_item['image_thumbnail'];
707
+				}
688 708
 				print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
689 709
 				print '</td>'."\n";
690 710
 			} else {
@@ -802,8 +822,11 @@  discard block
 block discarded – undo
802 822
 				print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n";
803 823
 			} else {
804 824
 				$aircraft_names = explode('/',$spotter_item['aircraft_name']);
805
-				if (count($aircraft_names) == 1) print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</a></span>'."\n";
806
-				else print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].'</a></span>'."\n";
825
+				if (count($aircraft_names) == 1) {
826
+					print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</a></span>'."\n";
827
+				} else {
828
+					print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].'</a></span>'."\n";
829
+				}
807 830
 			}
808 831
 			print '<span class="mobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n";
809 832
 		} elseif ($type == 'marine') {
@@ -846,15 +869,21 @@  discard block
 block discarded – undo
846 869
 			if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
847 870
 				if ($spotter_item['departure_airport_time'] > 2460) {
848 871
 					$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
849
-				} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
872
+				} else {
873
+					$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
874
+				}
850 875
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
851 876
 					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
852
-				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
877
+				} else {
878
+					$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
879
+				}
853 880
 				print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
854 881
 			} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
855 882
 				if ($spotter_item['real_departure_airport_time'] > 2460) {
856 883
 					$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
857
-				} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
884
+				} else {
885
+					$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
886
+				}
858 887
 				print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
859 888
 			} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
860 889
 				if ($spotter_item['departure_airport_time'] > 2460) {
@@ -876,7 +905,9 @@  discard block
 block discarded – undo
876 905
 						$longitude = $spotter_item['longitude'];
877 906
 					}
878 907
 					$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
879
-				} else $distance = '';
908
+				} else {
909
+					$distance = '';
910
+				}
880 911
 				if ($distance != '') {
881 912
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
882 913
 						echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -903,7 +934,9 @@  discard block
 block discarded – undo
903 934
 			} else {
904 935
 				if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
905 936
 					print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
906
-					if (!isset($Spotter)) $Spotter = new Spotter();
937
+					if (!isset($Spotter)) {
938
+						$Spotter = new Spotter();
939
+					}
907 940
 					$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
908 941
 					print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
909 942
 					print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -919,20 +952,28 @@  discard block
 block discarded – undo
919 952
 			if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
920 953
 				if ($spotter_item['arrival_airport_time'] > 2460) {
921 954
 					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
922
-				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
955
+				} else {
956
+					$arrival_airport_time = $spotter_item['arrival_airport_time'];
957
+				}
923 958
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
924 959
 					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
925
-				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
960
+				} else {
961
+					$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
962
+				}
926 963
 				print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
927 964
 			} elseif (isset($spotter_item['real_arrival_airport_time'])) {
928 965
 				if ($spotter_item['real_arrival_airport_time'] > 2460) {
929 966
 					$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
930
-				} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
967
+				} else {
968
+					$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
969
+				}
931 970
 				print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
932 971
 			} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
933 972
 				if ($spotter_item['arrival_airport_time'] > 2460) {
934 973
 					$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
935
-				} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
974
+				} else {
975
+					$arrival_airport_time = $spotter_item['arrival_airport_time'];
976
+				}
936 977
 				print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
937 978
 			}
938 979
 			if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -945,7 +986,9 @@  discard block
 block discarded – undo
945 986
 						$longitude = $spotter_item['longitude'];
946 987
 					}
947 988
 					$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
948
-				} else $distance = '';
989
+				} else {
990
+					$distance = '';
991
+				}
949 992
 				if ($distance != '') {
950 993
 					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
951 994
 						echo '<br/><i>'.round($distance*0.539957).' nm</i>';
Please login to merge, or discard this patch.