Ysurac / FlightAirMap

statistics-aircraft.php

Braces +13 added lines, -6 removed lines

@@ -5,11 +5,15 @@ 
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Aircraft");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 
@@ -28,9 +32,12 @@ 
 $aircraft_data = '';
 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'].'],';
-}
+	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'].'],';
+	}
+	}
 $aircraft_data = substr($aircraft_data, 0, -1);
 print 'var series = ['.$aircraft_data.'];';
 print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);';

statistics.php

Braces +145 added lines, -69 removed lines

@@ -18,11 +18,15 @@ 
 	require_once('require/class.Spotter.php');
 }
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $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];
-}
+	if (isset($globalFilter['airline'])) {
+		$airline_icao = $globalFilter['airline'][0];
+	}
+	}
 if ($type == 'aircraft' && $airline_icao != '' && $airline_icao != 'all') {
 	$Spotter = new Spotter();
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
@@ -53,7 +57,12 @@ 
 <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script>
 <div class="column">
     <div class="info">
-            <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1>
+            <h1><?php if (isset($airline_name)) {
+	echo _("Statistics for ").$airline_name;
+} else {
+	echo _("Statistics");
+}
+?></h1>
 <?php 
 	if ($type == 'aircraft') {
 		$last_update = $Stats->getLastStatsUpdate();
@@ -61,7 +70,9 @@ 
 		if (isset($last_update[0]['value'])) {
 			date_default_timezone_set('UTC');
 			$lastupdate = strtotime($last_update[0]['value']);
-			if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
+			if (isset($globalTimezone) && $globalTimezone != '') {
+				date_default_timezone_set($globalTimezone);
+			}
 			print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
 		}
 	}
@@ -139,14 +150,18 @@ 
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
                  <?php
                   $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
-		    if (count($aircraft_array) == 0) print _("No data available");
-		    else {
+		    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)
                     {
-                        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'].'],';
+                        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'].'],';
+                        }
                     }
                     $aircraft_data = substr($aircraft_data, 0, -1);
 		    print 'var series = ['.$aircraft_data.'];';
@@ -163,11 +178,17 @@ 
             	    <?php
             		if ($year != '' && $month != '') {
             	    ?>
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
             	    <?php
             		} else {
             	    ?>
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?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>
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?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>
             	    <?php
             		}
             	    ?>
@@ -198,11 +219,15 @@ 
 				print '</script>';
 				if ($year != '' && $month != '') {
 					print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
-					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+						echo '/'.$airline_icao;
+					}
 					print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 				} else {
 					print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
-					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+					if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+						echo '/'.$airline_icao;
+					}
 					print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 				}
 				print '</div>';
@@ -224,8 +249,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
                  <?php
                     $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
-		    if (count($marine_array) == 0) print _("No data available");
-		    else {
+		    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)
@@ -272,8 +298,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
                  <?php
                   $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
-		    if (count($tracker_array) == 0) print _("No data available");
-		    else {
+		    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)
@@ -328,8 +355,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
 			$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
-			if (count($pilot_array) == 0) print _("No data available");
-			else {
+			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)
@@ -348,7 +376,9 @@ 
 			}
 			print '<div class="more">';
 			print '<a href="'.$globalURL.'/statistics/pilot'; 
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+				echo '/'.$airline_icao;
+			}
 			print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
 			print '</div>';
 ?>
@@ -362,8 +392,9 @@ 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
 			$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
-			if (count($owner_array) == 0) print _("No data available");
-			else {
+			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)
@@ -382,7 +413,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?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>
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?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>
         
@@ -395,8 +429,9 @@ 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
 <?php
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
-			if (count($flightover_array) == 0) print _("No data available");
-			else {
+			if (count($flightover_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart10" class="chart" width="100%"></div><script>';
 				print 'var series = [';
 				$flightover_data = '';
@@ -439,7 +474,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <a href="<?php print $globalURL; ?>/statistics/country<?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>
+                    <a href="<?php print $globalURL; ?>/statistics/country<?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
@@ -461,8 +499,9 @@ 
 	<div class="col-md-6">
             <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2>
 <?php
-		if (count($flightover_array) == 0) print _("No data available");
-		else {
+		if (count($flightover_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
@@ -521,8 +560,9 @@ 
 	<div class="col-md-6">
             <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2>
 <?php
-		if (count($flightover_array) == 0) print _("No data available");
-		else {
+		if (count($flightover_array) == 0) {
+			print _("No data available");
+		} else {
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
@@ -632,7 +672,9 @@ 
 			});";
 			print '</script>';
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; 
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+				echo '/'.$airline_icao;
+			}
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 		}
 ?>
@@ -694,7 +736,9 @@ 
 			});";
 			print '</script>';
 			print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
-			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
+			if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+				echo '/'.$airline_icao;
+			}
 			print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
 		}
 ?>
@@ -715,8 +759,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 			$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-			if (count($year_array) == 0) print _("No data available");
-			else {
+			if (count($year_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
 				$year_data = '';
 				$year_cnt = '';
@@ -736,7 +781,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <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>
+                    <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' ?> -->
@@ -744,8 +792,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 			$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
-			if (count($month_array) == 0) print _("No data available");
-			else {
+			if (count($month_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
 				$month_data = '';
 				$month_cnt = '';
@@ -765,7 +814,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <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>
+                    <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' ?> -->
@@ -774,8 +826,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 			$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
-			if (empty($date_array)) print _("No data available");
-			else {
+			if (empty($date_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
 				$date_data = '';
 				$date_cnt = '';
@@ -795,7 +848,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <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>
+                    <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' ?> -->
@@ -803,8 +859,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 			$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
-			if (empty($hour_array)) print _("No data available");
-			else {
+			if (empty($hour_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
 				$hour_data = '';
 				$hour_cnt = '';
@@ -824,7 +881,10 @@ 
 			}
 ?>
                 <div class="more">
-                    <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>
+                    <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' ?> -->
@@ -846,8 +906,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 			$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
-			if (count($year_array) == 0) print _("No data available");
-			else {
+			if (count($year_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
 				$year_data = '';
 				$year_cnt = '';
@@ -876,8 +937,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 			$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
-			if (count($month_array) == 0) print _("No data available");
-			else {
+			if (count($month_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
 				$month_data = '';
 				$month_cnt = '';
@@ -906,8 +968,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 			$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
-			if (empty($date_array)) print _("No data available");
-			else {
+			if (empty($date_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
 				$date_data = '';
 				$date_cnt = '';
@@ -935,8 +998,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 			$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
-			if (empty($hour_array)) print _("No data available");
-			else {
+			if (empty($hour_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
 				$hour_data = '';
 				$hour_cnt = '';
@@ -978,8 +1042,9 @@ 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
 			$year_array = $Tracker->countAllMonthsLastYear(true);
-			if (count($year_array) == 0) print _("No data available");
-			else {
+			if (count($year_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart8" class="chart" width="100%"></div><script>';
 				$year_data = '';
 				$year_cnt = '';
@@ -1008,8 +1073,9 @@ 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
 			$month_array = $Tracker->countAllDatesLastMonth();
-			if (count($month_array) == 0) print _("No data available");
-			else {
+			if (count($month_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart9" class="chart" width="100%"></div><script>';
 				$month_data = '';
 				$month_cnt = '';
@@ -1038,8 +1104,9 @@ 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
 			$date_array = $Tracker->countAllDatesLast7Days();
-			if (empty($date_array)) print _("No data available");
-			else {
+			if (empty($date_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart5" class="chart" width="100%"></div><script>';
 				$date_data = '';
 				$date_cnt = '';
@@ -1067,8 +1134,9 @@ 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
 			$hour_array = $Tracker->countAllHours('hour',true);
-			if (empty($hour_array)) print _("No data available");
-			else {
+			if (empty($hour_array)) {
+				print _("No data available");
+			} else {
 				print '<div id="chart6" class="chart" width="100%"></div><script>';
 				$hour_data = '';
 				$hour_cnt = '';
@@ -1110,8 +1178,9 @@ 
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
 <?php
 			$year_array = $Stats->countFatalitiesByYear();
-			if (count($year_array) == 0) print _("No data available");
-			else {
+			if (count($year_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart32" class="chart" width="100%"></div><script>';
 				$year_data = '';
 				$year_cnt = '';
@@ -1141,8 +1210,9 @@ 
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
 <?php
 			$year_array = $Stats->countFatalitiesLast12Months();
-			if (count($year_array) == 0) print _("No data available");
-			else {
+			if (count($year_array) == 0) {
+				print _("No data available");
+			} else {
 				print '<div id="chart33" class="chart" width="100%"></div><script>';
 				$year_data = '';
 				$year_cnt = '';
@@ -1212,8 +1282,11 @@ 
 							$distance = $distance;
 							$unit = 'km';
 						}
-						if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
-						else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						if (!isset($polar_data)) {
+							$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						} else {
+							$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
+						}
 					}
 ?>
             <div class="col-md-6">
@@ -1273,9 +1346,12 @@ 
 				foreach ($msg as $eachmsg) {
 					//$eachmsg = $msg[0];
 					$data = $eachmsg['source_data'];
-					if ($data > 500) $max = (round(($data+100)/100))*100;
-					else $max = 500;
-?>
+					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>
         	<script>
 		      var g = new JustGage({

require/class.TrackerImport.php

Braces +190 added lines, -65 removed lines

@@ -42,7 +42,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	if ($globalDebug) echo "Update last seen tracked data...\n";
+	if ($globalDebug) {
+		echo "Update last seen tracked data...\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -55,12 +57,16 @@ 
     public function del() {
 	global $globalDebug;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if (isset($this->all_tracked[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		if ($globalDebug) {
+            			echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		}
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
@@ -70,7 +76,9 @@ 
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Tracker->db = null;
@@ -83,7 +91,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -97,19 +107,29 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['ident']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -117,31 +137,46 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 		
@@ -153,11 +188,17 @@ 
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
             		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+			if ($globalDebug && $result != 'success') {
+				echo '!!! ERROR : '.$result."\n";
+			}
 			$Tracker->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
+		    }
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
@@ -168,14 +209,21 @@ 
 		    if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
@@ -183,20 +231,30 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				$Tracker = new Tracker($this->db);
 				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				if (!empty($all_country)) {
+					$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				}
 				$Tracker->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -205,8 +263,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -224,7 +286,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -244,7 +308,9 @@ 
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
+				$this->all_tracked[$id]['putinarchive'] = true;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => round($line['altitude']/100)));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
@@ -256,15 +322,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -273,20 +345,31 @@ 
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
+				if ($globalDebug) {
+					echo "Check if aircraft is already in DB...";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				} else $recent_ident = '';
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 				$TrackerLive->db=null;
 
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+				if ($globalDebug && $recent_ident == '') {
+					echo " Not in DB.\n";
+				} elseif ($globalDebug && $recent_ident != '') {
+					echo " Already in DB.\n";
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -294,27 +377,41 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) {
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebug && isset($result)) {
+				    	echo $result."\n";
+				    }
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				    
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -327,7 +424,9 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
@@ -337,12 +436,16 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
+				    }
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
 				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -365,19 +468,25 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 				$TrackerLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source();
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -398,7 +507,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -416,7 +527,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -427,19 +540,29 @@ 
 				}
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+				if ($globalDebug) {
+					echo $result."\n";
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    if ($globalDebug) {
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    }
 			    $TrackerLive = new TrackerLive($this->db);
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
 			    $TrackerLive->db = null;
 			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
+			    if ($globalDebug) {
+			    	echo " Done\n";
+			    }
 			    $this->last_delete_hourly = time();
 			}
 			
@@ -447,7 +570,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }

require/class.MarineImport.php

Braces +193 added lines, -66 removed lines

@@ -53,7 +53,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	if ($globalDebug) echo "Update last seen tracked data...\n";
+	if ($globalDebug) {
+		echo "Update last seen tracked data...\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -66,13 +68,17 @@ 
     public function del() {
 	global $globalDebug, $globalNoDB, $globalNoImport;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
             		if (isset($this->all_tracked[$key]['id'])) {
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    if ($globalDebug) {
+            		    	echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    }
 			    /*
 			    $MarineLive = new MarineLive();
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
@@ -82,7 +88,9 @@ 
             		    $Marine = new Marine($this->db);
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			    }
 			    // Put in archive
 //				$Marine->db = null;
@@ -96,7 +104,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -110,20 +120,30 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
 		$AIS = new AIS();
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['mmsi']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -131,10 +151,16 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
@@ -184,34 +210,49 @@ 
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
 				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 				$Marine->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 			    }
 			}
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    }
 		}
 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 
@@ -224,14 +265,21 @@ 
 		    if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
@@ -239,22 +287,32 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Marine = new Marine($this->db);
 				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    if (!empty($all_country)) {
+				    	$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    }
 				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -263,8 +321,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -282,7 +344,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -312,15 +376,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -332,23 +402,38 @@ 
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
+				    if ($globalDebug) {
+				    	echo "Check if aircraft is already in DB...";
+				    }
 				    $timeelapsed = microtime(true);
 				    $MarineLive = new MarineLive($this->db);
 				    if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
+				    } else {
+				    	$recent_ident = '';
+				    }
 				    $MarineLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-				} else $recent_ident = '';
+				    if ($globalDebug && $recent_ident == '') {
+				    	echo " Not in DB.\n";
+				    } elseif ($globalDebug && $recent_ident != '') {
+				    	echo " Already in DB.\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -356,30 +441,44 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) {
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+				    }
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $timeelapsed = microtime(true);
 					    $Marine = new Marine($this->db);
 					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 					    $Marine->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    if ($globalDebug && isset($result)) {
+					    	echo $result."\n";
+					    }
+					    if ($globalDebugTimeElapsed) {
+					    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    }
 					}
 				    }
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					// Add source stat in DB
 					$Stats = new Stats($this->db);
 					if (!empty($this->stats)) {
-					    if ($globalDebug) echo 'Add source stats : ';
+					    if ($globalDebug) {
+					    	echo 'Add source stats : ';
+					    }
 				    	    foreach($this->stats as $date => $data) {
 						foreach($data as $source => $sourced) {
 					    	    //print_r($sourced);
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    if (isset($sourced['polar'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
+				    	    	    }
+				    	    	    if (isset($sourced['hist'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    }
 				    		    if (isset($sourced['msg'])) {
 				    			if (time() - $sourced['msg']['date'] > 10) {
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -392,7 +491,9 @@ 
 			    			    unset($this->stats[$date]);
 			    			}
 				    	    }
-				    	    if ($globalDebug) echo 'Done'."\n";
+				    	    if ($globalDebug) {
+				    	    	echo 'Done'."\n";
+				    	    }
 					}
 					$Stats->db = null;
 				    }
@@ -402,13 +503,17 @@ 
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Marine data older than 9 hours...";
+				    }
 				    //MarineLive->deleteLiveMarineDataNotUpdated();
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
 					$MarineLive->db=null;
-					if ($globalDebug) echo " Done\n";
+					if ($globalDebug) {
+						echo " Done\n";
+					}
 				    }
 				    $this->last_delete = time();
 				}
@@ -434,15 +539,21 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 					$MarineLive->db = null;
-					if ($globalDebug) echo $result."\n";
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebug) {
+						echo $result."\n";
+					}
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
@@ -454,7 +565,9 @@ 
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source();
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -475,7 +588,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -493,7 +608,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -505,19 +622,27 @@ 
 				
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				if ($globalDebug) {
+					echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				}
 				$MarineLive = new MarineLive($this->db);
 				$MarineLive->deleteLiveMarineDataNotUpdated();
 				$MarineLive->db = null;
 				//MarineLive->deleteLiveMarineData();
-				if ($globalDebug) echo " Done\n";
+				if ($globalDebug) {
+					echo " Done\n";
+				}
 			    }
 			    $this->last_delete_hourly = time();
 			}
@@ -526,7 +651,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }

require/class.Stats.php

Braces +485 added lines, -168 removed lines

@@ -13,7 +13,9 @@ 
 	
 	public function __construct($dbc = null) {
 		global $globalFilterName;
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
+		if (isset($globalFilterName)) {
+			$this->filter_name = $globalFilterName;
+		}
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
         }
@@ -81,7 +83,9 @@ 
                 }
         }
 	public function getAllAirlineNames($filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -93,7 +97,9 @@ 
                 return $all;
         }
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -105,7 +111,9 @@ 
                 return $all;
         }
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -117,7 +125,9 @@ 
                 return $all;
         }
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -130,7 +140,9 @@ 
         }
 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -143,7 +155,9 @@ 
         }
 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
                  try {
                         $sth = $this->db->prepare($query);
@@ -158,10 +172,15 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+			if ($limit) {
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -169,7 +188,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
             	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
             	    if ($filter_name != '') {
@@ -183,10 +204,15 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -194,7 +220,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
             		$Spotter = new Spotter($this->db);
             		$filters = array();
@@ -209,10 +237,15 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+			if ($limit) {
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -220,7 +253,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -235,10 +270,15 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+			if ($limit) {
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -246,7 +286,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -260,9 +302,14 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
-		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
+		} else {
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -284,17 +331,29 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($globalVATSIM) $forsource = 'vatsim';
-			if ($globalIVAO) $forsource = 'ivao';
+			if ($globalVATSIM) {
+				$forsource = 'vatsim';
+			}
+			if ($globalIVAO) {
+				$forsource = 'ivao';
+			}
 			if (isset($forsource)) {
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
+				}
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
 			} else {
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
+				}
 				$query_values = array(':filter_name' => $filter_name);
 			}
 			try {
@@ -304,7 +363,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
@@ -319,10 +380,15 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+			if ($limit) {
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -330,7 +396,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -344,10 +412,15 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+			if ($limit) {
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
+			}
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -355,7 +428,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -369,11 +444,16 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		$Connection = new Connection();
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
-				else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+				if ($limit) {
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
+				} else {
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -388,17 +468,24 @@ 
                 }
                 */
 				return $all;
-			} else return array();
+			} else {
+				return array();
+			}
 		} else {
 			return array();
 		}
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+			if ($limit) {
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -406,7 +493,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -421,10 +510,15 @@ 
 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+			if ($limit) {
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -432,7 +526,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -446,10 +542,15 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+			if ($limit) {
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -457,7 +558,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
             		if ($filter_name != '') {
@@ -478,7 +581,9 @@ 
         			$icao = $value['airport_departure_icao'];
         			if (isset($all[$icao])) {
         				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $all[$icao] = $value;
+        			} else {
+        				$all[$icao] = $value;
+        			}
         		}
         		$count = array();
         		foreach ($all as $key => $row) {
@@ -490,10 +595,15 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+			if ($limit) {
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -501,7 +611,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -522,7 +634,9 @@ 
         			$icao = $value['airport_arrival_icao'];
         			if (isset($all[$icao])) {
         				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-        			} else $all[$icao] = $value;
+        			} else {
+        				$all[$icao] = $value;
+        			}
         		}
         		$count = array();
         		foreach ($all as $key => $row) {
@@ -535,13 +649,21 @@ 
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			}
 		} else {
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+			}
 		}
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -565,7 +687,9 @@ 
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -587,7 +711,9 @@ 
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -613,7 +739,9 @@ 
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -635,7 +763,9 @@ 
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
 		$query_data = array('filter_name' => $filter_name);
                  try {
@@ -657,7 +787,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
 		} else {
@@ -726,7 +858,9 @@ 
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -747,9 +881,14 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
-		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		} else {
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
+		}
 		if ($orderby == 'hour') {
 			if ($globalDBdriver == 'mysql') {
 				//$query .= " ORDER BY flight_date ASC";
@@ -758,7 +897,9 @@ 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
@@ -779,8 +920,12 @@ 
 	
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -795,8 +940,12 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 		        $filters = array();
@@ -812,8 +961,12 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -828,7 +981,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 			try {
@@ -839,7 +994,9 @@ 
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb'];
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+		} else {
+			$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -853,7 +1010,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
 			try {
@@ -864,7 +1023,9 @@ 
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else {
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		}
 		if (empty($all)) {
             		$filters = array();
 			$filters = array('year' => $year,'month' => $month);
@@ -879,7 +1040,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
@@ -907,7 +1070,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		//if ($year == '') $year = date('Y');
 		if ($year == '' && $month == '') {
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -936,7 +1101,9 @@ 
 	}
 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
                  try {
@@ -949,7 +1116,9 @@ 
                 return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -962,7 +1131,9 @@ 
                 return $all;
         }
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
                  try {
@@ -973,7 +1144,9 @@ 
                 }
         }
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		global $globalArchiveMonths, $globalDBdriver;
     		if ($globalDBdriver == 'mysql') {
     			if ($month == '') {
@@ -1003,7 +1176,9 @@ 
         }
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		} else {
@@ -1021,7 +1196,9 @@ 
         }
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
                 } else {
@@ -1038,7 +1215,9 @@ 
         }
 	public function getStatsAirlineTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
                 } else {
@@ -1055,7 +1234,9 @@ 
         }
 	public function getStatsOwnerTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
@@ -1072,7 +1253,9 @@ 
         }
 	public function getStatsOwner($owner_name,$filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
                  try {
                         $sth = $this->db->prepare($query);
@@ -1081,12 +1264,17 @@ 
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
+                if (isset($all[0]['cnt'])) {
+                	return $all[0]['cnt'];
+                } else {
+                	return 0;
+                }
         }
 	public function getStatsPilotTotal($filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
     		if ($globalDBdriver == 'mysql') {
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
             	} else {
@@ -1103,7 +1291,9 @@ 
         }
 	public function getStatsPilot($pilot,$filter_name = '') {
     		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
                  try {
                         $sth = $this->db->prepare($query);
@@ -1112,13 +1302,18 @@ 
                         echo "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-                else return 0;
+                if (isset($all[0]['cnt'])) {
+                	return $all[0]['cnt'];
+                } else {
+                	return 0;
+                }
         }
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
                 } else {
@@ -1134,7 +1329,9 @@ 
         }
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
 		} else {
@@ -1520,10 +1717,14 @@ 
     		$Connection = new Connection();
     		date_default_timezone_set('UTC');
     		$last_update = $this->getLastStatsUpdate('last_update_stats');
-			if ($globalDebug) echo 'Update stats !'."\n";
+			if ($globalDebug) {
+				echo 'Update stats !'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
 			if ($globalStatsResetYear) {
@@ -1532,43 +1733,63 @@ 
 			}
 			$Spotter = new Spotter($this->db);
 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all registrations...'."\n";
+			if ($globalDebug) {
+				echo 'Count all registrations...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners...'."\n";
+			}
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots...'."\n";
+			}
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
 			foreach ($alldata as $number) {
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
+					$number['pilot_id'] = $number['pilot_name'];
+				}
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
 			}
 			
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order departure airports...'."\n";
+			}
 	        	$alldata = array();
 	        	
     			foreach ($pall as $value) {
@@ -1579,7 +1800,9 @@ 
     				$icao = $value['airport_departure_icao'];
         			if (isset($alldata[$icao])) {
     					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        			} else $alldata[$icao] = $value;
+        			} else {
+        				$alldata[$icao] = $value;
+        			}
 			}
     			$count = array();
     			foreach ($alldata as $key => $row) {
@@ -1589,11 +1812,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports...'."\n";
+			}
 	        	$alldata = array();
     			foreach ($pall as $value) {
 	        		$icao = $value['airport_arrival_icao'];
@@ -1603,7 +1832,9 @@ 
     				$icao = $value['airport_arrival_icao'];
         			if (isset($alldata[$icao])) {
         				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-	        		} else $alldata[$icao] = $value;
+	        		} else {
+	        			$alldata[$icao] = $value;
+	        		}
     			}
         		$count = array();
         		foreach ($alldata as $key => $row) {
@@ -1614,7 +1845,9 @@ 
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
 			}
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries...'."\n";
+				}
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
@@ -1624,7 +1857,9 @@ 
 				}
 			}
 			
-			if ($globalDebug) echo 'Count fatalities stats...'."\n";
+			if ($globalDebug) {
+				echo 'Count fatalities stats...'."\n";
+			}
 			$Accident = new Accident();
 			$this->deleteStatsByType('fatalities_byyear');
 			$alldata = $Accident->countFatalitiesByYear();
@@ -1641,46 +1876,66 @@ 
 			// Add by month using getstat if month finish...
 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths();
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all military flights by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMilitaryMonths();
 			foreach ($alldata as $number) {
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwners();
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilots();
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircrafts();
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivals();
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
 			}
-			if ($globalDebug) echo 'Airports data...'."\n";
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo 'Airports data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$this->deleteStatAirport('daily');
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -1801,7 +2056,9 @@ 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries by airlines...'."\n";
+				}
 				$SpotterArchive = new SpotterArchive();
 				//$Spotter = new Spotter($this->db);
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -1810,37 +2067,53 @@ 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft registrations by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
 			}
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports by airlines...'."\n";
+			}
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order detected departure airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_departure_icao'];
@@ -1861,11 +2134,17 @@ 
 			foreach ($alldata as $number) {
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports by airlines...'."\n";
+			}
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports by airlines...'."\n";
+			}
 	        	//$alldata = array();
     			foreach ($dall as $value) {
     				$icao = $value['airport_arrival_icao'];
@@ -1884,37 +2163,53 @@ 
     			}
     			$alldata = $pall;
                         foreach ($alldata as $number) {
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				if ($number['airline_icao'] != '') {
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
+				}
+			}
+			if ($globalDebug) {
+				echo 'Count all flights by months by airlines...'."\n";
 			}
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonthsByAirlines();
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
 			}
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
     			foreach ($dall as $value) {
@@ -1937,7 +2232,9 @@ 
 			foreach ($alldata as $number) {
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
 			}
-			if ($globalDebug) echo '...Arrival'."\n";
+			if ($globalDebug) {
+				echo '...Arrival'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
         		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
     			foreach ($dall as $value) {
@@ -1961,13 +2258,19 @@ 
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
 			}
 
-			if ($globalDebug) echo 'Flights data...'."\n";
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
+			if ($globalDebug) {
+				echo 'Flights data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '-> countAllDatesLastMonth...'."\n";
+			}
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
 			foreach ($alldata as $number) {
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
 			}
-			if ($globalDebug) echo '-> countAllDates...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllDates...'."\n";
+			}
 			//$previousdata = $this->countAllDatesByAirlines();
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
 			$values = array();
@@ -1980,7 +2283,9 @@ 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
 			}
 			
-			if ($globalDebug) echo '-> countAllHours...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllHours...'."\n";
+			}
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
@@ -1988,14 +2293,18 @@ 
 			
 
 			// Stats by filters
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				//$filter_name = $filter['name'];
 				$filter_name = $name;
 				$reset = false;
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+					if ($globalDebug) {
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+					}
 					$this->deleteOldStats($filter_name);
 					unset($last_update);
 				}
@@ -2014,7 +2323,9 @@ 
 				
 
 				// Count by filter
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
+				if ($globalDebug) {
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
+				}
 				$Spotter = new Spotter($this->db);
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
 				foreach ($alldata as $number) {
@@ -2051,7 +2362,9 @@ 
 	    				$icao = $value['airport_departure_icao'];
         				if (isset($alldata[$icao])) {
     						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-        				} else $alldata[$icao] = $value;
+        				} else {
+        					$alldata[$icao] = $value;
+        				}
 				}
 	    			$count = array();
     				foreach ($alldata as $key => $row) {
@@ -2072,7 +2385,9 @@ 
 	    				$icao = $value['airport_arrival_icao'];
         				if (isset($alldata[$icao])) {
         					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-		        		} else $alldata[$icao] = $value;
+		        		} else {
+		        			$alldata[$icao] = $value;
+		        		}
 	    			}
         			$count = array();
         			foreach ($alldata as $key => $row) {
@@ -2086,7 +2401,9 @@ 
 				$alldata = $Spotter->countAllMonths($filter);
 				$lastyear = false;
 				foreach ($alldata as $number) {
-					if ($number['year_name'] != date('Y')) $lastyear = true;
+					if ($number['year_name'] != date('Y')) {
+						$lastyear = true;
+					}
 					$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
 				}
 				$alldata = $Spotter->countAllMonthsOwners($filter);

require/class.NOTAM.php

Braces +213 added lines, -90 removed lines

@@ -1033,8 +1033,11 @@ 
 		$data = file_get_contents($filename);
 		preg_match_all("/%%(.+?)%%/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 	public function getAllNOTAMbyScope($scope) {
 		global $globalDBdriver;
@@ -1071,7 +1074,9 @@ 
 				$minlong = $maxlong;
 				$maxlong = $tmplong;
 			}
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP()';
 		} else {
@@ -1095,7 +1100,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
 		} else {
@@ -1122,8 +1129,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0])) return $all[0];
-		else return array();
+		if (isset($all[0])) {
+			return $all[0];
+		} else {
+			return array();
+		}
 	}
 
 	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
@@ -1201,7 +1211,9 @@ 
 					foreach ($alldata as $initial_data) {
 						$data = $this->parse($initial_data);
 						$notamref = $this->getNOTAMbyRef($data['ref']);
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						if (count($notamref) == 0) {
+							$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+						}
 					}
 				}
 			}
@@ -1214,7 +1226,9 @@ 
 			foreach ($alldata as $initial_data) {
 				$data = $this->parse($initial_data);
 				$notamref = $this->getNOTAMbyRef($data['ref']);
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				if (!isset($notamref['notam_id'])) {
+					$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+				}
 			}
 		}
 	}
@@ -1226,11 +1240,15 @@ 
 		foreach (array_chunk($allairports,20) as $airport) {
 			$airports_icao = array();
 			foreach($airport as $icao) {
-				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
+				if (isset($icao['icao'])) {
+					$airports_icao[] = $icao['icao'];
+				}
 			}
 			$airport_icao = implode(',',$airports_icao);
 			$alldata = $this->downloadNOTAM($airport_icao);
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			if (count($alldata) > 0) {
 				foreach ($alldata as $initial_data) {
 					//print_r($initial_data);
@@ -1239,14 +1257,23 @@ 
 					if (isset($data['ref'])) {
 						$notamref = $this->getNOTAMbyRef($data['ref']);
 						if (count($notamref) == 0) {
-							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
-							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							if (isset($data['ref_replaced'])) {
+								$this->deleteNOTAMbyRef($data['ref_replaced']);
+							}
+							if (isset($data['ref_cancelled'])) {
+								$this->deleteNOTAMbyRef($data['ref_cancelled']);
+							} elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) {
+								echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
+							}
 						}
 					}
 				}
-			} else echo 'Error on download. Nothing matches for '.$airport_icao."\n";
-			if ($globalTransaction) $this->db->commit();
+			} else {
+				echo 'Error on download. Nothing matches for '.$airport_icao."\n";
+			}
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
 			sleep(5);
 		}
 	}
@@ -1259,8 +1286,11 @@ 
 		$data = $Common->getData($url);
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
 		//print_r($matches);
-		if (isset($matches[1])) return $matches[1];
-		else return array();
+		if (isset($matches[1])) {
+			return $matches[1];
+		} else {
+			return array();
+		}
 	}
 
 	public function parse($data) {
@@ -1283,90 +1313,149 @@ 
 					$rules = str_split($matches[3]);
 					foreach ($rules as $rule) {
 						if ($rule == 'I') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR';
-							else $result['rules'] = 'IFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/IFR';
+							} else {
+								$result['rules'] = 'IFR';
+							}
 						} elseif ($rule == 'V') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR';
-							else $result['rules'] = 'VFR';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/VFR';
+							} else {
+								$result['rules'] = 'VFR';
+							}
 						} elseif ($rule == 'K') {
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['rules'])) {
+								$result['rules'] = $result['rules'].'/Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
 					$attentions = str_split($matches[4]);
 					foreach ($attentions as $attention) {
 						if ($attention == 'N') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention';
-							else $result['rules'] = 'Immediate attention';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Immediate attention';
+							} else {
+								$result['rules'] = 'Immediate attention';
+							}
 						} elseif ($attention == 'B') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance';
-							else $result['rules'] = 'Operational significance';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Operational significance';
+							} else {
+								$result['rules'] = 'Operational significance';
+							}
 						} elseif ($attention == 'O') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations';
-							else $result['rules'] = 'Flight operations';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Flight operations';
+							} else {
+								$result['rules'] = 'Flight operations';
+							}
 						} elseif ($attention == 'M') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc';
-							else $result['rules'] = 'Misc';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Misc';
+							} else {
+								$result['rules'] = 'Misc';
+							}
 						} elseif ($attention == 'K') {
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist';
-							else $result['rules'] = 'Checklist';
+							if (isset($result['attention'])) {
+								$result['attention'] = $result['attention'].' / Checklist';
+							} else {
+								$result['rules'] = 'Checklist';
+							}
 						}
 					}
-					if ($matches[5] == 'A') $result['scope'] = 'Airport warning';
-					elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning';
-					elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning';
-					elseif ($matches[5] == 'K') $result['scope'] = 'Checklist';
-					elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning';
-					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
+					if ($matches[5] == 'A') {
+						$result['scope'] = 'Airport warning';
+					} elseif ($matches[5] == 'E') {
+						$result['scope'] = 'Enroute warning';
+					} elseif ($matches[5] == 'W') {
+						$result['scope'] = 'Navigation warning';
+					} elseif ($matches[5] == 'K') {
+						$result['scope'] = 'Checklist';
+					} elseif ($matches[5] == 'AE') {
+						$result['scope'] = 'Airport/Enroute warning';
+					} elseif ($matches[5] == 'AW') {
+						$result['scope'] = 'Airport/Navigation warning';
+					}
 					$result['lower_limit'] = $matches[6];
 					$result['upper_limit'] = $matches[7];
 					$latitude = $Common->convertDec($matches[8],'latitude');
-					if ($matches[9] == 'S') $latitude = -$latitude;
+					if ($matches[9] == 'S') {
+						$latitude = -$latitude;
+					}
 					$longitude = $Common->convertDec($matches[10],'longitude');
-					if ($matches[11] == 'W') $longitude = -$longitude;
+					if ($matches[11] == 'W') {
+						$longitude = -$longitude;
+					}
 					$result['latitude'] = $latitude;
 					$result['longitude'] = $longitude;
-					if ($matches[12] != '') $result['radius'] = intval($matches[12]);
-					else $result['radius'] = 0;
-				} else echo 'ERROR : '.$line."\n";
-			}
-			elseif (preg_match('#A\) (.*)#',$line,$matches)) {
+					if ($matches[12] != '') {
+						$result['radius'] = intval($matches[12]);
+					} else {
+						$result['radius'] = 0;
+					}
+				} else {
+					echo 'ERROR : '.$line."\n";
+				}
+			} elseif (preg_match('#A\) (.*)#',$line,$matches)) {
 				$result['icao'] = $matches[1];
-			}
-			elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_begin'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
 				$result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
-				if ($matches[1] > 50) $year = '19'.$matches[1];
-				else $year = '20'.$matches[1];
+			} elseif (preg_match('#C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[1] > 50) {
+					$year = '19'.$matches[1];
+				} else {
+					$year = '20'.$matches[1];
+				}
 				$result['date_end'] = $year.'/'.$matches[2].'/'.$matches[3].' '.$matches[4].':'.$matches[5];
-				if ($matches[6] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[6] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
+				if ($matches[6] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[6] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#C\) (EST|PERM)$#',$line,$matches)) {
 				$result['date_end'] = '2030/12/20 12:00';
-				if ($matches[1] == 'EST') $result['estimated'] = 1;
-				else $result['estimated'] = 0;
-				if ($matches[1] == 'PERM') $result['permanent'] = 1;
-				else $result['permanent'] = 0;
-			}
-			elseif (preg_match('#E\) (.*)#',$line,$matches)) {
+				if ($matches[1] == 'EST') {
+					$result['estimated'] = 1;
+				} else {
+					$result['estimated'] = 0;
+				}
+				if ($matches[1] == 'PERM') {
+					$result['permanent'] = 1;
+				} else {
+					$result['permanent'] = 0;
+				}
+			} elseif (preg_match('#E\) (.*)#',$line,$matches)) {
 				$rtext = array();
 				$text = explode(' ',$matches[1]);
 				foreach ($text as $word) {
-					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
-					else $rtext[] = $word;
+					if (isset($this->abbr[$word])) {
+						$rtext[] = strtoupper($this->abbr[$word]);
+					} elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) {
+						$rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
+					} else {
+						$rtext[] = $word;
+					}
 				}
 				$result['text'] = implode(' ',$rtext);
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
@@ -1374,7 +1463,9 @@ 
 			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
 				$text = explode(' ',$line);
 				$result['ref'] = $text[0];
-				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
+				if ($matches[1] == 'NOTAMN') {
+					$result['type'] = 'new';
+				}
 				if ($matches[1] == 'NOTAMC') {
 					$result['type'] = 'cancel';
 					$result['ref_cancelled'] = $text[2];
@@ -1396,69 +1487,101 @@ 
 		switch ($code[1]) {
 			case 'A':
 				$result = 'Airspace organization ';
-				if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp];
+				if (isset($this->code_airspace[$code_fp])) {
+					$result .= $this->code_airspace[$code_fp];
+				}
 				break;
 			case 'C':
 				$result = 'Communications and radar facilities ';
-				if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp];
+				if (isset($this->code_comradar[$code_fp])) {
+					$result .= $this->code_comradar[$code_fp];
+				}
 				break;
 			case 'F':
 				$result = 'Facilities and services ';
-				if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp];
+				if (isset($this->code_facilities[$code_fp])) {
+					$result .= $this->code_facilities[$code_fp];
+				}
 				break;
 			case 'I':
 				$result = 'Instrument and Microwave Landing System ';
-				if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp];
+				if (isset($this->code_instrumentlanding[$code_fp])) {
+					$result .= $this->code_instrumentlanding[$code_fp];
+				}
 				break;
 			case 'L':
 				$result = 'Lighting facilities ';
-				if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp];
+				if (isset($this->code_lightingfacilities[$code_fp])) {
+					$result .= $this->code_lightingfacilities[$code_fp];
+				}
 				break;
 			case 'M':
 				$result = 'Movement and landing areas ';
-				if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp];
+				if (isset($this->code_movementareas[$code_fp])) {
+					$result .= $this->code_movementareas[$code_fp];
+				}
 				break;
 			case 'N':
 				$result = 'Terminal and En Route Navigation Facilities ';
-				if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp];
+				if (isset($this->code_terminalfacilities[$code_fp])) {
+					$result .= $this->code_terminalfacilities[$code_fp];
+				}
 				break;
 			case 'O':
 				$result = 'Other information ';
-				if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp];
+				if (isset($this->code_information[$code_fp])) {
+					$result .= $this->code_information[$code_fp];
+				}
 				break;
 			case 'P':
 				$result = 'Air Traffic procedures ';
-				if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp];
+				if (isset($this->code_airtraffic[$code_fp])) {
+					$result .= $this->code_airtraffic[$code_fp];
+				}
 				break;
 			case 'R':
 				$result = 'Navigation Warnings: Airspace Restrictions ';
-				if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp];
+				if (isset($this->code_navigationw[$code_fp])) {
+					$result .= $this->code_navigationw[$code_fp];
+				}
 				break;
 			case 'S':
 				$result = 'Air Traffic and VOLMET Services ';
-				if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp];
+				if (isset($this->code_volmet[$code_fp])) {
+					$result .= $this->code_volmet[$code_fp];
+				}
 				break;
 			case 'W':
 				$result = 'Navigation Warnings: Warnings ';
-				if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp];
+				if (isset($this->code_warnings[$code_fp])) {
+					$result .= $this->code_warnings[$code_fp];
+				}
 				break;
 		}
 		switch ($code[3]) {
 			case 'A':
 				// Availability
-				if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp];
+				if (isset($this->code_sp_availabity[$code_sp])) {
+					$result .= ' '.$this->code_sp_availabity[$code_sp];
+				}
 				break;
 			case 'C':
 				// Changes
-				if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp];
+				if (isset($this->code_sp_changes[$code_sp])) {
+					$result .= ' '.$this->code_sp_changes[$code_sp];
+				}
 				break;
 			case 'H':
 				// Hazardous conditions
-				if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp];
+				if (isset($this->code_sp_hazardous[$code_sp])) {
+					$result .= ' '.$this->code_sp_hazardous[$code_sp];
+				}
 				break;
 			case 'L':
 				// Limitations
-				if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp];
+				if (isset($this->code_sp_limitations[$code_sp])) {
+					$result .= ' '.$this->code_sp_limitations[$code_sp];
+				}
 				break;
 			case 'X':
 				// Other Information

require/class.ATC.php

Braces +17 added lines, -6 removed lines

@@ -20,20 +20,27 @@ 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 		foreach($globalStatsFilters[$globalFilterName] as $source) {
-			if (isset($source['source'])) $filter['source'][] = $source['source'];
+			if (isset($source['source'])) {
+				$filter['source'][] = $source['source'];
+			}
 		}
 	    } else {
 		$filter = $globalStatsFilters[$globalFilterName];
 	    }
 	}
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+	if (is_array($globalFilter)) {
+		$filter = array_merge($filter,$globalFilter);
+	}
 	$filter_query_join = '';
 	$filter_query_where = '';
 	if (isset($filter['source']) && !empty($filter['source'])) {
 	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 	}
-	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+	if ($filter_query_where == '' && $where) {
+		$filter_query_where = ' WHERE';
+	} elseif ($filter_query_where != '' && $and) {
+		$filter_query_where .= ' AND';
+	}
 	$filter_query = $filter_query_join.$filter_query_where;
 	return $filter_query;
     }
@@ -90,7 +97,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -106,7 +115,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {

js/map-aircraft.3d.js.php

Braces +30 added lines, -5 removed lines

@@ -202,7 +202,12 @@ 
 //				viewer.dataSources.get(dsn).entities.remove(entity);
 //			}
 			//console.log(entity.lastupdate);
-			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 //				console.log('Remove an entity date');
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			} else {
@@ -276,7 +281,12 @@ 
 	} else {
 		for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
 			var entity = viewer.dataSources.get(dsn).entities.values[i];
-			if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(entity.lastupdatesat) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			}
 		}
@@ -606,7 +616,12 @@ 
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 update_polarLayer();
-setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -704,7 +719,12 @@ 
 				}
 			}
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	//var widget = new Cesium.CesiumWidget('archivebox');
 //	var timeline = new Cesium.Timeline(viewer);
@@ -723,7 +743,12 @@ 
     if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 update_atcLayer();
-setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
     }
 ?>

atc-data.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT);
 	$atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING);
 	$atc_data = $ATC->getById($atcid);
-	if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident);
+	if (!isset($atc_data[0])) {
+		$atc_data = $ATC->getByIdent($atcident);
+	}
  ?>
 <div class="alldetails">
 <button type="button" class="close">&times;</button>