@@ -7,8 +7,10 @@ discard block |
||
7 | 7 | $showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop'); |
8 | 8 | if (isset($globalVM) && $globalVM && isset($type) && $type == 'marine') { |
9 | 9 | $showDuration = $Common->multiKeyExists($spotter_array,'race_time'); |
10 | - if ($showDuration === false) $showDuration = $Common->multiKeyExists($spotter_array,'duration'); |
|
11 | -} else { |
|
10 | + if ($showDuration === false) { |
|
11 | + $showDuration = $Common->multiKeyExists($spotter_array,'duration'); |
|
12 | + } |
|
13 | + } else { |
|
12 | 14 | $showDuration = $Common->multiKeyExists($spotter_array,'duration'); |
13 | 15 | } |
14 | 16 | if (isset($globalVM) && $globalVM && isset($type) && $type == 'marine') { |
@@ -16,7 +18,9 @@ discard block |
||
16 | 18 | } |
17 | 19 | |
18 | 20 | |
19 | -if (!isset($type)) $type = 'aircraft'; |
|
21 | +if (!isset($type)) { |
|
22 | + $type = 'aircraft'; |
|
23 | +} |
|
20 | 24 | |
21 | 25 | if (!isset($_GET['sort'])) |
22 | 26 | { |
@@ -592,7 +596,9 @@ discard block |
||
592 | 596 | if (isset($globalTimezone)) |
593 | 597 | { |
594 | 598 | date_default_timezone_set($globalTimezone); |
595 | - } else date_default_timezone_set('UTC'); |
|
599 | + } else { |
|
600 | + date_default_timezone_set('UTC'); |
|
601 | + } |
|
596 | 602 | if ($showSpecial === true) |
597 | 603 | { |
598 | 604 | print '<tr class="special">'."\n"; |
@@ -607,7 +613,9 @@ discard block |
||
607 | 613 | print '<tr class="active">'; |
608 | 614 | } elseif (isset($spotter_item['spotted_registration'])) { |
609 | 615 | print '<tr class="info">'; |
610 | - } else print '<tr>'; |
|
616 | + } else { |
|
617 | + print '<tr>'; |
|
618 | + } |
|
611 | 619 | } |
612 | 620 | 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") { |
613 | 621 | if ($type == 'aircraft') { |
@@ -615,8 +623,9 @@ discard block |
||
615 | 623 | { |
616 | 624 | print '<td class="aircraft_thumbnail">'."\n"; |
617 | 625 | if ($spotter_item['image_source'] == 'planespotters') { |
618 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
619 | - else { |
|
626 | + if ($spotter_item['image_source_website'] != '') { |
|
627 | + $image_src = $spotter_item['image_source_website']; |
|
628 | + } else { |
|
620 | 629 | $planespotter_url_array = explode("_", $spotter_item['image']); |
621 | 630 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
622 | 631 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -629,7 +638,9 @@ discard block |
||
629 | 638 | } else { |
630 | 639 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
631 | 640 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
632 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
641 | + } else { |
|
642 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
643 | + } |
|
633 | 644 | if (isset($spotter_item['airline_name'])) { |
634 | 645 | 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">© '.$spotter_item['image_copyright'].'</div>'; |
635 | 646 | } else { |
@@ -655,7 +666,9 @@ discard block |
||
655 | 666 | print '<td class="aircraft_thumbnail">'."\n"; |
656 | 667 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
657 | 668 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
658 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
669 | + } else { |
|
670 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
671 | + } |
|
659 | 672 | if (isset($spotter_item['mmsi']) && $spotter_item['mmsi'] != '') { |
660 | 673 | 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">© '.$spotter_item['image_copyright'].'</div>'; |
661 | 674 | } else { |
@@ -677,7 +690,9 @@ discard block |
||
677 | 690 | print '<td class="aircraft_thumbnail">'."\n"; |
678 | 691 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
679 | 692 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
680 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
693 | + } else { |
|
694 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
695 | + } |
|
681 | 696 | 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">© '.$spotter_item['image_copyright'].'</div>'; |
682 | 697 | print '</td>'."\n"; |
683 | 698 | } else { |
@@ -730,8 +745,9 @@ discard block |
||
730 | 745 | print '<td class="aircraft_thumbnail">'."\n"; |
731 | 746 | //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>'; |
732 | 747 | if ($spotter_item['image_source'] == 'planespotters') { |
733 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
734 | - else { |
|
748 | + if ($spotter_item['image_source_website'] != '') { |
|
749 | + $image_src = $spotter_item['image_source_website']; |
|
750 | + } else { |
|
735 | 751 | $planespotter_url_array = explode("_", $spotter_array[0]['image']); |
736 | 752 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
737 | 753 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -748,7 +764,9 @@ discard block |
||
748 | 764 | } else { |
749 | 765 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
750 | 766 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
751 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
767 | + } else { |
|
768 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
769 | + } |
|
752 | 770 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
753 | 771 | 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">© '.$spotter_item['image_copyright'].'</div>'; |
754 | 772 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
@@ -788,13 +806,19 @@ discard block |
||
788 | 806 | print '<td class="aircraft_thumbnail">'."\n"; |
789 | 807 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
790 | 808 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
791 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
809 | + } else { |
|
810 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
811 | + } |
|
792 | 812 | if (isset($spotter_item['mmsi']) && $spotter_item['mmsi'] != '') { |
793 | 813 | 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"; |
794 | - if ($spotter_item['image_copyright'] != '') print '<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
814 | + if ($spotter_item['image_copyright'] != '') { |
|
815 | + print '<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
816 | + } |
|
795 | 817 | } else { |
796 | 818 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['ident'].'" data-content="'._("Ident:").' '.$spotter_item['ident'].'" data-html="true" width="100px" />'."\n"; |
797 | - if ($spotter_item['image_copyright'] != '') print '<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
819 | + if ($spotter_item['image_copyright'] != '') { |
|
820 | + print '<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
821 | + } |
|
798 | 822 | } |
799 | 823 | print '</td>'."\n"; |
800 | 824 | } else { |
@@ -812,7 +836,9 @@ discard block |
||
812 | 836 | print '<td class="aircraft_thumbnail">'."\n"; |
813 | 837 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
814 | 838 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
815 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
839 | + } else { |
|
840 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
841 | + } |
|
816 | 842 | 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">© '.$spotter_item['image_copyright'].'</div>'; |
817 | 843 | print '</td>'."\n"; |
818 | 844 | } else { |
@@ -930,8 +956,11 @@ discard block |
||
930 | 956 | print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n"; |
931 | 957 | } else { |
932 | 958 | $aircraft_names = explode('/',$spotter_item['aircraft_name']); |
933 | - 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"; |
|
934 | - 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"; |
|
959 | + if (count($aircraft_names) == 1) { |
|
960 | + print '<span class="nomobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</a></span>'."\n"; |
|
961 | + } else { |
|
962 | + 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"; |
|
963 | + } |
|
935 | 964 | } |
936 | 965 | print '<span class="mobile"><a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a></span>'."\n"; |
937 | 966 | } elseif ($type == 'marine') { |
@@ -974,15 +1003,21 @@ discard block |
||
974 | 1003 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
975 | 1004 | if ($spotter_item['departure_airport_time'] > 2460) { |
976 | 1005 | $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
977 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
1006 | + } else { |
|
1007 | + $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
1008 | + } |
|
978 | 1009 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
979 | 1010 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
980 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
1011 | + } else { |
|
1012 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
1013 | + } |
|
981 | 1014 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
982 | 1015 | } elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') { |
983 | 1016 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
984 | 1017 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
985 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
1018 | + } else { |
|
1019 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
1020 | + } |
|
986 | 1021 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
987 | 1022 | } elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
988 | 1023 | if ($spotter_item['departure_airport_time'] > 2460) { |
@@ -1004,7 +1039,9 @@ discard block |
||
1004 | 1039 | $longitude = $spotter_item['longitude']; |
1005 | 1040 | } |
1006 | 1041 | $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
1007 | - } else $distance = ''; |
|
1042 | + } else { |
|
1043 | + $distance = ''; |
|
1044 | + } |
|
1008 | 1045 | if ($distance != '') { |
1009 | 1046 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
1010 | 1047 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |
@@ -1031,7 +1068,9 @@ discard block |
||
1031 | 1068 | } else { |
1032 | 1069 | if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) { |
1033 | 1070 | 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"; |
1034 | - if (!isset($Spotter)) $Spotter = new Spotter(); |
|
1071 | + if (!isset($Spotter)) { |
|
1072 | + $Spotter = new Spotter(); |
|
1073 | + } |
|
1035 | 1074 | $arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']); |
1036 | 1075 | if (isset($arrival_airport_info[0])) { |
1037 | 1076 | 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"; |
@@ -1051,20 +1090,28 @@ discard block |
||
1051 | 1090 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
1052 | 1091 | if ($spotter_item['arrival_airport_time'] > 2460) { |
1053 | 1092 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
1054 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
1093 | + } else { |
|
1094 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
1095 | + } |
|
1055 | 1096 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
1056 | 1097 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
1057 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
1098 | + } else { |
|
1099 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
1100 | + } |
|
1058 | 1101 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
1059 | 1102 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
1060 | 1103 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
1061 | 1104 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
1062 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
1105 | + } else { |
|
1106 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
1107 | + } |
|
1063 | 1108 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
1064 | 1109 | } elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
1065 | 1110 | if ($spotter_item['arrival_airport_time'] > 2460) { |
1066 | 1111 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
1067 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
1112 | + } else { |
|
1113 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
1114 | + } |
|
1068 | 1115 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
1069 | 1116 | } |
1070 | 1117 | if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
@@ -1077,7 +1124,9 @@ discard block |
||
1077 | 1124 | $longitude = $spotter_item['longitude']; |
1078 | 1125 | } |
1079 | 1126 | $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
1080 | - } else $distance = ''; |
|
1127 | + } else { |
|
1128 | + $distance = ''; |
|
1129 | + } |
|
1081 | 1130 | if ($distance != '') { |
1082 | 1131 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
1083 | 1132 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |