View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 64a0a6...a96b73 )
by Yannick
05:21
created
Status
Category
Toggle Patches
aircraft-statistics-route.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -7,14 +7,14 @@  discard block
 
 block discarded – undo
7 7 
         header('Location: '.$globalURL.'/aircraft');
8 8 
         die();
9 9 
 }
10 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
10 
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
11 11 
 $Spotter = new Spotter();
12 
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
12 
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
13 13
14 14
15 15 
 if (!empty($spotter_array))
16 16 
 {
17 
-	$title = sprintf(_("Most Common Routes from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
17 
+	$title = sprintf(_("Most Common Routes from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
18 18 
 	require_once('header.php');
19 19 
 	print '<div class="select-item">';
20 20 
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 
@@ -23,9 +23,9 @@  discard block
 
 block discarded – undo
23 23 
 	$Stats = new Stats();
24 24 
 	$aircraft_types = $Stats->getAllAircraftTypes();
25 25 
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
26 
-	foreach($aircraft_types as $aircrafttype)
26 
+	foreach ($aircraft_types as $aircrafttype)
27 27 
 	{
28 
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
28 
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
29 29 
 		{
30 30 
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
31 31 
 		} else {
 
@@ -51,7 +51,7 @@  discard block
 
 block discarded – undo
51 51 
 	include('aircraft-sub-menu.php');
52 52 
 	print '<div class="column">';
53 53 
 	print '<h2>'._("Most Common Routes").'</h2>';
54 
-	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
54 
+	print '<p>'.sprintf(_("The statistic below shows the most common routes from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
55 55
56 56 
 	$route_array = $Spotter->countAllRoutesByAircraft($aircraft_type);
57 57 
 	if (!empty($route_array))
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68 
 		print '</thead>';
69 69 
 		print '<tbody>';
70 70 
 		$i = 1;
71 
-		foreach($route_array as $route_item)
71 
+		foreach ($route_array as $route_item)
72 72 
 		{
73 73 
 			print '<tr>';
74 74 
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
airport-statistics-time.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -7,14 +7,14 @@  discard block
 
 block discarded – undo
7 7 
         header('Location: '.$globalURL.'/airport');
8 8 
         die();
9 9 
 }
10 
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
10 
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
11 11 
 $Spotter = new Spotter();
12 
-$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1","");
12 
+$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", "");
13 13 
 $airport_array = $Spotter->getAllAirportInfo($airport);
14 14
15 15 
 if (!empty($airport_array))
16 16 
 {
17 
-	$title = sprintf(_("Most Common Time of Day to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
17 
+	$title = sprintf(_("Most Common Time of Day to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
18 18
19 19 
 	require_once('header.php');
20 20 
 	print '<div class="select-item">';
 
@@ -25,9 +25,9 @@  discard block
 
 block discarded – undo
25 25 
 	$airport_names = $Stats->getAllAirportNames();
26 26 
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
27 27 
 	ksort($airport_names);
28 
-	foreach($airport_names as $airport_name)
28 
+	foreach ($airport_names as $airport_name)
29 29 
 	{
30 
-		if($airport == $airport_name['airport_icao'])
30 
+		if ($airport == $airport_name['airport_icao'])
31 31 
 		{
32 32 
 			print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
33 33 
 		} else {
 
@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58 
 	include('airport-sub-menu.php');
59 59 
 	print '<div class="column">';
60 60 
 	print '<h2>'._("Most Common Time of Day").'</h2>';
61 
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
61 
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
62 62
63 63 
 	$hour_array = $Spotter->countAllHoursByAirport($airport);
64 64 
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
 
@@ -70,7 +70,7 @@  discard block
 
 block discarded – undo
70 70 
             var data = google.visualization.arrayToDataTable([
71 71 
             	["'._("Hour").'", "'._("# of Flights").'"], ';
72 72 
             $hour_data = '';
73 
-	foreach($hour_array as $hour_item)
73 
+	foreach ($hour_array as $hour_item)
74 74 
 	{
75 75 
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
76 76 
 	}
Please login to merge, or discard this patch.
aircraft-statistics-arrival-airport-country.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -8,14 +8,14 @@  discard block
 
 block discarded – undo
8 8 
         die();
9 9 
 }
10 10
11 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
11 
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
12 12 
 $Spotter = new Spotter();
13 
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
13 
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
14 14
15 15
16 16 
 if (!empty($spotter_array))
17 17 
 {
18 
-	$title = sprintf(_("Most Common Arrival Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
18 
+	$title = sprintf(_("Most Common Arrival Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
19 19 
 	require_once('header.php');
20 20 
 	print '<div class="select-item">';
21 21 
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 
@@ -24,9 +24,9 @@  discard block
 
 block discarded – undo
24 24 
 	$Stats = new Stats();
25 25 
 	$aircraft_types = $Stats->getAllAircraftTypes();
26 26 
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
27 
-	foreach($aircraft_types as $aircrafttype)
27 
+	foreach ($aircraft_types as $aircrafttype)
28 28 
 	{
29 
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
29 
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
30 30 
 		{
31 31 
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
32 32 
 		} else {
 
@@ -53,7 +53,7 @@  discard block
 
 block discarded – undo
53 53 
 	include('aircraft-sub-menu.php');
54 54 
 	print '<div class="column">';
55 55 
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
56 
-  	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
56 
+  	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
57 57 
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAircraft($aircraft_type);
58 58 
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
59 59 
 	print '<div id="chartCountry" class="chart" width="100%"></div>
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
             var data = google.visualization.arrayToDataTable([
65 65 
             	["'._("Country").'", "'._("# of times").'"], ';
66 66 
         $country_data = '';
67 
-	foreach($airport_country_array as $airport_item)
67 
+	foreach ($airport_country_array as $airport_item)
68 68 
 	{
69 69 
 		$country_data .= '[ "'.$airport_item['arrival_airport_country'].'",'.$airport_item['airport_arrival_country_count'].'],';
70 70 
 	}
 
@@ -97,7 +97,7 @@  discard block
 
 block discarded – undo
97 97 
 		print '</thead>';
98 98 
 		print '<tbody>';
99 99 
 		$i = 1;
100 
-		foreach($airport_country_array as $airport_item)
100 
+		foreach ($airport_country_array as $airport_item)
101 101 
 		{
102 102 
 			print '<tr>';
103 103 
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
aircraft-statistics-arrival-airport.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -9,15 +9,15 @@  discard block
 
 block discarded – undo
9 9 
         die();
10 10 
 }
11 11
12 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
12 
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
13 13
14 14 
 $Spotter = new Spotter();
15 
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
15 
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
16 16
17 17
18 18 
 if (!empty($spotter_array))
19 19 
 {
20 
-	$title = sprintf(_("Most Common Arrival Airports for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
20 
+	$title = sprintf(_("Most Common Arrival Airports for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
21 21 
 	require_once('header.php');
22 22 
 	print '<div class="select-item">';
23 23 
 	print '<form action="'.$globalURL.'/aircraft" method="post">';
 
@@ -26,9 +26,9 @@  discard block
 
 block discarded – undo
26 26 
 	$Stats = new Stats();
27 27 
 	$aircraft_types = $Stats->getAllAircraftTypes();
28 28 
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
29 
-	foreach($aircraft_types as $aircrafttype)
29 
+	foreach ($aircraft_types as $aircrafttype)
30 30 
 	{
31 
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
31 
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
32 32 
 		{
33 33 
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
34 34 
 		} else {
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
 	include('aircraft-sub-menu.php');
56 56 
 	print '<div class="column">';
57 57 
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
58 
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
58 
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
59 59 
 	 $airport_airport_array = $Spotter->countAllArrivalAirportsByAircraft($aircraft_type);
60 60 
     	?>
61 61 
     	<script type="text/javascript" src="https://www.google.com/jsapi"></script>
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
         	["<?php echo _("Airport"); ?>", "<?php echo _("# of times"); ?>"],
72 72 
 	<?php
73 73 
 	$airport_data = '';
74 
-	foreach($airport_airport_array as $airport_item)
74 
+	foreach ($airport_airport_array as $airport_item)
75 75 
 	{
76 76 
 		$name = $airport_item['airport_arrival_city'].', '.$airport_item['airport_arrival_country'].' ('.$airport_item['airport_arrival_icao'].')';
77 77 
 		$name = str_replace("'", "", $name);
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
 	print '</thead>';
111 111 
 	print '<tbody>';
112 112 
 	$i = 1;
113 
-	foreach($airport_airport_array as $airport_item)
113 
+	foreach ($airport_airport_array as $airport_item)
114 114 
 	{
115 115 
 		print '<tr>';
116 116 
 		print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
date-statistics-registration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -3,8 +3,8 @@  discard block
 
 block discarded – undo
3 3 
 require_once('require/class.Spotter.php');
4 4 
 require_once('require/class.Language.php');
5 5 
 $Spotter = new Spotter();
6 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
7 
-$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
6 
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
7 
+$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
8 8
9 9 
 if (!empty($spotter_array))
10 10 
 {
 
@@ -20,13 +20,13 @@  discard block
 
 block discarded – undo
20 20 
 	print '</div>';
21 21
22 22 
 	print '<div class="info column">';
23 
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
23 
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
24 24 
 	print '</div>';
25 25
26 26 
 	include('date-sub-menu.php');
27 27 
 	print '<div class="column">';
28 28 
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
29 
-	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
29 
+	print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
30 30
31 31 
 	$aircraft_array = $Spotter->countAllAircraftRegistrationByDate($_GET['date']);
32 32 
 	if (!empty($aircraft_array))
 
@@ -43,7 +43,7 @@  discard block
 
 block discarded – undo
43 43 
 		print '</thead>';
44 44 
 		print '<tbody>';
45 45 
 		$i = 1;
46 
-		foreach($aircraft_array as $aircraft_item)
46 
+		foreach ($aircraft_array as $aircraft_item)
47 47 
 		{
48 48 
 			print '<tr>';
49 49 
 			print '<td><strong>'.$i.'</strong></td>';
 
@@ -53,7 +53,7 @@  discard block
 
 block discarded – undo
53 53 
 				if (isset($aircraft_item['aircraft_type'])) {
54 54 
 					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_type'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:").' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
55 55 
 				} else {
56 
-					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:");' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
56 
+					print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:"); ' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>';
57 57 
 				}
58 58 
 				print '</td>';
59 59 
 			} else {
Please login to merge, or discard this patch.
require/class.Image.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch 
@@ -17,14 +17,14 @@  discard block
 
 block discarded – undo
17 17 
 	* @return Array the images list
18 18 
 	*
19 19 
 	*/
20 
-	public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
20 
+	public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
21 21 
 	{
22 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
23 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
24 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
22 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
23 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
24 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
25 25 
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
26 26 
 		$registration = trim($registration);
27 
-		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration
27 
+		$query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration
28 28 
 			FROM spotter_image
29 29 
 			WHERE spotter_image.registration = :registration";
30 30 
 		$sth = $this->db->prepare($query);
 
@@ -63,9 +63,9 @@  discard block
 
 block discarded – undo
63 63 
 		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
64 64 
 		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
65 65 
 		if ($copyright != '') {
66 
-			$copyright = str_replace('Copyright ','',$copyright);
67 
-			$copyright = str_replace('© ','',$copyright);
68 
-			$copyright = str_replace('(c) ','',$copyright);
66 
+			$copyright = str_replace('Copyright ', '', $copyright);
67 
+			$copyright = str_replace('© ', '', $copyright);
68 
+			$copyright = str_replace('(c) ', '', $copyright);
69 69 
 		}
70 70 
 		return $copyright;
71 71 
 	}
 
@@ -76,26 +76,26 @@  discard block
 
 block discarded – undo
76 76 
 	* @return String either success or error
77 77 
 	*
78 78 
 	*/
79 
-	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
79 
+	public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '')
80 80 
 	{
81 
-		global $globalDebug,$globalAircraftImageFetch;
81 
+		global $globalDebug, $globalAircraftImageFetch;
82 82 
 		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
83 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
83 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
84 84 
 		$registration = trim($registration);
85 85 
 		//getting the aircraft image
86 86 
 		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
87 87 
 		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
88 88 
 		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
89 89 
 		else return "success";
90 
-		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
90 
+		$image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao);
91 91 
 		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
92 92 
 		if ($image_url['original'] != '') {
93 93 
 			if ($globalDebug) echo 'Found !'."\n";
94 
-			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
94 
+			$query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
95 95 
 			try {
96 96 
 				$sth = $this->db->prepare($query);
97 
-				$sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website']));
98 
-			} catch(PDOException $e) {
97 
+				$sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website']));
98 
+			} catch (PDOException $e) {
99 99 
 				echo $e->getMessage()."\n";
100 100 
 				return "error";
101 101 
 			}
 
@@ -115,9 +115,9 @@  discard block
 
 block discarded – undo
115 115 
 		global $globalAircraftImageSources, $globalIVAO;
116 116 
 		$Spotter = new Spotter($this->db);
117 117 
 		if (!isset($globalIVAO)) $globalIVAO = FALSE;
118 
-		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
118 
+		$aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING);
119 119 
 		if ($aircraft_registration != '') {
120 
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
120 
+			if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
121 121 
 			$aircraft_registration = urlencode(trim($aircraft_registration));
122 122 
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
123 123 
 			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
 
@@ -129,23 +129,23 @@  discard block
 
 block discarded – undo
129 129 
 		} elseif ($aircraft_icao != '') {
130 130 
 			$aircraft_registration = $aircraft_icao;
131 131 
 			$aircraft_name = '';
132 
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
133 
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
132 
+		} else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
133 
+		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
134 134 
 		foreach ($globalAircraftImageSources as $source) {
135 135 
 			$source = strtolower($source);
136 
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
137 
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
138 
-			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
139 
-			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
140 
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
141 
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
142 
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
143 
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
144 
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
145 
-			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
136 
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao, $airline_icao);
137 
+			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration, $aircraft_name);
138 
+			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration, $aircraft_name);
139 
+			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration, $aircraft_name);
140 
+			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration, $aircraft_name);
141 
+			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration, $aircraft_name);
142 
+			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration, $aircraft_name);
143 
+			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration, $aircraft_name);
144 
+			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration, $aircraft_name);
145 
+			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration, $aircraft_name);
146 146 
 			if (isset($images_array) && $images_array['original'] != '') return $images_array;
147 147 
 		}
148 
-		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
148 
+		return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => '');
149 149 
 	}
150 150
151 151 
 	/**
 
@@ -156,24 +156,24 @@  discard block
 
 block discarded – undo
156 156 
 	* @return Array the aircraft thumbnail, orignal url and copyright
157 157 
 	*
158 158 
 	*/
159 
-	public function fromPlanespotters($aircraft_registration, $aircraft_name='') {
159 
+	public function fromPlanespotters($aircraft_registration, $aircraft_name = '') {
160 160 
 		$Common = new Common();
161 161 
 		// If aircraft registration is only number, also check with aircraft model
162 
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
163 
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
162 
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
163 
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss';
164 164 
 		} else {
165 165 
 			//$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss';
166 
-			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
166 
+			$url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
167 167 
 		}
168 168 
 		$data = $Common->getData($url);
169 169 
 		if ($xml = simplexml_load_string($data)) {
170 170 
 			if (isset($xml->channel->item)) {
171 171 
 				$image_url = array();
172 
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
172 
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
173 173 
 				$image_url['thumbnail'] = $thumbnail_url;
174 
-				$image_url['original'] = str_replace('thumbnail','original',$thumbnail_url);
175 
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
176 
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
174 
+				$image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url);
175 
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright);
176 
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
177 177 
 				$image_url['source'] = 'planespotters';
178 178 
 				return $image_url;
179 179 
 			}
 
@@ -189,25 +189,25 @@  discard block
 
 block discarded – undo
189 189 
 	* @return Array the aircraft thumbnail, orignal url and copyright
190 190 
 	*
191 191 
 	*/
192 
-	public function fromDeviantart($aircraft_registration, $aircraft_name='') {
192 
+	public function fromDeviantart($aircraft_registration, $aircraft_name = '') {
193 193 
 		$Common = new Common();
194 194 
 		// If aircraft registration is only number, also check with aircraft model
195 
-		if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') {
196 
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
195 
+		if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') {
196 
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$aircraft_registration.'%20'.urlencode($aircraft_name);
197 197 
 		} else {
198 
-			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
198 
+			$url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$aircraft_registration;
199 199 
 		}
200 200
201 201 
 		$data = $Common->getData($url);
202 202 
 		if ($xml = simplexml_load_string($data)) {
203 203 
 			if (isset($xml->channel->item->link)) {
204 204 
 				$image_url = array();
205 
-				$thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
205 
+				$thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url);
206 206 
 				$image_url['thumbnail'] = $thumbnail_url;
207 
-				$original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
207 
+				$original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url);
208 208 
 				$image_url['original'] = $original_url;
209 
-				$image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
210 
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
209 
+				$image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright));
210 
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
211 211 
 				$image_url['source'] = 'deviantart';
212 212 
 				return $image_url;
213 213 
 			}
 
@@ -223,32 +223,32 @@  discard block
 
 block discarded – undo
223 223 
 	* @return Array the aircraft thumbnail, orignal url and copyright
224 224 
 	*
225 225 
 	*/
226 
-	public function fromJetPhotos($aircraft_registration, $aircraft_name='') {
226 
+	public function fromJetPhotos($aircraft_registration, $aircraft_name = '') {
227 227 
 		$Common = new Common();
228 
-		$url= 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
228 
+		$url = 'http://jetphotos.net/showphotos.php?displaymode=2&regsearch='.$aircraft_registration;
229 229 
 		$data = $Common->getData($url);
230 230 
 		$dom = new DOMDocument();
231 231 
 		@$dom->loadHTML($data);
232 232 
 		$all_pics = array();
233 
-		foreach($dom->getElementsByTagName('img') as $image) {
233 
+		foreach ($dom->getElementsByTagName('img') as $image) {
234 234 
 			if ($image->getAttribute('itemprop') == "http://schema.org/image") {
235 235 
 				$all_pics[] = $image->getAttribute('src');
236 236 
 			}
237 237 
 		}
238 238 
 		$all_authors = array();
239 
-		foreach($dom->getElementsByTagName('meta') as $author) {
239 
+		foreach ($dom->getElementsByTagName('meta') as $author) {
240 240 
 			if ($author->getAttribute('itemprop') == "http://schema.org/author") {
241 241 
 				$all_authors[] = $author->getAttribute('content');
242 242 
 			}
243 243 
 		}
244 244 
 		$all_ref = array();
245 
-		foreach($dom->getElementsByTagName('a') as $link) {
245 
+		foreach ($dom->getElementsByTagName('a') as $link) {
246 246 
 			$all_ref[] = $link->getAttribute('href');
247 247 
 		}
248 248 
 		if (isset($all_pics[0])) {
249 249 
 			$image_url = array();
250 250 
 			$image_url['thumbnail'] = $all_pics[0];
251 
-			$image_url['original'] = str_replace('_tb','',$all_pics[0]);
251 
+			$image_url['original'] = str_replace('_tb', '', $all_pics[0]);
252 252 
 			$image_url['copyright'] = $all_authors[0];
253 253 
 			$image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8];
254 254 
 			$image_url['source'] = 'JetPhotos';
 
@@ -265,24 +265,24 @@  discard block
 
 block discarded – undo
265 265 
 	* @return Array the aircraft thumbnail, orignal url and copyright
266 266 
 	*
267 267 
 	*/
268 
-	public function fromPlanePictures($aircraft_registration, $aircraft_name='') {
268 
+	public function fromPlanePictures($aircraft_registration, $aircraft_name = '') {
269 269 
 		$Common = new Common();
270 
-		$url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
270 
+		$url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2';
271 271 
 		$data = $Common->getData($url);
272 272 
 		$dom = new DOMDocument();
273 273 
 		@$dom->loadHTML($data);
274 274 
 		$all_pics = array();
275 
-		foreach($dom->getElementsByTagName('img') as $image) {
275 
+		foreach ($dom->getElementsByTagName('img') as $image) {
276 276 
 			$all_pics[] = $image->getAttribute('src');
277 277 
 		}
278 278 
 		$all_links = array();
279 
-		foreach($dom->getElementsByTagName('a') as $link) {
280 
-			$all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href'));
279 
+		foreach ($dom->getElementsByTagName('a') as $link) {
280 
+			$all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href'));
281 281 
 		}
282 
-		if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1])) {
282 
+		if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1])) {
283 283 
 			$image_url = array();
284 284 
 			$image_url['thumbnail'] = 'http://www.planepictures.net'.$all_pics[1];
285 
-			$image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN','',$all_pics[1]);
285 
+			$image_url['original'] = 'http://www.planepictures.net'.str_replace('_TN', '', $all_pics[1]);
286 286 
 			$image_url['copyright'] = $all_links[6]['text'];
287 287 
 			$image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href'];
288 288 
 			$image_url['source'] = 'PlanePictures';
 
@@ -299,19 +299,19 @@  discard block
 
 block discarded – undo
299 299 
 	* @return Array the aircraft thumbnail, orignal url and copyright
300 300 
 	*
301 301 
 	*/
302 
-	public function fromFlickr($aircraft_registration,$aircraft_name='') {
302 
+	public function fromFlickr($aircraft_registration, $aircraft_name = '') {
303 303 
 		$Common = new Common();
304 304 
 		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
305 305 
 		else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
306 306 
 		$data = $Common->getData($url);
307 307 
 		if ($xml = simplexml_load_string($data)) {
308 308 
 			if (isset($xml->channel->item)) {
309 
-				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
309 
+				$original_url = trim((string) $xml->channel->item->enclosure->attributes()->url);
310 310 
 				$image_url = array();
311 311 
 				$image_url['thumbnail'] = $original_url;
312 312 
 				$image_url['original'] = $original_url;
313 
-				$image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
314 
-				$image_url['source_website'] = trim((string)$xml->channel->item->link);
313 
+				$image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit);
314 
+				$image_url['source_website'] = trim((string) $xml->channel->item->link);
315 315 
 				$image_url['source'] = 'flickr';
316 316 
 				return $image_url;
317 317 
 			}
 
@@ -319,7 +319,7 @@  discard block
 
 block discarded – undo
319 319 
 		return false;
320 320 
 	}
321 321
322 
-	public function fromIvaoMtl($aircraft_icao,$airline_icao) {
322 
+	public function fromIvaoMtl($aircraft_icao, $airline_icao) {
323 323 
 		$Common = new Common();
324 324 
 		//echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg';
325 325 
 		if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) {
 
@@ -343,14 +343,14 @@  discard block
 
 block discarded – undo
343 343 
 	* @return Array the aircraft thumbnail, orignal url and copyright
344 344 
 	*
345 345 
 	*/
346 
-	public function fromBing($aircraft_registration,$aircraft_name='') {
346 
+	public function fromBing($aircraft_registration, $aircraft_name = '') {
347 347 
 		global $globalImageBingKey;
348 348 
 		$Common = new Common();
349 349 
 		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
350 350 
 		if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
351 351 
 		else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
352 
-		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
353 
-		$data = $Common->getData($url,'get','',$headers);
352 
+		$headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey));
353 
+		$data = $Common->getData($url, 'get', '', $headers);
354 354 
 		$result = json_decode($data);
355 355 
 		if (isset($result->d->results[0]->MediaUrl)) {
356 356 
 			$image_url = array();
 
@@ -375,14 +375,14 @@  discard block
 
 block discarded – undo
375 375 
 	* @return Array the aircraft thumbnail, orignal url and copyright
376 376 
 	*
377 377 
 	*/
378 
-	public function fromAirportData($aircraft_registration,$aircraft_name='') {
378 
+	public function fromAirportData($aircraft_registration, $aircraft_name = '') {
379 379 
 		$Common = new Common();
380 380 
 		$url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration;
381 381 
 		$data = $Common->getData($url);
382 382 
 		$result = json_decode($data);
383 383 
 		if (isset($result->count) && $result->count > 0) {
384 384 
 			$image_url = array();
385 
-			$image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image);
385 
+			$image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image);
386 386 
 			$image_url['source_website'] = $result->data[0]->link;
387 387 
 			$image_url['thumbnail'] = $result->data[0]->image;
388 388 
 			$image_url['copyright'] = $result->data[0]->photographer;
 
@@ -400,7 +400,7 @@  discard block
 
 block discarded – undo
400 400 
 	* @return Array the aircraft thumbnail, orignal url and copyright
401 401 
 	*
402 402 
 	*/
403 
-	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
403 
+	public function fromWikimedia($aircraft_registration, $aircraft_name = '') {
404 404 
 		$Common = new Common();
405 405 
 		if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
406 406 
 		else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
 
@@ -408,7 +408,7 @@  discard block
 
 block discarded – undo
408 408 
 		$result = json_decode($data);
409 409 
 		if (isset($result->query->search[0]->title)) {
410 410 
 			$fileo = $result->query->search[0]->title;
411 
-			if (substr($fileo,-3) == 'pdf') return false;
411 
+			if (substr($fileo, -3) == 'pdf') return false;
412 412 
 			$file = urlencode($fileo);
413 413 
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
414 414 
 			$data2 = $Common->getData($url2);
 
@@ -433,11 +433,11 @@  discard block
 
 block discarded – undo
433 433 
 				if (isset($result2->query->pages)) {
434 434 
 					foreach ($result2->query->pages as $page) {
435 435 
 						if (isset($page->imageinfo[0]->extmetadata->Artist)) {
436 
-							$image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
436 
+							$image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value));
437 437 
 							if (isset($page->imageinfo[0]->extmetadata->License->value)) {
438 438 
 								$image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')';
439 439 
 							}
440 
-							$image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright']));
440 
+							$image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright']));
441 441 
 							return $image_url;
442 442 
 						}
443 443 
 					}
 
@@ -456,22 +456,22 @@  discard block
 
 block discarded – undo
456 456 
 	* @return Array the aircraft thumbnail, orignal url and copyright
457 457 
 	*
458 458 
 	*/
459 
-	public function fromCustomSource($aircraft_registration,$aircraft_name='') {
459 
+	public function fromCustomSource($aircraft_registration, $aircraft_name = '') {
460 460 
 		global $globalAircraftImageCustomSources;
461 461 
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
462 462 
 		if (!empty($globalAircraftImageCustomSources)) {
463 463 
 			if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
464 464 
 			foreach ($globalAircraftImageCustomSources as $source) {
465 465 
 				$Common = new Common();
466 
-				$url = str_replace('{registration}',$aircraft_registration,$source['original']);
467 
-				$url_thumbnail = str_replace('{registration}',$aircraft_registration,$source['original']);
466 
+				$url = str_replace('{registration}', $aircraft_registration, $source['original']);
467 
+				$url_thumbnail = str_replace('{registration}', $aircraft_registration, $source['original']);
468 468 
 				if ($Common->urlexist($url)) {
469 469 
 					$image_url = array();
470 470 
 					$image_url['thumbnail'] = $url_thumbnail;
471 471 
 					$image_url['original'] = $url;
472 472 
 					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
473 473 
 					else $exifCopyright = '';
474 
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
474 
+					if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
475 475 
 					else $image_url['copyright'] = $source['copyright'];
476 476 
 					$image_url['source_website'] = $source['source_website'];
477 477 
 					$image_url['source'] = $source['source'];
Please login to merge, or discard this patch.
require/class.Connection.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -1,19 +1,19 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once(dirname(__FILE__).'/settings.php');
3 3
4 
-class Connection{
4 
+class Connection {
5 5 
 	public $db = null;
6 6 
 	public $dbs = array();
7 7 
 	public $latest_schema = 26;
8 8
9 
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
9 
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
10 10 
 	    global $globalDBdriver;
11 11 
 	    if ($dbc === null) {
12 12 
 		if ($this->db === null && $dbname === null) {
13 13 
 		    if ($user === null && $pass === null) {
14 14 
 			$this->createDBConnection();
15 15 
 		    } else {
16 
-			$this->createDBConnection(null,$user,$pass);
16 
+			$this->createDBConnection(null, $user, $pass);
17 17 
 		    }
18 18 
 		} else {
19 19 
 		    $this->createDBConnection($dbname);
 
@@ -91,14 +91,14 @@  discard block
 
 block discarded – undo
91 91 
 		while (true) {
92 92 
 			try {
93 93 
 				if ($globalDBSdriver == 'mysql') {
94 
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
94 
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
95 95 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
96 96 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
97 
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
98 
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
99 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
100 
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
101 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
97 
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
98 
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
99 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
100 
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
101 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
102 102 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
103 103 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
104 104 
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
 
@@ -108,18 +108,18 @@  discard block
 
 block discarded – undo
108 108 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
109 109 
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
110 110 
 				} else {
111 
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
111 
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
112 112 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
113 113 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
114 
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
115 
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
116 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
117 
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
118 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
114 
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
115 
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
116 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
117 
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
118 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
119 119 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
120 120 
 				}
121 121 
 				break;
122 
-			} catch(PDOException $e) {
122 
+			} catch (PDOException $e) {
123 123 
 				$i++;
124 124 
 				if (isset($globalDebug) && $globalDebug) echo $e->getMessage()."\n";
125 125 
 				//exit;
 
@@ -143,10 +143,10 @@  discard block
 
 block discarded – undo
143 143 
 		try {
144 144 
 			//$Connection = new Connection();
145 145 
 			$results = $this->db->query($query);
146 
-		} catch(PDOException $e) {
146 
+		} catch (PDOException $e) {
147 147 
 			return false;
148 148 
 		}
149 
-		if($results->rowCount()>0) {
149 
+		if ($results->rowCount() > 0) {
150 150 
 		    return true;
151 151 
 		}
152 152 
 		else return false;
 
@@ -167,8 +167,8 @@  discard block
 
 block discarded – undo
167 167 
 			     return false;
168 168 
 			}
169 169
170 
-		} catch(PDOException $e) {
171 
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
170 
+		} catch (PDOException $e) {
171 
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
172 172 
             			throw $e;
173 173 
 	                }
174 174 
 	                //echo 'error ! '.$e->getMessage();
 
@@ -180,7 +180,7 @@  discard block
 
 block discarded – undo
180 180 
 	/*
181 181 
 	* Check if index exist
182 182 
 	*/
183 
-	public function indexExists($table,$index)
183 
+	public function indexExists($table, $index)
184 184 
 	{
185 185 
 		global $globalDBdriver, $globalDBname;
186 186 
 		if ($globalDBdriver == 'mysql') {
 
@@ -191,11 +191,11 @@  discard block
 
 block discarded – undo
191 191 
 		try {
192 192 
 			//$Connection = new Connection();
193 193 
 			$results = $this->db->query($query);
194 
-		} catch(PDOException $e) {
194 
+		} catch (PDOException $e) {
195 195 
 			return false;
196 196 
 		}
197 197 
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
198 
-		if($nb[0]['nb'] > 0) {
198 
+		if ($nb[0]['nb'] > 0) {
199 199 
 			return true;
200 200 
 		}
201 201 
 		else return false;
 
@@ -210,7 +210,7 @@  discard block
 
 block discarded – undo
210 210 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
211 211 
 		try {
212 212 
 			$results = $this->db->query($query);
213 
-		} catch(PDOException $e) {
213 
+		} catch (PDOException $e) {
214 214 
 			return "error : ".$e->getMessage()."\n";
215 215 
 		}
216 216 
 		$columns = array();
 
@@ -226,7 +226,7 @@  discard block
 
 block discarded – undo
226 226 
 	* Check if a column name exist in a table
227 227 
 	* @return Boolean column exist or not
228 228 
 	*/
229 
-	public function checkColumnName($table,$name)
229 
+	public function checkColumnName($table, $name)
230 230 
 	{
231 231 
 		global $globalDBdriver, $globalDBname;
232 232 
 		if ($globalDBdriver == 'mysql') {
 
@@ -236,8 +236,8 @@  discard block
 
 block discarded – undo
236 236 
 		}
237 237 
 			try {
238 238 
 				$sth = $this->db()->prepare($query);
239 
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
240 
-			} catch(PDOException $e) {
239 
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
240 
+			} catch (PDOException $e) {
241 241 
 				echo "error : ".$e->getMessage()."\n";
242 242 
 			}
243 243 
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -276,7 +276,7 @@  discard block
 
 block discarded – undo
276 276 
 				try {
277 277 
 					$sth = $this->db->prepare($query);
278 278 
 					$sth->execute();
279 
-				} catch(PDOException $e) {
279 
+				} catch (PDOException $e) {
280 280 
 					return "error : ".$e->getMessage()."\n";
281 281 
 				}
282 282 
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Spacing   +299 added lines, -299 removed lines patch added patch discarded remove patch 
@@ -17,14 +17,14 @@  discard block
 
 block discarded – undo
17 17 
 		$this->db = $Connection->db();
18 18 
         }
19 19
20 
-	public function addLastStatsUpdate($type,$stats_date) {
20 
+	public function addLastStatsUpdate($type, $stats_date) {
21 21 
                 $query = "DELETE FROM config WHERE name = :type;
22 22 
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
23 
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
23 
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
24 24 
                  try {
25 25 
                         $sth = $this->db->prepare($query);
26 26 
                         $sth->execute($query_values);
27 
-                } catch(PDOException $e) {
27 
+                } catch (PDOException $e) {
28 28 
                         return "error : ".$e->getMessage();
29 29 
                 }
30 30 
         }
 
@@ -34,7 +34,7 @@  discard block
 
 block discarded – undo
34 34 
                  try {
35 35 
                         $sth = $this->db->prepare($query);
36 36 
                         $sth->execute(array(':type' => $type));
37 
-                } catch(PDOException $e) {
37 
+                } catch (PDOException $e) {
38 38 
                         echo "error : ".$e->getMessage();
39 39 
                 }
40 40 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -46,31 +46,31 @@  discard block
 
 block discarded – undo
46 46 
                  try {
47 47 
                         $sth = $this->db->prepare($query);
48 48 
                         $sth->execute(array(':filter_name' => $filter_name));
49 
-                } catch(PDOException $e) {
49 
+                } catch (PDOException $e) {
50 50 
                         echo "error : ".$e->getMessage();
51 51 
                 }
52 52 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
53 53 
                 return $all;
54 54 
         }
55 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
55 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
56 56 
 		if ($filter_name == '') $filter_name = $this->filter_name;
57 57 
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
58 58 
                  try {
59 59 
                         $sth = $this->db->prepare($query);
60 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
61 
-                } catch(PDOException $e) {
60 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
61 
+                } catch (PDOException $e) {
62 62 
                         echo "error : ".$e->getMessage();
63 63 
                 }
64 64 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
65 65 
                 return $all;
66 66 
         }
67 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
67 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
68 68 
 		if ($filter_name == '') $filter_name = $this->filter_name;
69 69 
                 $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";
70 70 
                  try {
71 71 
                         $sth = $this->db->prepare($query);
72 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
73 
-                } catch(PDOException $e) {
72 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
73 
+                } catch (PDOException $e) {
74 74 
                         echo "error : ".$e->getMessage();
75 75 
                 }
76 76 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -85,22 +85,22 @@  discard block
 
 block discarded – undo
85 85 
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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";
86 86 
                  try {
87 87 
                         $sth = $this->db->prepare($query);
88 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
89 
-                } catch(PDOException $e) {
88 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
89 
+                } catch (PDOException $e) {
90 90 
                         echo "error : ".$e->getMessage();
91 91 
                 }
92 92 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
93 93 
                 if (empty($all)) {
94 94 
             	    $filters = array('airlines' => array($stats_airline));
95 95 
             	    if ($filter_name != '') {
96 
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
96 
+            		    $filters = array_merge($filters, $globalStatsFilters[$filter_name]);
97 97 
             	    }
98 98 
             	    $Spotter = new Spotter($this->db);
99 
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
99 
+            	    $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
100 100 
                 }
101 101 
                 return $all;
102 102 
 	}
103 
-	public function countAllAirlineCountries($limit = true,$filter_name = '') {
103 
+	public function countAllAirlineCountries($limit = true, $filter_name = '') {
104 104 
 		global $globalStatsFilters;
105 105 
 		if ($filter_name == '') $filter_name = $this->filter_name;
106 106 
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
 
@@ -108,7 +108,7 @@  discard block
 
 block discarded – undo
108 108 
                  try {
109 109 
                         $sth = $this->db->prepare($query);
110 110 
                         $sth->execute(array(':filter_name' => $filter_name));
111 
-                } catch(PDOException $e) {
111 
+                } catch (PDOException $e) {
112 112 
                         echo "error : ".$e->getMessage();
113 113 
                 }
114 114 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -116,28 +116,28 @@  discard block
 
 block discarded – undo
116 116 
             		$Spotter = new Spotter($this->db);
117 117 
             		$filters = array();
118 118 
             		if ($filter_name != '') {
119 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
119 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
120 120 
 			}
121 
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
121 
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
122 122 
                 }
123 123 
                 return $all;
124 124 
 	}
125 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
125 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '') {
126 126 
 		global $globalStatsFilters;
127 127 
 		if ($filter_name == '') $filter_name = $this->filter_name;
128 128 
 		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";
129 129 
 		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";
130 130 
                  try {
131 131 
                         $sth = $this->db->prepare($query);
132 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
133 
-                } catch(PDOException $e) {
132 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
133 
+                } catch (PDOException $e) {
134 134 
                         echo "error : ".$e->getMessage();
135 135 
                 }
136 136 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
137 137 
                 if (empty($all)) {
138 138 
             		$filters = array('airlines' => array($stats_airline));
139 139 
             		if ($filter_name != '') {
140 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
140 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
141 141 
 			}
142 142 
             		$Spotter = new Spotter($this->db);
143 143 
 			$all = $Spotter->countAllAircraftManufacturers($filters);
 
@@ -152,18 +152,18 @@  discard block
 
 block discarded – undo
152 152 
 		else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
153 153 
                  try {
154 154 
                         $sth = $this->db->prepare($query);
155 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
156 
-                } catch(PDOException $e) {
155 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
156 
+                } catch (PDOException $e) {
157 157 
                         echo "error : ".$e->getMessage();
158 158 
                 }
159 159 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
160 160 
                 if (empty($all)) {
161 161 
 			$filters = array('airlines' => array($stats_airline));
162 162 
 			if ($filter_name != '') {
163 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
163 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
164 164 
 			}
165 165 
 			$Spotter = new Spotter($this->db);
166 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
166 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
167 167 
                 }
168 168 
                 return $all;
169 169 
 	}
 
@@ -174,15 +174,15 @@  discard block
 
 block discarded – undo
174 174 
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
175 175 
                  try {
176 176 
                         $sth = $this->db->prepare($query);
177 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
178 
-                } catch(PDOException $e) {
177 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
178 
+                } catch (PDOException $e) {
179 179 
                         echo "error : ".$e->getMessage();
180 180 
                 }
181 181 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
182 182 
                 if (empty($all)) {
183 183 
 			$filters = array('airlines' => array($stats_airline));
184 184 
 			if ($filter_name != '') {
185 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
185 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
186 186 
 			}
187 187 
 			$Spotter = new Spotter($this->db);
188 188 
 			$all = $Spotter->countAllDepartureCountries($filters);
 
@@ -190,7 +190,7 @@  discard block
 
 block discarded – undo
190 190 
                 return $all;
191 191 
 	}
192 192
193 
-	public function countAllAirlines($limit = true,$filter_name = '') {
193 
+	public function countAllAirlines($limit = true, $filter_name = '') {
194 194 
 		global $globalStatsFilters;
195 195 
 		if ($filter_name == '') $filter_name = $this->filter_name;
196 196 
 		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 ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 
@@ -198,7 +198,7 @@  discard block
 
 block discarded – undo
198 198 
                  try {
199 199 
                         $sth = $this->db->prepare($query);
200 200 
                         $sth->execute(array(':filter_name' => $filter_name));
201 
-                } catch(PDOException $e) {
201 
+                } catch (PDOException $e) {
202 202 
                         echo "error : ".$e->getMessage();
203 203 
                 }
204 204 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -206,58 +206,58 @@  discard block
 
 block discarded – undo
206 206 
 	                $Spotter = new Spotter($this->db);
207 207 
             		$filters = array();
208 208 
             		if ($filter_name != '') {
209 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
209 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
210 210 
 			}
211 211
212 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
212 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
213 213 
                 }
214 214 
                 return $all;
215 215 
 	}
216 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
216 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '') {
217 217 
 		global $globalStatsFilters;
218 218 
 		if ($filter_name == '') $filter_name = $this->filter_name;
219 219 
 		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";
220 220 
 		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";
221 221 
                  try {
222 222 
                         $sth = $this->db->prepare($query);
223 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
224 
-                } catch(PDOException $e) {
223 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
224 
+                } catch (PDOException $e) {
225 225 
                         echo "error : ".$e->getMessage();
226 226 
                 }
227 227 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
228 228 
                 if (empty($all)) {
229 229 
 			$filters = array('airlines' => array($stats_airline));
230 230 
 			if ($filter_name != '') {
231 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
231 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
232 232 
 			}
233 233 
 	                $Spotter = new Spotter($this->db);
234 
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
234 
+    		        $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
235 235 
                 }
236 236 
                 return $all;
237 237 
 	}
238 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
238 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '') {
239 239 
 		global $globalStatsFilters;
240 240 
 		if ($filter_name == '') $filter_name = $this->filter_name;
241 241 
 		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";
242 242 
 		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";
243 243 
 		 try {
244 244 
 			$sth = $this->db->prepare($query);
245 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
246 
-		} catch(PDOException $e) {
245 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
246 
+		} catch (PDOException $e) {
247 247 
 			echo "error : ".$e->getMessage();
248 248 
 		}
249 249 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
250 250 
 		if (empty($all)) {
251 251 
 			$filters = array('airlines' => array($stats_airline));
252 252 
 			if ($filter_name != '') {
253 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
253 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
254 254 
 			}
255 255 
 			$Spotter = new Spotter($this->db);
256 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
256 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
257 257 
 		}
258 258 
 		return $all;
259 259 
 	}
260 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') {
260 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '') {
261 261 
 		$Connection = new Connection();
262 262 
 		if ($filter_name == '') $filter_name = $this->filter_name;
263 263 
 		if ($Connection->tableExists('countries')) {
 
@@ -265,8 +265,8 @@  discard block
 
 block discarded – undo
265 265 
 			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";
266 266 
 			 try {
267 267 
 				$sth = $this->db->prepare($query);
268 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269 
-			} catch(PDOException $e) {
268 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
269 
+			} catch (PDOException $e) {
270 270 
 				echo "error : ".$e->getMessage();
271 271 
 			}
272 272 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -281,70 +281,70 @@  discard block
 
 block discarded – undo
281 281 
 			return array();
282 282 
 		}
283 283 
 	}
284 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') {
284 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '') {
285 285 
 		global $globalStatsFilters;
286 286 
 		if ($filter_name == '') $filter_name = $this->filter_name;
287 287 
 		if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
288 288 
 		else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
289 289 
                  try {
290 290 
                         $sth = $this->db->prepare($query);
291 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
292 
-                } catch(PDOException $e) {
291 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
292 
+                } catch (PDOException $e) {
293 293 
                         echo "error : ".$e->getMessage();
294 294 
                 }
295 295 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
296 296 
                 if (empty($all)) {
297 297 
 			$filters = array('airlines' => array($stats_airline));
298 298 
 			if ($filter_name != '') {
299 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
299 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
300 300 
 			}
301 301 
             		$Spotter = new Spotter($this->db);
302 
-            		$all = $Spotter->countAllPilots($limit,0,'',$filters);
302 
+            		$all = $Spotter->countAllPilots($limit, 0, '', $filters);
303 303 
                 }
304 304 
                 return $all;
305 305 
 	}
306 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
306 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '') {
307 307 
 		global $globalStatsFilters;
308 308 
 		if ($filter_name == '') $filter_name = $this->filter_name;
309 309 
 		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";
310 310 
 		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";
311 311 
                  try {
312 312 
                         $sth = $this->db->prepare($query);
313 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
314 
-                } catch(PDOException $e) {
313 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
314 
+                } catch (PDOException $e) {
315 315 
                         echo "error : ".$e->getMessage();
316 316 
                 }
317 317 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
318 318 
                 if (empty($all)) {
319 319 
 			$filters = array('airlines' => array($stats_airline));
320 320 
 			if ($filter_name != '') {
321 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
321 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
322 322 
 			}
323 323 
             		$Spotter = new Spotter($this->db);
324 
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
324 
+            		$all = $Spotter->countAllOwners($limit, 0, '', $filters);
325 325 
                 }
326 326 
                 return $all;
327 327 
 	}
328 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
328 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '') {
329 329 
 		global $globalStatsFilters;
330 330 
 		if ($filter_name == '') $filter_name = $this->filter_name;
331 331 
 		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 FROM stats_airport WHERE 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";
332 332 
 		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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
333 333 
                  try {
334 334 
                         $sth = $this->db->prepare($query);
335 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
336 
-                } catch(PDOException $e) {
335 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
336 
+                } catch (PDOException $e) {
337 337 
                         echo "error : ".$e->getMessage();
338 338 
                 }
339 339 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
340 340 
                 if (empty($all)) {
341 341 
 			$filters = array('airlines' => array($stats_airline));
342 342 
             		if ($filter_name != '') {
343 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
343 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
344 344 
 			}
345 345 
             		$Spotter = new Spotter($this->db);
346 
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
347 
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
346 
+            		$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
347 
+        		$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
348 348 
         		$all = array();
349 349 
         		foreach ($pall as $value) {
350 350 
         			$icao = $value['airport_departure_icao'];
 
@@ -361,30 +361,30 @@  discard block
 
 block discarded – undo
361 361 
         		foreach ($all as $key => $row) {
362 362 
         			$count[$key] = $row['airport_departure_icao_count'];
363 363 
         		}
364 
-        		array_multisort($count,SORT_DESC,$all);
364 
+        		array_multisort($count, SORT_DESC, $all);
365 365 
                 }
366 366 
                 return $all;
367 367 
 	}
368 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
368 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '') {
369 369 
 		global $globalStatsFilters;
370 370 
 		if ($filter_name == '') $filter_name = $this->filter_name;
371 371 
 		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 FROM stats_airport WHERE 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";
372 372 
 		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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
373 373 
 		try {
374 374 
 			$sth = $this->db->prepare($query);
375 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
376 
-		} catch(PDOException $e) {
375 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
376 
+		} catch (PDOException $e) {
377 377 
 			echo "error : ".$e->getMessage();
378 378 
 		}
379 379 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
380 380 
 		if (empty($all)) {
381 381 
 			$filters = array('airlines' => array($stats_airline));
382 382 
 			if ($filter_name != '') {
383 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
383 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
384 384 
 			}
385 385 
 			$Spotter = new Spotter($this->db);
386 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
387 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
386 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
387 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
388 388 
         		$all = array();
389 389 
         		foreach ($pall as $value) {
390 390 
         			$icao = $value['airport_arrival_icao'];
 
@@ -401,12 +401,12 @@  discard block
 
 block discarded – undo
401 401 
         		foreach ($all as $key => $row) {
402 402 
         			$count[$key] = $row['airport_arrival_icao_count'];
403 403 
         		}
404 
-        		array_multisort($count,SORT_DESC,$all);
404 
+        		array_multisort($count, SORT_DESC, $all);
405 405 
                 }
406 406
407 407 
                 return $all;
408 408 
 	}
409 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
409 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
410 410 
 		global $globalDBdriver, $globalStatsFilters;
411 411 
 		if ($filter_name == '') $filter_name = $this->filter_name;
412 412 
 		if ($globalDBdriver == 'mysql') {
 
@@ -416,18 +416,18 @@  discard block
 
 block discarded – undo
416 416 
 			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";
417 417 
 			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";
418 418 
 		}
419 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
419 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
420 420 
                  try {
421 421 
                         $sth = $this->db->prepare($query);
422 422 
                         $sth->execute($query_data);
423 
-                } catch(PDOException $e) {
423 
+                } catch (PDOException $e) {
424 424 
                         echo "error : ".$e->getMessage();
425 425 
                 }
426 426 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
427 427 
                 if (empty($all)) {
428 428 
 			$filters = array('airlines' => array($stats_airline));
429 429 
 			if ($filter_name != '') {
430 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
430 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
431 431 
 			}
432 432 
             		$Spotter = new Spotter($this->db);
433 433 
             		$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -436,29 +436,29 @@  discard block
 
 block discarded – undo
436 436 
                 return $all;
437 437 
 	}
438 438
439 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
439 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
440 440 
 		global $globalStatsFilters;
441 441 
 		if ($filter_name == '') $filter_name = $this->filter_name;
442 442 
 		$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";
443 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
443 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
444 444 
                  try {
445 445 
                         $sth = $this->db->prepare($query);
446 446 
                         $sth->execute($query_data);
447 
-                } catch(PDOException $e) {
447 
+                } catch (PDOException $e) {
448 448 
                         echo "error : ".$e->getMessage();
449 449 
                 }
450 450 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
451 451 
                 if (empty($all)) {
452 452 
 			$filters = array('airlines' => array($stats_airline));
453 453 
 			if ($filter_name != '') {
454 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
454 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
455 455 
 			}
456 456 
             		$Spotter = new Spotter($this->db);
457 457 
             		$all = $Spotter->countAllDatesLastMonth($filters);
458 458 
                 }
459 459 
                 return $all;
460 460 
 	}
461 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
461 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
462 462 
 		global $globalDBdriver, $globalStatsFilters;
463 463 
 		if ($filter_name == '') $filter_name = $this->filter_name;
464 464 
 		if ($globalDBdriver == 'mysql') {
 
@@ -466,40 +466,40 @@  discard block
 
 block discarded – undo
466 466 
 		} else {
467 467 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
468 468 
 		}
469 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
469 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
470 470 
                  try {
471 471 
                         $sth = $this->db->prepare($query);
472 472 
                         $sth->execute($query_data);
473 
-                } catch(PDOException $e) {
473 
+                } catch (PDOException $e) {
474 474 
                         echo "error : ".$e->getMessage();
475 475 
                 }
476 476 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
477 477 
                 if (empty($all)) {
478 478 
 			$filters = array('airlines' => array($stats_airline));
479 479 
 			if ($filter_name != '') {
480 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
480 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
481 481 
 			}
482 482 
             		$Spotter = new Spotter($this->db);
483 483 
             		$all = $Spotter->countAllDatesLast7Days($filters);
484 484 
                 }
485 485 
                 return $all;
486 486 
 	}
487 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
487 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
488 488 
 		global $globalStatsFilters;
489 489 
 		if ($filter_name == '') $filter_name = $this->filter_name;
490 490 
 		$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";
491 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
491 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
492 492 
                  try {
493 493 
                         $sth = $this->db->prepare($query);
494 494 
                         $sth->execute($query_data);
495 
-                } catch(PDOException $e) {
495 
+                } catch (PDOException $e) {
496 496 
                         echo "error : ".$e->getMessage();
497 497 
                 }
498 498 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
499 499 
                 if (empty($all)) {
500 500 
 			$filters = array('airlines' => array($stats_airline));
501 501 
 			if ($filter_name != '') {
502 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
502 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
503 503 
 			}
504 504 
             		$Spotter = new Spotter($this->db);
505 505 
             		$all = $Spotter->countAllDates($filters);
 
@@ -514,35 +514,35 @@  discard block
 
 block discarded – undo
514 514 
                  try {
515 515 
                         $sth = $this->db->prepare($query);
516 516 
                         $sth->execute($query_data);
517 
-                } catch(PDOException $e) {
517 
+                } catch (PDOException $e) {
518 518 
                         echo "error : ".$e->getMessage();
519 519 
                 }
520 520 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
521 521 
                 if (empty($all)) {
522 522 
             		$filters = array();
523 523 
             		if ($filter_name != '') {
524 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
524 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
525 525 
 			}
526 526 
             		$Spotter = new Spotter($this->db);
527 527 
             		$all = $Spotter->countAllDatesByAirlines($filters);
528 528 
                 }
529 529 
                 return $all;
530 530 
 	}
531 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
531 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
532 532 
 		global $globalStatsFilters;
533 533 
 		if ($filter_name == '') $filter_name = $this->filter_name;
534 534 
 	    	$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";
535 535 
                  try {
536 536 
                         $sth = $this->db->prepare($query);
537 537 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
538 
-                } catch(PDOException $e) {
538 
+                } catch (PDOException $e) {
539 539 
                         echo "error : ".$e->getMessage();
540 540 
                 }
541 541 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
542 542 
                 if (empty($all)) {
543 543 
 			$filters = array('airlines' => array($stats_airline));
544 544 
 			if ($filter_name != '') {
545 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
545 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
546 546 
 			}
547 547 
             		$Spotter = new Spotter($this->db);
548 548 
             		$all = $Spotter->countAllMonths($filters);
 
@@ -556,21 +556,21 @@  discard block
 
 block discarded – undo
556 556 
                  try {
557 557 
                         $sth = $this->db->prepare($query);
558 558 
                         $sth->execute(array(':filter_name' => $filter_name));
559 
-                } catch(PDOException $e) {
559 
+                } catch (PDOException $e) {
560 560 
                         echo "error : ".$e->getMessage();
561 561 
                 }
562 562 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
563 563 
                 if (empty($all)) {
564 564 
             		$filters = array();
565 565 
             		if ($filter_name != '') {
566 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
566 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
567 567 
 			}
568 568 
             		$Spotter = new Spotter($this->db);
569 569 
             		$all = $Spotter->countAllMilitaryMonths($filters);
570 570 
                 }
571 571 
                 return $all;
572 572 
 	}
573 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
573 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
574 574 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
575 575 
 		if ($filter_name == '') $filter_name = $this->filter_name;
576 576 
 		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";
 
@@ -587,17 +587,17 @@  discard block
 
 block discarded – undo
587 587 
                  try {
588 588 
                         $sth = $this->db->prepare($query);
589 589 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
590 
-                } catch(PDOException $e) {
590 
+                } catch (PDOException $e) {
591 591 
                         echo "error : ".$e->getMessage();
592 592 
                 }
593 593 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
594 594 
                 if (empty($all)) {
595 595 
 			$filters = array('airlines' => array($stats_airline));
596 596 
 			if ($filter_name != '') {
597 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
597 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
598 598 
 			}
599 599 
             		$Spotter = new Spotter($this->db);
600 
-            		$all = $Spotter->countAllHours($orderby,$filters);
600 
+            		$all = $Spotter->countAllHours($orderby, $filters);
601 601 
                 }
602 602 
                 return $all;
603 603 
 	}
 
@@ -605,11 +605,11 @@  discard block
 
 block discarded – undo
605 605 
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
606 606 
 		global $globalStatsFilters;
607 607 
 		if ($filter_name == '') $filter_name = $this->filter_name;
608 
-		$all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name);
608 
+		$all = $this->getSumStats('flights_bymonth', date('Y'), $stats_airline, $filter_name);
609 609 
 		if (empty($all)) {
610 610 
 			$filters = array('airlines' => array($stats_airline));
611 611 
 			if ($filter_name != '') {
612 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
612 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
613 613 
 			}
614 614 
 			$Spotter = new Spotter($this->db);
615 615 
 			$all = $Spotter->countOverallFlights($filters);
 
@@ -619,39 +619,39 @@  discard block
 
 block discarded – undo
619 619 
 	public function countOverallMilitaryFlights($filter_name = '') {
620 620 
 		global $globalStatsFilters;
621 621 
 		if ($filter_name == '') $filter_name = $this->filter_name;
622 
-		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
622 
+		$all = $this->getSumStats('military_flights_bymonth', date('Y'), '', $filter_name);
623 623 
 		if (empty($all)) {
624 624 
 		        $filters = array();
625 625 
             		if ($filter_name != '') {
626 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
626 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
627 627 
 			}
628 628 
 			$Spotter = new Spotter($this->db);
629 629 
 			$all = $Spotter->countOverallMilitaryFlights($filters);
630 630 
 		}
631 631 
 		return $all;
632 632 
 	}
633 
-	public function countOverallArrival($stats_airline = '',$filter_name = '') {
633 
+	public function countOverallArrival($stats_airline = '', $filter_name = '') {
634 634 
 		global $globalStatsFilters;
635 635 
 		if ($filter_name == '') $filter_name = $this->filter_name;
636 
-		$all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name);
636 
+		$all = $this->getSumStats('realarrivals_bymonth', date('Y'), $stats_airline, $filter_name);
637 637 
 		if (empty($all)) {
638 638 
 			$filters = array('airlines' => array($stats_airline));
639 639 
 			if ($filter_name != '') {
640 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
640 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
641 641 
 			}
642 642 
 			$Spotter = new Spotter($this->db);
643 643 
 			$all = $Spotter->countOverallArrival($filters);
644 644 
 		}
645 645 
 		return $all;
646 646 
 	}
647 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '') {
647 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '') {
648 648 
 		global $globalStatsFilters;
649 649 
 		if ($filter_name == '') $filter_name = $this->filter_name;
650 
-		$all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name);
650 
+		$all = $this->getSumStats('aircrafts_bymonth', date('Y'), $stats_airline, $filter_name);
651 651 
 		if (empty($all)) {
652 652 
 			$filters = array('airlines' => array($stats_airline));
653 653 
 			if ($filter_name != '') {
654 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
654 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
655 655 
 			}
656 656 
 			$Spotter = new Spotter($this->db);
657 657 
 			$all = $Spotter->countOverallAircrafts($filters);
 
@@ -665,7 +665,7 @@  discard block
 
 block discarded – undo
665 665 
                  try {
666 666 
                         $sth = $this->db->prepare($query);
667 667 
                         $sth->execute(array(':filter_name' => $filter_name));
668 
-                } catch(PDOException $e) {
668 
+                } catch (PDOException $e) {
669 669 
                         echo "error : ".$e->getMessage();
670 670 
                 }
671 671 
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -674,14 +674,14 @@  discard block
 
 block discarded – undo
674 674 
 		if (empty($all)) {
675 675 
             		$filters = array();
676 676 
             		if ($filter_name != '') {
677 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
677 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
678 678 
 			}
679 679 
 			$Spotter = new Spotter($this->db);
680 680 
 			$all = $Spotter->countOverallAirlines($filters);
681 681 
 		}
682 682 
 		return $all;
683 683 
 	}
684 
-	public function countOverallOwners($stats_airline = '',$filter_name = '') {
684 
+	public function countOverallOwners($stats_airline = '', $filter_name = '') {
685 685 
 		global $globalStatsFilters;
686 686 
 		if ($filter_name == '') $filter_name = $this->filter_name;
687 687 
 		/*
 
@@ -695,25 +695,25 @@  discard block
 
 block discarded – undo
695 695 
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
696 696 
                 $all = $result[0]['nb_owner'];
697 697 
                 */
698 
-		$all = $this->getSumStats('owners_bymonth',date('Y'),$stats_airline,$filter_name);
698 
+		$all = $this->getSumStats('owners_bymonth', date('Y'), $stats_airline, $filter_name);
699 699 
 		if (empty($all)) {
700 700 
 			$filters = array('airlines' => array($stats_airline));
701 701 
 			if ($filter_name != '') {
702 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
702 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
703 703 
 			}
704 704 
 			$Spotter = new Spotter($this->db);
705 705 
 			$all = $Spotter->countOverallOwners($filters);
706 706 
 		}
707 707 
 		return $all;
708 708 
 	}
709 
-	public function countOverallPilots($stats_airline = '',$filter_name = '') {
709 
+	public function countOverallPilots($stats_airline = '', $filter_name = '') {
710 710 
 		global $globalStatsFilters;
711 711 
 		if ($filter_name == '') $filter_name = $this->filter_name;
712 
-		$all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name);
712 
+		$all = $this->getSumStats('pilots_bymonth', date('Y'), $stats_airline, $filter_name);
713 713 
 		if (empty($all)) {
714 714 
 			$filters = array('airlines' => array($stats_airline));
715 715 
 			if ($filter_name != '') {
716 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
716 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
717 717 
 			}
718 718 
 			$Spotter = new Spotter($this->db);
719 719 
 			$all = $Spotter->countOverallPilots($filters);
 
@@ -721,33 +721,33 @@  discard block
 
 block discarded – undo
721 721 
 		return $all;
722 722 
 	}
723 723
724 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
724 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
725 725 
 		if ($filter_name == '') $filter_name = $this->filter_name;
726 726 
 		$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";
727 
-		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
727 
+		$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
728 728 
                  try {
729 729 
                         $sth = $this->db->prepare($query);
730 730 
                         $sth->execute($query_values);
731 
-                } catch(PDOException $e) {
731 
+                } catch (PDOException $e) {
732 732 
                         echo "error : ".$e->getMessage();
733 733 
                 }
734 734 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
735 735 
                 return $all;
736 736 
 	}
737 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
737 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
738 738 
 		if ($filter_name == '') $filter_name = $this->filter_name;
739 739 
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
740 
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
740 
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
741 741 
                  try {
742 742 
                         $sth = $this->db->prepare($query);
743 743 
                         $sth->execute($query_values);
744 
-                } catch(PDOException $e) {
744 
+                } catch (PDOException $e) {
745 745 
                         echo "error : ".$e->getMessage();
746 746 
                 }
747 747 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
748 748 
                 return $all;
749 749 
         }
750 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
750 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '') {
751 751 
 		if ($filter_name == '') $filter_name = $this->filter_name;
752 752 
     		global $globalArchiveMonths, $globalDBdriver;
753 753 
     		if ($globalDBdriver == 'mysql') {
 
@@ -755,11 +755,11 @@  discard block
 
 block discarded – undo
755 755 
 	        } else {
756 756 
             		$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
757 757 
                 }
758 
-                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
758 
+                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
759 759 
                  try {
760 760 
                         $sth = $this->db->prepare($query);
761 761 
                         $sth->execute($query_values);
762 
-                } catch(PDOException $e) {
762 
+                } catch (PDOException $e) {
763 763 
                         echo "error : ".$e->getMessage();
764 764 
                 }
765 765 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -777,7 +777,7 @@  discard block
 
 block discarded – undo
777 777 
                  try {
778 778 
                         $sth = $this->db->prepare($query);
779 779 
                         $sth->execute($query_values);
780 
-                } catch(PDOException $e) {
780 
+                } catch (PDOException $e) {
781 781 
                         echo "error : ".$e->getMessage();
782 782 
                 }
783 783 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -794,7 +794,7 @@  discard block
 
 block discarded – undo
794 794 
                  try {
795 795 
                         $sth = $this->db->prepare($query);
796 796 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
797 
-                } catch(PDOException $e) {
797 
+                } catch (PDOException $e) {
798 798 
                         echo "error : ".$e->getMessage();
799 799 
                 }
800 800 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -811,7 +811,7 @@  discard block
 
 block discarded – undo
811 811 
                  try {
812 812 
                         $sth = $this->db->prepare($query);
813 813 
                         $sth->execute(array(':filter_name' => $filter_name));
814 
-                } catch(PDOException $e) {
814 
+                } catch (PDOException $e) {
815 815 
                         echo "error : ".$e->getMessage();
816 816 
                 }
817 817 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -828,7 +828,7 @@  discard block
 
 block discarded – undo
828 828 
                  try {
829 829 
                         $sth = $this->db->prepare($query);
830 830 
                         $sth->execute(array(':filter_name' => $filter_name));
831 
-                } catch(PDOException $e) {
831 
+                } catch (PDOException $e) {
832 832 
                         echo "error : ".$e->getMessage();
833 833 
                 }
834 834 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -845,14 +845,14 @@  discard block
 
 block discarded – undo
845 845 
                  try {
846 846 
                         $sth = $this->db->prepare($query);
847 847 
                         $sth->execute(array(':filter_name' => $filter_name));
848 
-                } catch(PDOException $e) {
848 
+                } catch (PDOException $e) {
849 849 
                         echo "error : ".$e->getMessage();
850 850 
                 }
851 851 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
852 852 
                 return $all[0]['total'];
853 853 
         }
854 854
855 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
855 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
856 856 
 		global $globalDBdriver;
857 857 
 		if ($filter_name == '') $filter_name = $this->filter_name;
858 858 
 		if ($globalDBdriver == 'mysql') {
 
@@ -860,15 +860,15 @@  discard block
 
 block discarded – undo
860 860 
                 } else {
861 861 
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
862 862 
 		}
863 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
863 
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
864 864 
                  try {
865 865 
                         $sth = $this->db->prepare($query);
866 866 
                         $sth->execute($query_values);
867 
-                } catch(PDOException $e) {
867 
+                } catch (PDOException $e) {
868 868 
                         return "error : ".$e->getMessage();
869 869 
                 }
870 870 
         }
871 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
871 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
872 872 
 		global $globalDBdriver;
873 873 
 		if ($filter_name == '') $filter_name = $this->filter_name;
874 874 
 		if ($globalDBdriver == 'mysql') {
 
@@ -877,219 +877,219 @@  discard block
 
 block discarded – undo
877 877 
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
878 878 
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
879 879 
                 }
880 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
880 
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
881 881 
                  try {
882 882 
                         $sth = $this->db->prepare($query);
883 883 
                         $sth->execute($query_values);
884 
-                } catch(PDOException $e) {
884 
+                } catch (PDOException $e) {
885 885 
                         return "error : ".$e->getMessage();
886 886 
                 }
887 887 
         }
888 
-	public function getStatsSource($date,$stats_type = '') {
888 
+	public function getStatsSource($date, $stats_type = '') {
889 889 
 		if ($stats_type == '') {
890 890 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
891 891 
 			$query_values = array(':date' => $date);
892 892 
 		} else {
893 893 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
894 
-			$query_values = array(':date' => $date,':stats_type' => $stats_type);
894 
+			$query_values = array(':date' => $date, ':stats_type' => $stats_type);
895 895 
 		}
896 896 
                  try {
897 897 
                         $sth = $this->db->prepare($query);
898 898 
                         $sth->execute($query_values);
899 
-                } catch(PDOException $e) {
899 
+                } catch (PDOException $e) {
900 900 
                         echo "error : ".$e->getMessage();
901 901 
                 }
902 902 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
903 903 
                 return $all;
904 904 
         }
905 905
906 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
906 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
907 907 
 		global $globalDBdriver;
908 908 
 		if ($globalDBdriver == 'mysql') {
909 909 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
910 910 
 		} else {
911 911 
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);";
912 912 
                 }
913 
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
913 
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
914 914 
                  try {
915 915 
                         $sth = $this->db->prepare($query);
916 916 
                         $sth->execute($query_values);
917 
-                } catch(PDOException $e) {
917 
+                } catch (PDOException $e) {
918 918 
                         return "error : ".$e->getMessage();
919 919 
                 }
920 920 
         }
921 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
921 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
922 922 
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
923 
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
923 
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
924 924 
                  try {
925 925 
                         $sth = $this->db->prepare($query);
926 926 
                         $sth->execute($query_values);
927 
-                } catch(PDOException $e) {
927 
+                } catch (PDOException $e) {
928 928 
                         return "error : ".$e->getMessage();
929 929 
                 }
930 930 
         }
931 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '') {
931 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '') {
932 932 
 		global $globalDBdriver;
933 933 
 		if ($globalDBdriver == 'mysql') {
934 934 
 			$query = "INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) VALUES (:aircraft_icao,:registration,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
935 935 
 		} else {
936 936 
 			$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);";
937 937 
 		}
938 
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
938 
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
939 939 
                  try {
940 940 
                         $sth = $this->db->prepare($query);
941 941 
                         $sth->execute($query_values);
942 
-                } catch(PDOException $e) {
942 
+                } catch (PDOException $e) {
943 943 
                         return "error : ".$e->getMessage();
944 944 
                 }
945 945 
         }
946 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '') {
946 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '') {
947 947 
 		global $globalDBdriver;
948 948 
 		if ($globalDBdriver == 'mysql') {
949 949 
 			$query = "INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) VALUES (:callsign_icao,:airline_icao,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
950 950 
 		} else {
951 951 
 			$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);";
952 952 
 		}
953 
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
953 
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
954 954 
                  try {
955 955 
                         $sth = $this->db->prepare($query);
956 956 
                         $sth->execute($query_values);
957 
-                } catch(PDOException $e) {
957 
+                } catch (PDOException $e) {
958 958 
                         return "error : ".$e->getMessage();
959 959 
                 }
960 960 
         }
961 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '') {
961 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $filter_name = '') {
962 962 
 		global $globalDBdriver;
963 963 
 		if ($globalDBdriver == 'mysql') {
964 964 
 			$query = "INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) VALUES (:iso2,:iso3,:name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
965 965 
 		} else {
966 966 
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
967 967 
 		}
968 
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
968 
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
969 969 
                  try {
970 970 
                         $sth = $this->db->prepare($query);
971 971 
                         $sth->execute($query_values);
972 
-                } catch(PDOException $e) {
972 
+                } catch (PDOException $e) {
973 973 
                         return "error : ".$e->getMessage();
974 974 
                 }
975 975 
         }
976 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
976 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
977 977 
 		global $globalDBdriver;
978 978 
 		if ($globalDBdriver == 'mysql') {
979 979 
 			$query = "INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline, filter_name) VALUES (:aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, stats_airline = :stats_airline";
980 980 
 		} else {
981 981 
 			$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);";
982 982 
 		}
983 
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
983 
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
984 984 
                  try {
985 985 
                         $sth = $this->db->prepare($query);
986 986 
                         $sth->execute($query_values);
987 
-                } catch(PDOException $e) {
987 
+                } catch (PDOException $e) {
988 988 
                         return "error : ".$e->getMessage();
989 989 
                 }
990 990 
         }
991 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '') {
991 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '') {
992 992 
 		global $globalDBdriver;
993 993 
 		if ($globalDBdriver == 'mysql') {
994 994 
 			$query = "INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) VALUES (:airline_icao,:airline_name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt,airline_name = :airline_name";
995 995 
 		} else {
996 996 
 			$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);";
997 997 
 		}
998 
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
998 
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
999 999 
                  try {
1000 1000 
                         $sth = $this->db->prepare($query);
1001 1001 
                         $sth->execute($query_values);
1002 
-                } catch(PDOException $e) {
1002 
+                } catch (PDOException $e) {
1003 1003 
                         return "error : ".$e->getMessage();
1004 1004 
                 }
1005 1005 
         }
1006 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '') {
1006 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '') {
1007 1007 
 		global $globalDBdriver;
1008 1008 
 		if ($globalDBdriver == 'mysql') {
1009 1009 
 			$query = "INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) VALUES (:owner_name,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
1010 1010 
 		} else {
1011 1011 
 			$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1012 1012 
 		}
1013 
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1013 
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1014 1014 
                  try {
1015 1015 
                         $sth = $this->db->prepare($query);
1016 1016 
                         $sth->execute($query_values);
1017 
-                } catch(PDOException $e) {
1017 
+                } catch (PDOException $e) {
1018 1018 
                         return "error : ".$e->getMessage();
1019 1019 
                 }
1020 1020 
         }
1021 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '') {
1021 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '') {
1022 1022 
 		global $globalDBdriver;
1023 1023 
 		if ($globalDBdriver == 'mysql') {
1024 1024 
 			$query = "INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name) VALUES (:pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, pilot_name = :pilot_name";
1025 1025 
 		} else {
1026 1026 
 			$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1027 1027 
 		}
1028 
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1028 
+                $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1029 1029 
                  try {
1030 1030 
                         $sth = $this->db->prepare($query);
1031 1031 
                         $sth->execute($query_values);
1032 
-                } catch(PDOException $e) {
1032 
+                } catch (PDOException $e) {
1033 1033 
                         return "error : ".$e->getMessage();
1034 1034 
                 }
1035 1035 
         }
1036 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1036 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1037 1037 
 		global $globalDBdriver;
1038 1038 
 		if ($globalDBdriver == 'mysql') {
1039 1039 
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE departure = departure+:departure";
1040 1040 
 		} else {
1041 1041 
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
1042 1042 
 		}
1043 
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1043 
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1044 1044 
                  try {
1045 1045 
                         $sth = $this->db->prepare($query);
1046 1046 
                         $sth->execute($query_values);
1047 
-                } catch(PDOException $e) {
1047 
+                } catch (PDOException $e) {
1048 1048 
                         return "error : ".$e->getMessage();
1049 1049 
                 }
1050 1050 
         }
1051 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1051 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1052 1052 
 		global $globalDBdriver;
1053 1053 
 		if ($globalDBdriver == 'mysql') {
1054 1054 
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE departure = :departure";
1055 1055 
 		} else {
1056 1056 
 			$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1057 1057 
 		}
1058 
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1058 
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1059 1059 
                  try {
1060 1060 
                         $sth = $this->db->prepare($query);
1061 1061 
                         $sth->execute($query_values);
1062 
-                } catch(PDOException $e) {
1062 
+                } catch (PDOException $e) {
1063 1063 
                         return "error : ".$e->getMessage();
1064 1064 
                 }
1065 1065 
         }
1066 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1066 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1067 1067 
 		global $globalDBdriver;
1068 1068 
 		if ($globalDBdriver == 'mysql') {
1069 1069 
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE arrival = arrival+:arrival";
1070 1070 
 		} else {
1071 1071 
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
1072 1072 
 		}
1073 
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1073 
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1074 1074 
                  try {
1075 1075 
                         $sth = $this->db->prepare($query);
1076 1076 
                         $sth->execute($query_values);
1077 
-                } catch(PDOException $e) {
1077 
+                } catch (PDOException $e) {
1078 1078 
                         return "error : ".$e->getMessage();
1079 1079 
                 }
1080 1080 
         }
1081 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1081 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1082 1082 
 		global $globalDBdriver;
1083 1083 
 		if ($globalDBdriver == 'mysql') {
1084 1084 
 			$query = "INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) VALUES (:airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE arrival = :arrival";
1085 1085 
 		} else {
1086 1086 
 			$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1087 1087 
 		}
1088 
-                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1088 
+                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1089 1089 
                  try {
1090 1090 
                         $sth = $this->db->prepare($query);
1091 1091 
                         $sth->execute($query_values);
1092 
-                } catch(PDOException $e) {
1092 
+                } catch (PDOException $e) {
1093 1093 
                         return "error : ".$e->getMessage();
1094 1094 
                 }
1095 1095 
         }
 
@@ -1100,7 +1100,7 @@  discard block
 
 block discarded – undo
1100 1100 
                  try {
1101 1101 
                         $sth = $this->db->prepare($query);
1102 1102 
                         $sth->execute($query_values);
1103 
-                } catch(PDOException $e) {
1103 
+                } catch (PDOException $e) {
1104 1104 
                         return "error : ".$e->getMessage();
1105 1105 
                 }
1106 1106 
         }
 
@@ -1110,7 +1110,7 @@  discard block
 
 block discarded – undo
1110 1110 
                  try {
1111 1111 
                         $sth = $this->db->prepare($query);
1112 1112 
                         $sth->execute($query_values);
1113 
-                } catch(PDOException $e) {
1113 
+                } catch (PDOException $e) {
1114 1114 
                         return "error : ".$e->getMessage();
1115 1115 
                 }
1116 1116 
         }
 
@@ -1120,7 +1120,7 @@  discard block
 
 block discarded – undo
1120 1120 
                  try {
1121 1121 
                         $sth = $this->db->prepare($query);
1122 1122 
                         $sth->execute($query_values);
1123 
-                } catch(PDOException $e) {
1123 
+                } catch (PDOException $e) {
1124 1124 
                         return "error : ".$e->getMessage();
1125 1125 
                 }
1126 1126 
         }
 
@@ -1359,40 +1359,40 @@  discard block
 
 block discarded – undo
1359 1359 
 				$last_update_day = $last_update[0]['value'];
1360 1360 
 			} else $last_update_day = '2012-12-12 12:12:12';
1361 1361 
 			$Spotter = new Spotter($this->db);
1362 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1362 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
1363 1363 
 			foreach ($alldata as $number) {
1364 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer']);
1364 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer']);
1365 1365 
 			}
1366 1366 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
1367 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1367 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
1368 1368 
 			foreach ($alldata as $number) {
1369 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name']);
1369 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name']);
1370 1370 
 			}
1371 1371 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
1372 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1372 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
1373 1373 
 			foreach ($alldata as $number) {
1374 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao']);
1374 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao']);
1375 1375 
 			}
1376 1376 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
1377 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1377 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
1378 1378 
 			foreach ($alldata as $number) {
1379 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
1379 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
1380 1380 
 			}
1381 1381 
 			if ($globalDebug) echo 'Count all owners...'."\n";
1382 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1382 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
1383 1383 
 			foreach ($alldata as $number) {
1384 
-				$this->addStatOwner($number['owner_name'],$number['owner_count']);
1384 
+				$this->addStatOwner($number['owner_name'], $number['owner_count']);
1385 1385 
 			}
1386 1386 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
1387 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1387 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
1388 1388 
 			foreach ($alldata as $number) {
1389 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name']);
1389 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name']);
1390 1390 
 			}
1391 1391
1392 1392 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1393 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1393 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
1394 1394 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1395 
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1395 
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
1396 1396 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1397 1397 
 	        	$alldata = array();
1398 1398 
 	        	
@@ -1410,14 +1410,14 @@  discard block
 
 block discarded – undo
1410 1410 
     			foreach ($alldata as $key => $row) {
1411 1411 
     				$count[$key] = $row['airport_departure_icao_count'];
1412 1412 
         		}
1413 
-			array_multisort($count,SORT_DESC,$alldata);
1413 
+			array_multisort($count, SORT_DESC, $alldata);
1414 1414 
 			foreach ($alldata as $number) {
1415 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
1415 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count']);
1416 1416 
 			}
1417 1417 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1418 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1418 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
1419 1419 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1420 
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1420 
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
1421 1421 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1422 1422 
 	        	$alldata = array();
1423 1423 
     			foreach ($pall as $value) {
 
@@ -1434,16 +1434,16 @@  discard block
 
 block discarded – undo
1434 1434 
         		foreach ($alldata as $key => $row) {
1435 1435 
         			$count[$key] = $row['airport_arrival_icao_count'];
1436 1436 
 	        	}
1437 
-    			array_multisort($count,SORT_DESC,$alldata);
1437 
+    			array_multisort($count, SORT_DESC, $alldata);
1438 1438 
                         foreach ($alldata as $number) {
1439 
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
1439 
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count']);
1440 1440 
 			}
1441 1441 
 			if ($Connection->tableExists('countries')) {
1442 1442 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1443 1443 
 				$SpotterArchive = new SpotterArchive();
1444 
-				$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1444 
+				$alldata = $SpotterArchive->countAllFlightOverCountries(false, 0, $last_update_day);
1445 1445 
 				foreach ($alldata as $number) {
1446 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count']);
1446 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count']);
1447 1447 
 				}
1448 1448 
 			}
1449 1449 
 			
@@ -1457,37 +1457,37 @@  discard block
 
 block discarded – undo
1457 1457 
 			$lastyear = false;
1458 1458 
 			foreach ($alldata as $number) {
1459 1459 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1460 
-				$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'])));
1460 
+				$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'])));
1461 1461 
 			}
1462 1462 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1463 1463 
 			$alldata = $Spotter->countAllMilitaryMonths();
1464 1464 
 			foreach ($alldata as $number) {
1465 
-				$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'])));
1465 
+				$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'])));
1466 1466 
 			}
1467 1467 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
1468 1468 
 			$alldata = $Spotter->countAllMonthsOwners();
1469 1469 
 			foreach ($alldata as $number) {
1470 
-				$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'])));
1470 
+				$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'])));
1471 1471 
 			}
1472 1472 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1473 1473 
 			$alldata = $Spotter->countAllMonthsPilots();
1474 1474 
 			foreach ($alldata as $number) {
1475 
-				$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'])));
1475 
+				$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'])));
1476 1476 
 			}
1477 1477 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1478 1478 
 			$alldata = $Spotter->countAllMonthsAirlines();
1479 1479 
 			foreach ($alldata as $number) {
1480 
-				$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'])));
1480 
+				$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'])));
1481 1481 
 			}
1482 1482 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1483 1483 
 			$alldata = $Spotter->countAllMonthsAircrafts();
1484 1484 
 			foreach ($alldata as $number) {
1485 
-				$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'])));
1485 
+				$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'])));
1486 1486 
 			}
1487 1487 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1488 1488 
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1489 1489 
 			foreach ($alldata as $number) {
1490 
-				$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'])));
1490 
+				$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'])));
1491 1491 
 			}
1492 1492 
 			if ($globalDebug) echo 'Airports data...'."\n";
1493 1493 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -1532,7 +1532,7 @@  discard block
 
 block discarded – undo
1532 1532 
     			}
1533 1533 
     			$alldata = $pall;
1534 1534 
 			foreach ($alldata as $number) {
1535 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1535 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
1536 1536 
 			}
1537 1537 
 			echo '...Arrival'."\n";
1538 1538 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -1574,7 +1574,7 @@  discard block
 
 block discarded – undo
1574 1574 
     			}
1575 1575 
     			$alldata = $pall;
1576 1576 
 			foreach ($alldata as $number) {
1577 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1577 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
1578 1578 
 			}
1579 1579
1580 1580 
 			echo 'Flights data...'."\n";
 
@@ -1582,28 +1582,28 @@  discard block
 
 block discarded – undo
1582 1582 
 			echo '-> countAllDatesLastMonth...'."\n";
1583 1583 
 			$alldata = $Spotter->countAllDatesLastMonth();
1584 1584 
 			foreach ($alldata as $number) {
1585 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
1585 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
1586 1586 
 			}
1587 1587 
 			echo '-> countAllDates...'."\n";
1588 1588 
 			$previousdata = $this->countAllDates();
1589 1589 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
1590 1590 
 			$this->deleteStatFlight('date');
1591 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates());
1591 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates());
1592 1592 
 			$values = array();
1593 1593 
 			foreach ($alldata as $cnt) {
1594 1594 
 				$values[] = $cnt['date_count'];
1595 1595 
 			}
1596 
-			array_multisort($values,SORT_DESC,$alldata);
1597 
-			array_splice($alldata,11);
1596 
+			array_multisort($values, SORT_DESC, $alldata);
1597 
+			array_splice($alldata, 11);
1598 1598 
 			foreach ($alldata as $number) {
1599 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
1599 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
1600 1600 
 			}
1601 1601
1602 1602 
 			$this->deleteStatFlight('hour');
1603 1603 
 			echo '-> countAllHours...'."\n";
1604 1604 
 			$alldata = $Spotter->countAllHours('hour');
1605 1605 
 			foreach ($alldata as $number) {
1606 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
1606 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
1607 1607 
 			}
1608 1608
1609 1609 
 
@@ -1612,34 +1612,34 @@  discard block
 
 block discarded – undo
1612 1612 
 			echo '--- Stats by airlines ---'."\n";
1613 1613 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
1614 1614 
 			$Spotter = new Spotter($this->db);
1615 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1615 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
1616 1616 
 			foreach ($alldata as $number) {
1617 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao']);
1617 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao']);
1618 1618 
 			}
1619 1619 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
1620 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1620 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
1621 1621 
 			foreach ($alldata as $number) {
1622 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao']);
1622 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao']);
1623 1623 
 			}
1624 1624 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
1625 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1625 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
1626 1626 
 			foreach ($alldata as $number) {
1627 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
1627 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
1628 1628 
 			}
1629 1629 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
1630 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1630 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
1631 1631 
 			foreach ($alldata as $number) {
1632 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao']);
1632 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao']);
1633 1633 
 			}
1634 1634 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
1635 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1635 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
1636 1636 
 			foreach ($alldata as $number) {
1637 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao']);
1637 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao']);
1638 1638 
 			}
1639 1639 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1640 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1640 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
1641 1641 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1642 
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1642 
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
1643 1643 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1644 1644 
 	        	//$alldata = array();
1645 1645 
     			foreach ($dall as $value) {
 
@@ -1659,12 +1659,12 @@  discard block
 
 block discarded – undo
1659 1659 
     			}
1660 1660 
     			$alldata = $pall;
1661 1661 
 			foreach ($alldata as $number) {
1662 
-				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']);
1662 
+				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']);
1663 1663 
 			}
1664 1664 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1665 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1665 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
1666 1666 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1667 
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1667 
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
1668 1668 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1669 1669 
 	        	//$alldata = array();
1670 1670 
     			foreach ($dall as $value) {
 
@@ -1684,7 +1684,7 @@  discard block
 
 block discarded – undo
1684 1684 
     			}
1685 1685 
     			$alldata = $pall;
1686 1686 
                         foreach ($alldata as $number) {
1687 
-				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']);
1687 
+				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']);
1688 1688 
 			}
1689 1689 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1690 1690 
 			$Spotter = new Spotter($this->db);
 
@@ -1692,27 +1692,27 @@  discard block
 
 block discarded – undo
1692 1692 
 			$lastyear = false;
1693 1693 
 			foreach ($alldata as $number) {
1694 1694 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1695 
-				$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']);
1695 
+				$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']);
1696 1696 
 			}
1697 1697 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
1698 1698 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1699 1699 
 			foreach ($alldata as $number) {
1700 
-				$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']);
1700 
+				$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']);
1701 1701 
 			}
1702 1702 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
1703 1703 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1704 1704 
 			foreach ($alldata as $number) {
1705 
-				$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']);
1705 
+				$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']);
1706 1706 
 			}
1707 1707 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
1708 1708 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1709 1709 
 			foreach ($alldata as $number) {
1710 
-				$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']);
1710 
+				$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']);
1711 1711 
 			}
1712 1712 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
1713 1713 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1714 1714 
 			foreach ($alldata as $number) {
1715 
-				$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']);
1715 
+				$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']);
1716 1716 
 			}
1717 1717 
 			if ($globalDebug) echo '...Departure'."\n";
1718 1718 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -1735,7 +1735,7 @@  discard block
 
 block discarded – undo
1735 1735 
     			}
1736 1736 
     			$alldata = $pall;
1737 1737 
 			foreach ($alldata as $number) {
1738 
-				$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']);
1738 
+				$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']);
1739 1739 
 			}
1740 1740 
 			if ($globalDebug) echo '...Arrival'."\n";
1741 1741 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -1758,32 +1758,32 @@  discard block
 
 block discarded – undo
1758 1758 
     			}
1759 1759 
     			$alldata = $pall;
1760 1760 
 			foreach ($alldata as $number) {
1761 
-				$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']);
1761 
+				$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']);
1762 1762 
 			}
1763 1763
1764 1764 
 			if ($globalDebug) echo 'Flights data...'."\n";
1765 1765 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
1766 1766 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1767 1767 
 			foreach ($alldata as $number) {
1768 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1768 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
1769 1769 
 			}
1770 1770 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
1771 1771 
 			//$previousdata = $this->countAllDatesByAirlines();
1772 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1772 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines());
1773 1773 
 			$values = array();
1774 1774 
 			foreach ($alldata as $cnt) {
1775 1775 
 				$values[] = $cnt['date_count'];
1776 1776 
 			}
1777 
-			array_multisort($values,SORT_DESC,$alldata);
1778 
-			array_splice($alldata,11);
1777 
+			array_multisort($values, SORT_DESC, $alldata);
1778 
+			array_splice($alldata, 11);
1779 1779 
 			foreach ($alldata as $number) {
1780 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1780 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
1781 1781 
 			}
1782 1782
1783 1783 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
1784 1784 
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1785 1785 
 			foreach ($alldata as $number) {
1786 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
1786 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
1787 1787 
 			}
1788 1788
1789 1789 
 
@@ -1794,33 +1794,33 @@  discard block
 
 block discarded – undo
1794 1794 
 				// Count by filter
1795 1795 
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
1796 1796 
 				$Spotter = new Spotter($this->db);
1797 
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
1797 
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
1798 1798 
 				foreach ($alldata as $number) {
1799 
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name);
1799 
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name);
1800 1800 
 				}
1801 
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
1801 
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
1802 1802 
 				foreach ($alldata as $number) {
1803 
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name);
1803 
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name);
1804 1804 
 				}
1805 
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
1805 
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
1806 1806 
 				foreach ($alldata as $number) {
1807 
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name);
1807 
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name);
1808 1808 
 				}
1809 
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
1809 
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
1810 1810 
 				foreach ($alldata as $number) {
1811 
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name);
1811 
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name);
1812 1812 
 				}
1813 
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
1813 
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
1814 1814 
 				foreach ($alldata as $number) {
1815 
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name);
1815 
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name);
1816 1816 
 				}
1817 
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
1817 
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
1818 1818 
 				foreach ($alldata as $number) {
1819 
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name);
1819 
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name);
1820 1820 
 				}
1821 1821
1822 
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
1823 
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
1822 
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
1823 
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
1824 1824 
 		        	$alldata = array();
1825 1825 
 	    			foreach ($pall as $value) {
1826 1826 
 		        		$icao = $value['airport_departure_icao'];
 
@@ -1836,12 +1836,12 @@  discard block
 
 block discarded – undo
1836 1836 
     				foreach ($alldata as $key => $row) {
1837 1837 
     					$count[$key] = $row['airport_departure_icao_count'];
1838 1838 
     				}
1839 
-				array_multisort($count,SORT_DESC,$alldata);
1839 
+				array_multisort($count, SORT_DESC, $alldata);
1840 1840 
 				foreach ($alldata as $number) {
1841 
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name);
1841 
+    					echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name);
1842 1842 
 				}
1843 
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,$filter);
1844 
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,$filter);
1843 
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, $filter);
1844 
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, $filter);
1845 1845 
 				$alldata = array();
1846 1846 
     				foreach ($pall as $value) {
1847 1847 
 		        		$icao = $value['airport_arrival_icao'];
 
@@ -1857,36 +1857,36 @@  discard block
 
 block discarded – undo
1857 1857 
         			foreach ($alldata as $key => $row) {
1858 1858 
     					$count[$key] = $row['airport_arrival_icao_count'];
1859 1859 
 		        	}
1860 
-        			array_multisort($count,SORT_DESC,$alldata);
1860 
+        			array_multisort($count, SORT_DESC, $alldata);
1861 1861 
 				foreach ($alldata as $number) {
1862 
-					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name);
1862 
+					echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name);
1863 1863 
 				}
1864 1864 
 				$Spotter = new Spotter($this->db);
1865 1865 
 				$alldata = $Spotter->countAllMonths($filter);
1866 1866 
 				$lastyear = false;
1867 1867 
 				foreach ($alldata as $number) {
1868 1868 
 					if ($number['year_name'] != date('Y')) $lastyear = true;
1869 
-					$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);
1869 
+					$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);
1870 1870 
 				}
1871 1871 
 				$alldata = $Spotter->countAllMonthsOwners($filter);
1872 1872 
 				foreach ($alldata as $number) {
1873 
-					$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'])),'',$filter_name);
1873 
+					$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'])), '', $filter_name);
1874 1874 
 				}
1875 1875 
 				$alldata = $Spotter->countAllMonthsPilots($filter);
1876 1876 
 				foreach ($alldata as $number) {
1877 
-					$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'])),'',$filter_name);
1877 
+					$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'])), '', $filter_name);
1878 1878 
 				}
1879 1879 
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
1880 1880 
 				foreach ($alldata as $number) {
1881 
-					$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'])),'',$filter_name);
1881 
+					$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'])), '', $filter_name);
1882 1882 
 				}
1883 1883 
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
1884 1884 
 				foreach ($alldata as $number) {
1885 
-					$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'])),'',$filter_name);
1885 
+					$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'])), '', $filter_name);
1886 1886 
 				}
1887 1887 
 				echo '...Departure'."\n";
1888 
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
1889 
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
1888 
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
1889 
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
1890 1890 
 				foreach ($dall as $value) {
1891 1891 
     					$icao = $value['departure_airport_icao'];
1892 1892 
     					$ddate = $value['date'];
 
@@ -1904,11 +1904,11 @@  discard block
 
 block discarded – undo
1904 1904 
     				}
1905 1905 
 	    			$alldata = $pall;
1906 1906 
 				foreach ($alldata as $number) {
1907 
-					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
1907 
+					$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
1908 1908 
 				}
1909 1909 
 				echo '...Arrival'."\n";
1910 
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
1911 
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
1910 
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
1911 
+    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
1912 1912 
 				foreach ($dall as $value) {
1913 1913 
 					$icao = $value['arrival_airport_icao'];
1914 1914 
 					$ddate = $value['date'];
 
@@ -1926,32 +1926,32 @@  discard block
 
 block discarded – undo
1926 1926 
     				}
1927 1927 
     				$alldata = $pall;
1928 1928 
 				foreach ($alldata as $number) {
1929 
-					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
1929 
+					$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
1930 1930 
 				}
1931 1931
1932 1932 
 				echo 'Flights data...'."\n";
1933 1933 
 				echo '-> countAllDatesLastMonth...'."\n";
1934 1934 
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
1935 1935 
 				foreach ($alldata as $number) {
1936 
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
1936 
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
1937 1937 
 				}
1938 1938 
 				echo '-> countAllDates...'."\n";
1939 
-				$previousdata = $this->countAllDates('',$filter_name);
1940 
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
1939 
+				$previousdata = $this->countAllDates('', $filter_name);
1940 
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
1941 1941 
 				$values = array();
1942 1942 
 				foreach ($alldata as $cnt) {
1943 1943 
 					$values[] = $cnt['date_count'];
1944 1944 
 				}
1945 
-				array_multisort($values,SORT_DESC,$alldata);
1946 
-				array_splice($alldata,11);
1945 
+				array_multisort($values, SORT_DESC, $alldata);
1946 
+				array_splice($alldata, 11);
1947 1947 
 				foreach ($alldata as $number) {
1948 
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
1948 
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
1949 1949 
 				}
1950 1950
1951 1951 
 				echo '-> countAllHours...'."\n";
1952 
-				$alldata = $Spotter->countAllHours('hour',$filter);
1952 
+				$alldata = $Spotter->countAllHours('hour', $filter);
1953 1953 
 				foreach ($alldata as $number) {
1954 
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
1954 
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
1955 1955 
 				}
1956 1956 
 			}
1957 1957 
 	
@@ -1962,16 +1962,16 @@  discard block
 
 block discarded – undo
1962 1962 
 				// SUM all previous month to put as year
1963 1963 
 				$previous_year = date('Y');
1964 1964 
 				$previous_year--;
1965 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
1966 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
1967 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
1968 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
1965 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
1966 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
1967 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
1968 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
1969 1969 
 				$allairlines = $this->getAllAirlineNames();
1970 1970 
 				foreach ($allairlines as $data) {
1971 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
1972 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
1973 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
1974 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
1971 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
1972 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
1973 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
1974 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
1975 1975 
 				}
1976 1976
1977 1977 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -1980,7 +1980,7 @@  discard block
 
 block discarded – undo
1980 1980 
 						try {
1981 1981 
 							$sth = $this->db->prepare($query);
1982 1982 
 							$sth->execute();
1983 
-						} catch(PDOException $e) {
1983 
+						} catch (PDOException $e) {
1984 1984 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
1985 1985 
 						}
1986 1986 
 					}
 
@@ -1989,7 +1989,7 @@  discard block
 
 block discarded – undo
1989 1989 
 					try {
1990 1990 
 						$sth = $this->db->prepare($query);
1991 1991 
 						$sth->execute();
1992 
-					} catch(PDOException $e) {
1992 
+					} catch (PDOException $e) {
1993 1993 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
1994 1994 
 					}
1995 1995 
 				}
 
@@ -2011,7 +2011,7 @@  discard block
 
 block discarded – undo
2011 2011 
 					try {
2012 2012 
 						$sth = $this->db->prepare($query);
2013 2013 
 						$sth->execute();
2014 
-					} catch(PDOException $e) {
2014 
+					} catch (PDOException $e) {
2015 2015 
 						return "error : ".$e->getMessage();
2016 2016 
 					}
2017 2017 
 				}
 
@@ -2025,13 +2025,13 @@  discard block
 
 block discarded – undo
2025 2025 
 				try {
2026 2026 
 					$sth = $this->db->prepare($query);
2027 2027 
 					$sth->execute();
2028 
-				} catch(PDOException $e) {
2028 
+				} catch (PDOException $e) {
2029 2029 
 					return "error : ".$e->getMessage();
2030 2030 
 				}
2031 2031 
 			}
2032 2032 
 			echo 'Insert last stats update date...'."\n";
2033 2033 
 			date_default_timezone_set('UTC');
2034 
-			$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2034 
+			$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2035 2035 
 		//}
2036 2036 
 	}
2037 2037 
 }
Please login to merge, or discard this patch.
require/class.SpotterImport.php 1 patch
Spacing   +127 added lines, -127 removed lines patch added patch discarded remove patch 
@@ -29,18 +29,18 @@  discard block
 
 block discarded – undo
29 29 
 	$currentdate = date('Y-m-d');
30 30 
 	$sourcestat = $Stats->getStatsSource($currentdate);
31 31 
 	if (!empty($sourcestat)) {
32 
-	    foreach($sourcestat as $srcst) {
32 
+	    foreach ($sourcestat as $srcst) {
33 33 
 	    	$type = $srcst['stats_type'];
34 34 
 		if ($type == 'polar' || $type == 'hist') {
35 35 
 		    $source = $srcst['source_name'];
36 36 
 		    $data = $srcst['source_data'];
37 
-		    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
37 
+		    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
38 38 
 	        }
39 39 
 	    }
40 40 
 	}
41 41 
     }
42 42
43 
-    public function get_Schedule($id,$ident) {
43 
+    public function get_Schedule($id, $ident) {
44 44 
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
45 45 
 	// Get schedule here, so it's done only one time
46 46 
 	
@@ -64,8 +64,8 @@  discard block
 
 block discarded – undo
64 64 
 		$schedule = $Schedule->fetchSchedule($operator);
65 65 
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
66 66 
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
67 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
68 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
67 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
68 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
69 69 
 		    // Should also check if route schedule = route from DB
70 70 
 		    if ($schedule['DepartureAirportIATA'] != '') {
71 71 
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
 			    }
86 86 
 			}
87 87 
 		    }
88 
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
88 
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
89 89 
 		}
90 90 
 	    }
91 91 
 	}
 
@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
 		//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
116 116 
     		$Spotter = new Spotter($this->db);
117 117 
         	$real_arrival = $this->arrival($key);
118 
-        	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
118 
+        	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
119 119 
             }
120 120 
 	}
121 121 
     }
 
@@ -128,7 +128,7 @@  discard block
 
 block discarded – undo
128 128 
         $airport_time = '';
129 129 
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
130 130 
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
131 
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
131 
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
132 132 
     	    if (isset($closestAirports[0])) {
133 133 
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
134 134 
         	    $airport_icao = $closestAirports[0]['icao'];
 
@@ -143,7 +143,7 @@  discard block
 
 block discarded – undo
143 143 
         		    break;
144 144 
         		}
145 145 
         	    }
146 
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
146 
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
147 147 
         		$airport_icao = $closestAirports[0]['icao'];
148 148 
         		$airport_time = $this->all_flights[$key]['datetime'];
149 149 
         	} else {
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
         } else {
157 157 
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
158 158 
         }
159 
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
159 
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
160 160 
     }
161 161
162 162 
 
@@ -167,7 +167,7 @@  discard block
 
 block discarded – undo
167 167 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
168 168 
 	foreach ($this->all_flights as $key => $flight) {
169 169 
     	    if (isset($flight['lastupdate'])) {
170 
-        	if ($flight['lastupdate'] < (time()-3000)) {
170 
+        	if ($flight['lastupdate'] < (time() - 3000)) {
171 171 
             	    if (isset($this->all_flights[$key]['id'])) {
172 172 
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
173 173 
 			/*
 
@@ -178,7 +178,7 @@  discard block
 
 block discarded – undo
178 178 
             		$real_arrival = $this->arrival($key);
179 179 
             		$Spotter = new Spotter($this->db);
180 180 
             		if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
181 
-				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
181 
+				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
182 182 
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
183 183 
 			}
184 184 
 			// Put in archive
 
@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 	$send = false;
215 215
216 216 
 	// SBS format is CSV format
217 
-	if(is_array($line) && isset($line['hex'])) {
217 
+	if (is_array($line) && isset($line['hex'])) {
218 218 
 	    //print_r($line);
219 219 
   	    if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
220 220 
 
@@ -248,7 +248,7 @@  discard block
 
 block discarded – undo
248 248 
 		//print_r($this->all_flights);
249 249 
 		if (!isset($this->all_flights[$id]['hex']) && ctype_xdigit($hex)) {
250 250 
 		    $this->all_flights[$id] = array('hex' => $hex);
251 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
251 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
252 252 
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
253 253 
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
254 254 
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
 
@@ -258,7 +258,7 @@  discard block
 
 block discarded – undo
258 258 
 			$Spotter = new Spotter($this->db);
259 259 
 			$aircraft_icao = $Spotter->getAllAircraftType($hex);
260 260 
 			$Spotter->db = null;
261 
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
261 
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
262 262
263 263 
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
264 264 
 			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
 
@@ -266,32 +266,32 @@  discard block
 
 block discarded – undo
266 266 
 			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
267 267 
 			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
268 268 
 			}
269 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
269 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
270 270 
 		    } else if (isset($line['aircraft_name'])) {
271 271 
 			// Get aircraft ICAO from aircraft name
272 272 
 			$Spotter = new Spotter($this->db);
273 273 
 			$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
274 274 
 			$Spotter->db = null;
275 
-			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
276 
-			else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
277 
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
278 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true));
279 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
275 
+			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
276 
+			else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
277 
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $line['aircraft_icao']));
278 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true));
279 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
280 280 
 		    if (!isset($line['id'])) {
281 281 
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
282 282 
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
283 283 
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
284 
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
284 
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
285 285 
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
286 
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
286 
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
287 287
288 288 
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n";
289 289 
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
290 290 
 		}
291 291
292 
-		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
292 
+		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) {
293 293 
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
294 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
294 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
295 295 
 		    } else {
296 296 
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
297 297 
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 
@@ -302,23 +302,23 @@  discard block
 
 block discarded – undo
302 302 
 				*/
303 303 
 				return '';
304 304 
 		    }
305 
-		} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
305 
+		} else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
306 306
307 307 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
308 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
308 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
309 309 
 		}
310 310 
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
311 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
311 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
312 312 
 		}
313 313 
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
314 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
314 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id']));
315 315 
 		}
316 316 
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
317 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
317 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name']));
318 318 
 		}
319 319
320 320 
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
321 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
321 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
322 322 
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
323 323 
 			$timeelapsed = microtime(true);
324 324 
             		$Spotter = new Spotter($this->db);
 
@@ -328,10 +328,10 @@  discard block
 
 block discarded – undo
328 328 
 			elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
329 329 
 			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
330 330 
 			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
331 
-            		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
331 
+            		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
332 332 
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
333 333 
 			$Spotter->db = null;
334 
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
334 
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
335 335 
 		    }
336 336
337 337 
 /*
 
@@ -342,24 +342,24 @@  discard block
 
 block discarded – undo
342 342 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
343 343 
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
344 344 
   */
345 
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
345 
+		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
346 346
347 347 
 		    //$putinarchive = true;
348 348 
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
349 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
349 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
350 350 
 		    }
351 351 
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
352 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
352 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
353 353 
 		    }
354 354 
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
355 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
355 
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
356 356 
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
357 357 
 				$timeelapsed = microtime(true);
358 358 
 				$Spotter = new Spotter($this->db);
359 359 
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
360 360 
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
361 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
362 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
361 
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
362 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
363 363
364 364 
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
365 365 
 			$timeelapsed = microtime(true);
 
@@ -372,34 +372,34 @@  discard block
 
 block discarded – undo
372 372 
 				$Translation->db = null;
373 373 
 			}
374 374 
 			$Spotter->db = null;
375 
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
375 
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
376 376
377 377 
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
378 378 
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
379 379 
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
380 380 
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
381 
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
381 
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop']));
382 382 
 		    	    }
383 383 
 			}
384 384 
 			if (!isset($globalFork)) $globalFork = TRUE;
385 385 
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
386 
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
386 
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
387 387 
 			}
388 388 
 		    }
389 389 
 		}
390 390
391 391 
 		if (isset($line['speed']) && $line['speed'] != '') {
392 392 
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
393 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
394 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
393 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
394 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
395 395 
 		    //$dataFound = true;
396 396 
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
397 
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
397 
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
398 398 
 		    if ($distance > 1000 && $distance < 10000) {
399 399 
 		    // use datetime
400 400 
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
401 401 
 			$speed = $speed*3.6;
402 
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
402 
+			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
403 403 
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
404 404 
 		    }
405 405 
 		}
 
@@ -407,11 +407,11 @@  discard block
 
 block discarded – undo
407 407
408 408
409 409 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
410 
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
410 
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
411 411 
 	    	    else unset($timediff);
412 
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
412 
+	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) {
413 413 
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
414 
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
414 
+			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
415 415 
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
416 416 
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
417 417 
 				$this->all_flights[$id]['putinarchive'] = true;
 
@@ -419,10 +419,10 @@  discard block
 
 block discarded – undo
419 419 
 				if ($globalDebug) echo "\n".' ------- Check Country.... ';
420 420 
 				$timeelapsed = microtime(true);
421 421 
 				$Spotter = new Spotter($this->db);
422 
-				$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
422 
+				$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
423 423 
 				if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
424 424 
 				$Spotter->db = null;
425 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
425 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
426 426 
 				$this->tmd = 0;
427 427 
 				if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
428 428 
 			    }
 
@@ -431,13 +431,13 @@  discard block
 
 block discarded – undo
431 431 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
432 432 
 			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
433 433 
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
434 
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
434 
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
435 435 
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
436 436 
 				    $dataFound = true;
437 437 
 				    $this->all_flights[$id]['time_last_coord'] = time();
438 438 
 				}
439 439 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
440 
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
440 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
441 441 
 				/*
442 442 
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
443 443 
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 
@@ -455,13 +455,13 @@  discard block
 
 block discarded – undo
455 455 
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
456 456 
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
457 457 
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
458 
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
458 
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
459 459 
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
460 460 
 				    $dataFound = true;
461 461 
 				    $this->all_flights[$id]['time_last_coord'] = time();
462 462 
 				}
463 463 
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
464 
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
464 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
465 465 
 				/*
466 466 
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
467 467 
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 
@@ -479,45 +479,45 @@  discard block
 
 block discarded – undo
479 479 
 		    } else if ($globalDebug && $timediff > 20) {
480 480 
 			$this->tmd = $this->tmd + 1;
481 481 
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
482 
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
483 
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
482 
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
483 
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
484 484 
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
485 485 
 		    }
486 486 
 		}
487 487 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
488 488 
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
489 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
489 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
490 490 
 		}
491 491 
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
492 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
492 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
493 493 
 		    //$dataFound = true;
494 494 
 		}
495 495 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
496 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
496 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
497 497 
 		}
498 498 
 		if (isset($line['source_name']) && $line['source_name'] != '') {
499 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
499 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
500 500 
 		}
501 501 
 		if (isset($line['emergency']) && $line['emergency'] != '') {
502 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
502 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
503 503 
 		    //$dataFound = true;
504 504 
 		}
505 505 
 		if (isset($line['ground']) && $line['ground'] != '') {
506 506 
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
507 507 
 			// Here we force archive of flight because after ground it's a new one (or should be)
508 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
509 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
510 
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
511 
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
512 
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
508 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
509 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
510 
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
511 
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
512 
+			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
513 513 
 		    }
514 514 
 		    if ($line['ground'] != 1) $line['ground'] = 0;
515 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
515 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
516 516 
 		    //$dataFound = true;
517 517 
 		}
518 518 
 		if (isset($line['squawk']) && $line['squawk'] != '') {
519 519 
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
520 
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
520 
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
521 521 
 			    $highlight = '';
522 522 
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
523 523 
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
 
@@ -525,48 +525,48 @@  discard block
 
 block discarded – undo
525 525 
 			    if ($highlight != '') {
526 526 
 				$timeelapsed = microtime(true);
527 527 
 				$Spotter = new Spotter($this->db);
528 
-				$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
528 
+				$Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
529 529 
 				$Spotter->db = null;
530 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
530 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
531 531
532 532 
 				$this->all_flights[$id]['putinarchive'] = true;
533 533 
 				//$putinarchive = true;
534 534 
 				//$highlight = '';
535 535 
 			    }
536 536
537 
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
537 
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
538 538 
 		    //$dataFound = true;
539 539 
 		}
540 540
541 541 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
542 542 
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
543 
-			if (abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true;
544 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
545 
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
543 
+			if (abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true;
544 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
545 
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
546 546 
 			//$dataFound = true;
547 547 
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
548 548 
   		}
549 549
550 550 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
551 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
551 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
552 552 
 		}
553 553
554 554 
 		if (isset($line['heading']) && $line['heading'] != '') {
555 
-		    if (abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true;
556 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
557 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
555 
+		    if (abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true;
556 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
557 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
558 558 
 		    //$dataFound = true;
559 559 
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
560 
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
561 
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
562 
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true;
560 
+  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
561 
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
562 
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true;
563 563 
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
564 564 
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
565 565 
   		    // If not enough messages and ACARS set heading to 0
566 
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
566 
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
567 567 
   		}
568 
-		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
569 
-		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
568 
+		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
569 
+		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
570 570
571 571 
 //		print_r($this->all_flights[$id]);
572 572 
 		//gets the callsign from the last hour
 
@@ -576,7 +576,7 @@  discard block
 
 block discarded – undo
576 576 
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
577 577 
 		    $this->all_flights[$id]['lastupdate'] = time();
578 578 
 		    if ($this->all_flights[$id]['addedSpotter'] == 0) {
579 
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
579 
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
580 580 
 			    //print_r($this->all_flights);
581 581 
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
582 582 
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
 
@@ -586,61 +586,61 @@  discard block
 
 block discarded – undo
586 586 
 				$SpotterLive = new SpotterLive($this->db);
587 587 
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
588 588 
 				    $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
589 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
589 
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
590 590 
 				} elseif (isset($line['id'])) {
591 591 
 				    $recent_ident = $SpotterLive->checkIdRecent($line['id']);
592 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
592 
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
593 593 
 				} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
594 594 
 				    $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
595 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
595 
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
596 596 
 				} else $recent_ident = '';
597 
-				$SpotterLive->db=null;
597 
+				$SpotterLive->db = null;
598 598
599 599 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
600 600 
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
601 601 
 			    } else {
602 602 
 				$recent_ident = '';
603 
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
603 
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
604 604 
 			    }
605 605 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
606 
-			    if($recent_ident == "")
606 
+			    if ($recent_ident == "")
607 607 
 			    {
608 608 
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
609 609 
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
610 610 
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
611 611 
 				//adds the spotter data for the archive
612 612 
 				$ignoreImport = false;
613 
-				foreach($globalAirportIgnore as $airportIgnore) {
613 
+				foreach ($globalAirportIgnore as $airportIgnore) {
614 614 
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
615 615 
 					$ignoreImport = true;
616 616 
 				    }
617 617 
 				}
618 618 
 				if (count($globalAirportAccept) > 0) {
619 619 
 				    $ignoreImport = true;
620 
-				    foreach($globalAirportIgnore as $airportIgnore) {
620 
+				    foreach ($globalAirportIgnore as $airportIgnore) {
621 621 
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
622 622 
 					    $ignoreImport = false;
623 623 
 					}
624 624 
 				    }
625 625 
 				}
626 626 
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
627 
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
628 
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
627 
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
628 
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
629 629 
 					    $ignoreImport = true;
630 630 
 					}
631 631 
 				    }
632 632 
 				}
633 633 
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
634 634 
 				    $ignoreImport = true;
635 
-				    foreach($globalAirlineAccept as $airlineAccept) {
636 
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
635 
+				    foreach ($globalAirlineAccept as $airlineAccept) {
636 
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
637 637 
 					    $ignoreImport = false;
638 638 
 					}
639 639 
 				    }
640 640 
 				}
641 641 
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
642 642 
 				    $ignoreImport = true;
643 
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
643 
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
644 644 
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
645 645 
 					    $ignoreImport = false;
646 646 
 					}
 
@@ -652,27 +652,27 @@  discard block
 
 block discarded – undo
652 652 
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
653 653 
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
654 654 
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
655 
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
655 
+				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
656 656 
 				    $timeelapsed = microtime(true);
657 657 
 				    $Spotter = new Spotter($this->db);
658 
-				    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name']);
658 
+				    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name']);
659 659 
 				    $Spotter->db = null;
660 660 
 				    if ($globalDebug && isset($result)) echo $result."\n";
661 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
661 
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
662 662
663 663 
 				    // Add source stat in DB
664 664 
 				    $Stats = new Stats($this->db);
665 665 
 				    if (!empty($this->stats)) {
666 666 
 					if ($globalDebug) echo 'Add source stats : ';
667 
-				        foreach($this->stats as $date => $data) {
668 
-					    foreach($data as $source => $sourced) {
667 
+				        foreach ($this->stats as $date => $data) {
668 
+					    foreach ($data as $source => $sourced) {
669 669 
 					        //print_r($sourced);
670 
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
671 
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
670 
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
671 
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
672 672 
 				    		if (isset($sourced['msg'])) {
673 673 
 				    		    if (time() - $sourced['msg']['date'] > 10) {
674 674 
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
675 
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
675 
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
676 676 
 			    			        unset($this->stats[$date][$source]['msg']);
677 677 
 			    			    }
678 678 
 			    			}
 
@@ -708,18 +708,18 @@  discard block
 
 block discarded – undo
708 708 
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
709 709 
 				    $SpotterLive = new SpotterLive($this->db);
710 710 
 				    $SpotterLive->deleteLiveSpotterData();
711 
-				    $SpotterLive->db=null;
711 
+				    $SpotterLive->db = null;
712 712 
 				    if ($globalDebug) echo " Done\n";
713 713 
 				    $this->last_delete = time();
714 714 
 				}
715 715 
 			    } else {
716 
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
716 
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
717 717 
 				    $this->all_flights[$id]['id'] = $recent_ident;
718 718 
 				    $this->all_flights[$id]['addedSpotter'] = 1;
719 719 
 				}
720 720 
 				if (isset($globalDaemon) && !$globalDaemon) {
721 721 
 					$Spotter = new Spotter($this->db);
722 
-					$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
722 
+					$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
723 723 
 					$Spotter->db = null;
724 724 
 				}
725 725 
 				
@@ -743,37 +743,37 @@  discard block
 
 block discarded – undo
743 743 
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
744 744 
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
745 745
746 
-		    foreach($globalAirportIgnore as $airportIgnore) {
746 
+		    foreach ($globalAirportIgnore as $airportIgnore) {
747 747 
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
748 748 
 			    $ignoreImport = true;
749 749 
 			}
750 750 
 		    }
751 751 
 		    if (count($globalAirportAccept) > 0) {
752 752 
 		        $ignoreImport = true;
753 
-		        foreach($globalAirportIgnore as $airportIgnore) {
753 
+		        foreach ($globalAirportIgnore as $airportIgnore) {
754 754 
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
755 755 
 				$ignoreImport = false;
756 756 
 			    }
757 757 
 			}
758 758 
 		    }
759 759 
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
760 
-			foreach($globalAirlineIgnore as $airlineIgnore) {
761 
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
760 
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
761 
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
762 762 
 				$ignoreImport = true;
763 763 
 			    }
764 764 
 			}
765 765 
 		    }
766 766 
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
767 767 
 			$ignoreImport = true;
768 
-			foreach($globalAirlineAccept as $airlineAccept) {
769 
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
768 
+			foreach ($globalAirlineAccept as $airlineAccept) {
769 
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
770 770 
 				$ignoreImport = false;
771 771 
 			    }
772 772 
 			}
773 773 
 		    }
774 774 
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
775 775 
 			$ignoreImport = true;
776 
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
776 
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
777 777 
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
778 778 
 			        $ignoreImport = false;
779 779 
 			    }
 
@@ -781,13 +781,13 @@  discard block
 
 block discarded – undo
781 781 
 		    }
782 782
783 783 
 		    if (!$ignoreImport) {
784 
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
784 
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
785 785 
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
786 786 
 				$timeelapsed = microtime(true);
787 787 
 				$SpotterLive = new SpotterLive($this->db);
788 
-				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
788 
+				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
789 789 
 				$SpotterLive->db = null;
790 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
790 
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
791 791
792 792 
 				// Put statistics in $this->stats variable
793 793 
 				//if ($line['format_source'] != 'aprs') {
 
@@ -805,19 +805,19 @@  discard block
 
 block discarded – undo
805 805 
 							$latitude = $globalCenterLatitude;
806 806 
 							$longitude = $globalCenterLongitude;
807 807 
 						}
808 
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
808 
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
809 809 
 					} else {
810 810 
 						$latitude = $this->source_location[$source]['latitude'];
811 811 
 						$longitude = $this->source_location[$source]['longitude'];
812 812 
 					}
813 
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
813 
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
814 814 
 					//$stats_heading = $stats_heading%22.5;
815 815 
 					$stats_heading = round($stats_heading/22.5);
816 
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
816 
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
817 817 
 					$current_date = date('Y-m-d');
818 818 
 					if ($stats_heading == 16) $stats_heading = 0;
819 819 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
820 
-						for ($i=0;$i<=15;$i++) {
820 
+						for ($i = 0; $i <= 15; $i++) {
821 821 
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
822 822 
 						}
823 823 
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 
@@ -832,9 +832,9 @@  discard block
 
 block discarded – undo
832 832 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
833 833 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
834 834 
 						    end($this->stats[$current_date][$source]['hist']);
835 
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
835 
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
836 836 
 						} else $mini = 0;
837 
-						for ($i=$mini;$i<=$distance;$i+=10) {
837 
+						for ($i = $mini; $i <= $distance; $i += 10) {
838 838 
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
839 839 
 						}
840 840 
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 
@@ -847,7 +847,7 @@  discard block
 
 block discarded – undo
847 847 
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
848 848 
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
849 849 
 				if ($globalDebug) echo $result."\n";
850 
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
850 
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
851 851 
 			//$this->del();
852 852
853 853
Please login to merge, or discard this patch.