Ysurac / FlightAirMap

airport-statistics-arrival-airport.php

Spacing +7 added lines, -7 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/airport');
         die();
 }
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
 $airport_array = $Spotter->getAllAirportInfo($airport);
 
 if (!empty($airport_array))
 {
 	//$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
-	$title = sprintf(_("Most Common Arrival Airports from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
+	$title = sprintf(_("Most Common Arrival Airports from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airport" method="post">';
@@ -24,9 +24,9 @@ 
 	$airport_names = $Stats->getAllAirportNames();
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
-		if($airport == $airport_name['airport_icao'])
+		if ($airport == $airport_name['airport_icao'])
 		{
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
 		} else {
@@ -57,7 +57,7 @@ 
 	include('airport-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByAirport($airport);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -66,7 +66,7 @@ 
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 	}
@@ -121,7 +121,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

statistics.php

Spacing +157 added lines, -157 removed lines

@@ -23,7 +23,7 @@ 
 }
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -32,7 +32,7 @@ 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
 	if (isset($airline_info[0]['name'])) {
 		$airline_name = $airline_info[0]['name'];
-	} elseif (strpos($airline_icao,'alliance_') !== FALSE) {
+	} elseif (strpos($airline_icao, 'alliance_') !== FALSE) {
 		$alliance_name = $airline_icao;
 	}
 }
@@ -42,8 +42,8 @@ 
 	$title = _("Statistics");
 }
 
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -74,7 +74,7 @@ 
 	date_default_timezone_set('UTC');
 	$lastupdate = strtotime($last_update[0]['value']);
 	if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-	print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+	print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 }
 
 ?>
@@ -86,31 +86,31 @@ 
 <?php
 if ($type == 'aircraft') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircraft types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircraft types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
@@ -118,8 +118,8 @@ 
 	if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) {
 		if ($airline_icao == '' || $airline_icao == 'all') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 		}
 	}
@@ -127,35 +127,35 @@ 
 <?php
 } elseif ($type == 'marine') {
 ?>
-	<span><span class="badge"><?php print number_format($Stats->countOverallMarine($filter_name,$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Stats->countOverallMarine($filter_name, $year, $month)); ?></span> <?php echo _("Vessels"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if (isset($globalVM) && $globalVM) {
 ?>
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes($filter_name,$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineRaces($filter_name,$year,$month)); ?></span> <?php echo _("Races"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineCaptains($filter_name,$year,$month)); ?></span> <?php echo _("Captains"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes($filter_name, $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineRaces($filter_name, $year, $month)); ?></span> <?php echo _("Races"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineCaptains($filter_name, $year, $month)); ?></span> <?php echo _("Captains"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	} else {
 ?>
-	<span><span class="badge"><?php print number_format($Stats->countOverallMarineTypes($filter_name,$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Stats->countOverallMarineTypes($filter_name, $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 } elseif ($type == 'tracker') {
 ?>
-	<span><span class="badge"><?php print number_format($Stats->countOverallTracker($filter_name,$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Stats->countOverallTracker($filter_name, $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 }
 ?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
 <?php
 if ($type == 'aircraft') {
@@ -164,13 +164,13 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
 <?php
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
 	if (count($aircraft_array) == 0) {
 		print _("No data available");
 	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$aircraft_data = '';
-		foreach($aircraft_array as $aircraft_item) {
+		foreach ($aircraft_array as $aircraft_item) {
 			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 		}
@@ -199,16 +199,16 @@ 
 ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '' || $airline_icao == 'all') {
-		$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
+		$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
 		if (count($airline_array) > 0) {
 			print '<div class="col-md-6">';
 			print '<h2>'._("Top 10 Most Common Airline").'</h2>';
 			print '<div id="chart2" class="chart" width="100%"></div><script>';
 			$airline_data = '';
-			foreach($airline_array as $airline_item) {
+			foreach ($airline_array as $airline_item) {
 				$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 			}
 			$airline_data = substr($airline_data, 0, -1);
@@ -233,7 +233,7 @@ 
 		}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 }
@@ -245,12 +245,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
 <?php
-	$marine_array = $Stats->countAllMarineTypes(true,$filter_name,$year,$month);
+	$marine_array = $Stats->countAllMarineTypes(true, $filter_name, $year, $month);
 	if (count($marine_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$marine_data = '';
-		foreach($marine_array as $marine_item) {
+		foreach ($marine_array as $marine_item) {
 			$marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
 		}
 		$marine_data = substr($marine_data, 0, -1);
@@ -279,7 +279,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 	if (isset($globalVM) && $globalVM) {
@@ -287,12 +287,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Races Number of Participants"); ?></h2>
 <?php
-	$marine_array = $Marine->countAllCaptainsByRaces(true,$filter_name,$year,$month);
+	$marine_array = $Marine->countAllCaptainsByRaces(true, $filter_name, $year, $month);
 	if (count($marine_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart991" class="chart" width="100%"></div><script>';
 		$marine_data = '';
-		foreach($marine_array as $marine_item) {
+		foreach ($marine_array as $marine_item) {
 			$marine_data .= '["'.$marine_item['marine_race_name'].'",'.$marine_item['marine_captain_count'].'],';
 		}
 		$marine_data = substr($marine_data, 0, -1);
@@ -322,7 +322,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 	</div>
         <div class="row column">
 
@@ -335,12 +335,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
 <?php
-	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
+	$tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month);
 	if (count($tracker_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$tracker_data = '';
-		foreach($tracker_array as $tracker_item) {
+		foreach ($tracker_array as $tracker_item) {
 			$tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],';
 		}
 		$tracker_data = substr($tracker_data, 0, -1);
@@ -370,7 +370,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -385,7 +385,7 @@ 
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -405,7 +405,7 @@ 
                 </div>
                 -->
             </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
 <?php
@@ -414,7 +414,7 @@ 
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($countries_array as $owner_item) {
+			foreach ($countries_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['country_name'].'",'.$owner_item['country_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -435,7 +435,7 @@ 
                 -->
             </div>
             
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 ²	</div>
         <div class="row column">
             <div class="col-md-6">
@@ -446,7 +446,7 @@ 
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$launch_site_data = '';
-			foreach($launch_site_array as $launch_site_item) {
+			foreach ($launch_site_array as $launch_site_item) {
 				$launch_site_data .= '["'.$launch_site_item['launch_site'].'",'.$launch_site_item['launch_site_count'].'],';
 			}
 			$launch_site_data = substr($launch_site_data, 0, -1);
@@ -473,7 +473,7 @@ 
 ?>
         <div class="row column">
 <?php
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
 	//if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 		if (empty($flightover_array)) {
@@ -484,12 +484,12 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
+		$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
 		if (count($pilot_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$pilot_data = '';
-			foreach($pilot_array as $pilot_item) {
+			foreach ($pilot_array as $pilot_item) {
 				$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 			}
 			$pilot_data = substr($pilot_data, 0, -1);
@@ -510,7 +510,7 @@ 
 ?>
             </div>
 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	// else {
@@ -519,12 +519,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
+		$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
 		if (count($owner_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -543,7 +543,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if (!empty($flightover_array)) {
@@ -557,7 +557,7 @@ 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
-			foreach($flightover_array as $flightover_item) {
+			foreach ($flightover_array as $flightover_item) {
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 			}
 			$flightover_data = substr($flightover_data, 0, -1);
@@ -602,12 +602,12 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 }
 if ($type == 'marine') {
-	$flightover_array = $Stats->countAllMarineOverCountries(true,$filter_name,$year,$month);
+	$flightover_array = $Stats->countAllMarineOverCountries(true, $filter_name, $year, $month);
 ?>
 <!--    <div class="row column">-->
 	<div class="col-md-6">
@@ -618,7 +618,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -658,7 +658,7 @@ 
                 <div class="more">
                     <a href="<?php print $globalURL; ?>/marine/statistics/country" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             </div>
         </div>
 
@@ -676,7 +676,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -726,14 +726,14 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array) > 0) {
 		print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 		print '<div id="chart3" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array as $airport_item) {
+		foreach ($airport_airport_array as $airport_item) {
 			$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 		}
 		$airport_data = substr($airport_data, 0, -1);
@@ -783,18 +783,18 @@ 
 	}
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array2) > 0) {
 		print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 		print '<div id="chart4" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array2 as $airport_item)
+		foreach ($airport_airport_array2 as $airport_item)
 		{
 			if (isset($airport_item['airport_arrival_longitude']) && isset($airport_item['airport_arrival_latitude'])) {
 				$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
@@ -848,7 +848,7 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php 
 }
 if ($type == 'aircraft') {
@@ -860,18 +860,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -884,22 +884,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -912,23 +912,23 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -941,22 +941,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -969,7 +969,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -985,18 +985,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Stats->countAllMarineMonthsLastYear(true,$filter_name);
+		$year_array = $Stats->countAllMarineMonthsLastYear(true, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -1010,7 +1010,7 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
@@ -1020,12 +1020,12 @@ 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -1038,7 +1038,7 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -1049,12 +1049,12 @@ 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1067,22 +1067,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllMarineHours('hour',true,$filter_name);
+		$hour_array = $Stats->countAllMarineHours('hour', true, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1095,7 +1095,7 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1117,12 +1117,12 @@ 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -1136,7 +1136,7 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
@@ -1146,12 +1146,12 @@ 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -1164,7 +1164,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -1175,12 +1175,12 @@ 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1193,22 +1193,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllTrackerHours('hour',true);
+		$hour_array = $Stats->countAllTrackerHours('hour', true);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1221,7 +1221,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1243,12 +1243,12 @@ 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart21",
 			    data: { x: "x",
@@ -1264,7 +1264,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
 <?php
@@ -1274,12 +1274,12 @@ 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-01-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart22",
 			    data: { x: "x",
@@ -1295,7 +1295,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1317,12 +1317,12 @@ 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-01-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart32",
 			    data: { x: "x",
@@ -1335,7 +1335,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
@@ -1347,12 +1347,12 @@ 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart33",
 			    data: { x: "x",
@@ -1365,7 +1365,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <br/>
 <?php
 	}
@@ -1379,19 +1379,19 @@ 
 	//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',$year,$month);
+			$polar = $Stats->getStatsSource('polar', $year, $month);
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',$year,$month);
+			$polar = $Stats->getStatsSource('polar_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',$year,$month);
+			$polar = $Stats->getStatsSource('polar_tracker', $year, $month);
 		}
 	}
 	if (!empty($polar)) {
@@ -1400,7 +1400,7 @@ 
 			unset($polar_data);
 			$Spotter = new Spotter();
 			$data = json_decode($eachpolar['source_data']);
-			foreach($data as $value => $key) {
+			foreach ($data as $value => $key) {
 				$direction = $Spotter->parseDirection(($value*22.5));
 				$distance = $key;
 				$unit = 'km';
@@ -1420,7 +1420,7 @@ 
 ?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -1444,7 +1444,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -1459,19 +1459,19 @@ 
 	//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',$year,$month);
+			$msg = $Stats->getStatsSource('msg', $year, $month);
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',$year,$month);
+			$msg = $Stats->getStatsSource('msg_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',$year,$month);
+			$msg = $Stats->getStatsSource('msg_tracker', $year, $month);
 		}
 	}
 	if (!empty($msg)) {
@@ -1479,13 +1479,13 @@ 
 		foreach ($msg as $eachmsg) {
 			//$eachmsg = $msg[0];
 			$data = $eachmsg['source_data'];
-			if ($data > 500) $max = (round(($data+100)/100))*100;
+			if ($data > 500) $max = (round(($data + 100)/100))*100;
 			else $max = 500;
 ?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -1507,19 +1507,19 @@ 
 	//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',$year,$month);
+			$hist = $Stats->getStatsSource('hist', $year, $month);
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',$year,$month);
+			$hist = $Stats->getStatsSource('hist_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',$year,$month);
+			$hist = $Stats->getStatsSource('hist_tracker', $year, $month);
 		}
 	}
 	foreach ($hist as $hists) {
@@ -1529,7 +1529,7 @@ 
 		$source = $hists['source_name'];
 		$hist_array = json_decode($hists['source_data']);
 		$unit = 'km';
-		foreach($hist_array as $distance => $nb) {
+		foreach ($hist_array as $distance => $nb) {
 			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				$distance = round($distance*0.539957);
 				$unit = 'nm';
@@ -1549,18 +1549,18 @@ 
 		$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
 ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2>
 <?php
-		print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+		print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
 		print 'c3.generate({
-		    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
+		    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
 		    data: { x: "x",
 		    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 		    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 		print '</script>';
 ?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>

search.php

Spacing +110 added lines, -110 removed lines

@@ -26,24 +26,24 @@ 
 $sql_date = '';
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			//$end_date = $_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $start_date.",".$end_date;
 		}
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			$sql_date = $start_date;
 		}
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['end_date']) !== false) {
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $end_date;
 		}
 	} else $sql_date = '';
@@ -51,21 +51,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results']))
 	{
@@ -73,17 +73,17 @@ 
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -116,35 +116,35 @@ 
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
     (isset($_GET['dist']) && $_GET['dist'] != ''))
-    ){  
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
-	$captain_id  = filter_input(INPUT_GET, 'captain_id',FILTER_SANITIZE_NUMBER_INT);
-	$race_id  = filter_input(INPUT_GET, 'race_id',FILTER_SANITIZE_NUMBER_INT);
-	$captain_name  = filter_input(INPUT_GET, 'captain_name',FILTER_SANITIZE_STRING);
-	$race_name  = filter_input(INPUT_GET, 'race_name',FILTER_SANITIZE_STRING);
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+    ) {  
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
+	$captain_id = filter_input(INPUT_GET, 'captain_id', FILTER_SANITIZE_NUMBER_INT);
+	$race_id = filter_input(INPUT_GET, 'race_id', FILTER_SANITIZE_NUMBER_INT);
+	$captain_name = filter_input(INPUT_GET, 'captain_name', FILTER_SANITIZE_STRING);
+	$race_name = filter_input(INPUT_GET, 'race_name', FILTER_SANITIZE_STRING);
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
@@ -153,15 +153,15 @@ 
 	if ($archive == 1) {
 		if ($type == 'aircraft') {
 			$SpotterArchive = new SpotterArchive();
-			$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'tracker') {
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'marine') {
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist,$captain_id,$captain_name,$race_id,$race_name);
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist, $captain_id, $captain_name, $race_id, $race_name);
 		}
 	}
 	 
@@ -197,12 +197,12 @@ 
 	//remove 3D=true parameter
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
-	if (!isset($_GET['3D'])){
+	if (!isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
 	} else {
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
 	}
-	if (isset($_GET['3D'])){
+	if (isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
 	} else {
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
@@ -223,36 +223,36 @@ 
 		print '<div class="column">';
 		print '<div class="info">';
 		print '<h1>'._("Search Results for").' ';
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
-		if (isset($_GET['captain_id']) && $_GET['captain_id'] != ""){ print _("Captain id:").' <span>'.$captain_id.'</span> '; }
-		if (isset($_GET['captain_name']) && $_GET['captain_name'] != ""){ print _("Captain name:").' <span>'.$captain_name.'</span> '; }
-		if (isset($_GET['race_id']) && $_GET['race_id'] != ""){ print _("Race id:").' <span>'.$race_id.'</span> '; }
-		if (isset($_GET['race_name']) && $_GET['race_name'] != ""){ print _("Race name:").' <span>'.$race_name.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
+		if (isset($_GET['captain_id']) && $_GET['captain_id'] != "") { print _("Captain id:").' <span>'.$captain_id.'</span> '; }
+		if (isset($_GET['captain_name']) && $_GET['captain_name'] != "") { print _("Captain name:").' <span>'.$captain_name.'</span> '; }
+		if (isset($_GET['race_id']) && $_GET['race_id'] != "") { print _("Race id:").' <span>'.$race_id.'</span> '; }
+		if (isset($_GET['race_name']) && $_GET['race_name'] != "") { print _("Race name:").' <span>'.$race_name.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
 		print '</h1>';
 		print '</div>';
 
@@ -386,7 +386,7 @@ 
 					    </select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -395,7 +395,7 @@ 
 							</select>
 						</div>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
@@ -418,7 +418,7 @@ 
 					</div>
 				</div>
 <?php
-	}else {
+	} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -431,8 +431,8 @@ 
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircraft with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircraft with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircraft with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircraft with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -446,7 +446,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -455,7 +455,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
@@ -464,10 +464,10 @@ 
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -481,7 +481,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -490,7 +490,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -502,7 +502,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -511,7 +511,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend>Altitude</legend>
@@ -522,9 +522,9 @@ 
 							<option></option>
 <?php
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-foreach($altitude_array as $altitude)
+foreach ($altitude_array as $altitude)
 {
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
 	{
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 	} else {
@@ -542,9 +542,9 @@ 
 							<option></option>
 <?php
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-	foreach($altitude_array as $altitude)
+	foreach ($altitude_array as $altitude)
 	{
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
 		{
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 		} else {
@@ -706,10 +706,10 @@ 
 				<div class="col-sm-10">
 					<select class="form-control" name="number_results">
 <?php
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
-foreach($number_results_array as $number)
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
+foreach ($number_results_array as $number)
 {
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
 	{
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
 	} else {
@@ -728,7 +728,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 					<p class="help-block">Disabled in demo</p>
 				</div>
 			</div>
@@ -739,7 +739,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 				</div>
 			</div>
 		</fieldset>

statistics-race.php

Spacing +5 added lines, -5 removed lines

@@ -6,8 +6,8 @@ 
 $title = _("Statistics").' - '._("Top 10 Races Number of Participants");
 
 if (!isset($filter_name)) $filter_name = '';
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 $type = 'marine';
 require_once('header.php');
 include('statistics-sub-menu.php');
@@ -18,10 +18,10 @@ 
 	</div>
 	<p>'._("Below are the <strong>Top 10</strong> races with the most number of participants.").'</p>';
 	  
-$race_array = $Marine->countAllCaptainsByRaces(true,$filter_name,$year,$month);
+$race_array = $Marine->countAllCaptainsByRaces(true, $filter_name, $year, $month);
 print '<div id="chart" class="chart" width="100%"></div><script>';
 $pilot_data = '';
-foreach($race_array as $race_item)
+foreach ($race_array as $race_item)
 {
 	$race_data .= '["'.$race_item['marine_race_name'].' ('.$race_item['marine_race_id'].')",'.$race_item['marine_captain_count'].'],';
 }
@@ -46,7 +46,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($race_array as $race_item)
+	foreach ($race_array as $race_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

aircraft-data.php

Spacing +27 added lines, -27 removed lines

@@ -13,14 +13,14 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -31,15 +31,15 @@ 
 	}
 }
 if (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -59,7 +59,7 @@ 
 	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 	{
 		if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-			$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+			$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 		} else $image = $spotter_item['image_thumbnail'];
 	}
 	/* else {
@@ -86,7 +86,7 @@ 
 		print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 		if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 			}
@@ -95,7 +95,7 @@ 
 		print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 		if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 			}
@@ -114,7 +114,7 @@ 
 	print '<span>'._("Aircraft").'</span>';
 	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
-		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
+		$aircraft_names = explode('/', $spotter_item['aircraft_name']);
 		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
 		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
 	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
@@ -125,8 +125,8 @@ 
 	print '<div id="altitude"><span>'._("Altitude").'</span>';
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 		try {
-			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-		} catch(Exception $e) {
+			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+		} catch (Exception $e) {
 			// If catched not exist
 		}
 	}
@@ -157,15 +157,15 @@ 
 	print '</div>';
 	print '<div id="coordinates"><span>'._("Coordinates").'</span>';
 	if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) {
-		$latitude = $Common->convertDMS($spotter_item['latitude'],'latitude');
+		$latitude = $Common->convertDMS($spotter_item['latitude'], 'latitude');
 		print '<span class="latitude">'.$latitude['deg'].'° '.$latitude['min']."′ ".$latitude['sec'].'" '.$latitude['NSEW'].'</span>, ';
-		$longitude = $Common->convertDMS($spotter_item['longitude'],'longitude');
+		$longitude = $Common->convertDMS($spotter_item['longitude'], 'longitude');
 		print '<span class="longitude">'.$longitude['deg'].'° '.$longitude['min']."′ ".$longitude['sec'].'" '.$longitude['NSEW'].'</span>';
 	} elseif ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) {
-		$latitude = $Common->convertDM($spotter_item['latitude'],'latitude');
-		print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'],3)."′".$latitude['NSEW'].'</span>, ';
-		$longitude = $Common->convertDM($spotter_item['longitude'],'longitude');
-		print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'],3)."′".$longitude['NSEW'].'</span>';
+		$latitude = $Common->convertDM($spotter_item['latitude'], 'latitude');
+		print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'], 3)."′".$latitude['NSEW'].'</span>, ';
+		$longitude = $Common->convertDM($spotter_item['longitude'], 'longitude');
+		print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'], 3)."′".$longitude['NSEW'].'</span>';
 	} else {
 		print '<span class="latitude">'.$spotter_item['latitude'].'</span>, ';
 		print '<span class="longitude">'.$spotter_item['longitude'].'</span>';
@@ -190,9 +190,9 @@ 
 	if (isset($globalCam) && $globalCam) {
 		require_once(dirname(__FILE__).'/require/class.Common.php');
 		$Common = new Common();
-		$azimuth = round($Common->azimuth($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude']));
-		$distance = $Common->distance($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude'],'m');
-		$plunge = round($Common->plunge($globalCenterAltitude,$spotter_item['real_altitude'],$distance));
+		$azimuth = round($Common->azimuth($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude']));
+		$distance = $Common->distance($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude'], 'm');
+		$plunge = round($Common->plunge($globalCenterAltitude, $spotter_item['real_altitude'], $distance));
 		print '<div id="camcoordinates"><span>'._("Cam Coordinates").'</span>';
 		print 'azimuth: '.$azimuth;
 		print ' / ';
@@ -202,16 +202,16 @@ 
 		print '</div>';
 		//echo $Common->getData('http://127.0.0.1/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
 		//echo $Common->getData('file://'.dirname(__FILE__).'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
-		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
+		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge, 'get', '', '', '', '', '', '', false, true);
 	}
   
 	print '<div id="heading"><span>'._("Heading").'</span><span class="heading">'.$spotter_item['heading'].'</span>°</div>';
 	if (isset($spotter_item['verticalrate']) && $spotter_item['verticalrate'] != '') {
 		print '<div id="verticalrate"><span>'._("Vertical rate").'</span>';
 		if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-			print $spotter_item['verticalrate']. ' ft/min';
+			print $spotter_item['verticalrate'].' ft/min';
 		} else {
-			print round($spotter_item['verticalrate']*0.3048). ' m/min';
+			print round($spotter_item['verticalrate']*0.3048).' m/min';
 		}
 		print '</div>';
 	}
@@ -246,7 +246,7 @@ 
 	print '</div>';
 	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
 	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
 	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
 	print '</div>';
 }

marine-data.php

Spacing +17 added lines, -17 removed lines

@@ -11,15 +11,15 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident,$currenttime);
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident, $currenttime);
 		}
 		
 	} else {
@@ -33,16 +33,16 @@ 
 	}
 }
 if (isset($_GET['fammarine_id'])) {
-	$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
+	$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($fammarine_id,$currenttime);
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($fammarine_id, $currenttime);
 		}
 		
 	} else {
@@ -64,7 +64,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -94,24 +94,24 @@ 
 */
 print '<div><span>'._("Speed").'</span>';
 if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
-	print round($spotter_item['ground_speed']*0.621371,2).' mph';
+	print round($spotter_item['ground_speed']*0.621371, 2).' mph';
 } elseif ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
-	print round($spotter_item['ground_speed']*0.539957,2).' knots';
+	print round($spotter_item['ground_speed']*0.539957, 2).' knots';
 } else {
 	print $spotter_item['ground_speed'].' km/h';
 }
 print '</div>';
 print '<div><span>'._("Coordinates").'</span>';
 if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) {
-	$latitude = $Common->convertDMS($spotter_item['latitude'],'latitude');
+	$latitude = $Common->convertDMS($spotter_item['latitude'], 'latitude');
 	print '<span class="latitude">'.$latitude['deg'].'° '.$latitude['min']."′ ".$latitude['sec'].'" '.$latitude['NSEW'].'</span>, ';
-	$longitude = $Common->convertDMS($spotter_item['longitude'],'longitude');
+	$longitude = $Common->convertDMS($spotter_item['longitude'], 'longitude');
 	print '<span class="longitude">'.$longitude['deg'].'° '.$longitude['min']."′ ".$longitude['sec'].'" '.$longitude['NSEW'].'</span>';
 } elseif ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) {
-	$latitude = $Common->convertDM($spotter_item['latitude'],'latitude');
-	print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'],3)."′ ".$latitude['NSEW'].'</span>, ';
-	$longitude = $Common->convertDM($spotter_item['longitude'],'longitude');
-	print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'],3)."′ ".$longitude['NSEW'].'</span>';
+	$latitude = $Common->convertDM($spotter_item['latitude'], 'latitude');
+	print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'], 3)."′ ".$latitude['NSEW'].'</span>, ';
+	$longitude = $Common->convertDM($spotter_item['longitude'], 'longitude');
+	print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'], 3)."′ ".$longitude['NSEW'].'</span>';
 } else {
 	print '<span class="latitude">'.$spotter_item['latitude'].'</span>, ';
 	print '<span class="longitude">'.$spotter_item['longitude'].'</span>';

tracker-data.php

Spacing +17 added lines, -17 removed lines

@@ -13,14 +13,14 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+	$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident,$currenttime);
+		$spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident,$currenttime);
+			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident, $currenttime);
 		}
 		
 	} else {
@@ -32,16 +32,16 @@ 
 	}
 }
 if (isset($_GET['famtrackid'])) {
-	$famtrackid = urldecode(filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING));
+	$famtrackid = urldecode(filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING));
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid,$currenttime);
+		$spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($famtrackid,$currenttime);
+			$spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($famtrackid, $currenttime);
 		}
 		
 	} else {
@@ -61,7 +61,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }
@@ -81,8 +81,8 @@ 
 print '<div><span>'._("Altitude").'</span>';
 if (isset($globalGroundAltitude) && $globalGroundAltitude) {
     try {
-	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-    } catch(Exception $e) {
+	$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+    } catch (Exception $e) {
     }
 }
 print '<span class="altitude">';
@@ -117,15 +117,15 @@ 
 print '</div>';
 print '<div><span>'._("Coordinates").'</span>';
 if ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dms') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dms')) {
-	$latitude = $Common->convertDMS($spotter_item['latitude'],'latitude');
+	$latitude = $Common->convertDMS($spotter_item['latitude'], 'latitude');
 	print '<span class="latitude">'.$latitude['deg'].'° '.$latitude['min']."′ ".$latitude['sec'].'" '.$latitude['NSEW'].'</span>, ';
-	$longitude = $Common->convertDMS($spotter_item['longitude'],'longitude');
+	$longitude = $Common->convertDMS($spotter_item['longitude'], 'longitude');
 	print '<span class="longitude">'.$longitude['deg'].'° '.$longitude['min']."′ ".$longitude['sec'].'" '.$longitude['NSEW'].'</span>';
 } elseif ((!isset($_COOKIE['unitcoordinate']) && isset($globalUnitCoordinate) && $globalUnitCoordinate == 'dm') || (isset($_COOKIE['unitcoordinate']) && $_COOKIE['unitcoordinate'] == 'dm')) {
-	$latitude = $Common->convertDM($spotter_item['latitude'],'latitude');
-	print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'],3)."′ ".$latitude['NSEW'].'</span>, ';
-	$longitude = $Common->convertDM($spotter_item['longitude'],'longitude');
-	print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'],3)."′ ".$longitude['NSEW'].'</span>';
+	$latitude = $Common->convertDM($spotter_item['latitude'], 'latitude');
+	print '<span class="latitude">'.$latitude['deg'].'° '.round($latitude['min'], 3)."′ ".$latitude['NSEW'].'</span>, ';
+	$longitude = $Common->convertDM($spotter_item['longitude'], 'longitude');
+	print '<span class="longitude">'.$longitude['deg'].'° '.round($longitude['min'], 3)."′ ".$longitude['NSEW'].'</span>';
 } else {
 	print '<span class="latitude">'.$spotter_item['latitude'].'</span>, ';
 	print '<span class="longitude">'.$spotter_item['longitude'].'</span>';

location-geojson.php

Spacing +15 added lines, -15 removed lines

@@ -11,47 +11,47 @@ 
 $spotter_array = array();
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 	    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 		//$spotter_array = $Source->getAllLocationInfo();
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords));
 	}
 	if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 	    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords));
 	}
 	if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 	    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords));
 	}
 	if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') 
 	    || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true));
 	}
 	if (!isset($globalDemo)) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	}
 } else {
 	if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 	    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 		//$spotter_array = $Source->getAllLocationInfo();
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs'));
 	}
 	if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 	    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx'));
 	}
 	if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 	    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning'));
 	}
 	if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
 	    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true));
 	}
 	if (!isset($globalDemo)) {
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	}
 }
 
@@ -59,7 +59,7 @@ 
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array) && count($spotter_array) > 0)
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		$output .= '{"type": "Feature",';
@@ -78,8 +78,8 @@ 
 		$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
 		$output .= '"type": "'.$spotter_item['type'].'",';
 		if ($spotter_item['type'] == 'wx') {
-			$weather = json_decode($spotter_item['description'],true);
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
+			$weather = json_decode($spotter_item['description'], true);
+			if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",';
 		}
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 		$output .= '},';
@@ -89,7 +89,7 @@ 
 		$output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 print $output;

space-data.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
 $sat = urldecode($sat);
 //$info = $Satellite->get_info(str_replace(' ','-',$sat));
 //print_r($info);
@@ -48,7 +48,7 @@ 
 	$aircraft_name = 'INTEGRAL';
 //	$ground_speed = 14970;
 	$launch_date = '17 October 2002';
-} elseif (strpos($sat,'IRIDIUM') !== false) {
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
 	$image_copyright = 'Cliff';
 	$ident = 'Iridium satellite constellation';
@@ -56,23 +56,23 @@ 
 	$aircraft_name = $sat;
 //	$ground_speed = 14970;
 //	$launch_date = '29 september 2011';
-} elseif (strpos($sat,'ORBCOMM') !== false) {
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
 	$ident = 'Orbcomm';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
 	$ident = 'Globalstar';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
 	$aircraft_name = $sat;
-	$satname = str_replace(array('[+]','[-]'),'',$sat);
-} elseif (strpos($sat,'OSCAR 7') !== false) {
+	$satname = str_replace(array('[+]', '[-]'), '', $sat);
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
 	$image_copyright = 'Amsat.org';
 	$ident = 'AMSAT-OSCAR 7';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
 	$aircraft_name = $sat;
 	$launch_date = '15 November 1974';
-} elseif (strpos($sat,'santaclaus') !== false) {
+} elseif (strpos($sat, 'santaclaus') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
 	$image_copyright = 'Jonathan G Meath';
 	$ident = 'Santa Claus';
@@ -81,8 +81,8 @@ 
 //	$launch_date = '15 November 1974';
 } else {
 	$ident = $sat;
-	if (strpos($sat,'(')) $satname = $sat;
-	else $satname = str_replace(array(' '),'-',$sat);
+	if (strpos($sat, '(')) $satname = $sat;
+	else $satname = str_replace(array(' '), '-', $sat);
 }
 if (!isset($satname)) $satname = $sat;
 if ($satname != 'santaclaus') {
@@ -156,7 +156,7 @@ 
 		print '<div><span>'._("Orbit").'</span>'.$info['orbit'].'</div>';
 	}
 	if ($info['launch_date'] != '') {
-		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d',strtotime($info['launch_date'])).'</div>';
+		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d', strtotime($info['launch_date'])).'</div>';
 	}
 	if ($info['launch_site'] != '') {
 		print '<div><span>'._("Launch Site").'</span>'.$info['launch_site'].'</div>';