@@ -1,6 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
4 | -if ($date == '') $date = date('Y-m-d'); |
|
4 | +if ($date == '') { |
|
5 | + $date = date('Y-m-d'); |
|
6 | +} |
|
5 | 7 | header('Location: '.$globalURL.'/accident/'.$date); |
6 | 8 | ?> |
7 | 9 | \ No newline at end of file |
@@ -5,7 +5,9 @@ |
||
5 | 5 | $Spotter = new Spotter(); |
6 | 6 | $title = _("Statistics").' - '._("Most common Route by Waypoint"); |
7 | 7 | require_once('header.php'); |
8 | -if (!isset($filter_name)) $filter_name = ''; |
|
8 | +if (!isset($filter_name)) { |
|
9 | + $filter_name = ''; |
|
10 | +} |
|
9 | 11 | include('statistics-sub-menu.php'); |
10 | 12 | |
11 | 13 | print '<div class="info"> |
@@ -5,7 +5,9 @@ |
||
5 | 5 | $Spotter = new Spotter(); |
6 | 6 | $title = _("Statistics").' - '._("Most common Route by Airport"); |
7 | 7 | require_once('header.php'); |
8 | -if (!isset($filter_name)) $filter_name = ''; |
|
8 | +if (!isset($filter_name)) { |
|
9 | + $filter_name = ''; |
|
10 | +} |
|
9 | 11 | include('statistics-sub-menu.php'); |
10 | 12 | |
11 | 13 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -1,6 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
4 | -if ($date == '') $date = date('Y-m-d'); |
|
4 | +if ($date == '') { |
|
5 | + $date = date('Y-m-d'); |
|
6 | +} |
|
5 | 7 | header('Location: '.$globalURL.'/incident/'.$date); |
6 | 8 | ?> |
7 | 9 | \ No newline at end of file |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $limit_start = 0; |
32 | 32 | $limit_end = 25; |
33 | 33 | $absolute_difference = 25; |
34 | -} else { |
|
34 | +} else { |
|
35 | 35 | $limit_explode = explode(",", $_GET['limit']); |
36 | 36 | $limit_start = $limit_explode[0]; |
37 | 37 | $limit_end = $limit_explode[1]; |
@@ -50,20 +50,32 @@ discard block |
||
50 | 50 | print '</div>'; |
51 | 51 | |
52 | 52 | print '<div class="table column">'; |
53 | -if ($type == 'aircraft') print '<p>'._("The table below shows the detailed information of all current flights.").'</p>'; |
|
54 | -elseif ($type == 'marine') print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>'; |
|
55 | -elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>'; |
|
53 | +if ($type == 'aircraft') { |
|
54 | + print '<p>'._("The table below shows the detailed information of all current flights.").'</p>'; |
|
55 | +} elseif ($type == 'marine') { |
|
56 | + print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>'; |
|
57 | +} elseif ($type == 'tracker') { |
|
58 | + print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>'; |
|
59 | +} |
|
56 | 60 | |
57 | 61 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
58 | 62 | if ($sort != '') { |
59 | - if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort); |
|
60 | - elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort); |
|
61 | - elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort); |
|
62 | -} else { |
|
63 | - if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference); |
|
64 | - elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference); |
|
65 | - elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference); |
|
66 | -} |
|
63 | + if ($type == 'aircraft') { |
|
64 | + $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort); |
|
65 | + } elseif ($type == 'marine') { |
|
66 | + $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort); |
|
67 | + } elseif ($type == 'tracker') { |
|
68 | + $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort); |
|
69 | + } |
|
70 | + } else { |
|
71 | + if ($type == 'aircraft') { |
|
72 | + $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference); |
|
73 | + } elseif ($type == 'marine') { |
|
74 | + $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference); |
|
75 | + } elseif ($type == 'tracker') { |
|
76 | + $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference); |
|
77 | + } |
|
78 | + } |
|
67 | 79 | |
68 | 80 | if (!empty($spotter_array)) |
69 | 81 | { |
@@ -1,11 +1,20 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $type = 'aircraft'; |
4 | -if (isset($_GET['marine'])) $type = 'marine'; |
|
5 | -elseif (isset($_GET['tracker'])) $type = 'tracker'; |
|
4 | +if (isset($_GET['marine'])) { |
|
5 | + $type = 'marine'; |
|
6 | +} elseif (isset($_GET['tracker'])) { |
|
7 | + $type = 'tracker'; |
|
8 | +} |
|
6 | 9 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
7 | -if ($date == '') $date = date('Y-m-d'); |
|
8 | -if ($type == 'marine') header('Location: '.$globalURL.'/marine/date/'.$date); |
|
9 | -elseif ($type == 'tracker') header('Location: '.$globalURL.'/tracker/date/'.$date); |
|
10 | -else header('Location: '.$globalURL.'/date/'.$date); |
|
10 | +if ($date == '') { |
|
11 | + $date = date('Y-m-d'); |
|
12 | +} |
|
13 | +if ($type == 'marine') { |
|
14 | + header('Location: '.$globalURL.'/marine/date/'.$date); |
|
15 | +} elseif ($type == 'tracker') { |
|
16 | + header('Location: '.$globalURL.'/tracker/date/'.$date); |
|
17 | +} else { |
|
18 | + header('Location: '.$globalURL.'/date/'.$date); |
|
19 | +} |
|
11 | 20 | ?> |
12 | 21 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $limit_start = 0; |
30 | 30 | $limit_end = 25; |
31 | 31 | $absolute_difference = 25; |
32 | - } else { |
|
32 | + } else { |
|
33 | 33 | $limit_explode = explode(",", $_GET['limit']); |
34 | 34 | $limit_start = $limit_explode[0]; |
35 | 35 | $limit_end = $limit_explode[1]; |
@@ -46,21 +46,33 @@ discard block |
||
46 | 46 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
47 | 47 | if ($sort != '') |
48 | 48 | { |
49 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
50 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
51 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
49 | + if ($type == 'marine') { |
|
50 | + $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
51 | + } elseif ($type == 'tracker') { |
|
52 | + $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
53 | + } else { |
|
54 | + $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
55 | + } |
|
52 | 56 | } else { |
53 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference); |
|
54 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference); |
|
55 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference); |
|
57 | + if ($type == 'marine') { |
|
58 | + $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference); |
|
59 | + } elseif ($type == 'tracker') { |
|
60 | + $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference); |
|
61 | + } else { |
|
62 | + $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference); |
|
63 | + } |
|
56 | 64 | } |
57 | 65 | |
58 | 66 | if (!empty($spotter_array)) |
59 | 67 | { |
60 | 68 | date_default_timezone_set($globalTimezone); |
61 | - if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
62 | - elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
63 | - else $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
69 | + if ($type == 'marine') { |
|
70 | + $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
71 | + } elseif ($type == 'tracker') { |
|
72 | + $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
73 | + } else { |
|
74 | + $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
75 | + } |
|
64 | 76 | |
65 | 77 | require_once('header.php'); |
66 | 78 | print '<div class="select-item">'; |
@@ -78,15 +90,24 @@ discard block |
||
78 | 90 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
79 | 91 | print '<br />'; |
80 | 92 | print '<div class="info column">'; |
81 | - if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
82 | - else print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
93 | + if ($type == 'marine') { |
|
94 | + print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
95 | + } else { |
|
96 | + print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
97 | + } |
|
83 | 98 | print '</div>'; |
84 | 99 | |
85 | - if ($type == 'aircraft') include('date-sub-menu.php'); |
|
100 | + if ($type == 'aircraft') { |
|
101 | + include('date-sub-menu.php'); |
|
102 | + } |
|
86 | 103 | print '<div class="table column">'; |
87 | - if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
88 | - elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
89 | - else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
104 | + if ($type == 'marine') { |
|
105 | + print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
106 | + } elseif ($type == 'tracker') { |
|
107 | + print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
108 | + } else { |
|
109 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
110 | + } |
|
90 | 111 | |
91 | 112 | include('table-output.php'); |
92 | 113 | print '<div class="pagination">'; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $limit_start = 0; |
29 | 29 | $limit_end = 25; |
30 | 30 | $absolute_difference = 25; |
31 | -} else { |
|
31 | +} else { |
|
32 | 32 | $limit_explode = explode(",", $_GET['limit']); |
33 | 33 | $limit_start = $limit_explode[0]; |
34 | 34 | $limit_end = $limit_explode[1]; |
@@ -47,9 +47,13 @@ discard block |
||
47 | 47 | print '<h1>'._("Latest Activity").'</h1>'; |
48 | 48 | print '</div>'; |
49 | 49 | print '<div class="table column">'; |
50 | -if ($type == 'marine') print '<p>'._("The table below shows the detailed information of all recent vessels.").'</p>'; |
|
51 | -elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all recent trackers.").'</p>'; |
|
52 | -else print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>'; |
|
50 | +if ($type == 'marine') { |
|
51 | + print '<p>'._("The table below shows the detailed information of all recent vessels.").'</p>'; |
|
52 | +} elseif ($type == 'tracker') { |
|
53 | + print '<p>'._("The table below shows the detailed information of all recent trackers.").'</p>'; |
|
54 | +} else { |
|
55 | + print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>'; |
|
56 | +} |
|
53 | 57 | |
54 | 58 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
55 | 59 | $sql_begin = microtime(true); |
@@ -7,7 +7,9 @@ discard block |
||
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 | { |
@@ -440,7 +442,9 @@ discard block |
||
440 | 442 | if (isset($globalTimezone)) |
441 | 443 | { |
442 | 444 | date_default_timezone_set($globalTimezone); |
443 | - } else date_default_timezone_set('UTC'); |
|
445 | + } else { |
|
446 | + date_default_timezone_set('UTC'); |
|
447 | + } |
|
444 | 448 | if ($showSpecial === true) |
445 | 449 | { |
446 | 450 | print '<tr class="special">'."\n"; |
@@ -455,7 +459,9 @@ discard block |
||
455 | 459 | print '<tr class="active">'; |
456 | 460 | } elseif (isset($spotter_item['spotted_registration'])) { |
457 | 461 | print '<tr class="info">'; |
458 | - } else print '<tr>'; |
|
462 | + } else { |
|
463 | + print '<tr>'; |
|
464 | + } |
|
459 | 465 | } |
460 | 466 | 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") { |
461 | 467 | if ($type == 'aircraft') { |
@@ -463,8 +469,9 @@ discard block |
||
463 | 469 | { |
464 | 470 | print '<td class="aircraft_thumbnail">'."\n"; |
465 | 471 | if ($spotter_item['image_source'] == 'planespotters') { |
466 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
467 | - else { |
|
472 | + if ($spotter_item['image_source_website'] != '') { |
|
473 | + $image_src = $spotter_item['image_source_website']; |
|
474 | + } else { |
|
468 | 475 | $planespotter_url_array = explode("_", $spotter_item['image']); |
469 | 476 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
470 | 477 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -477,7 +484,9 @@ discard block |
||
477 | 484 | } else { |
478 | 485 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
479 | 486 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
480 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
487 | + } else { |
|
488 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
489 | + } |
|
481 | 490 | if (isset($spotter_item['airline_name'])) { |
482 | 491 | 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>'; |
483 | 492 | } else { |
@@ -496,7 +505,9 @@ discard block |
||
496 | 505 | print '<td class="aircraft_thumbnail">'."\n"; |
497 | 506 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
498 | 507 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
499 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
508 | + } else { |
|
509 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
510 | + } |
|
500 | 511 | if (isset($spotter_item['airline_name'])) { |
501 | 512 | 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>'; |
502 | 513 | } else { |
@@ -514,7 +525,9 @@ discard block |
||
514 | 525 | print '<td class="aircraft_thumbnail">'."\n"; |
515 | 526 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
516 | 527 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
517 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
528 | + } else { |
|
529 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
530 | + } |
|
518 | 531 | 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>'; |
519 | 532 | print '</td>'."\n"; |
520 | 533 | } else { |
@@ -565,8 +578,9 @@ discard block |
||
565 | 578 | print '<td class="aircraft_thumbnail">'."\n"; |
566 | 579 | //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>'; |
567 | 580 | if ($spotter_item['image_source'] == 'planespotters') { |
568 | - if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website']; |
|
569 | - else { |
|
581 | + if ($spotter_item['image_source_website'] != '') { |
|
582 | + $image_src = $spotter_item['image_source_website']; |
|
583 | + } else { |
|
570 | 584 | $planespotter_url_array = explode("_", $spotter_array[0]['image']); |
571 | 585 | $planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]); |
572 | 586 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
@@ -583,7 +597,9 @@ discard block |
||
583 | 597 | } else { |
584 | 598 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
585 | 599 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
586 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
600 | + } else { |
|
601 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
602 | + } |
|
587 | 603 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
588 | 604 | 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>'; |
589 | 605 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
@@ -616,7 +632,9 @@ discard block |
||
616 | 632 | print '<td class="aircraft_thumbnail">'."\n"; |
617 | 633 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
618 | 634 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
619 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
635 | + } else { |
|
636 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
637 | + } |
|
620 | 638 | 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>'; |
621 | 639 | print '</td>'."\n"; |
622 | 640 | } else { |
@@ -630,7 +648,9 @@ discard block |
||
630 | 648 | print '<td class="aircraft_thumbnail">'."\n"; |
631 | 649 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
632 | 650 | $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
633 | - } else $image_thumbnail = $spotter_item['image_thumbnail']; |
|
651 | + } else { |
|
652 | + $image_thumbnail = $spotter_item['image_thumbnail']; |
|
653 | + } |
|
634 | 654 | 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>'; |
635 | 655 | print '</td>'."\n"; |
636 | 656 | } else { |
@@ -783,15 +803,21 @@ discard block |
||
783 | 803 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
784 | 804 | if ($spotter_item['departure_airport_time'] > 2460) { |
785 | 805 | $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
786 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
806 | + } else { |
|
807 | + $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
808 | + } |
|
787 | 809 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
788 | 810 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
789 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
811 | + } else { |
|
812 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
813 | + } |
|
790 | 814 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
791 | 815 | } elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') { |
792 | 816 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
793 | 817 | $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
794 | - } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
818 | + } else { |
|
819 | + $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
|
820 | + } |
|
795 | 821 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
796 | 822 | } elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
797 | 823 | if ($spotter_item['departure_airport_time'] > 2460) { |
@@ -813,7 +839,9 @@ discard block |
||
813 | 839 | $longitude = $spotter_item['longitude']; |
814 | 840 | } |
815 | 841 | $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
816 | - } else $distance = ''; |
|
842 | + } else { |
|
843 | + $distance = ''; |
|
844 | + } |
|
817 | 845 | if ($distance != '') { |
818 | 846 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
819 | 847 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |
@@ -840,7 +868,9 @@ discard block |
||
840 | 868 | } else { |
841 | 869 | if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) { |
842 | 870 | 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"; |
843 | - if (!isset($Spotter)) $Spotter = new Spotter(); |
|
871 | + if (!isset($Spotter)) { |
|
872 | + $Spotter = new Spotter(); |
|
873 | + } |
|
844 | 874 | $arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']); |
845 | 875 | 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"; |
846 | 876 | print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n"; |
@@ -856,20 +886,28 @@ discard block |
||
856 | 886 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
857 | 887 | if ($spotter_item['arrival_airport_time'] > 2460) { |
858 | 888 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
859 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
889 | + } else { |
|
890 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
891 | + } |
|
860 | 892 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
861 | 893 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
862 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
894 | + } else { |
|
895 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
896 | + } |
|
863 | 897 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
864 | 898 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
865 | 899 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
866 | 900 | $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
867 | - } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
901 | + } else { |
|
902 | + $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
|
903 | + } |
|
868 | 904 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
869 | 905 | } elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
870 | 906 | if ($spotter_item['arrival_airport_time'] > 2460) { |
871 | 907 | $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
872 | - } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
908 | + } else { |
|
909 | + $arrival_airport_time = $spotter_item['arrival_airport_time']; |
|
910 | + } |
|
873 | 911 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
874 | 912 | } |
875 | 913 | if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') { |
@@ -882,7 +920,9 @@ discard block |
||
882 | 920 | $longitude = $spotter_item['longitude']; |
883 | 921 | } |
884 | 922 | $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
885 | - } else $distance = ''; |
|
923 | + } else { |
|
924 | + $distance = ''; |
|
925 | + } |
|
886 | 926 | if ($distance != '') { |
887 | 927 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
888 | 928 | echo '<br/><i>'.round($distance*0.539957).' nm</i>'; |