Completed
Push — master ( 52a9ad...59fd6c )
by Yannick
06:10
created
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.Spotter.php 2 patches
Spacing   +993 added lines, -993 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 require_once(dirname(__FILE__).'/class.Image.php');
5 5
 $global_query = "SELECT spotter_output.* FROM spotter_output";
6 6
 
7
-class Spotter{
7
+class Spotter {
8 8
 	public $db;
9 9
 	
10 10
 	public function __construct($dbc = null) {
@@ -17,15 +17,15 @@  discard block
 block discarded – undo
17 17
 	* @param Array $filter the filter
18 18
 	* @return Array the SQL part
19 19
 	*/
20
-	public function getFilter($filter = array(),$where = false,$and = false) {
20
+	public function getFilter($filter = array(), $where = false, $and = false) {
21 21
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
22
-		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) $filter = array_merge($globalStatsFilters[$globalFilterName],$filter);
23
-		if (is_array($globalFilter)) $filter = array_merge($globalFilter,$filter);
22
+		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) $filter = array_merge($globalStatsFilters[$globalFilterName], $filter);
23
+		if (is_array($globalFilter)) $filter = array_merge($globalFilter, $filter);
24 24
 		$filter_query_join = '';
25 25
 		$filter_query_where = '';
26 26
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
27 27
 			if ($filter['airlines'][0] != '') {
28
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
28
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
29 29
 			}
30 30
 		}
31 31
 		
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_output.flightaware_id ";
34 34
 		}
35 35
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
36
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
36
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
37 37
 		}
38 38
 		if (isset($filter['source']) && !empty($filter['source'])) {
39
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
39
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
40 40
 		}
41 41
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
42 42
 			$filter_query_where = " WHERE ident = '".$filter['ident']."'";
43 43
 		}
44 44
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
45 45
 			if ($filter_query_where == '') {
46
-				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
46
+				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
47 47
 			} else {
48
-				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
48
+				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
49 49
 			}
50 50
 		}
51 51
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			$sth = $this->db->prepare($query.$limitQuery);
94 94
 			$sth->execute($params);
95 95
 		} catch (PDOException $e) {
96
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
96
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
97 97
 			exit();
98 98
 		}
99 99
 		
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		$spotter_array = array();
104 104
 		
105 105
 
106
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
106
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
107 107
 		{
108 108
 			$num_rows++;
109 109
 			$temp_array = array();
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 			if (isset($row['route_stop'])) {
149 149
 				$temp_array['route_stop'] = $row['route_stop'];
150 150
 				if ($row['route_stop'] != '') {
151
-					$allroute = explode(' ',$row['route_stop']);
151
+					$allroute = explode(' ', $row['route_stop']);
152 152
 			
153 153
 					foreach ($allroute as $route) {
154 154
 						$route_airport_array = $this->getAllAirportInfo($route);
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
203 203
 				{
204 204
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
205 205
 				} else {
206
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
206
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
207 207
 				}
208 208
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
209
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
210
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
209
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
210
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
211 211
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
212 212
 			}
213 213
 			
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
242 242
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
243 243
 					if (is_numeric(substr($row['ident'], 2, 1))) {
244
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource);
244
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource);
245 245
 					} elseif (is_numeric(substr($row['ident'], 3, 1))) {
246
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
246
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
247 247
 					} else {
248 248
 						$airline_array = $this->getAllAirlineInfo('NA');
249 249
 					}
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 				$temp_array['airline_type'] = $row['airline_type'];
270 270
 			}
271 271
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
272
-				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3));
272
+				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3));
273 273
 				//$acars_array = ACARS->getLiveAcarsData('BA40YL');
274 274
 				if (count($acars_array) > 0) {
275 275
 					$temp_array['acars'] = $acars_array;
@@ -286,11 +286,11 @@  discard block
 block discarded – undo
286 286
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
287 287
 			}
288 288
 
289
-			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
289
+			if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
290 290
 			{
291 291
 				if ($globalIVAO) {
292
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
293
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
292
+					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']);
293
+					else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']);
294 294
 				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
295 295
 				if (count($image_array) > 0) {
296 296
 					$temp_array['image'] = $image_array[0]['image'];
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 			if (isset($row['arrival_airport_time']) && $row['arrival_airport_time'] != '') {
314 314
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
315 315
 			}
316
-			if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
316
+			if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
317 317
 				$schedule_array = $Schedule->getSchedule($temp_array['ident']);
318 318
 				//print_r($schedule_array);
319 319
 				if (count($schedule_array) > 0) {
@@ -394,12 +394,12 @@  discard block
 block discarded – undo
394 394
 			if (isset($row['squawk'])) {
395 395
 				$temp_array['squawk'] = $row['squawk'];
396 396
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
397
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
398
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
397
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']);
398
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
399 399
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
400
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
401
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
402
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
400
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']);
401
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
402
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
403 403
 			}
404 404
     			
405 405
 			$temp_array['query_number_rows'] = $num_rows;
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 	* @return Array the spotter information
419 419
 	*
420 420
 	*/
421
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
421
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
422 422
 	{
423 423
 		global $globalTimezone, $globalDBdriver;
424 424
 		require_once(dirname(__FILE__).'/class.Translation.php');
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
 
429 429
 		$query_values = array();
430 430
 		$additional_query = '';
431
-		$filter_query = $this->getFilter($filters,true,true);
431
+		$filter_query = $this->getFilter($filters, true, true);
432 432
 		if ($q != "")
433 433
 		{
434 434
 			if (!is_string($q))
@@ -436,8 +436,8 @@  discard block
 block discarded – undo
436 436
 				return false;
437 437
 			} else {
438 438
 				$q_array = explode(" ", $q);
439
-				foreach ($q_array as $q_item){
440
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
439
+				foreach ($q_array as $q_item) {
440
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
441 441
 					$additional_query .= " AND (";
442 442
 					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
443 443
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -469,37 +469,37 @@  discard block
 block discarded – undo
469 469
 
470 470
 		if ($registration != "")
471 471
 		{
472
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
472
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
473 473
 			if (!is_string($registration))
474 474
 			{
475 475
 				return false;
476 476
 			} else {
477 477
 				$additional_query .= " AND spotter_output.registration = :registration";
478
-				$query_values = array_merge($query_values,array(':registration' => $registration));
478
+				$query_values = array_merge($query_values, array(':registration' => $registration));
479 479
 			}
480 480
 		}
481 481
 
482 482
 		if ($aircraft_icao != "")
483 483
 		{
484
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
484
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
485 485
 			if (!is_string($aircraft_icao))
486 486
 			{
487 487
 				return false;
488 488
 			} else {
489 489
 				$additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao";
490
-				$query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao));
490
+				$query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao));
491 491
 			}
492 492
 		}
493 493
 
494 494
 		if ($aircraft_manufacturer != "")
495 495
 		{
496
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
496
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
497 497
 			if (!is_string($aircraft_manufacturer))
498 498
 			{
499 499
 				return false;
500 500
 			} else {
501 501
 				$additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer";
502
-				$query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer));
502
+				$query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer));
503 503
 			}
504 504
 		}
505 505
 
@@ -515,25 +515,25 @@  discard block
 block discarded – undo
515 515
 
516 516
 		if ($airline_icao != "")
517 517
 		{
518
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
518
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
519 519
 			if (!is_string($airline_icao))
520 520
 			{
521 521
 				return false;
522 522
 			} else {
523 523
 				$additional_query .= " AND spotter_output.airline_icao = :airline_icao";
524
-				$query_values = array_merge($query_values,array(':airline_icao' => $airline_icao));
524
+				$query_values = array_merge($query_values, array(':airline_icao' => $airline_icao));
525 525
 			}
526 526
 		}
527 527
 
528 528
 		if ($airline_country != "")
529 529
 		{
530
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
530
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
531 531
 			if (!is_string($airline_country))
532 532
 			{
533 533
 				return false;
534 534
 			} else {
535 535
 				$additional_query .= " AND spotter_output.airline_country = :airline_country";
536
-				$query_values = array_merge($query_values,array(':airline_country' => $airline_country));
536
+				$query_values = array_merge($query_values, array(':airline_country' => $airline_country));
537 537
 			}
538 538
 		}
539 539
 
@@ -560,31 +560,31 @@  discard block
 block discarded – undo
560 560
 
561 561
 		if ($airport != "")
562 562
 		{
563
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
563
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
564 564
 			if (!is_string($airport))
565 565
 			{
566 566
 				return false;
567 567
 			} else {
568 568
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)";
569
-				$query_values = array_merge($query_values,array(':airport' => $airport));
569
+				$query_values = array_merge($query_values, array(':airport' => $airport));
570 570
 			}
571 571
 		}
572 572
 
573 573
 		if ($airport_country != "")
574 574
 		{
575
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
575
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
576 576
 			if (!is_string($airport_country))
577 577
 			{
578 578
 				return false;
579 579
 			} else {
580 580
 				$additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)";
581
-				$query_values = array_merge($query_values,array(':airport_country' => $airport_country));
581
+				$query_values = array_merge($query_values, array(':airport_country' => $airport_country));
582 582
 			}
583 583
 		}
584 584
     
585 585
 		if ($callsign != "")
586 586
 		{
587
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
587
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
588 588
 			if (!is_string($callsign))
589 589
 			{
590 590
 				return false;
@@ -592,79 +592,79 @@  discard block
 block discarded – undo
592 592
 				$translate = $Translation->ident2icao($callsign);
593 593
 				if ($translate != $callsign) {
594 594
 					$additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)";
595
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
595
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
596 596
 				} else {
597 597
 					$additional_query .= " AND spotter_output.ident = :callsign";
598
-					$query_values = array_merge($query_values,array(':callsign' => $callsign));
598
+					$query_values = array_merge($query_values, array(':callsign' => $callsign));
599 599
 				}
600 600
 			}
601 601
 		}
602 602
 
603 603
 		if ($owner != "")
604 604
 		{
605
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
605
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
606 606
 			if (!is_string($owner))
607 607
 			{
608 608
 				return false;
609 609
 			} else {
610 610
 				$additional_query .= " AND spotter_output.owner_name = :owner";
611
-				$query_values = array_merge($query_values,array(':owner' => $owner));
611
+				$query_values = array_merge($query_values, array(':owner' => $owner));
612 612
 			}
613 613
 		}
614 614
 
615 615
 		if ($pilot_name != "")
616 616
 		{
617
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
617
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
618 618
 			if (!is_string($pilot_name))
619 619
 			{
620 620
 				return false;
621 621
 			} else {
622 622
 				$additional_query .= " AND spotter_output.pilot_name = :pilot_name";
623
-				$query_values = array_merge($query_values,array(':pilot_name' => $pilot_name));
623
+				$query_values = array_merge($query_values, array(':pilot_name' => $pilot_name));
624 624
 			}
625 625
 		}
626 626
 
627 627
 		if ($pilot_id != "")
628 628
 		{
629
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
629
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
630 630
 			if (!is_string($pilot_id))
631 631
 			{
632 632
 				return false;
633 633
 			} else {
634 634
 				$additional_query .= " AND spotter_output.pilot_id = :pilot_id";
635
-				$query_values = array_merge($query_values,array(':pilot_id' => $pilot_id));
635
+				$query_values = array_merge($query_values, array(':pilot_id' => $pilot_id));
636 636
 			}
637 637
 		}
638 638
 
639 639
 		if ($departure_airport_route != "")
640 640
 		{
641
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
641
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
642 642
 			if (!is_string($departure_airport_route))
643 643
 			{
644 644
 				return false;
645 645
 			} else {
646 646
 				$additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route";
647
-				$query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route));
647
+				$query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route));
648 648
 			}
649 649
 		}
650 650
 
651 651
 		if ($arrival_airport_route != "")
652 652
 		{
653
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
653
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
654 654
 			if (!is_string($arrival_airport_route))
655 655
 			{
656 656
 				return false;
657 657
 			} else {
658 658
 				$additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route";
659
-				$query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route));
659
+				$query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route));
660 660
 			}
661 661
 		}
662 662
 
663 663
 		if ($altitude != "")
664 664
 		{
665 665
 			$altitude_array = explode(",", $altitude);
666
-			$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
667
-			$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
666
+			$altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
667
+			$altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
668 668
 
669 669
 			if ($altitude_array[1] != "")
670 670
 			{                
@@ -680,8 +680,8 @@  discard block
 block discarded – undo
680 680
 		if ($date_posted != "")
681 681
 		{
682 682
 			$date_array = explode(",", $date_posted);
683
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
684
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
683
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
684
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
685 685
 
686 686
 			if ($globalTimezone != '') {
687 687
 				date_default_timezone_set($globalTimezone);
@@ -712,8 +712,8 @@  discard block
 block discarded – undo
712 712
 		{
713 713
 			$limit_array = explode(",", $limit);
714 714
 			
715
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
716
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
715
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
716
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
717 717
 			
718 718
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
719 719
 			{
@@ -742,23 +742,23 @@  discard block
 block discarded – undo
742 742
 
743 743
 
744 744
 		if ($origLat != "" && $origLon != "" && $dist != "") {
745
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
745
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
746 746
 
747 747
 			if ($globalDBdriver == 'mysql') {
748
-				$query="SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance 
748
+				$query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance 
749 749
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
750 750
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
751 751
 			} else {
752
-				$query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
752
+				$query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
753 753
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
754 754
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
755 755
 			}
756 756
 		} else {		
757
-			$query  = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
757
+			$query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
758 758
 					".$additional_query."
759 759
 					".$orderby_query;
760 760
 		}
761
-		$spotter_array = $this->getDataFromDB($query, $query_values,$limit_query);
761
+		$spotter_array = $this->getDataFromDB($query, $query_values, $limit_query);
762 762
 		return $spotter_array;
763 763
 	}
764 764
 	
@@ -781,8 +781,8 @@  discard block
 block discarded – undo
781 781
 		{
782 782
 			$limit_array = explode(",", $limit);
783 783
 			
784
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
785
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
784
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
785
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
786 786
 			
787 787
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
788 788
 			{
@@ -799,9 +799,9 @@  discard block
 block discarded – undo
799 799
 			$orderby_query = " ORDER BY spotter_output.date DESC";
800 800
 		}
801 801
 
802
-		$query  = $global_query.$filter_query." ".$orderby_query;
802
+		$query = $global_query.$filter_query." ".$orderby_query;
803 803
 
804
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query);
804
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
805 805
 
806 806
 		return $spotter_array;
807 807
 	}
@@ -847,34 +847,34 @@  discard block
 block discarded – undo
847 847
 			{
848 848
 				return false;
849 849
 			} else {
850
-				if ($interval == "30m"){
850
+				if ($interval == "30m") {
851 851
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date ';
852
-				} else if ($interval == "1h"){
852
+				} else if ($interval == "1h") {
853 853
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date ';
854
-				} else if ($interval == "3h"){
854
+				} else if ($interval == "3h") {
855 855
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date ';
856
-				} else if ($interval == "6h"){
856
+				} else if ($interval == "6h") {
857 857
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date ';
858
-				} else if ($interval == "12h"){
858
+				} else if ($interval == "12h") {
859 859
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date ';
860
-				} else if ($interval == "24h"){
860
+				} else if ($interval == "24h") {
861 861
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date ';
862
-				} else if ($interval == "7d"){
862
+				} else if ($interval == "7d") {
863 863
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date ';
864
-				} else if ($interval == "30d"){
864
+				} else if ($interval == "30d") {
865 865
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date ';
866 866
 				} 
867 867
 			}
868 868
 		}
869 869
 
870
-		$query  = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output 
870
+		$query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output 
871 871
                    WHERE spotter_output.latitude <> '' 
872 872
 				   AND spotter_output.longitude <> '' 
873 873
                    ".$additional_query."
874 874
                    HAVING distance < :radius  
875 875
 				   ORDER BY distance";
876 876
 
877
-		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query);
877
+		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query);
878 878
 
879 879
 		return $spotter_array;
880 880
 	}
@@ -886,21 +886,21 @@  discard block
 block discarded – undo
886 886
 	* @return Array the spotter information
887 887
 	*
888 888
 	*/
889
-	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
889
+	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array())
890 890
 	{
891 891
 		global $global_query;
892 892
 		
893 893
 		date_default_timezone_set('UTC');
894 894
 
895
-		$filter_query = $this->getFilter($filter,true,true);
895
+		$filter_query = $this->getFilter($filter, true, true);
896 896
 
897 897
 		$limit_query = '';
898 898
 		if ($limit != "")
899 899
 		{
900 900
 			$limit_array = explode(",", $limit);
901 901
 			
902
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
903
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
902
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
903
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
904 904
 			
905 905
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
906 906
 			{
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
918 918
 		}
919 919
 
920
-		$query  = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
920
+		$query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
921 921
 
922 922
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
923 923
 
@@ -936,15 +936,15 @@  discard block
 block discarded – undo
936 936
 		global $global_query;
937 937
 		
938 938
 		date_default_timezone_set('UTC');
939
-		$filter_query = $this->getFilter($filter,true,true);
939
+		$filter_query = $this->getFilter($filter, true, true);
940 940
 
941 941
 		$limit_query = '';
942 942
 		if ($limit != "")
943 943
 		{
944 944
 			$limit_array = explode(",", $limit);
945 945
 			
946
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
947
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
946
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
947
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
948 948
 			
949 949
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
950 950
 			{
@@ -961,7 +961,7 @@  discard block
 block discarded – undo
961 961
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
962 962
 		}
963 963
 
964
-		$query  = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
964
+		$query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
965 965
 
966 966
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
967 967
 
@@ -975,20 +975,20 @@  discard block
 block discarded – undo
975 975
 	* @return Array the spotter information
976 976
 	*
977 977
 	*/
978
-	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
978
+	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array())
979 979
 	{
980 980
 		global $global_query;
981 981
 		
982 982
 		date_default_timezone_set('UTC');
983
-		$filter_query = $this->getFilter($filter,true,true);
983
+		$filter_query = $this->getFilter($filter, true, true);
984 984
 		
985 985
 		$limit_query = '';
986 986
 		if ($limit != "")
987 987
 		{
988 988
 			$limit_array = explode(",", $limit);
989 989
 			
990
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
991
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
990
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
991
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
992 992
 			
993 993
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
994 994
 			{
@@ -1005,7 +1005,7 @@  discard block
 block discarded – undo
1005 1005
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1006 1006
 		}
1007 1007
 
1008
-		$query  = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1008
+		$query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1009 1009
 
1010 1010
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1011 1011
 
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 		
1026 1026
 		date_default_timezone_set('UTC');
1027 1027
 		
1028
-		$filter_query = $this->getFilter($filter,true,true);
1028
+		$filter_query = $this->getFilter($filter, true, true);
1029 1029
 		
1030 1030
 		$limit_query = '';
1031 1031
 		
@@ -1033,8 +1033,8 @@  discard block
 block discarded – undo
1033 1033
 		{
1034 1034
 			$limit_array = explode(",", $limit);
1035 1035
 			
1036
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1037
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1036
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1037
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1038 1038
 			
1039 1039
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1040 1040
 			{
@@ -1051,7 +1051,7 @@  discard block
 block discarded – undo
1051 1051
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1052 1052
 		}
1053 1053
 
1054
-		$query  = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1054
+		$query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1055 1055
 
1056 1056
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1057 1057
 
@@ -1070,14 +1070,14 @@  discard block
 block discarded – undo
1070 1070
 		global $global_query;
1071 1071
 		
1072 1072
 		date_default_timezone_set('UTC');
1073
-		$filter_query = $this->getFilter($filter,true,true);
1073
+		$filter_query = $this->getFilter($filter, true, true);
1074 1074
 		$limit_query = '';
1075 1075
 		if ($limit != "")
1076 1076
 		{
1077 1077
 			$limit_array = explode(",", $limit);
1078 1078
 			
1079
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1080
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1079
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1080
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1081 1081
 			
1082 1082
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1083 1083
 			{
@@ -1094,7 +1094,7 @@  discard block
 block discarded – undo
1094 1094
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1095 1095
 		}
1096 1096
 
1097
-		$query  = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1097
+		$query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1098 1098
 
1099 1099
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1100 1100
 
@@ -1118,9 +1118,9 @@  discard block
 block discarded – undo
1118 1118
 		$query_values = array(':id' => $id);
1119 1119
 
1120 1120
 		//$query  = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." ";
1121
-		$query  = $global_query." WHERE ".$additional_query." ";
1121
+		$query = $global_query." WHERE ".$additional_query." ";
1122 1122
 
1123
-		$spotter_array = $this->getDataFromDB($query,$query_values);
1123
+		$spotter_array = $this->getDataFromDB($query, $query_values);
1124 1124
 
1125 1125
 		return $spotter_array;
1126 1126
 	}
@@ -1158,8 +1158,8 @@  discard block
 block discarded – undo
1158 1158
 		{
1159 1159
 			$limit_array = explode(",", $limit);
1160 1160
 			
1161
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1162
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1161
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1162
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1163 1163
 			
1164 1164
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1165 1165
 			{
@@ -1200,7 +1200,7 @@  discard block
 block discarded – undo
1200 1200
 		$query_values = array();
1201 1201
 		$limit_query = '';
1202 1202
 		$additional_query = '';
1203
-		$filter_query = $this->getFilter($filter,true,true);
1203
+		$filter_query = $this->getFilter($filter, true, true);
1204 1204
 		
1205 1205
 		if ($aircraft_type != "")
1206 1206
 		{
@@ -1217,8 +1217,8 @@  discard block
 block discarded – undo
1217 1217
 		{
1218 1218
 			$limit_array = explode(",", $limit);
1219 1219
 			
1220
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1221
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1220
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1221
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1222 1222
 			
1223 1223
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1224 1224
 			{
@@ -1258,7 +1258,7 @@  discard block
 block discarded – undo
1258 1258
 		$query_values = array();
1259 1259
 		$limit_query = '';
1260 1260
 		$additional_query = '';
1261
-		$filter_query = $this->getFilter($filter,true,true);
1261
+		$filter_query = $this->getFilter($filter, true, true);
1262 1262
 		
1263 1263
 		if ($registration != "")
1264 1264
 		{
@@ -1275,8 +1275,8 @@  discard block
 block discarded – undo
1275 1275
 		{
1276 1276
 			$limit_array = explode(",", $limit);
1277 1277
 			
1278
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1279
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1278
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1279
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1280 1280
 			
1281 1281
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1282 1282
 			{
@@ -1309,7 +1309,7 @@  discard block
 block discarded – undo
1309 1309
 	* @return Array the spotter information
1310 1310
 	*
1311 1311
 	*/
1312
-	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
1312
+	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array())
1313 1313
 	{
1314 1314
 		global $global_query;
1315 1315
 		
@@ -1318,7 +1318,7 @@  discard block
 block discarded – undo
1318 1318
 		$query_values = array();
1319 1319
 		$limit_query = '';
1320 1320
 		$additional_query = '';
1321
-		$filter_query = $this->getFilter($filters,true,true);
1321
+		$filter_query = $this->getFilter($filters, true, true);
1322 1322
 		
1323 1323
 		if ($airline != "")
1324 1324
 		{
@@ -1335,8 +1335,8 @@  discard block
 block discarded – undo
1335 1335
 		{
1336 1336
 			$limit_array = explode(",", $limit);
1337 1337
 			
1338
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1339
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1338
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1339
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1340 1340
 			
1341 1341
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1342 1342
 			{
@@ -1366,7 +1366,7 @@  discard block
 block discarded – undo
1366 1366
 	* @return Array the spotter information
1367 1367
 	*
1368 1368
 	*/
1369
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1369
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1370 1370
 	{
1371 1371
 		global $global_query;
1372 1372
 		
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 		$query_values = array();
1375 1375
 		$limit_query = '';
1376 1376
 		$additional_query = '';
1377
-		$filter_query = $this->getFilter($filters,true,true);
1377
+		$filter_query = $this->getFilter($filters, true, true);
1378 1378
 		
1379 1379
 		if ($airport != "")
1380 1380
 		{
@@ -1391,8 +1391,8 @@  discard block
 block discarded – undo
1391 1391
 		{
1392 1392
 			$limit_array = explode(",", $limit);
1393 1393
 			
1394
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1395
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1394
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1395
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1396 1396
 			
1397 1397
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1398 1398
 			{
@@ -1424,7 +1424,7 @@  discard block
 block discarded – undo
1424 1424
 	* @return Array the spotter information
1425 1425
 	*
1426 1426
 	*/
1427
-	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
1427
+	public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array())
1428 1428
 	{
1429 1429
 		global $global_query, $globalTimezone, $globalDBdriver;
1430 1430
 		
@@ -1432,7 +1432,7 @@  discard block
 block discarded – undo
1432 1432
 		$limit_query = '';
1433 1433
 		$additional_query = '';
1434 1434
 
1435
-		$filter_query = $this->getFilter($filter,true,true);
1435
+		$filter_query = $this->getFilter($filter, true, true);
1436 1436
 		
1437 1437
 		if ($date != "")
1438 1438
 		{
@@ -1458,8 +1458,8 @@  discard block
 block discarded – undo
1458 1458
 		{
1459 1459
 			$limit_array = explode(",", $limit);
1460 1460
 			
1461
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1462
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1461
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1462
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1463 1463
 			
1464 1464
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1465 1465
 			{
@@ -1489,7 +1489,7 @@  discard block
 block discarded – undo
1489 1489
 	* @return Array the spotter information
1490 1490
 	*
1491 1491
 	*/
1492
-	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
1492
+	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array())
1493 1493
 	{
1494 1494
 		global $global_query;
1495 1495
 		
@@ -1498,7 +1498,7 @@  discard block
 block discarded – undo
1498 1498
 		$query_values = array();
1499 1499
 		$limit_query = '';
1500 1500
 		$additional_query = '';
1501
-		$filter_query = $this->getFilter($filters,true,true);
1501
+		$filter_query = $this->getFilter($filters, true, true);
1502 1502
 		if ($country != "")
1503 1503
 		{
1504 1504
 			if (!is_string($country))
@@ -1515,8 +1515,8 @@  discard block
 block discarded – undo
1515 1515
 		{
1516 1516
 			$limit_array = explode(",", $limit);
1517 1517
 			
1518
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1519
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1518
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1519
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1520 1520
 			
1521 1521
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1522 1522
 			{
@@ -1556,7 +1556,7 @@  discard block
 block discarded – undo
1556 1556
 		$query_values = array();
1557 1557
 		$additional_query = '';
1558 1558
 		$limit_query = '';
1559
-		$filter_query = $this->getFilter($filters,true,true);
1559
+		$filter_query = $this->getFilter($filters, true, true);
1560 1560
 		
1561 1561
 		if ($aircraft_manufacturer != "")
1562 1562
 		{
@@ -1573,8 +1573,8 @@  discard block
 block discarded – undo
1573 1573
 		{
1574 1574
 			$limit_array = explode(",", $limit);
1575 1575
 			
1576
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1577
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1576
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1577
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1578 1578
 			
1579 1579
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1580 1580
 			{
@@ -1616,14 +1616,14 @@  discard block
 block discarded – undo
1616 1616
 		$query_values = array();
1617 1617
 		$additional_query = '';
1618 1618
 		$limit_query = '';
1619
-		$filter_query = $this->getFilter($filters,true,true);
1619
+		$filter_query = $this->getFilter($filters, true, true);
1620 1620
 		if ($departure_airport_icao != "")
1621 1621
 		{
1622 1622
 			if (!is_string($departure_airport_icao))
1623 1623
 			{
1624 1624
 				return false;
1625 1625
 			} else {
1626
-				$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1626
+				$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1627 1627
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)";
1628 1628
 				$query_values = array(':departure_airport_icao' => $departure_airport_icao);
1629 1629
 			}
@@ -1635,9 +1635,9 @@  discard block
 block discarded – undo
1635 1635
 			{
1636 1636
 				return false;
1637 1637
 			} else {
1638
-				$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1638
+				$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1639 1639
 				$additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)";
1640
-				$query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao));
1640
+				$query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao));
1641 1641
 			}
1642 1642
 		}
1643 1643
 		
@@ -1645,8 +1645,8 @@  discard block
 block discarded – undo
1645 1645
 		{
1646 1646
 			$limit_array = explode(",", $limit);
1647 1647
 			
1648
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1649
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1648
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1649
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1650 1650
 			
1651 1651
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1652 1652
 			{
@@ -1685,15 +1685,15 @@  discard block
 block discarded – undo
1685 1685
 		global $global_query;
1686 1686
 		
1687 1687
 		date_default_timezone_set('UTC');
1688
-		$filter_query = $this->getFilter($filter,true,true);
1688
+		$filter_query = $this->getFilter($filter, true, true);
1689 1689
 		$limit_query = '';
1690 1690
 		
1691 1691
 		if ($limit != "")
1692 1692
 		{
1693 1693
 			$limit_array = explode(",", $limit);
1694 1694
 			
1695
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1696
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1695
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1696
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1697 1697
 			
1698 1698
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1699 1699
 			{
@@ -1710,7 +1710,7 @@  discard block
 block discarded – undo
1710 1710
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1711 1711
 		}
1712 1712
 
1713
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1713
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1714 1714
 
1715 1715
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1716 1716
 
@@ -1723,19 +1723,19 @@  discard block
 block discarded – undo
1723 1723
 	* @return String the highlight text
1724 1724
 	*
1725 1725
 	*/
1726
-	public function getHighlightByRegistration($registration,$filter = array())
1726
+	public function getHighlightByRegistration($registration, $filter = array())
1727 1727
 	{
1728 1728
 		global $global_query;
1729 1729
 		
1730 1730
 		date_default_timezone_set('UTC');
1731
-		$filter_query = $this->getFilter($filter,true,true);
1732
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
1731
+		$filter_query = $this->getFilter($filter, true, true);
1732
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
1733 1733
 		
1734
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1734
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1735 1735
 		$sth = $this->db->prepare($query);
1736 1736
 		$sth->execute(array(':registration' => $registration));
1737 1737
 
1738
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1738
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1739 1739
 		{
1740 1740
 			$highlight = $row['highlight'];
1741 1741
 		}
@@ -1751,14 +1751,14 @@  discard block
 block discarded – undo
1751 1751
 	* @return String usage
1752 1752
 	*
1753 1753
 	*/
1754
-	public function getSquawkUsage($squawk = '',$country = 'FR')
1754
+	public function getSquawkUsage($squawk = '', $country = 'FR')
1755 1755
 	{
1756 1756
 		
1757
-		$squawk = filter_var($squawk,FILTER_SANITIZE_STRING);
1758
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
1757
+		$squawk = filter_var($squawk, FILTER_SANITIZE_STRING);
1758
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
1759 1759
 
1760 1760
 		$query  = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1";
1761
-		$query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country);
1761
+		$query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country);
1762 1762
 		
1763 1763
 		$sth = $this->db->prepare($query);
1764 1764
 		$sth->execute($query_values);
@@ -1780,9 +1780,9 @@  discard block
 block discarded – undo
1780 1780
 	public function getAirportIcao($airport_iata = '')
1781 1781
 	{
1782 1782
 		
1783
-		$airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING);
1783
+		$airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING);
1784 1784
 
1785
-		$query  = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1785
+		$query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1786 1786
 		$query_values = array(':airport' => $airport_iata);
1787 1787
 		
1788 1788
 		$sth = $this->db->prepare($query);
@@ -1804,12 +1804,12 @@  discard block
 block discarded – undo
1804 1804
 	* @return Float distance to the airport
1805 1805
 	*
1806 1806
 	*/
1807
-	public function getAirportDistance($airport_icao,$latitude,$longitude)
1807
+	public function getAirportDistance($airport_icao, $latitude, $longitude)
1808 1808
 	{
1809 1809
 		
1810
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
1810
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
1811 1811
 
1812
-		$query  = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1812
+		$query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1813 1813
 		$query_values = array(':airport' => $airport_icao);
1814 1814
 		$sth = $this->db->prepare($query);
1815 1815
 		$sth->execute($query_values);
@@ -1819,7 +1819,7 @@  discard block
 block discarded – undo
1819 1819
 			$airport_latitude = $row['latitude'];
1820 1820
 			$airport_longitude = $row['longitude'];
1821 1821
 			$Common = new Common();
1822
-			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1822
+			return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude);
1823 1823
 		} else return '';
1824 1824
 	}
1825 1825
 	
@@ -1833,11 +1833,11 @@  discard block
 block discarded – undo
1833 1833
 	public function getAllAirportInfo($airport = '')
1834 1834
 	{
1835 1835
 		
1836
-		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
1836
+		$airport = filter_var($airport, FILTER_SANITIZE_STRING);
1837 1837
 
1838 1838
 		$query_values = array();
1839 1839
 		if ($airport == 'NA') {
1840
-			return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => ''));
1840
+			return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => ''));
1841 1841
 		} elseif ($airport == '') {
1842 1842
 			$query  = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport";
1843 1843
 		} else {
@@ -1885,14 +1885,14 @@  discard block
 block discarded – undo
1885 1885
 	{
1886 1886
 		$lst_countries = '';
1887 1887
 		foreach ($countries as $country) {
1888
-			$country = filter_var($country,FILTER_SANITIZE_STRING);
1888
+			$country = filter_var($country, FILTER_SANITIZE_STRING);
1889 1889
 			if ($lst_countries == '') {
1890 1890
 				$lst_countries = "'".$country."'";
1891 1891
 			} else {
1892 1892
 				$lst_countries .= ",'".$country."'";
1893 1893
 			}
1894 1894
 		}
1895
-		$query  = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1895
+		$query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1896 1896
 		
1897 1897
 		$sth = $this->db->prepare($query);
1898 1898
 		$sth->execute();
@@ -1900,7 +1900,7 @@  discard block
 block discarded – undo
1900 1900
 		$airport_array = array();
1901 1901
 		$temp_array = array();
1902 1902
 		
1903
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1903
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1904 1904
 		{
1905 1905
 			$temp_array['name'] = $row['name'];
1906 1906
 			$temp_array['city'] = $row['city'];
@@ -1928,10 +1928,10 @@  discard block
 block discarded – undo
1928 1928
 	{
1929 1929
 		global $globalDBdriver;
1930 1930
 		if (is_array($coord)) {
1931
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1932
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1933
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1934
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1931
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1932
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1933
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1934
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1935 1935
 		} else return array();
1936 1936
 		if ($globalDBdriver == 'mysql') {
1937 1937
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
@@ -1943,7 +1943,7 @@  discard block
 block discarded – undo
1943 1943
     
1944 1944
 		$airport_array = array();
1945 1945
 		
1946
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1946
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1947 1947
 		{
1948 1948
 			$temp_array = $row;
1949 1949
 
@@ -1963,13 +1963,13 @@  discard block
 block discarded – undo
1963 1963
 	public function getAllWaypointsInfobyCoord($coord)
1964 1964
 	{
1965 1965
 		if (is_array($coord)) {
1966
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1967
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1968
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1969
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1966
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1967
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1968
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1969
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1970 1970
 		} else return array();
1971 1971
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
1972
-		$query  = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
1972
+		$query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
1973 1973
 		//$query  = "SELECT waypoints.* FROM waypoints";
1974 1974
 		//$query  = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end";
1975 1975
 		//$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
@@ -1981,7 +1981,7 @@  discard block
 block discarded – undo
1981 1981
     
1982 1982
 		$waypoints_array = array();
1983 1983
 		
1984
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1984
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1985 1985
 		{
1986 1986
 			$temp_array = $row;
1987 1987
 
@@ -2003,10 +2003,10 @@  discard block
 block discarded – undo
2003 2003
 	{
2004 2004
 		global $globalUseRealAirlines;
2005 2005
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2006
-		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2006
+		$airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING));
2007 2007
 		if ($airline_icao == 'NA') {
2008 2008
 			$airline_array = array();
2009
-			$airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2009
+			$airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2010 2010
 			return $airline_array;
2011 2011
 		} else {
2012 2012
 			if (strlen($airline_icao) == 2) {
@@ -2027,7 +2027,7 @@  discard block
 block discarded – undo
2027 2027
 			if ($fromsource === NULL) {
2028 2028
 				$sth->execute(array(':airline_icao' => $airline_icao));
2029 2029
 			} else {
2030
-				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
2030
+				$sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource));
2031 2031
 			}
2032 2032
                         /*
2033 2033
 			$airline_array = array();
@@ -2069,12 +2069,12 @@  discard block
 block discarded – undo
2069 2069
 	*/
2070 2070
 	public function getAllAircraftInfo($aircraft_type)
2071 2071
 	{
2072
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2072
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2073 2073
 
2074 2074
 		if ($aircraft_type == 'NA') {
2075
-			return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2075
+			return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2076 2076
 		}
2077
-		$query  = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow FROM aircraft WHERE aircraft.icao = :aircraft_type";
2077
+		$query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow FROM aircraft WHERE aircraft.icao = :aircraft_type";
2078 2078
 		
2079 2079
 		$sth = $this->db->prepare($query);
2080 2080
 		$sth->execute(array(':aircraft_type' => $aircraft_type));
@@ -2106,7 +2106,7 @@  discard block
 block discarded – undo
2106 2106
 	*/
2107 2107
 	public function getAircraftIcao($aircraft_type)
2108 2108
 	{
2109
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2109
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2110 2110
 		$all_aircraft = array('737-300' => 'B733',
2111 2111
 				'777-200' => 'B772',
2112 2112
 				'777-200ER' => 'B772',
@@ -2118,10 +2118,10 @@  discard block
 block discarded – undo
2118 2118
 				'A380' => 'A388');
2119 2119
 		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2120 2120
 
2121
-		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2121
+		$query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2122 2122
 		$aircraft_type = strtoupper($aircraft_type);
2123 2123
 		$sth = $this->db->prepare($query);
2124
-		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2124
+		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,));
2125 2125
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2126 2126
 		if (isset($result[0]['icao'])) return $result[0]['icao'];
2127 2127
 		else return '';
@@ -2136,9 +2136,9 @@  discard block
 block discarded – undo
2136 2136
 	*/
2137 2137
 	public function getAllAircraftType($aircraft_modes)
2138 2138
 	{
2139
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
2139
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
2140 2140
 
2141
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
2141
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
2142 2142
 		
2143 2143
 		$sth = $this->db->prepare($query);
2144 2144
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -2159,8 +2159,8 @@  discard block
 block discarded – undo
2159 2159
 	*/
2160 2160
 	public function getOperator($operator)
2161 2161
 	{
2162
-		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
2163
-		$query  = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2162
+		$operator = filter_var($operator, FILTER_SANITIZE_STRING);
2163
+		$query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2164 2164
 		
2165 2165
 		$sth = $this->db->prepare($query);
2166 2166
 		$sth->execute(array(':operator' => $operator));
@@ -2181,9 +2181,9 @@  discard block
 block discarded – undo
2181 2181
 	*/
2182 2182
 	public function getRouteInfo($callsign)
2183 2183
 	{
2184
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2184
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
2185 2185
                 if ($callsign == '') return array();
2186
-		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2186
+		$query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2187 2187
 		
2188 2188
 		$sth = $this->db->prepare($query);
2189 2189
 		$sth->execute(array(':callsign' => $callsign));
@@ -2204,9 +2204,9 @@  discard block
 block discarded – undo
2204 2204
 	*/
2205 2205
 	public function getAircraftInfoByRegistration($registration)
2206 2206
 	{
2207
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2207
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2208 2208
 
2209
-		$query  = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2209
+		$query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2210 2210
 		
2211 2211
 		$sth = $this->db->prepare($query);
2212 2212
 		$sth->execute(array(':registration' => $registration));
@@ -2214,7 +2214,7 @@  discard block
 block discarded – undo
2214 2214
 		$aircraft_array = array();
2215 2215
 		$temp_array = array();
2216 2216
 		
2217
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2217
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2218 2218
 		{
2219 2219
 			$temp_array['airline_icao'] = $row['airline_icao'];
2220 2220
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
@@ -2236,7 +2236,7 @@  discard block
 block discarded – undo
2236 2236
 	*/
2237 2237
 	public function getAircraftOwnerByRegistration($registration)
2238 2238
 	{
2239
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2239
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2240 2240
 		$Connection = new Connection($this->db);
2241 2241
 		if ($Connection->tableExists('aircraft_owner')) {
2242 2242
 			$query  = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1";
@@ -2258,7 +2258,7 @@  discard block
 block discarded – undo
2258 2258
 	public function getAllFlightsforSitemap()
2259 2259
 	{
2260 2260
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
2261
-		$query  = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2261
+		$query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2262 2262
 		
2263 2263
 		$sth = $this->db->prepare($query);
2264 2264
 		$sth->execute();
@@ -2305,7 +2305,7 @@  discard block
 block discarded – undo
2305 2305
 		$manufacturer_array = array();
2306 2306
 		$temp_array = array();
2307 2307
 		
2308
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2308
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2309 2309
 		{
2310 2310
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
2311 2311
 
@@ -2331,7 +2331,7 @@  discard block
 block discarded – undo
2331 2331
 								ORDER BY spotter_output.aircraft_name ASC";
2332 2332
 								
2333 2333
 		*/
2334
-		$filter_query = $this->getFilter($filters,true,true);
2334
+		$filter_query = $this->getFilter($filters, true, true);
2335 2335
 		$query = "SELECT DISTINCT icao AS aircraft_icao, type AS aircraft_name, manufacturer AS aircraft_manufacturer FROM aircraft".$filter_query." icao <> '' ORDER BY aircraft_manufacturer ASC";
2336 2336
 		
2337 2337
 		$sth = $this->db->prepare($query);
@@ -2340,7 +2340,7 @@  discard block
 block discarded – undo
2340 2340
 		$aircraft_array = array();
2341 2341
 		$temp_array = array();
2342 2342
 		
2343
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2343
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2344 2344
 		{
2345 2345
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
2346 2346
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
@@ -2361,8 +2361,8 @@  discard block
 block discarded – undo
2361 2361
 	*/
2362 2362
 	public function getAllAircraftRegistrations($filters = array())
2363 2363
 	{
2364
-		$filter_query = $this->getFilter($filters,true,true);
2365
-		$query  = "SELECT DISTINCT spotter_output.registration 
2364
+		$filter_query = $this->getFilter($filters, true, true);
2365
+		$query = "SELECT DISTINCT spotter_output.registration 
2366 2366
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' 
2367 2367
 				ORDER BY spotter_output.registration ASC";
2368 2368
 
@@ -2372,7 +2372,7 @@  discard block
 block discarded – undo
2372 2372
 		$aircraft_array = array();
2373 2373
 		$temp_array = array();
2374 2374
 		
2375
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2375
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2376 2376
 		{
2377 2377
 			$temp_array['registration'] = $row['registration'];
2378 2378
 
@@ -2389,11 +2389,11 @@  discard block
 block discarded – undo
2389 2389
 	* @return Array list of source name
2390 2390
 	*
2391 2391
 	*/
2392
-	public function getAllSourceName($type = '',$filters = array())
2392
+	public function getAllSourceName($type = '', $filters = array())
2393 2393
 	{
2394
-		$filter_query = $this->getFilter($filters,true,true);
2394
+		$filter_query = $this->getFilter($filters, true, true);
2395 2395
 		$query_values = array();
2396
-		$query  = "SELECT DISTINCT spotter_output.source_name 
2396
+		$query = "SELECT DISTINCT spotter_output.source_name 
2397 2397
 				FROM spotter_output".$filter_query." spotter_output.source_name <> ''";
2398 2398
 		if ($type != '') {
2399 2399
 			$query_values = array(':type' => $type);
@@ -2408,7 +2408,7 @@  discard block
 block discarded – undo
2408 2408
 		$source_array = array();
2409 2409
 		$temp_array = array();
2410 2410
 		
2411
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2411
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2412 2412
 		{
2413 2413
 			$temp_array['source_name'] = $row['source_name'];
2414 2414
 			$source_array[] = $temp_array;
@@ -2424,11 +2424,11 @@  discard block
 block discarded – undo
2424 2424
 	* @return Array list of airline names
2425 2425
 	*
2426 2426
 	*/
2427
-	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
2427
+	public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array())
2428 2428
 	{
2429
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
2430
-		$filter_query = $this->getFilter($filters,true,true);
2431
-		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
2429
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
2430
+		$filter_query = $this->getFilter($filters, true, true);
2431
+		$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
2432 2432
 		if ($airline_type == '' || $airline_type == 'all') {
2433 2433
 			/*
2434 2434
 			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
@@ -2447,7 +2447,7 @@  discard block
 block discarded – undo
2447 2447
 				$query_data = array(':forsource' => $forsource);
2448 2448
 			}
2449 2449
 		} else {
2450
-			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2450
+			$query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2451 2451
 					FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
2452 2452
 					AND spotter_output.airline_type = :airline_type 
2453 2453
 					ORDER BY spotter_output.airline_icao ASC";
@@ -2460,7 +2460,7 @@  discard block
 block discarded – undo
2460 2460
 		$airline_array = array();
2461 2461
 		$temp_array = array();
2462 2462
 		
2463
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2463
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2464 2464
 		{
2465 2465
 			$temp_array['airline_icao'] = $row['airline_icao'];
2466 2466
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -2480,8 +2480,8 @@  discard block
 block discarded – undo
2480 2480
 	*/
2481 2481
 	public function getAllAirlineCountries($filters = array())
2482 2482
 	{
2483
-		$filter_query = $this->getFilter($filters,true,true);
2484
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2483
+		$filter_query = $this->getFilter($filters, true, true);
2484
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2485 2485
 				FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
2486 2486
 				ORDER BY spotter_output.airline_country ASC";
2487 2487
 		
@@ -2492,7 +2492,7 @@  discard block
 block discarded – undo
2492 2492
 		$airline_array = array();
2493 2493
 		$temp_array = array();
2494 2494
 		
2495
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2495
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2496 2496
 		{
2497 2497
 			$temp_array['airline_country'] = $row['airline_country'];
2498 2498
 
@@ -2512,9 +2512,9 @@  discard block
 block discarded – undo
2512 2512
 	*/
2513 2513
 	public function getAllAirportNames($filters = array())
2514 2514
 	{
2515
-		$filter_query = $this->getFilter($filters,true,true);
2515
+		$filter_query = $this->getFilter($filters, true, true);
2516 2516
 		$airport_array = array();
2517
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2517
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2518 2518
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA' 
2519 2519
 				ORDER BY spotter_output.departure_airport_city ASC";
2520 2520
 		
@@ -2523,7 +2523,7 @@  discard block
 block discarded – undo
2523 2523
 		$sth->execute();
2524 2524
 
2525 2525
 		$temp_array = array();
2526
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2526
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2527 2527
 		{
2528 2528
 			$temp_array['airport_icao'] = $row['airport_icao'];
2529 2529
 			$temp_array['airport_name'] = $row['airport_name'];
@@ -2533,14 +2533,14 @@  discard block
 block discarded – undo
2533 2533
 			$airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array;
2534 2534
 		}
2535 2535
 
2536
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2536
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2537 2537
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' 
2538 2538
 								ORDER BY spotter_output.arrival_airport_city ASC";
2539 2539
 					
2540 2540
 		$sth = $this->db->prepare($query);
2541 2541
 		$sth->execute();
2542 2542
 
2543
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2543
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2544 2544
 			{
2545 2545
 		//	if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao'])
2546 2546
 		//	{
@@ -2580,21 +2580,21 @@  discard block
 block discarded – undo
2580 2580
    
2581 2581
 		$temp_array = array();
2582 2582
 		
2583
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2583
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2584 2584
 		{
2585 2585
 			$temp_array['airport_country'] = $row['airport_country'];
2586 2586
 
2587 2587
 			$airport_array[$row['airport_country']] = $temp_array;
2588 2588
 		}
2589
-		$filter_query = $this->getFilter($filters,true,true);
2590
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2589
+		$filter_query = $this->getFilter($filters, true, true);
2590
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2591 2591
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
2592 2592
 								ORDER BY spotter_output.arrival_airport_country ASC";
2593 2593
 					
2594 2594
 		$sth = $this->db->prepare($query);
2595 2595
 		$sth->execute();
2596 2596
 		
2597
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2597
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2598 2598
 		{
2599 2599
 			if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country'])
2600 2600
 			{
@@ -2617,9 +2617,9 @@  discard block
 block discarded – undo
2617 2617
 	*/
2618 2618
 	public function getAllCountries($filters = array())
2619 2619
 	{
2620
-		$Connection= new Connection($this->db);
2620
+		$Connection = new Connection($this->db);
2621 2621
 		if ($Connection->tableExists('countries')) {
2622
-			$query  = "SELECT countries.name AS airport_country
2622
+			$query = "SELECT countries.name AS airport_country
2623 2623
 				FROM countries
2624 2624
 				ORDER BY countries.name ASC";
2625 2625
 			$sth = $this->db->prepare($query);
@@ -2628,14 +2628,14 @@  discard block
 block discarded – undo
2628 2628
 			$temp_array = array();
2629 2629
 			$country_array = array();
2630 2630
 		
2631
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2631
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2632 2632
 			{
2633 2633
 				$temp_array['country'] = $row['airport_country'];
2634 2634
 				$country_array[$row['airport_country']] = $temp_array;
2635 2635
 			}
2636 2636
 		} else {
2637
-			$filter_query = $this->getFilter($filters,true,true);
2638
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2637
+			$filter_query = $this->getFilter($filters, true, true);
2638
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2639 2639
 								FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' 
2640 2640
 								ORDER BY spotter_output.departure_airport_country ASC";
2641 2641
 
@@ -2644,20 +2644,20 @@  discard block
 block discarded – undo
2644 2644
    
2645 2645
 			$temp_array = array();
2646 2646
 			$country_array = array();
2647
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2647
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2648 2648
 			{
2649 2649
 				$temp_array['country'] = $row['airport_country'];
2650 2650
 				$country_array[$row['airport_country']] = $temp_array;
2651 2651
 			}
2652 2652
 
2653
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2653
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2654 2654
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
2655 2655
 								ORDER BY spotter_output.arrival_airport_country ASC";
2656 2656
 					
2657 2657
 		$sth = $this->db->prepare($query);
2658 2658
 		$sth->execute();
2659 2659
 		
2660
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2660
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2661 2661
 		{
2662 2662
 			if ($country_array[$row['airport_country']]['country'] != $row['airport_country'])
2663 2663
 			{
@@ -2667,14 +2667,14 @@  discard block
 block discarded – undo
2667 2667
 			}
2668 2668
 		}
2669 2669
 		
2670
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2670
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2671 2671
 								FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
2672 2672
 								ORDER BY spotter_output.airline_country ASC";
2673 2673
 					
2674 2674
 		$sth = $this->db->prepare($query);
2675 2675
 		$sth->execute();
2676 2676
 		
2677
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2677
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2678 2678
 		{
2679 2679
 			if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country'])
2680 2680
 			{
@@ -2698,8 +2698,8 @@  discard block
 block discarded – undo
2698 2698
 	*/
2699 2699
 	public function getAllIdents($filters = array())
2700 2700
 	{
2701
-		$filter_query = $this->getFilter($filters,true,true);
2702
-		$query  = "SELECT DISTINCT spotter_output.ident
2701
+		$filter_query = $this->getFilter($filters, true, true);
2702
+		$query = "SELECT DISTINCT spotter_output.ident
2703 2703
 								FROM spotter_output".$filter_query." spotter_output.ident <> '' 
2704 2704
 								ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0";
2705 2705
 
@@ -2709,7 +2709,7 @@  discard block
 block discarded – undo
2709 2709
 		$ident_array = array();
2710 2710
 		$temp_array = array();
2711 2711
 		
2712
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2712
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2713 2713
 		{
2714 2714
 			$temp_array['ident'] = $row['ident'];
2715 2715
 			$ident_array[] = $temp_array;
@@ -2723,9 +2723,9 @@  discard block
 block discarded – undo
2723 2723
 	* @return Array number, icao, name and city of airports
2724 2724
 	*/
2725 2725
 
2726
-	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
2726
+	public function getLast7DaysAirportsDeparture($airport_icao = '', $filters = array()) {
2727 2727
 		global $globalTimezone, $globalDBdriver;
2728
-		$filter_query = $this->getFilter($filters,true,true);
2728
+		$filter_query = $this->getFilter($filters, true, true);
2729 2729
 		if ($globalTimezone != '') {
2730 2730
 			date_default_timezone_set($globalTimezone);
2731 2731
 			$datetime = new DateTime();
@@ -2790,7 +2790,7 @@  discard block
 block discarded – undo
2790 2790
 
2791 2791
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
2792 2792
 		global $globalTimezone, $globalDBdriver;
2793
-		$filter_query = $this->getFilter($filters,true,true);
2793
+		$filter_query = $this->getFilter($filters, true, true);
2794 2794
 		if ($globalTimezone != '') {
2795 2795
 			date_default_timezone_set($globalTimezone);
2796 2796
 			$datetime = new DateTime();
@@ -2874,7 +2874,7 @@  discard block
 block discarded – undo
2874 2874
 
2875 2875
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
2876 2876
 		global $globalTimezone, $globalDBdriver;
2877
-		$filter_query = $this->getFilter($filters,true,true);
2877
+		$filter_query = $this->getFilter($filters, true, true);
2878 2878
 		if ($globalTimezone != '') {
2879 2879
 			date_default_timezone_set($globalTimezone);
2880 2880
 			$datetime = new DateTime();
@@ -2907,9 +2907,9 @@  discard block
 block discarded – undo
2907 2907
 	* @return Array number, icao, name and city of airports
2908 2908
 	*/
2909 2909
 
2910
-	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
2910
+	public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $filters = array()) {
2911 2911
 		global $globalTimezone, $globalDBdriver;
2912
-		$filter_query = $this->getFilter($filters,true,true);
2912
+		$filter_query = $this->getFilter($filters, true, true);
2913 2913
 		if ($globalTimezone != '') {
2914 2914
 			date_default_timezone_set($globalTimezone);
2915 2915
 			$datetime = new DateTime();
@@ -3041,12 +3041,12 @@  discard block
 block discarded – undo
3041 3041
 		} else $offset = '+00:00';
3042 3042
 
3043 3043
 		if ($globalDBdriver == 'mysql') {
3044
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3044
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3045 3045
 								FROM spotter_output
3046 3046
 								WHERE spotter_output.date <> '' 
3047 3047
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
3048 3048
 		} else {
3049
-			$query  = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3049
+			$query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3050 3050
 								FROM spotter_output
3051 3051
 								WHERE spotter_output.date <> '' 
3052 3052
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
@@ -3058,7 +3058,7 @@  discard block
 block discarded – undo
3058 3058
 		$date_array = array();
3059 3059
 		$temp_array = array();
3060 3060
 		
3061
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3061
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3062 3062
 		{
3063 3063
 			$temp_array['date'] = $row['date'];
3064 3064
 
@@ -3078,7 +3078,7 @@  discard block
 block discarded – undo
3078 3078
 	*/
3079 3079
 	public function getAllRoutes()
3080 3080
 	{
3081
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
3081
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
3082 3082
 				FROM spotter_output
3083 3083
 				WHERE spotter_output.ident <> '' 
3084 3084
 				GROUP BY route
@@ -3089,7 +3089,7 @@  discard block
 block discarded – undo
3089 3089
 
3090 3090
 		$routes_array = array();
3091 3091
 		$temp_array = array();
3092
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3092
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3093 3093
 		{
3094 3094
 			$temp_array['route'] = $row['route'];
3095 3095
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -3108,21 +3108,21 @@  discard block
 block discarded – undo
3108 3108
 	* @return String success or false
3109 3109
 	*
3110 3110
 	*/	
3111
-	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
3111
+	public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL)
3112 3112
 	{
3113 3113
 		if (!is_numeric(substr($ident, 0, 3)))
3114 3114
 		{
3115 3115
 			if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3116
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3116
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3117 3117
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3118
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3118
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3119 3119
 			} else {
3120 3120
 				$airline_array = $this->getAllAirlineInfo("NA");
3121 3121
 			}
3122 3122
 			if (count($airline_array) == 0) {
3123 3123
 				$airline_array = $this->getAllAirlineInfo("NA");
3124 3124
 			}
3125
-			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3125
+			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3126 3126
 				$airline_array = $this->getAllAirlineInfo("NA");
3127 3127
 			}
3128 3128
 		} else {
@@ -3135,7 +3135,7 @@  discard block
 block discarded – undo
3135 3135
 
3136 3136
 
3137 3137
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
3138
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
3138
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type);
3139 3139
 
3140 3140
 		try {
3141 3141
 			$sth = $this->db->prepare($query);
@@ -3156,11 +3156,11 @@  discard block
 block discarded – undo
3156 3156
 	* @return String success or false
3157 3157
 	*
3158 3158
 	*/	
3159
-	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3159
+	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '')
3160 3160
 	{
3161 3161
 		if ($groundspeed == '') $groundspeed = NULL;
3162 3162
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
3163
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3163
+                $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3164 3164
 
3165 3165
 		try {
3166 3166
 			$sth = $this->db->prepare($query);
@@ -3200,7 +3200,7 @@  discard block
 block discarded – undo
3200 3200
 	* @param String $verticalrate vertival rate of flight
3201 3201
 	* @return String success or false
3202 3202
 	*/
3203
-	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
3203
+	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '')
3204 3204
 	{
3205 3205
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
3206 3206
 		
@@ -3224,13 +3224,13 @@  discard block
 block discarded – undo
3224 3224
 				if ($ModeS != '') {
3225 3225
 					$timeelapsed = microtime(true);
3226 3226
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3227
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3227
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3228 3228
 				} else {
3229
-					$myhex = explode('-',$flightaware_id);
3229
+					$myhex = explode('-', $flightaware_id);
3230 3230
 					if (count($myhex) > 0) {
3231 3231
 						$timeelapsed = microtime(true);
3232 3232
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3233
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3233
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3234 3234
 					}
3235 3235
 				}
3236 3236
 			}
@@ -3252,24 +3252,24 @@  discard block
 block discarded – undo
3252 3252
 				{
3253 3253
 					$timeelapsed = microtime(true);
3254 3254
 					if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3255
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3255
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3256 3256
 					} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3257
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3257
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3258 3258
 					} else {
3259 3259
 						$airline_array = $this->getAllAirlineInfo("NA");
3260 3260
 					}
3261 3261
 					if (count($airline_array) == 0) {
3262 3262
 						$airline_array = $this->getAllAirlineInfo("NA");
3263 3263
 					}
3264
-					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3264
+					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3265 3265
 						$airline_array = $this->getAllAirlineInfo("NA");
3266 3266
 					}
3267
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3267
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3268 3268
 
3269 3269
 				} else {
3270 3270
 					$timeelapsed = microtime(true);
3271 3271
 					$airline_array = $this->getAllAirlineInfo("NA");
3272
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3272
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3273 3273
 				}
3274 3274
 			}
3275 3275
 		} else $airline_array = array();
@@ -3286,27 +3286,27 @@  discard block
 block discarded – undo
3286 3286
 				{
3287 3287
 					$timeelapsed = microtime(true);
3288 3288
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3289
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3289
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3290 3290
 				} else {
3291 3291
 					$timeelapsed = microtime(true);
3292 3292
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3293
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3293
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3294 3294
 				}
3295 3295
 			}
3296 3296
 		} else {
3297 3297
 			if ($ModeS != '') {
3298 3298
 				$timeelapsed = microtime(true);
3299 3299
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3300
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3300
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3301 3301
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3302 3302
 				{
3303 3303
 					$timeelapsed = microtime(true);
3304 3304
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3305
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3305
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3306 3306
 				} else {
3307 3307
 					$timeelapsed = microtime(true);
3308 3308
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3309
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3309
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3310 3310
 				}
3311 3311
 			}
3312 3312
 		}
@@ -3321,7 +3321,7 @@  discard block
 block discarded – undo
3321 3321
 			} else {
3322 3322
 				$timeelapsed = microtime(true);
3323 3323
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3324
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3324
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3325 3325
 			}
3326 3326
 		}
3327 3327
 		
@@ -3335,7 +3335,7 @@  discard block
 block discarded – undo
3335 3335
 			} else {
3336 3336
 				$timeelapsed = microtime(true);
3337 3337
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3338
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3338
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3339 3339
 			}
3340 3340
 		}
3341 3341
 
@@ -3399,7 +3399,7 @@  discard block
 block discarded – undo
3399 3399
 		{
3400 3400
 			$timeelapsed = microtime(true);
3401 3401
 			$image_array = $Image->getSpotterImage($registration);
3402
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3402
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3403 3403
 			if (!isset($image_array[0]['registration']))
3404 3404
 			{
3405 3405
 				//echo "Add image !!!! \n";
@@ -3407,7 +3407,7 @@  discard block
 block discarded – undo
3407 3407
 			}
3408 3408
 			$timeelapsed = microtime(true);
3409 3409
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3410
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3410
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3411 3411
 			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3412 3412
 		}
3413 3413
     
@@ -3415,33 +3415,33 @@  discard block
 block discarded – undo
3415 3415
 		{
3416 3416
             		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3417 3417
             		else $airline_icao = '';
3418
-			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3418
+			$image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao);
3419 3419
 			if (!isset($image_array[0]['registration']))
3420 3420
 			{
3421 3421
 				//echo "Add image !!!! \n";
3422
-				$Image->addSpotterImage('',$aircraft_icao,$airline_icao);
3422
+				$Image->addSpotterImage('', $aircraft_icao, $airline_icao);
3423 3423
 			}
3424 3424
 		}
3425 3425
     
3426
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
3427
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
3428
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
3429
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3430
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
3431
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
3432
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3433
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3434
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
3435
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3436
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
3437
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3438
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
3439
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
3440
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
3441
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
3442
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
3443
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
3444
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
3426
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
3427
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
3428
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
3429
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3430
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
3431
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
3432
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3433
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3434
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
3435
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3436
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
3437
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3438
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
3439
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
3440
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
3441
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
3442
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
3443
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
3444
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
3445 3445
 	
3446 3446
 		if (count($airline_array) == 0) 
3447 3447
 		{
@@ -3465,7 +3465,7 @@  discard block
 block discarded – undo
3465 3465
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3466 3466
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3467 3467
                 if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3468
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
3468
+                $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
3469 3469
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
3470 3470
 
3471 3471
                 $airline_name = $airline_array[0]['name'];
@@ -3475,7 +3475,7 @@  discard block
 block discarded – undo
3475 3475
 		if ($airline_type == '') {
3476 3476
 			$timeelapsed = microtime(true);
3477 3477
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3478
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3478
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3479 3479
 		}
3480 3480
 		if ($airline_type == null) $airline_type = '';
3481 3481
                 $aircraft_type = $aircraft_array[0]['type'];
@@ -3486,7 +3486,7 @@  discard block
 block discarded – undo
3486 3486
                 $arrival_airport_name = $arrival_airport_array[0]['name'];
3487 3487
                 $arrival_airport_city = $arrival_airport_array[0]['city'];
3488 3488
                 $arrival_airport_country = $arrival_airport_array[0]['country'];
3489
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3489
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3490 3490
 
3491 3491
 		try {
3492 3492
 		        
@@ -3512,13 +3512,13 @@  discard block
 block discarded – undo
3512 3512
 	{
3513 3513
 		global $globalDBdriver, $globalTimezone;
3514 3514
 		if ($globalDBdriver == 'mysql') {
3515
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
3515
+			$query = "SELECT spotter_output.ident FROM spotter_output 
3516 3516
 								WHERE spotter_output.ident = :ident 
3517 3517
 								AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
3518 3518
 								AND spotter_output.date < UTC_TIMESTAMP()";
3519 3519
 			$query_data = array(':ident' => $ident);
3520 3520
 		} else {
3521
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
3521
+			$query = "SELECT spotter_output.ident FROM spotter_output 
3522 3522
 								WHERE spotter_output.ident = :ident 
3523 3523
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
3524 3524
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
@@ -3527,8 +3527,8 @@  discard block
 block discarded – undo
3527 3527
 		
3528 3528
 		$sth = $this->db->prepare($query);
3529 3529
 		$sth->execute($query_data);
3530
-    		$ident_result='';
3531
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3530
+    		$ident_result = '';
3531
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3532 3532
 		{
3533 3533
 			$ident_result = $row['ident'];
3534 3534
 		}
@@ -3554,8 +3554,8 @@  discard block
 block discarded – undo
3554 3554
 				return false;
3555 3555
 			} else {
3556 3556
 				$q_array = explode(" ", $q);
3557
-				foreach ($q_array as $q_item){
3558
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
3557
+				foreach ($q_array as $q_item) {
3558
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
3559 3559
 					$additional_query .= " AND (";
3560 3560
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
3561 3561
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
@@ -3570,11 +3570,11 @@  discard block
 block discarded – undo
3570 3570
 			}
3571 3571
 		}
3572 3572
 		if ($globalDBdriver == 'mysql') {
3573
-			$query  = "SELECT spotter_output.* FROM spotter_output 
3573
+			$query = "SELECT spotter_output.* FROM spotter_output 
3574 3574
 				WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
3575 3575
 				AND spotter_output.date < UTC_TIMESTAMP()";
3576 3576
 		} else {
3577
-			$query  = "SELECT spotter_output.* FROM spotter_output 
3577
+			$query = "SELECT spotter_output.* FROM spotter_output 
3578 3578
 				WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
3579 3579
 				AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
3580 3580
 		}
@@ -3591,11 +3591,11 @@  discard block
 block discarded – undo
3591 3591
 	* @return Array the airline list
3592 3592
 	*
3593 3593
 	*/
3594
-	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3594
+	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3595 3595
 	{
3596 3596
 		global $globalDBdriver;
3597
-		$filter_query = $this->getFilter($filters,true,true);
3598
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3597
+		$filter_query = $this->getFilter($filters, true, true);
3598
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3599 3599
 		 			FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA' ";
3600 3600
 		if ($olderthanmonths > 0) {
3601 3601
 			if ($globalDBdriver == 'mysql') {
@@ -3619,7 +3619,7 @@  discard block
 block discarded – undo
3619 3619
  
3620 3620
 		$airline_array = array();
3621 3621
 		$temp_array = array();
3622
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3622
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3623 3623
 		{
3624 3624
 			$temp_array['airline_name'] = $row['airline_name'];
3625 3625
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3636,11 +3636,11 @@  discard block
 block discarded – undo
3636 3636
 	* @return Array the pilots list
3637 3637
 	*
3638 3638
 	*/
3639
-	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3639
+	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3640 3640
 	{
3641 3641
 		global $globalDBdriver;
3642
-		$filter_query = $this->getFilter($filters,true,true);
3643
-		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count
3642
+		$filter_query = $this->getFilter($filters, true, true);
3643
+		$query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count
3644 3644
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
3645 3645
                 if ($olderthanmonths > 0) {
3646 3646
             		if ($globalDBdriver == 'mysql') {
@@ -3666,7 +3666,7 @@  discard block
 block discarded – undo
3666 3666
 		$airline_array = array();
3667 3667
 		$temp_array = array();
3668 3668
         
3669
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3669
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3670 3670
 		{
3671 3671
 			$temp_array['pilot_name'] = $row['pilot_name'];
3672 3672
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -3685,7 +3685,7 @@  discard block
 block discarded – undo
3685 3685
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
3686 3686
 	{
3687 3687
 		global $globalDBdriver;
3688
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count
3688
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count
3689 3689
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
3690 3690
                 if ($olderthanmonths > 0) {
3691 3691
             		if ($globalDBdriver == 'mysql') {
@@ -3711,7 +3711,7 @@  discard block
 block discarded – undo
3711 3711
 		$airline_array = array();
3712 3712
 		$temp_array = array();
3713 3713
         
3714
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3714
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3715 3715
 		{
3716 3716
 			$temp_array['pilot_name'] = $row['pilot_name'];
3717 3717
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -3728,11 +3728,11 @@  discard block
 block discarded – undo
3728 3728
 	* @return Array the pilots list
3729 3729
 	*
3730 3730
 	*/
3731
-	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3731
+	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3732 3732
 	{
3733 3733
 		global $globalDBdriver;
3734
-		$filter_query = $this->getFilter($filters,true,true);
3735
-		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3734
+		$filter_query = $this->getFilter($filters, true, true);
3735
+		$query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3736 3736
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3737 3737
                 if ($olderthanmonths > 0) {
3738 3738
             		if ($globalDBdriver == 'mysql') {
@@ -3758,7 +3758,7 @@  discard block
 block discarded – undo
3758 3758
 		$airline_array = array();
3759 3759
 		$temp_array = array();
3760 3760
         
3761
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3761
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3762 3762
 		{
3763 3763
 			$temp_array['owner_name'] = $row['owner_name'];
3764 3764
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -3773,11 +3773,11 @@  discard block
 block discarded – undo
3773 3773
 	* @return Array the pilots list
3774 3774
 	*
3775 3775
 	*/
3776
-	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3776
+	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3777 3777
 	{
3778 3778
 		global $globalDBdriver;
3779
-		$filter_query = $this->getFilter($filters,true,true);
3780
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3779
+		$filter_query = $this->getFilter($filters, true, true);
3780
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3781 3781
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3782 3782
                 if ($olderthanmonths > 0) {
3783 3783
             		if ($globalDBdriver == 'mysql') {
@@ -3803,7 +3803,7 @@  discard block
 block discarded – undo
3803 3803
 		$airline_array = array();
3804 3804
 		$temp_array = array();
3805 3805
         
3806
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3806
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3807 3807
 		{
3808 3808
 			$temp_array['owner_name'] = $row['owner_name'];
3809 3809
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -3819,11 +3819,11 @@  discard block
 block discarded – undo
3819 3819
 	* @return Array the airline list
3820 3820
 	*
3821 3821
 	*/
3822
-	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
3822
+	public function countAllAirlinesByAircraft($aircraft_icao, $filters = array())
3823 3823
 	{
3824
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3825
-		$filter_query = $this->getFilter($filters,true,true);
3826
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3824
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3825
+		$filter_query = $this->getFilter($filters, true, true);
3826
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3827 3827
 		 	    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
3828 3828
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
3829 3829
 			    ORDER BY airline_count DESC";
@@ -3835,7 +3835,7 @@  discard block
 block discarded – undo
3835 3835
 		$airline_array = array();
3836 3836
 		$temp_array = array();
3837 3837
         
3838
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3838
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3839 3839
 		{
3840 3840
 			$temp_array['airline_name'] = $row['airline_name'];
3841 3841
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3855,11 +3855,11 @@  discard block
 block discarded – undo
3855 3855
 	* @return Array the airline country list
3856 3856
 	*
3857 3857
 	*/
3858
-	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
3858
+	public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array())
3859 3859
 	{
3860
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3861
-		$filter_query = $this->getFilter($filters,true,true);
3862
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3860
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3861
+		$filter_query = $this->getFilter($filters, true, true);
3862
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3863 3863
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3864 3864
                     GROUP BY spotter_output.airline_country
3865 3865
 					ORDER BY airline_country_count DESC
@@ -3872,7 +3872,7 @@  discard block
 block discarded – undo
3872 3872
 		$airline_country_array = array();
3873 3873
 		$temp_array = array();
3874 3874
         
3875
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3875
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3876 3876
 		{
3877 3877
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3878 3878
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -3891,11 +3891,11 @@  discard block
 block discarded – undo
3891 3891
 	* @return Array the airline list
3892 3892
 	*
3893 3893
 	*/
3894
-	public function countAllAirlinesByAirport($airport_icao,$filters = array())
3894
+	public function countAllAirlinesByAirport($airport_icao, $filters = array())
3895 3895
 	{
3896
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3897
-		$filter_query = $this->getFilter($filters,true,true);
3898
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3896
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3897
+		$filter_query = $this->getFilter($filters, true, true);
3898
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3899 3899
 		    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) 
3900 3900
                     GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3901 3901
 		    ORDER BY airline_count DESC";
@@ -3907,7 +3907,7 @@  discard block
 block discarded – undo
3907 3907
 		$airline_array = array();
3908 3908
 		$temp_array = array();
3909 3909
         
3910
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3910
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3911 3911
 		{
3912 3912
 			$temp_array['airline_name'] = $row['airline_name'];
3913 3913
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3926,11 +3926,11 @@  discard block
 block discarded – undo
3926 3926
 	* @return Array the airline country list
3927 3927
 	*
3928 3928
 	*/
3929
-	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
3929
+	public function countAllAirlineCountriesByAirport($airport_icao, $filters = array())
3930 3930
 	{
3931
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3932
-		$filter_query = $this->getFilter($filters,true,true);
3933
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3931
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3932
+		$filter_query = $this->getFilter($filters, true, true);
3933
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3934 3934
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
3935 3935
 					GROUP BY spotter_output.airline_country
3936 3936
 					ORDER BY airline_country_count DESC
@@ -3943,7 +3943,7 @@  discard block
 block discarded – undo
3943 3943
 		$airline_country_array = array();
3944 3944
 		$temp_array = array();
3945 3945
         
3946
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3946
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3947 3947
 		{
3948 3948
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3949 3949
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -3960,11 +3960,11 @@  discard block
 block discarded – undo
3960 3960
 	* @return Array the airline list
3961 3961
 	*
3962 3962
 	*/
3963
-	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
3963
+	public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array())
3964 3964
 	{
3965
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
3966
-		$filter_query = $this->getFilter($filters,true,true);
3967
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3965
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
3966
+		$filter_query = $this->getFilter($filters, true, true);
3967
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3968 3968
 		 			FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
3969 3969
 					GROUP BY spotter_output.airline_name
3970 3970
 					ORDER BY airline_count DESC";
@@ -3975,7 +3975,7 @@  discard block
 block discarded – undo
3975 3975
 		$airline_array = array();
3976 3976
 		$temp_array = array();
3977 3977
         
3978
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3978
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3979 3979
 		{
3980 3980
 			$temp_array['airline_name'] = $row['airline_name'];
3981 3981
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3995,11 +3995,11 @@  discard block
 block discarded – undo
3995 3995
 	* @return Array the airline country list
3996 3996
 	*
3997 3997
 	*/
3998
-	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
3998
+	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array())
3999 3999
 	{
4000
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4001
-		$filter_query = $this->getFilter($filters,true,true);
4002
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4000
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4001
+		$filter_query = $this->getFilter($filters, true, true);
4002
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4003 4003
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
4004 4004
 					GROUP BY spotter_output.airline_country
4005 4005
 					ORDER BY airline_country_count DESC
@@ -4012,7 +4012,7 @@  discard block
 block discarded – undo
4012 4012
 		$airline_country_array = array();
4013 4013
 		$temp_array = array();
4014 4014
         
4015
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4015
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4016 4016
 		{
4017 4017
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4018 4018
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4028,11 +4028,11 @@  discard block
 block discarded – undo
4028 4028
 	* @return Array the airline list
4029 4029
 	*
4030 4030
 	*/
4031
-	public function countAllAirlinesByDate($date,$filters = array())
4031
+	public function countAllAirlinesByDate($date, $filters = array())
4032 4032
 	{
4033 4033
 		global $globalTimezone, $globalDBdriver;
4034
-		$filter_query = $this->getFilter($filters,true,true);
4035
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4034
+		$filter_query = $this->getFilter($filters, true, true);
4035
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4036 4036
 		if ($globalTimezone != '') {
4037 4037
 			date_default_timezone_set($globalTimezone);
4038 4038
 			$datetime = new DateTime($date);
@@ -4040,12 +4040,12 @@  discard block
 block discarded – undo
4040 4040
 		} else $offset = '+00:00';
4041 4041
 
4042 4042
 		if ($globalDBdriver == 'mysql') {
4043
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4043
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4044 4044
 		 			FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4045 4045
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country 
4046 4046
 					ORDER BY airline_count DESC";
4047 4047
 		} else {
4048
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4048
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4049 4049
 		 			FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4050 4050
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4051 4051
 					ORDER BY airline_count DESC";
@@ -4056,7 +4056,7 @@  discard block
 block discarded – undo
4056 4056
 
4057 4057
 		$airline_array = array();
4058 4058
 		$temp_array = array();
4059
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4059
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4060 4060
 		{
4061 4061
 			$temp_array['airline_name'] = $row['airline_name'];
4062 4062
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4076,11 +4076,11 @@  discard block
 block discarded – undo
4076 4076
 	* @return Array the airline country list
4077 4077
 	*
4078 4078
 	*/
4079
-	public function countAllAirlineCountriesByDate($date,$filters = array())
4079
+	public function countAllAirlineCountriesByDate($date, $filters = array())
4080 4080
 	{
4081 4081
 		global $globalTimezone, $globalDBdriver;
4082
-		$filter_query = $this->getFilter($filters,true,true);
4083
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4082
+		$filter_query = $this->getFilter($filters, true, true);
4083
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4084 4084
 		if ($globalTimezone != '') {
4085 4085
 			date_default_timezone_set($globalTimezone);
4086 4086
 			$datetime = new DateTime($date);
@@ -4088,13 +4088,13 @@  discard block
 block discarded – undo
4088 4088
 		} else $offset = '+00:00';
4089 4089
 		
4090 4090
 		if ($globalDBdriver == 'mysql') {
4091
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4091
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4092 4092
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4093 4093
 					GROUP BY spotter_output.airline_country
4094 4094
 					ORDER BY airline_country_count DESC
4095 4095
 					LIMIT 10 OFFSET 0";
4096 4096
 		} else {
4097
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4097
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4098 4098
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4099 4099
 					GROUP BY spotter_output.airline_country
4100 4100
 					ORDER BY airline_country_count DESC
@@ -4106,7 +4106,7 @@  discard block
 block discarded – undo
4106 4106
  
4107 4107
 		$airline_country_array = array();
4108 4108
 		$temp_array = array();
4109
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4109
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4110 4110
 		{
4111 4111
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4112 4112
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4123,11 +4123,11 @@  discard block
 block discarded – undo
4123 4123
 	* @return Array the airline list
4124 4124
 	*
4125 4125
 	*/
4126
-	public function countAllAirlinesByIdent($ident,$filters = array())
4126
+	public function countAllAirlinesByIdent($ident, $filters = array())
4127 4127
 	{
4128
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4129
-		$filter_query = $this->getFilter($filters,true,true);
4130
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4128
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4129
+		$filter_query = $this->getFilter($filters, true, true);
4130
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4131 4131
 		 		FROM spotter_output".$filter_query." spotter_output.ident = :ident  
4132 4132
 				GROUP BY spotter_output.airline_name
4133 4133
 				ORDER BY airline_count DESC";
@@ -4139,7 +4139,7 @@  discard block
 block discarded – undo
4139 4139
 		$airline_array = array();
4140 4140
 		$temp_array = array();
4141 4141
         
4142
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4142
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4143 4143
 		{
4144 4144
 			$temp_array['airline_name'] = $row['airline_name'];
4145 4145
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4157,25 +4157,25 @@  discard block
 block discarded – undo
4157 4157
 	* @return Array the airline list
4158 4158
 	*
4159 4159
 	*/
4160
-	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
4160
+	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4161 4161
 	{
4162
-		$filter_query = $this->getFilter($filters,true,true);
4163
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4164
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4162
+		$filter_query = $this->getFilter($filters, true, true);
4163
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4164
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4165 4165
 
4166
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4166
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4167 4167
 		 			FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
4168 4168
 					GROUP BY spotter_output.airline_name
4169 4169
 					ORDER BY airline_count DESC";
4170 4170
       
4171 4171
 		
4172 4172
 		$sth = $this->db->prepare($query);
4173
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4173
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4174 4174
       
4175 4175
 		$airline_array = array();
4176 4176
 		$temp_array = array();
4177 4177
         
4178
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4178
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4179 4179
 		{
4180 4180
 			$temp_array['airline_name'] = $row['airline_name'];
4181 4181
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4193,13 +4193,13 @@  discard block
 block discarded – undo
4193 4193
 	* @return Array the airline country list
4194 4194
 	*
4195 4195
 	*/
4196
-	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
4196
+	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4197 4197
 	{
4198
-		$filter_query = $this->getFilter($filters,true,true);
4199
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4200
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4198
+		$filter_query = $this->getFilter($filters, true, true);
4199
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4200
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4201 4201
       
4202
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4202
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4203 4203
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
4204 4204
 				GROUP BY spotter_output.airline_country
4205 4205
 				ORDER BY airline_country_count DESC
@@ -4207,11 +4207,11 @@  discard block
 block discarded – undo
4207 4207
       
4208 4208
 		
4209 4209
 		$sth = $this->db->prepare($query);
4210
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4210
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4211 4211
       
4212 4212
 		$airline_country_array = array();
4213 4213
 		$temp_array = array();
4214
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4214
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4215 4215
 		{
4216 4216
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4217 4217
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4229,11 +4229,11 @@  discard block
 block discarded – undo
4229 4229
 	* @return Array the airline list
4230 4230
 	*
4231 4231
 	*/
4232
-	public function countAllAirlinesByCountry($country,$filters = array())
4232
+	public function countAllAirlinesByCountry($country, $filters = array())
4233 4233
 	{
4234
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4235
-		$filter_query = $this->getFilter($filters,true,true);
4236
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4234
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4235
+		$filter_query = $this->getFilter($filters, true, true);
4236
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4237 4237
 		 	    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
4238 4238
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
4239 4239
 			    ORDER BY airline_count DESC";
@@ -4244,7 +4244,7 @@  discard block
 block discarded – undo
4244 4244
 
4245 4245
 		$airline_array = array();
4246 4246
 		$temp_array = array();
4247
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4247
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4248 4248
 		{
4249 4249
 			$temp_array['airline_name'] = $row['airline_name'];
4250 4250
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4263,11 +4263,11 @@  discard block
 block discarded – undo
4263 4263
 	* @return Array the airline country list
4264 4264
 	*
4265 4265
 	*/
4266
-	public function countAllAirlineCountriesByCountry($country,$filters = array())
4266
+	public function countAllAirlineCountriesByCountry($country, $filters = array())
4267 4267
 	{
4268
-		$filter_query = $this->getFilter($filters,true,true);
4269
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4270
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4268
+		$filter_query = $this->getFilter($filters, true, true);
4269
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4270
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4271 4271
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
4272 4272
 				GROUP BY spotter_output.airline_country
4273 4273
 				ORDER BY airline_country_count DESC
@@ -4279,7 +4279,7 @@  discard block
 block discarded – undo
4279 4279
 
4280 4280
 		$airline_country_array = array();
4281 4281
 		$temp_array = array();
4282
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4282
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4283 4283
 		{
4284 4284
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4285 4285
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4298,8 +4298,8 @@  discard block
 block discarded – undo
4298 4298
 	*/
4299 4299
 	public function countAllAirlineCountries($limit = true, $filters = array())
4300 4300
 	{
4301
-		$filter_query = $this->getFilter($filters,true,true);
4302
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4301
+		$filter_query = $this->getFilter($filters, true, true);
4302
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4303 4303
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA' 
4304 4304
 					GROUP BY spotter_output.airline_country
4305 4305
 					ORDER BY airline_country_count DESC";
@@ -4310,7 +4310,7 @@  discard block
 block discarded – undo
4310 4310
 
4311 4311
 		$airline_array = array();
4312 4312
 		$temp_array = array();
4313
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4313
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4314 4314
 		{
4315 4315
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4316 4316
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4326,11 +4326,11 @@  discard block
 block discarded – undo
4326 4326
 	* @return Array the airline country list
4327 4327
 	*
4328 4328
 	*/
4329
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
4329
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
4330 4330
 	{
4331 4331
 		global $globalDBdriver;
4332 4332
 		//$filter_query = $this->getFilter($filters,true,true);
4333
-		$Connection= new Connection($this->db);
4333
+		$Connection = new Connection($this->db);
4334 4334
 		if (!$Connection->tableExists('countries')) return array();
4335 4335
 		/*
4336 4336
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -4365,7 +4365,7 @@  discard block
 block discarded – undo
4365 4365
 		$flight_array = array();
4366 4366
 		$temp_array = array();
4367 4367
         
4368
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4368
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4369 4369
 		{
4370 4370
 			$temp_array['flight_count'] = $row['nb'];
4371 4371
 			$temp_array['flight_country'] = $row['name'];
@@ -4383,12 +4383,12 @@  discard block
 block discarded – undo
4383 4383
 	* @return Array the aircraft list
4384 4384
 	*
4385 4385
 	*/
4386
-	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4386
+	public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4387 4387
 	{
4388 4388
 		global $globalDBdriver;
4389
-		$filter_query = $this->getFilter($filters,true,true);
4389
+		$filter_query = $this->getFilter($filters, true, true);
4390 4390
 
4391
-		$query  = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4391
+		$query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4392 4392
 		    FROM spotter_output ".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> ''";
4393 4393
 		if ($olderthanmonths > 0) {
4394 4394
 			if ($globalDBdriver == 'mysql') {
@@ -4413,7 +4413,7 @@  discard block
 block discarded – undo
4413 4413
 
4414 4414
 		$aircraft_array = array();
4415 4415
 		$temp_array = array();
4416
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4416
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4417 4417
 		{
4418 4418
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4419 4419
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4430,11 +4430,11 @@  discard block
 block discarded – undo
4430 4430
 	* @return Array the aircraft list
4431 4431
 	*
4432 4432
 	*/
4433
-	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4433
+	public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4434 4434
 	{
4435 4435
 		global $globalDBdriver;
4436
-		$filter_query = $this->getFilter($filters,true,true);
4437
-		$query  = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4436
+		$filter_query = $this->getFilter($filters, true, true);
4437
+		$query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4438 4438
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
4439 4439
 		if ($olderthanmonths > 0) {
4440 4440
 			if ($globalDBdriver == 'mysql') {
@@ -4459,7 +4459,7 @@  discard block
 block discarded – undo
4459 4459
 
4460 4460
 		$aircraft_array = array();
4461 4461
 		$temp_array = array();
4462
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4462
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4463 4463
 		{
4464 4464
 			$temp_array['airline_icao'] = $row['airline_icao'];
4465 4465
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
@@ -4478,13 +4478,13 @@  discard block
 block discarded – undo
4478 4478
 	* @return Array the aircraft list
4479 4479
 	*
4480 4480
 	*/
4481
-	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
4481
+	public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array())
4482 4482
 	{
4483 4483
 		$Image = new Image($this->db);
4484
-		$filter_query = $this->getFilter($filters,true,true);
4485
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
4484
+		$filter_query = $this->getFilter($filters, true, true);
4485
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
4486 4486
 
4487
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4487
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4488 4488
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao  
4489 4489
 				GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4490 4490
 				ORDER BY registration_count DESC";
@@ -4495,14 +4495,14 @@  discard block
 block discarded – undo
4495 4495
 		$aircraft_array = array();
4496 4496
 		$temp_array = array();
4497 4497
         
4498
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4498
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4499 4499
 		{
4500 4500
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4501 4501
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4502 4502
 			$temp_array['registration'] = $row['registration'];
4503 4503
 			$temp_array['airline_name'] = $row['airline_name'];
4504 4504
 			$temp_array['image_thumbnail'] = "";
4505
-			if($row['registration'] != "")
4505
+			if ($row['registration'] != "")
4506 4506
 			{
4507 4507
 				$image_array = $Image->getSpotterImage($row['registration']);
4508 4508
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4521,11 +4521,11 @@  discard block
 block discarded – undo
4521 4521
 	* @return Array the aircraft list
4522 4522
 	*
4523 4523
 	*/
4524
-	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
4524
+	public function countAllAircraftTypesByAirline($airline_icao, $filters = array())
4525 4525
 	{
4526
-		$filter_query = $this->getFilter($filters,true,true);
4527
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4528
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4526
+		$filter_query = $this->getFilter($filters, true, true);
4527
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4528
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4529 4529
 			    FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao 
4530 4530
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4531 4531
 			    ORDER BY aircraft_icao_count DESC";
@@ -4536,7 +4536,7 @@  discard block
 block discarded – undo
4536 4536
 		$aircraft_array = array();
4537 4537
 		$temp_array = array();
4538 4538
 
4539
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4539
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4540 4540
 		{
4541 4541
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4542 4542
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4554,13 +4554,13 @@  discard block
 block discarded – undo
4554 4554
 	* @return Array the aircraft list
4555 4555
 	*
4556 4556
 	*/
4557
-	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
4557
+	public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array())
4558 4558
 	{
4559
-		$filter_query = $this->getFilter($filters,true,true);
4559
+		$filter_query = $this->getFilter($filters, true, true);
4560 4560
 		$Image = new Image($this->db);
4561
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4561
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4562 4562
 
4563
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
4563
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
4564 4564
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao 
4565 4565
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4566 4566
 			    ORDER BY registration_count DESC";
@@ -4570,14 +4570,14 @@  discard block
 block discarded – undo
4570 4570
 
4571 4571
 		$aircraft_array = array();
4572 4572
 		$temp_array = array();
4573
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4573
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4574 4574
 		{
4575 4575
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4576 4576
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4577 4577
 			$temp_array['registration'] = $row['registration'];
4578 4578
 			$temp_array['airline_name'] = $row['airline_name'];
4579 4579
 			$temp_array['image_thumbnail'] = "";
4580
-			if($row['registration'] != "")
4580
+			if ($row['registration'] != "")
4581 4581
 			{
4582 4582
 				$image_array = $Image->getSpotterImage($row['registration']);
4583 4583
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4596,11 +4596,11 @@  discard block
 block discarded – undo
4596 4596
 	* @return Array the aircraft list
4597 4597
 	*
4598 4598
 	*/
4599
-	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
4599
+	public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array())
4600 4600
 	{
4601
-		$filter_query = $this->getFilter($filters,true,true);
4602
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4603
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4601
+		$filter_query = $this->getFilter($filters, true, true);
4602
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4603
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4604 4604
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao 
4605 4605
 				GROUP BY spotter_output.aircraft_manufacturer 
4606 4606
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -4611,7 +4611,7 @@  discard block
 block discarded – undo
4611 4611
 		$aircraft_array = array();
4612 4612
 		$temp_array = array();
4613 4613
 
4614
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4614
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4615 4615
 		{
4616 4616
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4617 4617
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -4628,12 +4628,12 @@  discard block
 block discarded – undo
4628 4628
 	* @return Array the aircraft list
4629 4629
 	*
4630 4630
 	*/
4631
-	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
4631
+	public function countAllAircraftTypesByAirport($airport_icao, $filters = array())
4632 4632
 	{
4633
-		$filter_query = $this->getFilter($filters,true,true);
4634
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4633
+		$filter_query = $this->getFilter($filters, true, true);
4634
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4635 4635
 
4636
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4636
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4637 4637
 				FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) 
4638 4638
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4639 4639
 				ORDER BY aircraft_icao_count DESC";
@@ -4643,7 +4643,7 @@  discard block
 block discarded – undo
4643 4643
 
4644 4644
 		$aircraft_array = array();
4645 4645
 		$temp_array = array();
4646
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4646
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4647 4647
 		{
4648 4648
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4649 4649
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4661,13 +4661,13 @@  discard block
 block discarded – undo
4661 4661
 	* @return Array the aircraft list
4662 4662
 	*
4663 4663
 	*/
4664
-	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
4664
+	public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array())
4665 4665
 	{
4666
-		$filter_query = $this->getFilter($filters,true,true);
4666
+		$filter_query = $this->getFilter($filters, true, true);
4667 4667
 		$Image = new Image($this->db);
4668
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4668
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4669 4669
 
4670
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4670
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4671 4671
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)   
4672 4672
                     GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
4673 4673
 		    ORDER BY registration_count DESC";
@@ -4677,14 +4677,14 @@  discard block
 block discarded – undo
4677 4677
 
4678 4678
 		$aircraft_array = array();
4679 4679
 		$temp_array = array();
4680
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4680
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4681 4681
 		{
4682 4682
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4683 4683
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4684 4684
 			$temp_array['registration'] = $row['registration'];
4685 4685
 			$temp_array['airline_name'] = $row['airline_name'];
4686 4686
 			$temp_array['image_thumbnail'] = "";
4687
-			if($row['registration'] != "")
4687
+			if ($row['registration'] != "")
4688 4688
 			{
4689 4689
 				$image_array = $Image->getSpotterImage($row['registration']);
4690 4690
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4702,11 +4702,11 @@  discard block
 block discarded – undo
4702 4702
 	* @return Array the aircraft list
4703 4703
 	*
4704 4704
 	*/
4705
-	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
4705
+	public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array())
4706 4706
 	{
4707
-		$filter_query = $this->getFilter($filters,true,true);
4708
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4709
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4707
+		$filter_query = $this->getFilter($filters, true, true);
4708
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4709
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4710 4710
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)  
4711 4711
                     GROUP BY spotter_output.aircraft_manufacturer 
4712 4712
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -4717,7 +4717,7 @@  discard block
 block discarded – undo
4717 4717
 
4718 4718
 		$aircraft_array = array();
4719 4719
 		$temp_array = array();
4720
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4720
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4721 4721
 		{
4722 4722
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4723 4723
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -4732,12 +4732,12 @@  discard block
 block discarded – undo
4732 4732
 	* @return Array the aircraft list
4733 4733
 	*
4734 4734
 	*/
4735
-	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
4735
+	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array())
4736 4736
 	{
4737
-		$filter_query = $this->getFilter($filters,true,true);
4738
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4737
+		$filter_query = $this->getFilter($filters, true, true);
4738
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4739 4739
 
4740
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4740
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4741 4741
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4742 4742
                     GROUP BY spotter_output.aircraft_name 
4743 4743
 					ORDER BY aircraft_icao_count DESC";
@@ -4746,7 +4746,7 @@  discard block
 block discarded – undo
4746 4746
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4747 4747
 		$aircraft_array = array();
4748 4748
 		$temp_array = array();
4749
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4749
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4750 4750
 		{
4751 4751
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4752 4752
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4765,11 +4765,11 @@  discard block
 block discarded – undo
4765 4765
 	*/
4766 4766
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
4767 4767
 	{
4768
-		$filter_query = $this->getFilter($filters,true,true);
4768
+		$filter_query = $this->getFilter($filters, true, true);
4769 4769
 		$Image = new Image($this->db);
4770
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4770
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4771 4771
 
4772
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
4772
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
4773 4773
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
4774 4774
                     GROUP BY spotter_output.registration 
4775 4775
 					ORDER BY registration_count DESC";
@@ -4779,14 +4779,14 @@  discard block
 block discarded – undo
4779 4779
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4780 4780
 		$aircraft_array = array();
4781 4781
 		$temp_array = array();
4782
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4782
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4783 4783
 		{
4784 4784
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4785 4785
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4786 4786
 			$temp_array['registration'] = $row['registration'];
4787 4787
 			$temp_array['airline_name'] = $row['airline_name'];
4788 4788
 			$temp_array['image_thumbnail'] = "";
4789
-			if($row['registration'] != "")
4789
+			if ($row['registration'] != "")
4790 4790
 			{
4791 4791
 				$image_array = $Image->getSpotterImage($row['registration']);
4792 4792
 				$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4803,11 +4803,11 @@  discard block
 block discarded – undo
4803 4803
 	* @return Array the aircraft list
4804 4804
 	*
4805 4805
 	*/
4806
-	public function countAllAircraftTypesByDate($date,$filters = array())
4806
+	public function countAllAircraftTypesByDate($date, $filters = array())
4807 4807
 	{
4808 4808
 		global $globalTimezone, $globalDBdriver;
4809
-		$filter_query = $this->getFilter($filters,true,true);
4810
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4809
+		$filter_query = $this->getFilter($filters, true, true);
4810
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4811 4811
 		if ($globalTimezone != '') {
4812 4812
 			date_default_timezone_set($globalTimezone);
4813 4813
 			$datetime = new DateTime($date);
@@ -4815,12 +4815,12 @@  discard block
 block discarded – undo
4815 4815
 		} else $offset = '+00:00';
4816 4816
 
4817 4817
 		if ($globalDBdriver == 'mysql') {
4818
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4818
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4819 4819
 					FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4820 4820
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4821 4821
 					ORDER BY aircraft_icao_count DESC";
4822 4822
 		} else {
4823
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4823
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4824 4824
 					FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4825 4825
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4826 4826
 					ORDER BY aircraft_icao_count DESC";
@@ -4831,7 +4831,7 @@  discard block
 block discarded – undo
4831 4831
 
4832 4832
 		$aircraft_array = array();
4833 4833
 		$temp_array = array();
4834
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4834
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4835 4835
 		{
4836 4836
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4837 4837
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4849,12 +4849,12 @@  discard block
 block discarded – undo
4849 4849
 	* @return Array the aircraft list
4850 4850
 	*
4851 4851
 	*/
4852
-	public function countAllAircraftRegistrationByDate($date,$filters = array())
4852
+	public function countAllAircraftRegistrationByDate($date, $filters = array())
4853 4853
 	{
4854 4854
 		global $globalTimezone, $globalDBdriver;
4855
-		$filter_query = $this->getFilter($filters,true,true);
4855
+		$filter_query = $this->getFilter($filters, true, true);
4856 4856
 		$Image = new Image($this->db);
4857
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4857
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4858 4858
 		if ($globalTimezone != '') {
4859 4859
 			date_default_timezone_set($globalTimezone);
4860 4860
 			$datetime = new DateTime($date);
@@ -4862,12 +4862,12 @@  discard block
 block discarded – undo
4862 4862
 		} else $offset = '+00:00';
4863 4863
 
4864 4864
 		if ($globalDBdriver == 'mysql') {
4865
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
4865
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
4866 4866
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4867 4867
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
4868 4868
 					ORDER BY registration_count DESC";
4869 4869
 		} else {
4870
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name    
4870
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name    
4871 4871
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4872 4872
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
4873 4873
 					ORDER BY registration_count DESC";
@@ -4878,14 +4878,14 @@  discard block
 block discarded – undo
4878 4878
 
4879 4879
 		$aircraft_array = array();
4880 4880
 		$temp_array = array();
4881
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4881
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4882 4882
 		{
4883 4883
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4884 4884
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4885 4885
 			$temp_array['registration'] = $row['registration'];
4886 4886
 			$temp_array['airline_name'] = $row['airline_name'];
4887 4887
 			$temp_array['image_thumbnail'] = "";
4888
-			if($row['registration'] != "")
4888
+			if ($row['registration'] != "")
4889 4889
 			{
4890 4890
 				$image_array = $Image->getSpotterImage($row['registration']);
4891 4891
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4904,11 +4904,11 @@  discard block
 block discarded – undo
4904 4904
 	* @return Array the aircraft manufacturer list
4905 4905
 	*
4906 4906
 	*/
4907
-	public function countAllAircraftManufacturerByDate($date,$filters = array())
4907
+	public function countAllAircraftManufacturerByDate($date, $filters = array())
4908 4908
 	{
4909 4909
 		global $globalTimezone, $globalDBdriver;
4910
-		$filter_query = $this->getFilter($filters,true,true);
4911
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4910
+		$filter_query = $this->getFilter($filters, true, true);
4911
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4912 4912
 		if ($globalTimezone != '') {
4913 4913
 			date_default_timezone_set($globalTimezone);
4914 4914
 			$datetime = new DateTime($date);
@@ -4916,12 +4916,12 @@  discard block
 block discarded – undo
4916 4916
 		} else $offset = '+00:00';
4917 4917
 
4918 4918
 		if ($globalDBdriver == 'mysql') {
4919
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4919
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4920 4920
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4921 4921
 				GROUP BY spotter_output.aircraft_manufacturer 
4922 4922
 				ORDER BY aircraft_manufacturer_count DESC";
4923 4923
 		} else {
4924
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4924
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4925 4925
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4926 4926
 				GROUP BY spotter_output.aircraft_manufacturer 
4927 4927
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -4933,7 +4933,7 @@  discard block
 block discarded – undo
4933 4933
 		$aircraft_array = array();
4934 4934
 		$temp_array = array();
4935 4935
 
4936
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4936
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4937 4937
 		{
4938 4938
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4939 4939
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -4950,11 +4950,11 @@  discard block
 block discarded – undo
4950 4950
 	* @return Array the aircraft list
4951 4951
 	*
4952 4952
 	*/
4953
-	public function countAllAircraftTypesByIdent($ident,$filters = array())
4953
+	public function countAllAircraftTypesByIdent($ident, $filters = array())
4954 4954
 	{
4955
-		$filter_query = $this->getFilter($filters,true,true);
4956
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4957
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4955
+		$filter_query = $this->getFilter($filters, true, true);
4956
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4957
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4958 4958
 				FROM spotter_output".$filter_query." spotter_output.ident = :ident 
4959 4959
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4960 4960
 				ORDER BY aircraft_icao_count DESC";
@@ -4965,7 +4965,7 @@  discard block
 block discarded – undo
4965 4965
 		$aircraft_array = array();
4966 4966
 		$temp_array = array();
4967 4967
 
4968
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4968
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4969 4969
 		{
4970 4970
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4971 4971
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4983,13 +4983,13 @@  discard block
 block discarded – undo
4983 4983
 	* @return Array the aircraft list
4984 4984
 	*
4985 4985
 	*/
4986
-	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
4986
+	public function countAllAircraftRegistrationByIdent($ident, $filters = array())
4987 4987
 	{
4988
-		$filter_query = $this->getFilter($filters,true,true);
4988
+		$filter_query = $this->getFilter($filters, true, true);
4989 4989
 		$Image = new Image($this->db);
4990
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4990
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4991 4991
 
4992
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4992
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4993 4993
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident   
4994 4994
                     GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4995 4995
 		    ORDER BY registration_count DESC";
@@ -5001,14 +5001,14 @@  discard block
 block discarded – undo
5001 5001
 		$aircraft_array = array();
5002 5002
 		$temp_array = array();
5003 5003
         
5004
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5004
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5005 5005
 		{
5006 5006
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5007 5007
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5008 5008
 			$temp_array['registration'] = $row['registration'];
5009 5009
 			$temp_array['airline_name'] = $row['airline_name'];
5010 5010
 			$temp_array['image_thumbnail'] = "";
5011
-			if($row['registration'] != "")
5011
+			if ($row['registration'] != "")
5012 5012
 			{
5013 5013
 				$image_array = $Image->getSpotterImage($row['registration']);
5014 5014
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5027,11 +5027,11 @@  discard block
 block discarded – undo
5027 5027
 	* @return Array the aircraft manufacturer list
5028 5028
 	*
5029 5029
 	*/
5030
-	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
5030
+	public function countAllAircraftManufacturerByIdent($ident, $filters = array())
5031 5031
 	{
5032
-		$filter_query = $this->getFilter($filters,true,true);
5033
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5034
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5032
+		$filter_query = $this->getFilter($filters, true, true);
5033
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5034
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5035 5035
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident  
5036 5036
                     GROUP BY spotter_output.aircraft_manufacturer 
5037 5037
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -5041,7 +5041,7 @@  discard block
 block discarded – undo
5041 5041
 		$sth->execute(array(':ident' => $ident));
5042 5042
 		$aircraft_array = array();
5043 5043
 		$temp_array = array();
5044
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5044
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5045 5045
 		{
5046 5046
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5047 5047
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5057,24 +5057,24 @@  discard block
 block discarded – undo
5057 5057
 	* @return Array the aircraft list
5058 5058
 	*
5059 5059
 	*/
5060
-	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5060
+	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5061 5061
 	{
5062
-		$filter_query = $this->getFilter($filters,true,true);
5063
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5064
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5062
+		$filter_query = $this->getFilter($filters, true, true);
5063
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5064
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5065 5065
 		
5066 5066
 
5067
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5067
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5068 5068
                     FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5069 5069
                     GROUP BY spotter_output.aircraft_name 
5070 5070
 					ORDER BY aircraft_icao_count DESC";
5071 5071
  
5072 5072
 		
5073 5073
 		$sth = $this->db->prepare($query);
5074
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5074
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5075 5075
 		$aircraft_array = array();
5076 5076
 		$temp_array = array();
5077
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5077
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5078 5078
 		{
5079 5079
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5080 5080
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -5090,33 +5090,33 @@  discard block
 block discarded – undo
5090 5090
 	* @return Array the aircraft list
5091 5091
 	*
5092 5092
 	*/
5093
-	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5093
+	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5094 5094
 	{
5095
-		$filter_query = $this->getFilter($filters,true,true);
5095
+		$filter_query = $this->getFilter($filters, true, true);
5096 5096
 		$Image = new Image($this->db);
5097
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5098
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5097
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5098
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5099 5099
 
5100
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
5100
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
5101 5101
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)   
5102 5102
                     GROUP BY spotter_output.registration 
5103 5103
 					ORDER BY registration_count DESC";
5104 5104
 
5105 5105
 		
5106 5106
 		$sth = $this->db->prepare($query);
5107
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5107
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5108 5108
       
5109 5109
 		$aircraft_array = array();
5110 5110
 		$temp_array = array();
5111 5111
         
5112
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5112
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5113 5113
 		{
5114 5114
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5115 5115
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5116 5116
 			$temp_array['registration'] = $row['registration'];
5117 5117
 			$temp_array['airline_name'] = $row['airline_name'];
5118 5118
 			$temp_array['image_thumbnail'] = "";
5119
-			if($row['registration'] != "")
5119
+			if ($row['registration'] != "")
5120 5120
 			{
5121 5121
 				$image_array = $Image->getSpotterImage($row['registration']);
5122 5122
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5136,25 +5136,25 @@  discard block
 block discarded – undo
5136 5136
 	* @return Array the aircraft manufacturer list
5137 5137
 	*
5138 5138
 	*/
5139
-	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5139
+	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5140 5140
 	{
5141
-		$filter_query = $this->getFilter($filters,true,true);
5142
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5143
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5141
+		$filter_query = $this->getFilter($filters, true, true);
5142
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5143
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5144 5144
 
5145
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5145
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5146 5146
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
5147 5147
                     GROUP BY spotter_output.aircraft_manufacturer 
5148 5148
 					ORDER BY aircraft_manufacturer_count DESC";
5149 5149
 
5150 5150
 		
5151 5151
 		$sth = $this->db->prepare($query);
5152
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5152
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5153 5153
       
5154 5154
 		$aircraft_array = array();
5155 5155
 		$temp_array = array();
5156 5156
         
5157
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5157
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5158 5158
 		{
5159 5159
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5160 5160
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5174,11 +5174,11 @@  discard block
 block discarded – undo
5174 5174
 	* @return Array the aircraft list
5175 5175
 	*
5176 5176
 	*/
5177
-	public function countAllAircraftTypesByCountry($country,$filters = array())
5177
+	public function countAllAircraftTypesByCountry($country, $filters = array())
5178 5178
 	{
5179
-		$filter_query = $this->getFilter($filters,true,true);
5180
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5181
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5179
+		$filter_query = $this->getFilter($filters, true, true);
5180
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5181
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5182 5182
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
5183 5183
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
5184 5184
 			    ORDER BY aircraft_icao_count DESC";
@@ -5190,7 +5190,7 @@  discard block
 block discarded – undo
5190 5190
 		$aircraft_array = array();
5191 5191
 		$temp_array = array();
5192 5192
         
5193
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5193
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5194 5194
 		{
5195 5195
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5196 5196
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -5209,12 +5209,12 @@  discard block
 block discarded – undo
5209 5209
 	* @return Array the aircraft list
5210 5210
 	*
5211 5211
 	*/
5212
-	public function countAllAircraftRegistrationByCountry($country,$filters = array())
5212
+	public function countAllAircraftRegistrationByCountry($country, $filters = array())
5213 5213
 	{
5214
-		$filter_query = $this->getFilter($filters,true,true);
5214
+		$filter_query = $this->getFilter($filters, true, true);
5215 5215
 		$Image = new Image($this->db);
5216
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5217
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
5216
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5217
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
5218 5218
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)    
5219 5219
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
5220 5220
 			    ORDER BY registration_count DESC";
@@ -5226,14 +5226,14 @@  discard block
 block discarded – undo
5226 5226
 		$aircraft_array = array();
5227 5227
 		$temp_array = array();
5228 5228
         
5229
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5229
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5230 5230
 		{
5231 5231
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5232 5232
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5233 5233
 			$temp_array['registration'] = $row['registration'];
5234 5234
 			$temp_array['airline_name'] = $row['airline_name'];
5235 5235
 			$temp_array['image_thumbnail'] = "";
5236
-			if($row['registration'] != "")
5236
+			if ($row['registration'] != "")
5237 5237
 			{
5238 5238
 				$image_array = $Image->getSpotterImage($row['registration']);
5239 5239
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5253,11 +5253,11 @@  discard block
 block discarded – undo
5253 5253
 	* @return Array the aircraft manufacturer list
5254 5254
 	*
5255 5255
 	*/
5256
-	public function countAllAircraftManufacturerByCountry($country,$filters = array())
5256
+	public function countAllAircraftManufacturerByCountry($country, $filters = array())
5257 5257
 	{
5258
-		$filter_query = $this->getFilter($filters,true,true);
5259
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5260
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5258
+		$filter_query = $this->getFilter($filters, true, true);
5259
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5260
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5261 5261
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) 
5262 5262
                     GROUP BY spotter_output.aircraft_manufacturer 
5263 5263
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -5269,7 +5269,7 @@  discard block
 block discarded – undo
5269 5269
 		$aircraft_array = array();
5270 5270
 		$temp_array = array();
5271 5271
         
5272
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5272
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5273 5273
 		{
5274 5274
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5275 5275
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5290,8 +5290,8 @@  discard block
 block discarded – undo
5290 5290
 	*/
5291 5291
 	public function countAllAircraftManufacturers($filters = array())
5292 5292
 	{
5293
-		$filter_query = $this->getFilter($filters,true,true);
5294
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5293
+		$filter_query = $this->getFilter($filters, true, true);
5294
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5295 5295
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
5296 5296
                 $query .= " GROUP BY spotter_output.aircraft_manufacturer
5297 5297
 					ORDER BY aircraft_manufacturer_count DESC
@@ -5304,7 +5304,7 @@  discard block
 block discarded – undo
5304 5304
 		$manufacturer_array = array();
5305 5305
 		$temp_array = array();
5306 5306
         
5307
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5307
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5308 5308
 		{
5309 5309
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5310 5310
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5323,12 +5323,12 @@  discard block
 block discarded – undo
5323 5323
 	* @return Array the aircraft list
5324 5324
 	*
5325 5325
 	*/
5326
-	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5326
+	public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5327 5327
 	{
5328 5328
 		global $globalDBdriver;
5329 5329
 		$Image = new Image($this->db);
5330
-		$filter_query = $this->getFilter($filters,true,true);
5331
-		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
5330
+		$filter_query = $this->getFilter($filters, true, true);
5331
+		$query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
5332 5332
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
5333 5333
                 if ($olderthanmonths > 0) {
5334 5334
             		if ($globalDBdriver == 'mysql') {
@@ -5356,7 +5356,7 @@  discard block
 block discarded – undo
5356 5356
 		$aircraft_array = array();
5357 5357
 		$temp_array = array();
5358 5358
         
5359
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5359
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5360 5360
 		{
5361 5361
 			$temp_array['registration'] = $row['registration'];
5362 5362
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -5364,7 +5364,7 @@  discard block
 block discarded – undo
5364 5364
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5365 5365
 			$temp_array['airline_name'] = $row['airline_name'];
5366 5366
 			$temp_array['image_thumbnail'] = "";
5367
-			if($row['registration'] != "")
5367
+			if ($row['registration'] != "")
5368 5368
 			{
5369 5369
 				$image_array = $Image->getSpotterImage($row['registration']);
5370 5370
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5383,12 +5383,12 @@  discard block
 block discarded – undo
5383 5383
 	* @return Array the aircraft list
5384 5384
 	*
5385 5385
 	*/
5386
-	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5386
+	public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5387 5387
 	{
5388 5388
 		global $globalDBdriver;
5389
-		$filter_query = $this->getFilter($filters,true,true);
5389
+		$filter_query = $this->getFilter($filters, true, true);
5390 5390
 		$Image = new Image($this->db);
5391
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
5391
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
5392 5392
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
5393 5393
                 if ($olderthanmonths > 0) {
5394 5394
             		if ($globalDBdriver == 'mysql') {
@@ -5416,7 +5416,7 @@  discard block
 block discarded – undo
5416 5416
 		$aircraft_array = array();
5417 5417
 		$temp_array = array();
5418 5418
         
5419
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5419
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5420 5420
 		{
5421 5421
 			$temp_array['registration'] = $row['registration'];
5422 5422
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -5425,7 +5425,7 @@  discard block
 block discarded – undo
5425 5425
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5426 5426
 			$temp_array['airline_name'] = $row['airline_name'];
5427 5427
 			$temp_array['image_thumbnail'] = "";
5428
-			if($row['registration'] != "")
5428
+			if ($row['registration'] != "")
5429 5429
 			{
5430 5430
 				$image_array = $Image->getSpotterImage($row['registration']);
5431 5431
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5444,11 +5444,11 @@  discard block
 block discarded – undo
5444 5444
 	* @return Array the airport list
5445 5445
 	*
5446 5446
 	*/
5447
-	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5447
+	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5448 5448
 	{
5449 5449
 		global $globalDBdriver;
5450
-		$filter_query = $this->getFilter($filters,true,true);
5451
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5450
+		$filter_query = $this->getFilter($filters, true, true);
5451
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5452 5452
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA'";
5453 5453
                 if ($olderthanmonths > 0) {
5454 5454
             		if ($globalDBdriver == 'mysql') {
@@ -5477,7 +5477,7 @@  discard block
 block discarded – undo
5477 5477
 		$airport_array = array();
5478 5478
 		$temp_array = array();
5479 5479
         
5480
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5480
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5481 5481
 		{
5482 5482
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5483 5483
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5496,11 +5496,11 @@  discard block
 block discarded – undo
5496 5496
 	* @return Array the airport list
5497 5497
 	*
5498 5498
 	*/
5499
-	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5499
+	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5500 5500
 	{
5501 5501
 		global $globalDBdriver;
5502
-		$filter_query = $this->getFilter($filters,true,true);
5503
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5502
+		$filter_query = $this->getFilter($filters, true, true);
5503
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5504 5504
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' ";
5505 5505
                 if ($olderthanmonths > 0) {
5506 5506
             		if ($globalDBdriver == 'mysql') {
@@ -5529,7 +5529,7 @@  discard block
 block discarded – undo
5529 5529
 		$airport_array = array();
5530 5530
 		$temp_array = array();
5531 5531
         
5532
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5532
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5533 5533
 		{
5534 5534
 			$temp_array['airline_icao'] = $row['airline_icao'];
5535 5535
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -5549,11 +5549,11 @@  discard block
 block discarded – undo
5549 5549
 	* @return Array the airport list
5550 5550
 	*
5551 5551
 	*/
5552
-	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5552
+	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5553 5553
 	{
5554 5554
 		global $globalDBdriver;
5555
-		$filter_query = $this->getFilter($filters,true,true);
5556
-		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5555
+		$filter_query = $this->getFilter($filters, true, true);
5556
+		$query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5557 5557
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
5558 5558
                 if ($olderthanmonths > 0) {
5559 5559
             		if ($globalDBdriver == 'mysql') {
@@ -5581,7 +5581,7 @@  discard block
 block discarded – undo
5581 5581
 		$airport_array = array();
5582 5582
 		$temp_array = array();
5583 5583
         
5584
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5584
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5585 5585
 		{
5586 5586
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5587 5587
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5600,11 +5600,11 @@  discard block
 block discarded – undo
5600 5600
 	* @return Array the airport list
5601 5601
 	*
5602 5602
 	*/
5603
-	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5603
+	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5604 5604
 	{
5605 5605
 		global $globalDBdriver;
5606
-		$filter_query = $this->getFilter($filters,true,true);
5607
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5606
+		$filter_query = $this->getFilter($filters, true, true);
5607
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5608 5608
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
5609 5609
                 if ($olderthanmonths > 0) {
5610 5610
             		if ($globalDBdriver == 'mysql') {
@@ -5633,7 +5633,7 @@  discard block
 block discarded – undo
5633 5633
 		$airport_array = array();
5634 5634
 		$temp_array = array();
5635 5635
         
5636
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5636
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5637 5637
 		{
5638 5638
 			$temp_array['airline_icao'] = $row['airline_icao'];
5639 5639
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -5653,11 +5653,11 @@  discard block
 block discarded – undo
5653 5653
 	* @return Array the airport list
5654 5654
 	*
5655 5655
 	*/
5656
-	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
5656
+	public function countAllDepartureAirportsByAirline($airline_icao, $filters = array())
5657 5657
 	{
5658
-		$filter_query = $this->getFilter($filters,true,true);
5659
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5660
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5658
+		$filter_query = $this->getFilter($filters, true, true);
5659
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5660
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5661 5661
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao 
5662 5662
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5663 5663
 			    ORDER BY airport_departure_icao_count DESC";
@@ -5669,7 +5669,7 @@  discard block
 block discarded – undo
5669 5669
 		$airport_array = array();
5670 5670
 		$temp_array = array();
5671 5671
         
5672
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5672
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5673 5673
 		{
5674 5674
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5675 5675
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5691,11 +5691,11 @@  discard block
 block discarded – undo
5691 5691
 	* @return Array the airport list
5692 5692
 	*
5693 5693
 	*/
5694
-	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
5694
+	public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array())
5695 5695
 	{
5696
-		$filter_query = $this->getFilter($filters,true,true);
5697
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5698
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5696
+		$filter_query = $this->getFilter($filters, true, true);
5697
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5698
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5699 5699
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
5700 5700
                     GROUP BY spotter_output.departure_airport_country
5701 5701
 					ORDER BY airport_departure_country_count DESC";
@@ -5707,7 +5707,7 @@  discard block
 block discarded – undo
5707 5707
 		$airport_array = array();
5708 5708
 		$temp_array = array();
5709 5709
         
5710
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5710
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5711 5711
 		{
5712 5712
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5713 5713
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5726,11 +5726,11 @@  discard block
 block discarded – undo
5726 5726
 	* @return Array the airport list
5727 5727
 	*
5728 5728
 	*/
5729
-	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
5729
+	public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array())
5730 5730
 	{
5731
-		$filter_query = $this->getFilter($filters,true,true);
5732
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5733
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5731
+		$filter_query = $this->getFilter($filters, true, true);
5732
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5733
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5734 5734
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao 
5735 5735
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5736 5736
 			    ORDER BY airport_departure_icao_count DESC";
@@ -5742,7 +5742,7 @@  discard block
 block discarded – undo
5742 5742
 		$airport_array = array();
5743 5743
 		$temp_array = array();
5744 5744
         
5745
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5745
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5746 5746
 		{
5747 5747
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5748 5748
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5763,11 +5763,11 @@  discard block
 block discarded – undo
5763 5763
 	* @return Array the airport list
5764 5764
 	*
5765 5765
 	*/
5766
-	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
5766
+	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array())
5767 5767
 	{
5768
-		$filter_query = $this->getFilter($filters,true,true);
5769
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5770
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5768
+		$filter_query = $this->getFilter($filters, true, true);
5769
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5770
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5771 5771
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
5772 5772
                     GROUP BY spotter_output.departure_airport_country
5773 5773
 					ORDER BY airport_departure_country_count DESC";
@@ -5779,7 +5779,7 @@  discard block
 block discarded – undo
5779 5779
 		$airport_array = array();
5780 5780
 		$temp_array = array();
5781 5781
         
5782
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5782
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5783 5783
 		{
5784 5784
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5785 5785
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5797,11 +5797,11 @@  discard block
 block discarded – undo
5797 5797
 	* @return Array the airport list
5798 5798
 	*
5799 5799
 	*/
5800
-	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
5800
+	public function countAllDepartureAirportsByRegistration($registration, $filters = array())
5801 5801
 	{
5802
-		$filter_query = $this->getFilter($filters,true,true);
5803
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5804
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5802
+		$filter_query = $this->getFilter($filters, true, true);
5803
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5804
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5805 5805
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration 
5806 5806
                     GROUP BY spotter_output.departure_airport_icao
5807 5807
 					ORDER BY airport_departure_icao_count DESC";
@@ -5813,7 +5813,7 @@  discard block
 block discarded – undo
5813 5813
 		$airport_array = array();
5814 5814
 		$temp_array = array();
5815 5815
         
5816
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5816
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5817 5817
 		{
5818 5818
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5819 5819
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5834,11 +5834,11 @@  discard block
 block discarded – undo
5834 5834
 	* @return Array the airport list
5835 5835
 	*
5836 5836
 	*/
5837
-	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
5837
+	public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array())
5838 5838
 	{
5839
-		$filter_query = $this->getFilter($filters,true,true);
5840
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5841
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5839
+		$filter_query = $this->getFilter($filters, true, true);
5840
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5841
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5842 5842
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration 
5843 5843
                     GROUP BY spotter_output.departure_airport_country
5844 5844
 					ORDER BY airport_departure_country_count DESC";
@@ -5850,7 +5850,7 @@  discard block
 block discarded – undo
5850 5850
 		$airport_array = array();
5851 5851
 		$temp_array = array();
5852 5852
         
5853
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5853
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5854 5854
 		{
5855 5855
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5856 5856
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5868,11 +5868,11 @@  discard block
 block discarded – undo
5868 5868
 	* @return Array the airport list
5869 5869
 	*
5870 5870
 	*/
5871
-	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
5871
+	public function countAllDepartureAirportsByAirport($airport_icao, $filters = array())
5872 5872
 	{
5873
-		$filter_query = $this->getFilter($filters,true,true);
5874
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
5875
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5873
+		$filter_query = $this->getFilter($filters, true, true);
5874
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
5875
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5876 5876
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao 
5877 5877
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5878 5878
 			    ORDER BY airport_departure_icao_count DESC";
@@ -5884,7 +5884,7 @@  discard block
 block discarded – undo
5884 5884
 		$airport_array = array();
5885 5885
 		$temp_array = array();
5886 5886
         
5887
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5887
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5888 5888
 		{
5889 5889
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5890 5890
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5905,11 +5905,11 @@  discard block
 block discarded – undo
5905 5905
 	* @return Array the airport list
5906 5906
 	*
5907 5907
 	*/
5908
-	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
5908
+	public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array())
5909 5909
 	{
5910
-		$filter_query = $this->getFilter($filters,true,true);
5911
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
5912
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5910
+		$filter_query = $this->getFilter($filters, true, true);
5911
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
5912
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5913 5913
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao 
5914 5914
                     GROUP BY spotter_output.departure_airport_country
5915 5915
 					ORDER BY airport_departure_country_count DESC";
@@ -5921,7 +5921,7 @@  discard block
 block discarded – undo
5921 5921
 		$airport_array = array();
5922 5922
 		$temp_array = array();
5923 5923
         
5924
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5924
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5925 5925
 		{
5926 5926
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5927 5927
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5940,11 +5940,11 @@  discard block
 block discarded – undo
5940 5940
 	* @return Array the airport list
5941 5941
 	*
5942 5942
 	*/
5943
-	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
5943
+	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array())
5944 5944
 	{
5945
-		$filter_query = $this->getFilter($filters,true,true);
5946
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
5947
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5945
+		$filter_query = $this->getFilter($filters, true, true);
5946
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
5947
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5948 5948
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
5949 5949
                     GROUP BY spotter_output.departure_airport_icao
5950 5950
 					ORDER BY airport_departure_icao_count DESC";
@@ -5956,7 +5956,7 @@  discard block
 block discarded – undo
5956 5956
 		$airport_array = array();
5957 5957
 		$temp_array = array();
5958 5958
         
5959
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5959
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5960 5960
 		{
5961 5961
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5962 5962
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5977,11 +5977,11 @@  discard block
 block discarded – undo
5977 5977
 	* @return Array the airport list
5978 5978
 	*
5979 5979
 	*/
5980
-	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
5980
+	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
5981 5981
 	{
5982
-		$filter_query = $this->getFilter($filters,true,true);
5983
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
5984
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5982
+		$filter_query = $this->getFilter($filters, true, true);
5983
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
5984
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5985 5985
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
5986 5986
                     GROUP BY spotter_output.departure_airport_country
5987 5987
 					ORDER BY airport_departure_country_count DESC";
@@ -5993,7 +5993,7 @@  discard block
 block discarded – undo
5993 5993
 		$airport_array = array();
5994 5994
 		$temp_array = array();
5995 5995
         
5996
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5996
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5997 5997
 		{
5998 5998
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5999 5999
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6011,11 +6011,11 @@  discard block
 block discarded – undo
6011 6011
 	* @return Array the airport list
6012 6012
 	*
6013 6013
 	*/
6014
-	public function countAllDepartureAirportsByDate($date,$filters = array())
6014
+	public function countAllDepartureAirportsByDate($date, $filters = array())
6015 6015
 	{
6016 6016
 		global $globalTimezone, $globalDBdriver;
6017
-		$filter_query = $this->getFilter($filters,true,true);
6018
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6017
+		$filter_query = $this->getFilter($filters, true, true);
6018
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6019 6019
 		if ($globalTimezone != '') {
6020 6020
 			date_default_timezone_set($globalTimezone);
6021 6021
 			$datetime = new DateTime($date);
@@ -6023,12 +6023,12 @@  discard block
 block discarded – undo
6023 6023
 		} else $offset = '+00:00';
6024 6024
 
6025 6025
 		if ($globalDBdriver == 'mysql') {
6026
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6026
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6027 6027
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6028 6028
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6029 6029
 					ORDER BY airport_departure_icao_count DESC";
6030 6030
 		} else {
6031
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6031
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6032 6032
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6033 6033
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6034 6034
 					ORDER BY airport_departure_icao_count DESC";
@@ -6040,7 +6040,7 @@  discard block
 block discarded – undo
6040 6040
 		$airport_array = array();
6041 6041
 		$temp_array = array();
6042 6042
         
6043
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6043
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6044 6044
 		{
6045 6045
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6046 6046
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6061,11 +6061,11 @@  discard block
 block discarded – undo
6061 6061
 	* @return Array the airport list
6062 6062
 	*
6063 6063
 	*/
6064
-	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
6064
+	public function countAllDepartureAirportCountriesByDate($date, $filters = array())
6065 6065
 	{
6066 6066
 		global $globalTimezone, $globalDBdriver;
6067
-		$filter_query = $this->getFilter($filters,true,true);
6068
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6067
+		$filter_query = $this->getFilter($filters, true, true);
6068
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6069 6069
 		if ($globalTimezone != '') {
6070 6070
 			date_default_timezone_set($globalTimezone);
6071 6071
 			$datetime = new DateTime($date);
@@ -6073,12 +6073,12 @@  discard block
 block discarded – undo
6073 6073
 		} else $offset = '+00:00';
6074 6074
 
6075 6075
 		if ($globalDBdriver == 'mysql') {
6076
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6076
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6077 6077
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
6078 6078
 					GROUP BY spotter_output.departure_airport_country
6079 6079
 					ORDER BY airport_departure_country_count DESC";
6080 6080
 		} else {
6081
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6081
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6082 6082
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
6083 6083
 					GROUP BY spotter_output.departure_airport_country
6084 6084
 					ORDER BY airport_departure_country_count DESC";
@@ -6090,7 +6090,7 @@  discard block
 block discarded – undo
6090 6090
 		$airport_array = array();
6091 6091
 		$temp_array = array();
6092 6092
         
6093
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6093
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6094 6094
 		{
6095 6095
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6096 6096
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6108,11 +6108,11 @@  discard block
 block discarded – undo
6108 6108
 	* @return Array the airport list
6109 6109
 	*
6110 6110
 	*/
6111
-	public function countAllDepartureAirportsByIdent($ident,$filters = array())
6111
+	public function countAllDepartureAirportsByIdent($ident, $filters = array())
6112 6112
 	{
6113
-		$filter_query = $this->getFilter($filters,true,true);
6114
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6115
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6113
+		$filter_query = $this->getFilter($filters, true, true);
6114
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6115
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6116 6116
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.ident = :ident 
6117 6117
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6118 6118
 		    ORDER BY airport_departure_icao_count DESC";
@@ -6124,7 +6124,7 @@  discard block
 block discarded – undo
6124 6124
 		$airport_array = array();
6125 6125
 		$temp_array = array();
6126 6126
         
6127
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6127
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6128 6128
 		{
6129 6129
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6130 6130
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6146,11 +6146,11 @@  discard block
 block discarded – undo
6146 6146
 	* @return Array the airport list
6147 6147
 	*
6148 6148
 	*/
6149
-	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
6149
+	public function countAllDepartureAirportCountriesByIdent($ident, $filters = array())
6150 6150
 	{
6151
-		$filter_query = $this->getFilter($filters,true,true);
6152
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6153
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6151
+		$filter_query = $this->getFilter($filters, true, true);
6152
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6153
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6154 6154
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident 
6155 6155
                     GROUP BY spotter_output.departure_airport_country
6156 6156
 					ORDER BY airport_departure_country_count DESC";
@@ -6162,7 +6162,7 @@  discard block
 block discarded – undo
6162 6162
 		$airport_array = array();
6163 6163
 		$temp_array = array();
6164 6164
         
6165
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6165
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6166 6166
 		{
6167 6167
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6168 6168
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6181,12 +6181,12 @@  discard block
 block discarded – undo
6181 6181
 	* @return Array the airport list
6182 6182
 	*
6183 6183
 	*/
6184
-	public function countAllDepartureAirportsByCountry($country,$filters = array())
6184
+	public function countAllDepartureAirportsByCountry($country, $filters = array())
6185 6185
 	{
6186
-		$filter_query = $this->getFilter($filters,true,true);
6187
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6186
+		$filter_query = $this->getFilter($filters, true, true);
6187
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6188 6188
 
6189
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6189
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6190 6190
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6191 6191
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6192 6192
 			    ORDER BY airport_departure_icao_count DESC";
@@ -6198,7 +6198,7 @@  discard block
 block discarded – undo
6198 6198
 		$airport_array = array();
6199 6199
 		$temp_array = array();
6200 6200
         
6201
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6201
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6202 6202
 		{
6203 6203
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6204 6204
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6219,11 +6219,11 @@  discard block
 block discarded – undo
6219 6219
 	* @return Array the airport list
6220 6220
 	*
6221 6221
 	*/
6222
-	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
6222
+	public function countAllDepartureAirportCountriesByCountry($country, $filters = array())
6223 6223
 	{
6224
-		$filter_query = $this->getFilter($filters,true,true);
6225
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6226
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6224
+		$filter_query = $this->getFilter($filters, true, true);
6225
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6226
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6227 6227
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
6228 6228
                     GROUP BY spotter_output.departure_airport_country
6229 6229
 					ORDER BY airport_departure_country_count DESC";
@@ -6235,7 +6235,7 @@  discard block
 block discarded – undo
6235 6235
 		$airport_array = array();
6236 6236
 		$temp_array = array();
6237 6237
         
6238
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6238
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6239 6239
 		{
6240 6240
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6241 6241
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6253,11 +6253,11 @@  discard block
 block discarded – undo
6253 6253
 	* @return Array the airport list
6254 6254
 	*
6255 6255
 	*/
6256
-	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6256
+	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6257 6257
 	{
6258 6258
 		global $globalDBdriver;
6259
-		$filter_query = $this->getFilter($filters,true,true);
6260
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6259
+		$filter_query = $this->getFilter($filters, true, true);
6260
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6261 6261
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
6262 6262
                 if ($olderthanmonths > 0) {
6263 6263
             		if ($globalDBdriver == 'mysql') {
@@ -6292,7 +6292,7 @@  discard block
 block discarded – undo
6292 6292
 		$airport_array = array();
6293 6293
 		$temp_array = array();
6294 6294
         
6295
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6295
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6296 6296
 		{
6297 6297
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6298 6298
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6315,11 +6315,11 @@  discard block
 block discarded – undo
6315 6315
 	* @return Array the airport list
6316 6316
 	*
6317 6317
 	*/
6318
-	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6318
+	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6319 6319
 	{
6320 6320
 		global $globalDBdriver;
6321
-		$filter_query = $this->getFilter($filters,true,true);
6322
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6321
+		$filter_query = $this->getFilter($filters, true, true);
6322
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6323 6323
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' ";
6324 6324
                 if ($olderthanmonths > 0) {
6325 6325
             		if ($globalDBdriver == 'mysql') {
@@ -6354,7 +6354,7 @@  discard block
 block discarded – undo
6354 6354
 		$airport_array = array();
6355 6355
 		$temp_array = array();
6356 6356
         
6357
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6357
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6358 6358
 		{
6359 6359
 			$temp_array['airline_icao'] = $row['airline_icao'];
6360 6360
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
@@ -6379,11 +6379,11 @@  discard block
 block discarded – undo
6379 6379
 	* @return Array the airport list
6380 6380
 	*
6381 6381
 	*/
6382
-	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6382
+	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6383 6383
 	{
6384 6384
 		global $globalDBdriver;
6385
-		$filter_query = $this->getFilter($filters,true,true);
6386
-		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
6385
+		$filter_query = $this->getFilter($filters, true, true);
6386
+		$query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
6387 6387
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
6388 6388
                 if ($olderthanmonths > 0) {
6389 6389
             		if ($globalDBdriver == 'mysql') {
@@ -6417,7 +6417,7 @@  discard block
 block discarded – undo
6417 6417
 		$airport_array = array();
6418 6418
 		$temp_array = array();
6419 6419
         
6420
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6420
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6421 6421
 		{
6422 6422
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6423 6423
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6440,11 +6440,11 @@  discard block
 block discarded – undo
6440 6440
 	* @return Array the airport list
6441 6441
 	*
6442 6442
 	*/
6443
-	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6443
+	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6444 6444
 	{
6445 6445
 		global $globalDBdriver;
6446
-		$filter_query = $this->getFilter($filters,true,true);
6447
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
6446
+		$filter_query = $this->getFilter($filters, true, true);
6447
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
6448 6448
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
6449 6449
                 if ($olderthanmonths > 0) {
6450 6450
             		if ($globalDBdriver == 'mysql') {
@@ -6479,7 +6479,7 @@  discard block
 block discarded – undo
6479 6479
 		$airport_array = array();
6480 6480
 		$temp_array = array();
6481 6481
         
6482
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6482
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6483 6483
 		{
6484 6484
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6485 6485
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6505,9 +6505,9 @@  discard block
 block discarded – undo
6505 6505
 	*/
6506 6506
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
6507 6507
 	{
6508
-		$filter_query = $this->getFilter($filters,true,true);
6509
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6510
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6508
+		$filter_query = $this->getFilter($filters, true, true);
6509
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6510
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6511 6511
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao 
6512 6512
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6513 6513
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6518,7 +6518,7 @@  discard block
 block discarded – undo
6518 6518
 		$airport_array = array();
6519 6519
 		$temp_array = array();
6520 6520
         
6521
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6521
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6522 6522
 		{
6523 6523
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6524 6524
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6539,12 +6539,12 @@  discard block
 block discarded – undo
6539 6539
 	* @return Array the airport list
6540 6540
 	*
6541 6541
 	*/
6542
-	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
6542
+	public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array())
6543 6543
 	{
6544
-		$filter_query = $this->getFilter($filters,true,true);
6545
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6544
+		$filter_query = $this->getFilter($filters, true, true);
6545
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6546 6546
 					
6547
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6547
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6548 6548
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
6549 6549
                     GROUP BY spotter_output.arrival_airport_country
6550 6550
 					ORDER BY airport_arrival_country_count DESC";
@@ -6556,7 +6556,7 @@  discard block
 block discarded – undo
6556 6556
 		$airport_array = array();
6557 6557
 		$temp_array = array();
6558 6558
         
6559
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6559
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6560 6560
 		{
6561 6561
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6562 6562
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6574,11 +6574,11 @@  discard block
 block discarded – undo
6574 6574
 	* @return Array the airport list
6575 6575
 	*
6576 6576
 	*/
6577
-	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
6577
+	public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array())
6578 6578
 	{
6579
-		$filter_query = $this->getFilter($filters,true,true);
6580
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6581
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6579
+		$filter_query = $this->getFilter($filters, true, true);
6580
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6581
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6582 6582
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao 
6583 6583
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6584 6584
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6590,7 +6590,7 @@  discard block
 block discarded – undo
6590 6590
 		$airport_array = array();
6591 6591
 		$temp_array = array();
6592 6592
         
6593
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6593
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6594 6594
 		{
6595 6595
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6596 6596
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6612,11 +6612,11 @@  discard block
 block discarded – undo
6612 6612
 	* @return Array the airport list
6613 6613
 	*
6614 6614
 	*/
6615
-	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
6615
+	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array())
6616 6616
 	{
6617
-		$filter_query = $this->getFilter($filters,true,true);
6618
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6619
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6617
+		$filter_query = $this->getFilter($filters, true, true);
6618
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6619
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6620 6620
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
6621 6621
                     GROUP BY spotter_output.arrival_airport_country
6622 6622
 					ORDER BY airport_arrival_country_count DESC";
@@ -6628,7 +6628,7 @@  discard block
 block discarded – undo
6628 6628
 		$airport_array = array();
6629 6629
 		$temp_array = array();
6630 6630
         
6631
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6631
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6632 6632
 		{
6633 6633
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6634 6634
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6646,12 +6646,12 @@  discard block
 block discarded – undo
6646 6646
 	* @return Array the airport list
6647 6647
 	*
6648 6648
 	*/
6649
-	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
6649
+	public function countAllArrivalAirportsByRegistration($registration, $filters = array())
6650 6650
 	{
6651
-		$filter_query = $this->getFilter($filters,true,true);
6652
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6651
+		$filter_query = $this->getFilter($filters, true, true);
6652
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6653 6653
 
6654
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6654
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6655 6655
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.registration = :registration 
6656 6656
                     GROUP BY spotter_output.arrival_airport_icao
6657 6657
 					ORDER BY airport_arrival_icao_count DESC";
@@ -6663,7 +6663,7 @@  discard block
 block discarded – undo
6663 6663
 		$airport_array = array();
6664 6664
 		$temp_array = array();
6665 6665
         
6666
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6666
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6667 6667
 		{
6668 6668
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6669 6669
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6684,11 +6684,11 @@  discard block
 block discarded – undo
6684 6684
 	* @return Array the airport list
6685 6685
 	*
6686 6686
 	*/
6687
-	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
6687
+	public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array())
6688 6688
 	{
6689
-		$filter_query = $this->getFilter($filters,true,true);
6690
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6691
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6689
+		$filter_query = $this->getFilter($filters, true, true);
6690
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6691
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6692 6692
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration 
6693 6693
                     GROUP BY spotter_output.arrival_airport_country
6694 6694
 					ORDER BY airport_arrival_country_count DESC";
@@ -6700,7 +6700,7 @@  discard block
 block discarded – undo
6700 6700
 		$airport_array = array();
6701 6701
 		$temp_array = array();
6702 6702
         
6703
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6703
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6704 6704
 		{
6705 6705
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6706 6706
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6719,11 +6719,11 @@  discard block
 block discarded – undo
6719 6719
 	* @return Array the airport list
6720 6720
 	*
6721 6721
 	*/
6722
-	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
6722
+	public function countAllArrivalAirportsByAirport($airport_icao, $filters = array())
6723 6723
 	{
6724
-		$filter_query = $this->getFilter($filters,true,true);
6725
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6726
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6724
+		$filter_query = $this->getFilter($filters, true, true);
6725
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6726
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6727 6727
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.departure_airport_icao = :airport_icao 
6728 6728
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6729 6729
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6735,7 +6735,7 @@  discard block
 block discarded – undo
6735 6735
 		$airport_array = array();
6736 6736
 		$temp_array = array();
6737 6737
         
6738
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6738
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6739 6739
 		{
6740 6740
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6741 6741
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6756,11 +6756,11 @@  discard block
 block discarded – undo
6756 6756
 	* @return Array the airport list
6757 6757
 	*
6758 6758
 	*/
6759
-	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
6759
+	public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array())
6760 6760
 	{
6761
-		$filter_query = $this->getFilter($filters,true,true);
6762
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6763
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6761
+		$filter_query = $this->getFilter($filters, true, true);
6762
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6763
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6764 6764
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao 
6765 6765
                     GROUP BY spotter_output.arrival_airport_country
6766 6766
 					ORDER BY airport_arrival_country_count DESC";
@@ -6772,7 +6772,7 @@  discard block
 block discarded – undo
6772 6772
 		$airport_array = array();
6773 6773
 		$temp_array = array();
6774 6774
         
6775
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6775
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6776 6776
 		{
6777 6777
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6778 6778
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6790,11 +6790,11 @@  discard block
 block discarded – undo
6790 6790
 	* @return Array the airport list
6791 6791
 	*
6792 6792
 	*/
6793
-	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6793
+	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6794 6794
 	{
6795
-		$filter_query = $this->getFilter($filters,true,true);
6796
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6797
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6795
+		$filter_query = $this->getFilter($filters, true, true);
6796
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6797
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6798 6798
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6799 6799
                     GROUP BY spotter_output.arrival_airport_icao
6800 6800
 					ORDER BY airport_arrival_icao_count DESC";
@@ -6806,7 +6806,7 @@  discard block
 block discarded – undo
6806 6806
 		$airport_array = array();
6807 6807
 		$temp_array = array();
6808 6808
         
6809
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6809
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6810 6810
 		{
6811 6811
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6812 6812
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6828,11 +6828,11 @@  discard block
 block discarded – undo
6828 6828
 	* @return Array the airport list
6829 6829
 	*
6830 6830
 	*/
6831
-	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6831
+	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6832 6832
 	{
6833
-		$filter_query = $this->getFilter($filters,true,true);
6834
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6835
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6833
+		$filter_query = $this->getFilter($filters, true, true);
6834
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6835
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6836 6836
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6837 6837
                     GROUP BY spotter_output.arrival_airport_country
6838 6838
 					ORDER BY airport_arrival_country_count DESC";
@@ -6844,7 +6844,7 @@  discard block
 block discarded – undo
6844 6844
 		$airport_array = array();
6845 6845
 		$temp_array = array();
6846 6846
         
6847
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6847
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6848 6848
 		{
6849 6849
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6850 6850
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6863,11 +6863,11 @@  discard block
 block discarded – undo
6863 6863
 	* @return Array the airport list
6864 6864
 	*
6865 6865
 	*/
6866
-	public function countAllArrivalAirportsByDate($date,$filters = array())
6866
+	public function countAllArrivalAirportsByDate($date, $filters = array())
6867 6867
 	{
6868 6868
 		global $globalTimezone, $globalDBdriver;
6869
-		$filter_query = $this->getFilter($filters,true,true);
6870
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6869
+		$filter_query = $this->getFilter($filters, true, true);
6870
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6871 6871
 		if ($globalTimezone != '') {
6872 6872
 			date_default_timezone_set($globalTimezone);
6873 6873
 			$datetime = new DateTime($date);
@@ -6875,12 +6875,12 @@  discard block
 block discarded – undo
6875 6875
 		} else $offset = '+00:00';
6876 6876
 
6877 6877
 		if ($globalDBdriver == 'mysql') {
6878
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6878
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6879 6879
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date  
6880 6880
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6881 6881
 					ORDER BY airport_arrival_icao_count DESC";
6882 6882
 		} else {
6883
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6883
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6884 6884
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date  
6885 6885
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6886 6886
 					ORDER BY airport_arrival_icao_count DESC";
@@ -6892,7 +6892,7 @@  discard block
 block discarded – undo
6892 6892
 		$airport_array = array();
6893 6893
 		$temp_array = array();
6894 6894
         
6895
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6895
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6896 6896
 		{
6897 6897
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6898 6898
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6916,8 +6916,8 @@  discard block
 block discarded – undo
6916 6916
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
6917 6917
 	{
6918 6918
 		global $globalTimezone, $globalDBdriver;
6919
-		$filter_query = $this->getFilter($filters,true,true);
6920
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6919
+		$filter_query = $this->getFilter($filters, true, true);
6920
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6921 6921
 		if ($globalTimezone != '') {
6922 6922
 			date_default_timezone_set($globalTimezone);
6923 6923
 			$datetime = new DateTime($date);
@@ -6925,12 +6925,12 @@  discard block
 block discarded – undo
6925 6925
 		} else $offset = '+00:00';
6926 6926
 
6927 6927
 		if ($globalDBdriver == 'mysql') {
6928
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6928
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6929 6929
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
6930 6930
 					GROUP BY spotter_output.arrival_airport_country
6931 6931
 					ORDER BY airport_arrival_country_count DESC";
6932 6932
 		} else {
6933
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6933
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6934 6934
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
6935 6935
 					GROUP BY spotter_output.arrival_airport_country
6936 6936
 					ORDER BY airport_arrival_country_count DESC";
@@ -6942,7 +6942,7 @@  discard block
 block discarded – undo
6942 6942
 		$airport_array = array();
6943 6943
 		$temp_array = array();
6944 6944
         
6945
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6945
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6946 6946
 		{
6947 6947
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6948 6948
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6960,11 +6960,11 @@  discard block
 block discarded – undo
6960 6960
 	* @return Array the airport list
6961 6961
 	*
6962 6962
 	*/
6963
-	public function countAllArrivalAirportsByIdent($ident,$filters = array())
6963
+	public function countAllArrivalAirportsByIdent($ident, $filters = array())
6964 6964
 	{
6965
-		$filter_query = $this->getFilter($filters,true,true);
6966
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6967
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6965
+		$filter_query = $this->getFilter($filters, true, true);
6966
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6967
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6968 6968
 		    FROM spotter_output".$filter_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.ident = :ident  
6969 6969
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6970 6970
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -6976,7 +6976,7 @@  discard block
 block discarded – undo
6976 6976
 		$airport_array = array();
6977 6977
 		$temp_array = array();
6978 6978
         
6979
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6979
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6980 6980
 		{
6981 6981
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6982 6982
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6999,9 +6999,9 @@  discard block
 block discarded – undo
6999 6999
 	*/
7000 7000
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
7001 7001
 	{
7002
-		$filter_query = $this->getFilter($filters,true,true);
7003
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7004
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7002
+		$filter_query = $this->getFilter($filters, true, true);
7003
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7004
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7005 7005
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident 
7006 7006
                     GROUP BY spotter_output.arrival_airport_country
7007 7007
 					ORDER BY airport_arrival_country_count DESC";
@@ -7013,7 +7013,7 @@  discard block
 block discarded – undo
7013 7013
 		$airport_array = array();
7014 7014
 		$temp_array = array();
7015 7015
         
7016
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7016
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7017 7017
 		{
7018 7018
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7019 7019
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7032,11 +7032,11 @@  discard block
 block discarded – undo
7032 7032
 	* @return Array the airport list
7033 7033
 	*
7034 7034
 	*/
7035
-	public function countAllArrivalAirportsByCountry($country,$filters = array())
7035
+	public function countAllArrivalAirportsByCountry($country, $filters = array())
7036 7036
 	{
7037
-		$filter_query = $this->getFilter($filters,true,true);
7038
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7039
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7037
+		$filter_query = $this->getFilter($filters, true, true);
7038
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7039
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7040 7040
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
7041 7041
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7042 7042
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -7048,7 +7048,7 @@  discard block
 block discarded – undo
7048 7048
 		$airport_array = array();
7049 7049
 		$temp_array = array();
7050 7050
         
7051
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7051
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7052 7052
 		{
7053 7053
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7054 7054
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -7069,11 +7069,11 @@  discard block
 block discarded – undo
7069 7069
 	* @return Array the airport list
7070 7070
 	*
7071 7071
 	*/
7072
-	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
7072
+	public function countAllArrivalAirportCountriesByCountry($country, $filters = array())
7073 7073
 	{
7074
-		$filter_query = $this->getFilter($filters,true,true);
7075
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7076
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7074
+		$filter_query = $this->getFilter($filters, true, true);
7075
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7076
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7077 7077
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
7078 7078
                     GROUP BY spotter_output.arrival_airport_country
7079 7079
 					ORDER BY airport_arrival_country_count DESC";
@@ -7085,7 +7085,7 @@  discard block
 block discarded – undo
7085 7085
 		$airport_array = array();
7086 7086
 		$temp_array = array();
7087 7087
         
7088
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7088
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7089 7089
 		{
7090 7090
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7091 7091
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7106,7 +7106,7 @@  discard block
 block discarded – undo
7106 7106
 	*/
7107 7107
 	public function countAllDepartureCountries($filters = array())
7108 7108
 	{
7109
-		$filter_query = $this->getFilter($filters,true,true);
7109
+		$filter_query = $this->getFilter($filters, true, true);
7110 7110
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
7111 7111
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA'";
7112 7112
 		$query .= " GROUP BY spotter_output.departure_airport_country
@@ -7120,7 +7120,7 @@  discard block
 block discarded – undo
7120 7120
 		$airport_array = array();
7121 7121
 		$temp_array = array();
7122 7122
         
7123
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7123
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7124 7124
 		{
7125 7125
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
7126 7126
 			$temp_array['airport_departure_country'] = $row['departure_airport_country'];
@@ -7138,9 +7138,9 @@  discard block
 block discarded – undo
7138 7138
 	* @return Array the airport arrival list
7139 7139
 	*
7140 7140
 	*/
7141
-	public function countAllArrivalCountries($limit = true,$filters = array())
7141
+	public function countAllArrivalCountries($limit = true, $filters = array())
7142 7142
 	{
7143
-		$filter_query = $this->getFilter($filters,true,true);
7143
+		$filter_query = $this->getFilter($filters, true, true);
7144 7144
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7145 7145
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
7146 7146
 		$query .= " GROUP BY spotter_output.arrival_airport_country
@@ -7154,7 +7154,7 @@  discard block
 block discarded – undo
7154 7154
 		$airport_array = array();
7155 7155
 		$temp_array = array();
7156 7156
         
7157
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7157
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7158 7158
 		{
7159 7159
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
7160 7160
 			$temp_array['airport_arrival_country'] = $row['arrival_airport_country'];
@@ -7177,8 +7177,8 @@  discard block
 block discarded – undo
7177 7177
 	*/
7178 7178
 	public function countAllRoutes($filters = array())
7179 7179
 	{
7180
-		$filter_query = $this->getFilter($filters,true,true);
7181
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7180
+		$filter_query = $this->getFilter($filters, true, true);
7181
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7182 7182
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> 'NA'
7183 7183
                     GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
7184 7184
                     ORDER BY route_count DESC
@@ -7191,7 +7191,7 @@  discard block
 block discarded – undo
7191 7191
 		$routes_array = array();
7192 7192
 		$temp_array = array();
7193 7193
         
7194
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7194
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7195 7195
 		{
7196 7196
 			$temp_array['route_count'] = $row['route_count'];
7197 7197
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7218,11 +7218,11 @@  discard block
 block discarded – undo
7218 7218
 	* @return Array the route list
7219 7219
 	*
7220 7220
 	*/
7221
-	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
7221
+	public function countAllRoutesByAircraft($aircraft_icao, $filters = array())
7222 7222
 	{
7223
-		$filter_query = $this->getFilter($filters,true,true);
7224
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
7225
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7223
+		$filter_query = $this->getFilter($filters, true, true);
7224
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
7225
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7226 7226
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
7227 7227
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7228 7228
 			    ORDER BY route_count DESC";
@@ -7233,7 +7233,7 @@  discard block
 block discarded – undo
7233 7233
 		$routes_array = array();
7234 7234
 		$temp_array = array();
7235 7235
         
7236
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7236
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7237 7237
 		{
7238 7238
 			$temp_array['route_count'] = $row['route_count'];
7239 7239
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7260,9 +7260,9 @@  discard block
 block discarded – undo
7260 7260
 	*/
7261 7261
 	public function countAllRoutesByRegistration($registration, $filters = array())
7262 7262
 	{
7263
-		$filter_query = $this->getFilter($filters,true,true);
7263
+		$filter_query = $this->getFilter($filters, true, true);
7264 7264
 		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
7265
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7265
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7266 7266
 			FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration 
7267 7267
                     GROUP BY route
7268 7268
                     ORDER BY route_count DESC";
@@ -7274,7 +7274,7 @@  discard block
 block discarded – undo
7274 7274
 		$routes_array = array();
7275 7275
 		$temp_array = array();
7276 7276
         
7277
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7277
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7278 7278
 		{
7279 7279
 			$temp_array['route_count'] = $row['route_count'];
7280 7280
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7302,9 +7302,9 @@  discard block
 block discarded – undo
7302 7302
 	*/
7303 7303
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
7304 7304
 	{
7305
-		$filter_query = $this->getFilter($filters,true,true);
7306
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
7307
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7305
+		$filter_query = $this->getFilter($filters, true, true);
7306
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
7307
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7308 7308
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao 
7309 7309
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7310 7310
 			    ORDER BY route_count DESC";
@@ -7316,7 +7316,7 @@  discard block
 block discarded – undo
7316 7316
 		$routes_array = array();
7317 7317
 		$temp_array = array();
7318 7318
         
7319
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7319
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7320 7320
 		{
7321 7321
 			$temp_array['route_count'] = $row['route_count'];
7322 7322
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7344,9 +7344,9 @@  discard block
 block discarded – undo
7344 7344
 	*/
7345 7345
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
7346 7346
 	{
7347
-		$filter_query = $this->getFilter($filters,true,true);
7348
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
7349
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7347
+		$filter_query = $this->getFilter($filters, true, true);
7348
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
7349
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7350 7350
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
7351 7351
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7352 7352
 			    ORDER BY route_count DESC";
@@ -7357,7 +7357,7 @@  discard block
 block discarded – undo
7357 7357
 		$routes_array = array();
7358 7358
 		$temp_array = array();
7359 7359
         
7360
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7360
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7361 7361
 		{
7362 7362
 			$temp_array['route_count'] = $row['route_count'];
7363 7363
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7385,9 +7385,9 @@  discard block
 block discarded – undo
7385 7385
 	*/
7386 7386
 	public function countAllRoutesByCountry($country, $filters = array())
7387 7387
 	{
7388
-		$filter_query = $this->getFilter($filters,true,true);
7389
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7390
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7388
+		$filter_query = $this->getFilter($filters, true, true);
7389
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7390
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7391 7391
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
7392 7392
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7393 7393
 			    ORDER BY route_count DESC";
@@ -7398,7 +7398,7 @@  discard block
 block discarded – undo
7398 7398
 		$routes_array = array();
7399 7399
 		$temp_array = array();
7400 7400
         
7401
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7401
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7402 7402
 		{
7403 7403
 			$temp_array['route_count'] = $row['route_count'];
7404 7404
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7426,8 +7426,8 @@  discard block
 block discarded – undo
7426 7426
 	public function countAllRoutesByDate($date, $filters = array())
7427 7427
 	{
7428 7428
 		global $globalTimezone, $globalDBdriver;
7429
-		$filter_query = $this->getFilter($filters,true,true);
7430
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7429
+		$filter_query = $this->getFilter($filters, true, true);
7430
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7431 7431
 		if ($globalTimezone != '') {
7432 7432
 			date_default_timezone_set($globalTimezone);
7433 7433
 			$datetime = new DateTime($date);
@@ -7435,12 +7435,12 @@  discard block
 block discarded – undo
7435 7435
 		} else $offset = '+00:00';
7436 7436
 		
7437 7437
 		if ($globalDBdriver == 'mysql') {
7438
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7438
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7439 7439
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date  
7440 7440
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7441 7441
 				    ORDER BY route_count DESC";
7442 7442
 		} else {
7443
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7443
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7444 7444
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date  
7445 7445
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7446 7446
 				    ORDER BY route_count DESC";
@@ -7452,7 +7452,7 @@  discard block
 block discarded – undo
7452 7452
 		$routes_array = array();
7453 7453
 		$temp_array = array();
7454 7454
         
7455
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7455
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7456 7456
 		{
7457 7457
 			$temp_array['route_count'] = $row['route_count'];
7458 7458
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7479,9 +7479,9 @@  discard block
 block discarded – undo
7479 7479
 	*/
7480 7480
 	public function countAllRoutesByIdent($ident, $filters = array())
7481 7481
 	{
7482
-		$filter_query = $this->getFilter($filters,true,true);
7483
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7484
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7482
+		$filter_query = $this->getFilter($filters, true, true);
7483
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7484
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7485 7485
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident   
7486 7486
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7487 7487
                     ORDER BY route_count DESC";
@@ -7493,7 +7493,7 @@  discard block
 block discarded – undo
7493 7493
 		$routes_array = array();
7494 7494
 		$temp_array = array();
7495 7495
         
7496
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7496
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7497 7497
 		{
7498 7498
 			$temp_array['route_count'] = $row['route_count'];
7499 7499
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7520,9 +7520,9 @@  discard block
 block discarded – undo
7520 7520
 	*/
7521 7521
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
7522 7522
 	{
7523
-		$filter_query = $this->getFilter($filters,true,true);
7524
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
7525
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7523
+		$filter_query = $this->getFilter($filters, true, true);
7524
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
7525
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7526 7526
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
7527 7527
                     GROUP BY route
7528 7528
                     ORDER BY route_count DESC";
@@ -7534,7 +7534,7 @@  discard block
 block discarded – undo
7534 7534
 		$routes_array = array();
7535 7535
 		$temp_array = array();
7536 7536
         
7537
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7537
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7538 7538
 		{
7539 7539
 			$temp_array['route_count'] = $row['route_count'];
7540 7540
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7562,8 +7562,8 @@  discard block
 block discarded – undo
7562 7562
 	*/
7563 7563
 	public function countAllRoutesWithWaypoints($filters = array())
7564 7564
 	{
7565
-		$filter_query = $this->getFilter($filters,true,true);
7566
-		$query  = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7565
+		$filter_query = $this->getFilter($filters, true, true);
7566
+		$query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7567 7567
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> '' 
7568 7568
                     GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7569 7569
                     ORDER BY route_count DESC
@@ -7576,7 +7576,7 @@  discard block
 block discarded – undo
7576 7576
 		$routes_array = array();
7577 7577
 		$temp_array = array();
7578 7578
         
7579
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7579
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7580 7580
 		{
7581 7581
 			$temp_array['spotter_id'] = $row['spotter_id'];
7582 7582
 			$temp_array['route_count'] = $row['route_count'];
@@ -7601,11 +7601,11 @@  discard block
 block discarded – undo
7601 7601
 	* @return Array the callsign list
7602 7602
 	*
7603 7603
 	*/
7604
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
7604
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7605 7605
 	{
7606 7606
 		global $globalDBdriver;
7607
-		$filter_query = $this->getFilter($filters,true,true);
7608
-		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7607
+		$filter_query = $this->getFilter($filters, true, true);
7608
+		$query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7609 7609
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7610 7610
 		 if ($olderthanmonths > 0) {
7611 7611
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -7624,7 +7624,7 @@  discard block
 block discarded – undo
7624 7624
 		$callsign_array = array();
7625 7625
 		$temp_array = array();
7626 7626
         
7627
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7627
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7628 7628
 		{
7629 7629
 			$temp_array['callsign_icao'] = $row['ident'];
7630 7630
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -7646,8 +7646,8 @@  discard block
 block discarded – undo
7646 7646
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7647 7647
 	{
7648 7648
 		global $globalDBdriver;
7649
-		$filter_query = $this->getFilter($filters,true,true);
7650
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7649
+		$filter_query = $this->getFilter($filters, true, true);
7650
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7651 7651
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7652 7652
 		 if ($olderthanmonths > 0) {
7653 7653
 			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
@@ -7666,7 +7666,7 @@  discard block
 block discarded – undo
7666 7666
 		$callsign_array = array();
7667 7667
 		$temp_array = array();
7668 7668
         
7669
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7669
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7670 7670
 		{
7671 7671
 			$temp_array['callsign_icao'] = $row['ident'];
7672 7672
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -7720,7 +7720,7 @@  discard block
 block discarded – undo
7720 7720
 		$date_array = array();
7721 7721
 		$temp_array = array();
7722 7722
         
7723
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7723
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7724 7724
 		{
7725 7725
 			$temp_array['date_name'] = $row['date_name'];
7726 7726
 			$temp_array['date_count'] = $row['date_count'];
@@ -7745,15 +7745,15 @@  discard block
 block discarded – undo
7745 7745
 			$datetime = new DateTime();
7746 7746
 			$offset = $datetime->format('P');
7747 7747
 		} else $offset = '+00:00';
7748
-		$filter_query = $this->getFilter($filters,true,true);
7748
+		$filter_query = $this->getFilter($filters, true, true);
7749 7749
 		if ($globalDBdriver == 'mysql') {
7750
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7750
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7751 7751
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
7752 7752
 								GROUP BY spotter_output.airline_icao, date_name 
7753 7753
 								ORDER BY date_count DESC
7754 7754
 								LIMIT 10 OFFSET 0";
7755 7755
 		} else {
7756
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7756
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7757 7757
 								FROM spotter_output 
7758 7758
 								WHERE spotter_output.airline_icao <> '' 
7759 7759
 								GROUP BY spotter_output.airline_icao, date_name 
@@ -7768,7 +7768,7 @@  discard block
 block discarded – undo
7768 7768
 		$date_array = array();
7769 7769
 		$temp_array = array();
7770 7770
         
7771
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7771
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7772 7772
 		{
7773 7773
 			$temp_array['date_name'] = $row['date_name'];
7774 7774
 			$temp_array['date_count'] = $row['date_count'];
@@ -7794,7 +7794,7 @@  discard block
 block discarded – undo
7794 7794
 			$datetime = new DateTime();
7795 7795
 			$offset = $datetime->format('P');
7796 7796
 		} else $offset = '+00:00';
7797
-		$filter_query = $this->getFilter($filters,true,true);
7797
+		$filter_query = $this->getFilter($filters, true, true);
7798 7798
 		if ($globalDBdriver == 'mysql') {
7799 7799
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7800 7800
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -7815,7 +7815,7 @@  discard block
 block discarded – undo
7815 7815
 		$date_array = array();
7816 7816
 		$temp_array = array();
7817 7817
         
7818
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7818
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7819 7819
 		{
7820 7820
 			$temp_array['date_name'] = $row['date_name'];
7821 7821
 			$temp_array['date_count'] = $row['date_count'];
@@ -7840,7 +7840,7 @@  discard block
 block discarded – undo
7840 7840
 			$datetime = new DateTime();
7841 7841
 			$offset = $datetime->format('P');
7842 7842
 		} else $offset = '+00:00';
7843
-		$filter_query = $this->getFilter($filters,true,true);
7843
+		$filter_query = $this->getFilter($filters, true, true);
7844 7844
 		if ($globalDBdriver == 'mysql') {
7845 7845
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7846 7846
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -7861,7 +7861,7 @@  discard block
 block discarded – undo
7861 7861
 		$date_array = array();
7862 7862
 		$temp_array = array();
7863 7863
         
7864
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7864
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7865 7865
 		{
7866 7866
 			$temp_array['date_name'] = $row['date_name'];
7867 7867
 			$temp_array['date_count'] = $row['date_count'];
@@ -7882,7 +7882,7 @@  discard block
 block discarded – undo
7882 7882
 	public function countAllDatesLastMonthByAirlines($filters = array())
7883 7883
 	{
7884 7884
 		global $globalTimezone, $globalDBdriver;
7885
-		$filter_query = $this->getFilter($filters,true,true);
7885
+		$filter_query = $this->getFilter($filters, true, true);
7886 7886
 		if ($globalTimezone != '') {
7887 7887
 			date_default_timezone_set($globalTimezone);
7888 7888
 			$datetime = new DateTime();
@@ -7890,13 +7890,13 @@  discard block
 block discarded – undo
7890 7890
 		} else $offset = '+00:00';
7891 7891
 		
7892 7892
 		if ($globalDBdriver == 'mysql') {
7893
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7893
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7894 7894
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)
7895 7895
 								GROUP BY spotter_output.airline_icao, date_name 
7896 7896
 								ORDER BY spotter_output.date ASC";
7897 7897
 			$query_data = array(':offset' => $offset);
7898 7898
 		} else {
7899
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7899
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7900 7900
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS'
7901 7901
 								GROUP BY spotter_output.airline_icao, date_name 
7902 7902
 								ORDER BY date_name ASC";
@@ -7909,7 +7909,7 @@  discard block
 block discarded – undo
7909 7909
 		$date_array = array();
7910 7910
 		$temp_array = array();
7911 7911
         
7912
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7912
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7913 7913
 		{
7914 7914
 			$temp_array['date_name'] = $row['date_name'];
7915 7915
 			$temp_array['date_count'] = $row['date_count'];
@@ -7956,7 +7956,7 @@  discard block
 block discarded – undo
7956 7956
 		$date_array = array();
7957 7957
 		$temp_array = array();
7958 7958
         
7959
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7959
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7960 7960
 		{
7961 7961
 			$temp_array['month_name'] = $row['month_name'];
7962 7962
 			$temp_array['year_name'] = $row['year_name'];
@@ -7977,7 +7977,7 @@  discard block
 block discarded – undo
7977 7977
 	public function countAllMonthsByAirlines($filters = array())
7978 7978
 	{
7979 7979
 		global $globalTimezone, $globalDBdriver;
7980
-		$filter_query = $this->getFilter($filters,true,true);
7980
+		$filter_query = $this->getFilter($filters, true, true);
7981 7981
 		if ($globalTimezone != '') {
7982 7982
 			date_default_timezone_set($globalTimezone);
7983 7983
 			$datetime = new DateTime();
@@ -7985,12 +7985,12 @@  discard block
 block discarded – undo
7985 7985
 		} else $offset = '+00:00';
7986 7986
 
7987 7987
 		if ($globalDBdriver == 'mysql') {
7988
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
7988
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
7989 7989
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
7990 7990
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
7991 7991
 								ORDER BY date_count DESC";
7992 7992
 		} else {
7993
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
7993
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
7994 7994
 								FROM spotter_output 
7995 7995
 								WHERE spotter_output.airline_icao <> '' 
7996 7996
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
@@ -8004,7 +8004,7 @@  discard block
 block discarded – undo
8004 8004
 		$date_array = array();
8005 8005
 		$temp_array = array();
8006 8006
         
8007
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8007
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8008 8008
 		{
8009 8009
 			$temp_array['month_name'] = $row['month_name'];
8010 8010
 			$temp_array['year_name'] = $row['year_name'];
@@ -8031,14 +8031,14 @@  discard block
 block discarded – undo
8031 8031
 			$datetime = new DateTime();
8032 8032
 			$offset = $datetime->format('P');
8033 8033
 		} else $offset = '+00:00';
8034
-		$filter_query = $this->getFilter($filters,true,true);
8034
+		$filter_query = $this->getFilter($filters, true, true);
8035 8035
 		if ($globalDBdriver == 'mysql') {
8036
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8036
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8037 8037
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8038 8038
 								GROUP BY year_name, month_name 
8039 8039
 								ORDER BY date_count DESC";
8040 8040
 		} else {
8041
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8041
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8042 8042
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8043 8043
 								GROUP BY year_name, month_name 
8044 8044
 								ORDER BY date_count DESC";
@@ -8050,7 +8050,7 @@  discard block
 block discarded – undo
8050 8050
 		$date_array = array();
8051 8051
 		$temp_array = array();
8052 8052
         
8053
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8053
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8054 8054
 		{
8055 8055
 			$temp_array['month_name'] = $row['month_name'];
8056 8056
 			$temp_array['year_name'] = $row['year_name'];
@@ -8076,15 +8076,15 @@  discard block
 block discarded – undo
8076 8076
 			$datetime = new DateTime();
8077 8077
 			$offset = $datetime->format('P');
8078 8078
 		} else $offset = '+00:00';
8079
-		$filter_query = $this->getFilter($filters,true,true);
8079
+		$filter_query = $this->getFilter($filters, true, true);
8080 8080
 
8081 8081
 		if ($globalDBdriver == 'mysql') {
8082
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8082
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8083 8083
 								FROM spotter_output".$filter_query." owner_name <> ''
8084 8084
 								GROUP BY year_name, month_name
8085 8085
 								ORDER BY date_count DESC";
8086 8086
 		} else {
8087
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8087
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8088 8088
 								FROM spotter_output".$filter_query." owner_name <> ''
8089 8089
 								GROUP BY year_name, month_name
8090 8090
 								ORDER BY date_count DESC";
@@ -8096,7 +8096,7 @@  discard block
 block discarded – undo
8096 8096
 		$date_array = array();
8097 8097
 		$temp_array = array();
8098 8098
         
8099
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8099
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8100 8100
 		{
8101 8101
 			$temp_array['month_name'] = $row['month_name'];
8102 8102
 			$temp_array['year_name'] = $row['year_name'];
@@ -8117,7 +8117,7 @@  discard block
 block discarded – undo
8117 8117
 	public function countAllMonthsOwnersByAirlines($filters = array())
8118 8118
 	{
8119 8119
 		global $globalTimezone, $globalDBdriver;
8120
-		$filter_query = $this->getFilter($filters,true,true);
8120
+		$filter_query = $this->getFilter($filters, true, true);
8121 8121
 		if ($globalTimezone != '') {
8122 8122
 			date_default_timezone_set($globalTimezone);
8123 8123
 			$datetime = new DateTime();
@@ -8125,12 +8125,12 @@  discard block
 block discarded – undo
8125 8125
 		} else $offset = '+00:00';
8126 8126
 
8127 8127
 		if ($globalDBdriver == 'mysql') {
8128
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8128
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8129 8129
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
8130 8130
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8131 8131
 								ORDER BY date_count DESC";
8132 8132
 		} else {
8133
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8133
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8134 8134
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
8135 8135
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8136 8136
 								ORDER BY date_count DESC";
@@ -8142,7 +8142,7 @@  discard block
 block discarded – undo
8142 8142
 		$date_array = array();
8143 8143
 		$temp_array = array();
8144 8144
         
8145
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8145
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8146 8146
 		{
8147 8147
 			$temp_array['month_name'] = $row['month_name'];
8148 8148
 			$temp_array['year_name'] = $row['year_name'];
@@ -8169,15 +8169,15 @@  discard block
 block discarded – undo
8169 8169
 			$datetime = new DateTime();
8170 8170
 			$offset = $datetime->format('P');
8171 8171
 		} else $offset = '+00:00';
8172
-		$filter_query = $this->getFilter($filters,true,true);
8172
+		$filter_query = $this->getFilter($filters, true, true);
8173 8173
 
8174 8174
 		if ($globalDBdriver == 'mysql') {
8175
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8175
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8176 8176
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8177 8177
 								GROUP BY year_name, month_name
8178 8178
 								ORDER BY date_count DESC";
8179 8179
 		} else {
8180
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8180
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8181 8181
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8182 8182
 								GROUP BY year_name, month_name
8183 8183
 								ORDER BY date_count DESC";
@@ -8189,7 +8189,7 @@  discard block
 block discarded – undo
8189 8189
 		$date_array = array();
8190 8190
 		$temp_array = array();
8191 8191
         
8192
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8192
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8193 8193
 		{
8194 8194
 			$temp_array['month_name'] = $row['month_name'];
8195 8195
 			$temp_array['year_name'] = $row['year_name'];
@@ -8210,7 +8210,7 @@  discard block
 block discarded – undo
8210 8210
 	public function countAllMonthsPilotsByAirlines($filters = array())
8211 8211
 	{
8212 8212
 		global $globalTimezone, $globalDBdriver;
8213
-		$filter_query = $this->getFilter($filters,true,true);
8213
+		$filter_query = $this->getFilter($filters, true, true);
8214 8214
 		if ($globalTimezone != '') {
8215 8215
 			date_default_timezone_set($globalTimezone);
8216 8216
 			$datetime = new DateTime();
@@ -8218,12 +8218,12 @@  discard block
 block discarded – undo
8218 8218
 		} else $offset = '+00:00';
8219 8219
 
8220 8220
 		if ($globalDBdriver == 'mysql') {
8221
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8221
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8222 8222
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8223 8223
 								GROUP BY spotter_output.airline_icao,year_name, month_name
8224 8224
 								ORDER BY date_count DESC";
8225 8225
 		} else {
8226
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8226
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8227 8227
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8228 8228
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8229 8229
 								ORDER BY date_count DESC";
@@ -8235,7 +8235,7 @@  discard block
 block discarded – undo
8235 8235
 		$date_array = array();
8236 8236
 		$temp_array = array();
8237 8237
         
8238
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8238
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8239 8239
 		{
8240 8240
 			$temp_array['month_name'] = $row['month_name'];
8241 8241
 			$temp_array['year_name'] = $row['year_name'];
@@ -8257,7 +8257,7 @@  discard block
 block discarded – undo
8257 8257
 	public function countAllMonthsAirlines($filters = array())
8258 8258
 	{
8259 8259
 		global $globalTimezone, $globalDBdriver;
8260
-		$filter_query = $this->getFilter($filters,true,true);
8260
+		$filter_query = $this->getFilter($filters, true, true);
8261 8261
 		if ($globalTimezone != '') {
8262 8262
 			date_default_timezone_set($globalTimezone);
8263 8263
 			$datetime = new DateTime();
@@ -8265,12 +8265,12 @@  discard block
 block discarded – undo
8265 8265
 		} else $offset = '+00:00';
8266 8266
 
8267 8267
 		if ($globalDBdriver == 'mysql') {
8268
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8268
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8269 8269
 								FROM spotter_output".$filter_query." airline_icao <> '' 
8270 8270
 								GROUP BY year_name, month_name
8271 8271
 								ORDER BY date_count DESC";
8272 8272
 		} else {
8273
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8273
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8274 8274
 								FROM spotter_output".$filter_query." airline_icao <> '' 
8275 8275
 								GROUP BY year_name, month_name
8276 8276
 								ORDER BY date_count DESC";
@@ -8282,7 +8282,7 @@  discard block
 block discarded – undo
8282 8282
 		$date_array = array();
8283 8283
 		$temp_array = array();
8284 8284
         
8285
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8285
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8286 8286
 		{
8287 8287
 			$temp_array['month_name'] = $row['month_name'];
8288 8288
 			$temp_array['year_name'] = $row['year_name'];
@@ -8308,15 +8308,15 @@  discard block
 block discarded – undo
8308 8308
 			$datetime = new DateTime();
8309 8309
 			$offset = $datetime->format('P');
8310 8310
 		} else $offset = '+00:00';
8311
-		$filter_query = $this->getFilter($filters,true,true);
8311
+		$filter_query = $this->getFilter($filters, true, true);
8312 8312
 
8313 8313
 		if ($globalDBdriver == 'mysql') {
8314
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8314
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8315 8315
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
8316 8316
 								GROUP BY year_name, month_name
8317 8317
 								ORDER BY date_count DESC";
8318 8318
 		} else {
8319
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8319
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8320 8320
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
8321 8321
 								GROUP BY year_name, month_name
8322 8322
 								ORDER BY date_count DESC";
@@ -8328,7 +8328,7 @@  discard block
 block discarded – undo
8328 8328
 		$date_array = array();
8329 8329
 		$temp_array = array();
8330 8330
         
8331
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8331
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8332 8332
 		{
8333 8333
 			$temp_array['month_name'] = $row['month_name'];
8334 8334
 			$temp_array['year_name'] = $row['year_name'];
@@ -8350,7 +8350,7 @@  discard block
 block discarded – undo
8350 8350
 	public function countAllMonthsAircraftsByAirlines($filters = array())
8351 8351
 	{
8352 8352
 		global $globalTimezone, $globalDBdriver;
8353
-		$filter_query = $this->getFilter($filters,true,true);
8353
+		$filter_query = $this->getFilter($filters, true, true);
8354 8354
 		if ($globalTimezone != '') {
8355 8355
 			date_default_timezone_set($globalTimezone);
8356 8356
 			$datetime = new DateTime();
@@ -8358,12 +8358,12 @@  discard block
 block discarded – undo
8358 8358
 		} else $offset = '+00:00';
8359 8359
 
8360 8360
 		if ($globalDBdriver == 'mysql') {
8361
-			$query  = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8361
+			$query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8362 8362
 								FROM spotter_output".$filter_query." aircraft_icao <> ''  AND spotter_output.airline_icao <> '' 
8363 8363
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8364 8364
 								ORDER BY date_count DESC";
8365 8365
 		} else {
8366
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8366
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8367 8367
 								FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> '' 
8368 8368
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8369 8369
 								ORDER BY date_count DESC";
@@ -8375,7 +8375,7 @@  discard block
 block discarded – undo
8375 8375
 		$date_array = array();
8376 8376
 		$temp_array = array();
8377 8377
         
8378
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8378
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8379 8379
 		{
8380 8380
 			$temp_array['month_name'] = $row['month_name'];
8381 8381
 			$temp_array['year_name'] = $row['year_name'];
@@ -8402,15 +8402,15 @@  discard block
 block discarded – undo
8402 8402
 			$datetime = new DateTime();
8403 8403
 			$offset = $datetime->format('P');
8404 8404
 		} else $offset = '+00:00';
8405
-		$filter_query = $this->getFilter($filters,true,true);
8405
+		$filter_query = $this->getFilter($filters, true, true);
8406 8406
 
8407 8407
 		if ($globalDBdriver == 'mysql') {
8408
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8408
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8409 8409
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
8410 8410
 								GROUP BY year_name, month_name
8411 8411
 								ORDER BY date_count DESC";
8412 8412
 		} else {
8413
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8413
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8414 8414
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
8415 8415
 								GROUP BY year_name, month_name
8416 8416
 								ORDER BY date_count DESC";
@@ -8422,7 +8422,7 @@  discard block
 block discarded – undo
8422 8422
 		$date_array = array();
8423 8423
 		$temp_array = array();
8424 8424
         
8425
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8425
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8426 8426
 		{
8427 8427
 			$temp_array['month_name'] = $row['month_name'];
8428 8428
 			$temp_array['year_name'] = $row['year_name'];
@@ -8444,7 +8444,7 @@  discard block
 block discarded – undo
8444 8444
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
8445 8445
 	{
8446 8446
 		global $globalTimezone, $globalDBdriver;
8447
-		$filter_query = $this->getFilter($filters,true,true);
8447
+		$filter_query = $this->getFilter($filters, true, true);
8448 8448
 		if ($globalTimezone != '') {
8449 8449
 			date_default_timezone_set($globalTimezone);
8450 8450
 			$datetime = new DateTime();
@@ -8452,12 +8452,12 @@  discard block
 block discarded – undo
8452 8452
 		} else $offset = '+00:00';
8453 8453
 
8454 8454
 		if ($globalDBdriver == 'mysql') {
8455
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8455
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8456 8456
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
8457 8457
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8458 8458
 								ORDER BY date_count DESC";
8459 8459
 		} else {
8460
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8460
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8461 8461
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
8462 8462
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8463 8463
 								ORDER BY date_count DESC";
@@ -8469,7 +8469,7 @@  discard block
 block discarded – undo
8469 8469
 		$date_array = array();
8470 8470
 		$temp_array = array();
8471 8471
         
8472
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8472
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8473 8473
 		{
8474 8474
 			$temp_array['month_name'] = $row['month_name'];
8475 8475
 			$temp_array['year_name'] = $row['year_name'];
@@ -8497,7 +8497,7 @@  discard block
 block discarded – undo
8497 8497
 			$datetime = new DateTime();
8498 8498
 			$offset = $datetime->format('P');
8499 8499
 		} else $offset = '+00:00';
8500
-		$filter_query = $this->getFilter($filters,true,true);
8500
+		$filter_query = $this->getFilter($filters, true, true);
8501 8501
 		if ($globalDBdriver == 'mysql') {
8502 8502
 			$query  = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
8503 8503
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -8518,7 +8518,7 @@  discard block
 block discarded – undo
8518 8518
 		$date_array = array();
8519 8519
 		$temp_array = array();
8520 8520
         
8521
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8521
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8522 8522
 		{
8523 8523
 			$temp_array['year_name'] = $row['year_name'];
8524 8524
 			$temp_array['month_name'] = $row['month_name'];
@@ -8538,7 +8538,7 @@  discard block
 block discarded – undo
8538 8538
 	* @return Array the hour list
8539 8539
 	*
8540 8540
 	*/
8541
-	public function countAllHours($orderby,$filters = array())
8541
+	public function countAllHours($orderby, $filters = array())
8542 8542
 	{
8543 8543
 		global $globalTimezone, $globalDBdriver;
8544 8544
 		if ($globalTimezone != '') {
@@ -8586,7 +8586,7 @@  discard block
 block discarded – undo
8586 8586
 		$hour_array = array();
8587 8587
 		$temp_array = array();
8588 8588
         
8589
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8589
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8590 8590
 		{
8591 8591
 			$temp_array['hour_name'] = $row['hour_name'];
8592 8592
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8606,7 +8606,7 @@  discard block
 block discarded – undo
8606 8606
 	public function countAllHoursByAirlines($orderby, $filters = array())
8607 8607
 	{
8608 8608
 		global $globalTimezone, $globalDBdriver;
8609
-		$filter_query = $this->getFilter($filters,true,true);
8609
+		$filter_query = $this->getFilter($filters, true, true);
8610 8610
 		if ($globalTimezone != '') {
8611 8611
 			date_default_timezone_set($globalTimezone);
8612 8612
 			$datetime = new DateTime();
@@ -8624,7 +8624,7 @@  discard block
 block discarded – undo
8624 8624
 		}
8625 8625
 		
8626 8626
 		if ($globalDBdriver == 'mysql') {
8627
-			$query  = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8627
+			$query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8628 8628
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
8629 8629
 								GROUP BY spotter_output.airline_icao, hour_name 
8630 8630
 								".$orderby_sql;
@@ -8637,7 +8637,7 @@  discard block
 block discarded – undo
8637 8637
   */    
8638 8638
 		$query_data = array(':offset' => $offset);
8639 8639
 		} else {
8640
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8640
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8641 8641
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
8642 8642
 								GROUP BY spotter_output.airline_icao, hour_name 
8643 8643
 								".$orderby_sql;
@@ -8650,7 +8650,7 @@  discard block
 block discarded – undo
8650 8650
 		$hour_array = array();
8651 8651
 		$temp_array = array();
8652 8652
         
8653
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8653
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8654 8654
 		{
8655 8655
 			$temp_array['hour_name'] = $row['hour_name'];
8656 8656
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8673,34 +8673,34 @@  discard block
 block discarded – undo
8673 8673
 	public function countAllHoursByAirline($airline_icao, $filters = array())
8674 8674
 	{
8675 8675
 		global $globalTimezone, $globalDBdriver;
8676
-		$filter_query = $this->getFilter($filters,true,true);
8676
+		$filter_query = $this->getFilter($filters, true, true);
8677 8677
 		if ($globalTimezone != '') {
8678 8678
 			date_default_timezone_set($globalTimezone);
8679 8679
 			$datetime = new DateTime();
8680 8680
 			$offset = $datetime->format('P');
8681 8681
 		} else $offset = '+00:00';
8682 8682
 
8683
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8683
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
8684 8684
 
8685 8685
 		if ($globalDBdriver == 'mysql') {
8686
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8686
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8687 8687
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8688 8688
 								GROUP BY hour_name 
8689 8689
 								ORDER BY hour_name ASC";
8690 8690
 		} else {
8691
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8691
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8692 8692
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8693 8693
 								GROUP BY hour_name 
8694 8694
 								ORDER BY hour_name ASC";
8695 8695
 		}
8696 8696
 		
8697 8697
 		$sth = $this->db->prepare($query);
8698
-		$sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset));
8698
+		$sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset));
8699 8699
       
8700 8700
 		$hour_array = array();
8701 8701
 		$temp_array = array();
8702 8702
         
8703
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8703
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8704 8704
 		{
8705 8705
 			$temp_array['hour_name'] = $row['hour_name'];
8706 8706
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8723,8 +8723,8 @@  discard block
 block discarded – undo
8723 8723
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
8724 8724
 	{
8725 8725
 		global $globalTimezone, $globalDBdriver;
8726
-		$filter_query = $this->getFilter($filters,true,true);
8727
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
8726
+		$filter_query = $this->getFilter($filters, true, true);
8727
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
8728 8728
 		if ($globalTimezone != '') {
8729 8729
 			date_default_timezone_set($globalTimezone);
8730 8730
 			$datetime = new DateTime();
@@ -8732,24 +8732,24 @@  discard block
 block discarded – undo
8732 8732
 		} else $offset = '+00:00';
8733 8733
 
8734 8734
 		if ($globalDBdriver == 'mysql') {
8735
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8735
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8736 8736
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8737 8737
 								GROUP BY hour_name 
8738 8738
 								ORDER BY hour_name ASC";
8739 8739
 		} else {
8740
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8740
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8741 8741
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8742 8742
 								GROUP BY hour_name 
8743 8743
 								ORDER BY hour_name ASC";
8744 8744
 		}
8745 8745
 		
8746 8746
 		$sth = $this->db->prepare($query);
8747
-		$sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset));
8747
+		$sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset));
8748 8748
       
8749 8749
 		$hour_array = array();
8750 8750
 		$temp_array = array();
8751 8751
         
8752
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8752
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8753 8753
 		{
8754 8754
 			$temp_array['hour_name'] = $row['hour_name'];
8755 8755
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8770,8 +8770,8 @@  discard block
 block discarded – undo
8770 8770
 	public function countAllHoursByRegistration($registration, $filters = array())
8771 8771
 	{
8772 8772
 		global $globalTimezone, $globalDBdriver;
8773
-		$filter_query = $this->getFilter($filters,true,true);
8774
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
8773
+		$filter_query = $this->getFilter($filters, true, true);
8774
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
8775 8775
 		if ($globalTimezone != '') {
8776 8776
 			date_default_timezone_set($globalTimezone);
8777 8777
 			$datetime = new DateTime();
@@ -8779,24 +8779,24 @@  discard block
 block discarded – undo
8779 8779
 		} else $offset = '+00:00';
8780 8780
 
8781 8781
 		if ($globalDBdriver == 'mysql') {
8782
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8782
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8783 8783
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8784 8784
 								GROUP BY hour_name 
8785 8785
 								ORDER BY hour_name ASC";
8786 8786
 		} else {
8787
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8787
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8788 8788
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8789 8789
 								GROUP BY hour_name 
8790 8790
 								ORDER BY hour_name ASC";
8791 8791
 		}
8792 8792
 		
8793 8793
 		$sth = $this->db->prepare($query);
8794
-		$sth->execute(array(':registration' => $registration,':offset' => $offset));
8794
+		$sth->execute(array(':registration' => $registration, ':offset' => $offset));
8795 8795
       
8796 8796
 		$hour_array = array();
8797 8797
 		$temp_array = array();
8798 8798
         
8799
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8799
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8800 8800
 		{
8801 8801
 			$temp_array['hour_name'] = $row['hour_name'];
8802 8802
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8817,8 +8817,8 @@  discard block
 block discarded – undo
8817 8817
 	public function countAllHoursByAirport($airport_icao, $filters = array())
8818 8818
 	{
8819 8819
 		global $globalTimezone, $globalDBdriver;
8820
-		$filter_query = $this->getFilter($filters,true,true);
8821
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
8820
+		$filter_query = $this->getFilter($filters, true, true);
8821
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
8822 8822
 		if ($globalTimezone != '') {
8823 8823
 			date_default_timezone_set($globalTimezone);
8824 8824
 			$datetime = new DateTime();
@@ -8826,24 +8826,24 @@  discard block
 block discarded – undo
8826 8826
 		} else $offset = '+00:00';
8827 8827
 
8828 8828
 		if ($globalDBdriver == 'mysql') {
8829
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8829
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8830 8830
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8831 8831
 								GROUP BY hour_name 
8832 8832
 								ORDER BY hour_name ASC";
8833 8833
 		} else {
8834
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8834
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8835 8835
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8836 8836
 								GROUP BY hour_name 
8837 8837
 								ORDER BY hour_name ASC";
8838 8838
 		}
8839 8839
 		
8840 8840
 		$sth = $this->db->prepare($query);
8841
-		$sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset));
8841
+		$sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset));
8842 8842
       
8843 8843
 		$hour_array = array();
8844 8844
 		$temp_array = array();
8845 8845
         
8846
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8846
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8847 8847
 		{
8848 8848
 			$temp_array['hour_name'] = $row['hour_name'];
8849 8849
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8862,11 +8862,11 @@  discard block
 block discarded – undo
8862 8862
 	* @return Array the hour list
8863 8863
 	*
8864 8864
 	*/
8865
-	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
8865
+	public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array())
8866 8866
 	{
8867 8867
 		global $globalTimezone, $globalDBdriver;
8868
-		$filter_query = $this->getFilter($filters,true,true);
8869
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
8868
+		$filter_query = $this->getFilter($filters, true, true);
8869
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
8870 8870
 		if ($globalTimezone != '') {
8871 8871
 			date_default_timezone_set($globalTimezone);
8872 8872
 			$datetime = new DateTime();
@@ -8874,24 +8874,24 @@  discard block
 block discarded – undo
8874 8874
 		} else $offset = '+00:00';
8875 8875
 
8876 8876
 		if ($globalDBdriver == 'mysql') {
8877
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8877
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8878 8878
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
8879 8879
 								GROUP BY hour_name 
8880 8880
 								ORDER BY hour_name ASC";
8881 8881
 		} else {
8882
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8882
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8883 8883
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
8884 8884
 								GROUP BY hour_name 
8885 8885
 								ORDER BY hour_name ASC";
8886 8886
 		}
8887 8887
 		
8888 8888
 		$sth = $this->db->prepare($query);
8889
-		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset));
8889
+		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset));
8890 8890
       
8891 8891
 		$hour_array = array();
8892 8892
 		$temp_array = array();
8893 8893
         
8894
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8894
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8895 8895
 		{
8896 8896
 			$temp_array['hour_name'] = $row['hour_name'];
8897 8897
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8913,8 +8913,8 @@  discard block
 block discarded – undo
8913 8913
 	public function countAllHoursByDate($date, $filters = array())
8914 8914
 	{
8915 8915
 		global $globalTimezone, $globalDBdriver;
8916
-		$filter_query = $this->getFilter($filters,true,true);
8917
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
8916
+		$filter_query = $this->getFilter($filters, true, true);
8917
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
8918 8918
 		if ($globalTimezone != '') {
8919 8919
 			date_default_timezone_set($globalTimezone);
8920 8920
 			$datetime = new DateTime($date);
@@ -8922,12 +8922,12 @@  discard block
 block discarded – undo
8922 8922
 		} else $offset = '+00:00';
8923 8923
 
8924 8924
 		if ($globalDBdriver == 'mysql') {
8925
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8925
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8926 8926
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
8927 8927
 								GROUP BY hour_name 
8928 8928
 								ORDER BY hour_name ASC";
8929 8929
 		} else {
8930
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8930
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8931 8931
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
8932 8932
 								GROUP BY hour_name 
8933 8933
 								ORDER BY hour_name ASC";
@@ -8939,7 +8939,7 @@  discard block
 block discarded – undo
8939 8939
 		$hour_array = array();
8940 8940
 		$temp_array = array();
8941 8941
         
8942
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8942
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8943 8943
 		{
8944 8944
 			$temp_array['hour_name'] = $row['hour_name'];
8945 8945
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8961,8 +8961,8 @@  discard block
 block discarded – undo
8961 8961
 	public function countAllHoursByIdent($ident, $filters = array())
8962 8962
 	{
8963 8963
 		global $globalTimezone, $globalDBdriver;
8964
-		$filter_query = $this->getFilter($filters,true,true);
8965
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
8964
+		$filter_query = $this->getFilter($filters, true, true);
8965
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
8966 8966
 		if ($globalTimezone != '') {
8967 8967
 			date_default_timezone_set($globalTimezone);
8968 8968
 			$datetime = new DateTime();
@@ -8970,12 +8970,12 @@  discard block
 block discarded – undo
8970 8970
 		} else $offset = '+00:00';
8971 8971
 
8972 8972
 		if ($globalDBdriver == 'mysql') {
8973
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8973
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8974 8974
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
8975 8975
 								GROUP BY hour_name 
8976 8976
 								ORDER BY hour_name ASC";
8977 8977
 		} else {
8978
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8978
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8979 8979
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
8980 8980
 								GROUP BY hour_name 
8981 8981
 								ORDER BY hour_name ASC";
@@ -8983,12 +8983,12 @@  discard block
 block discarded – undo
8983 8983
       
8984 8984
 		
8985 8985
 		$sth = $this->db->prepare($query);
8986
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
8986
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
8987 8987
       
8988 8988
 		$hour_array = array();
8989 8989
 		$temp_array = array();
8990 8990
         
8991
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8991
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8992 8992
 		{
8993 8993
 			$temp_array['hour_name'] = $row['hour_name'];
8994 8994
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9007,12 +9007,12 @@  discard block
 block discarded – undo
9007 9007
 	* @return Array the hour list
9008 9008
 	*
9009 9009
 	*/
9010
-	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
9010
+	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
9011 9011
 	{
9012 9012
 		global $globalTimezone, $globalDBdriver;
9013
-		$filter_query = $this->getFilter($filters,true,true);
9014
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
9015
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
9013
+		$filter_query = $this->getFilter($filters, true, true);
9014
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
9015
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
9016 9016
 		if ($globalTimezone != '') {
9017 9017
 			date_default_timezone_set($globalTimezone);
9018 9018
 			$datetime = new DateTime();
@@ -9020,24 +9020,24 @@  discard block
 block discarded – undo
9020 9020
 		} else $offset = '+00:00';
9021 9021
 
9022 9022
 		if ($globalDBdriver == 'mysql') {
9023
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9023
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9024 9024
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9025 9025
 								GROUP BY hour_name 
9026 9026
 								ORDER BY hour_name ASC";
9027 9027
 		} else {
9028
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9028
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9029 9029
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9030 9030
 								GROUP BY hour_name 
9031 9031
 								ORDER BY hour_name ASC";
9032 9032
 		}
9033 9033
 		
9034 9034
 		$sth = $this->db->prepare($query);
9035
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset));
9035
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset));
9036 9036
       
9037 9037
 		$hour_array = array();
9038 9038
 		$temp_array = array();
9039 9039
         
9040
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9040
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9041 9041
 		{
9042 9042
 			$temp_array['hour_name'] = $row['hour_name'];
9043 9043
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9058,8 +9058,8 @@  discard block
 block discarded – undo
9058 9058
 	public function countAllHoursByCountry($country, $filters = array())
9059 9059
 	{
9060 9060
 		global $globalTimezone, $globalDBdriver;
9061
-		$filter_query = $this->getFilter($filters,true,true);
9062
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
9061
+		$filter_query = $this->getFilter($filters, true, true);
9062
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
9063 9063
 		if ($globalTimezone != '') {
9064 9064
 			date_default_timezone_set($globalTimezone);
9065 9065
 			$datetime = new DateTime();
@@ -9067,24 +9067,24 @@  discard block
 block discarded – undo
9067 9067
 		} else $offset = '+00:00';
9068 9068
 
9069 9069
 		if ($globalDBdriver == 'mysql') {
9070
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9070
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9071 9071
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9072 9072
 								GROUP BY hour_name 
9073 9073
 								ORDER BY hour_name ASC";
9074 9074
 		} else {
9075
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9075
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9076 9076
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9077 9077
 								GROUP BY hour_name 
9078 9078
 								ORDER BY hour_name ASC";
9079 9079
 		}
9080 9080
 		
9081 9081
 		$sth = $this->db->prepare($query);
9082
-		$sth->execute(array(':country' => $country,':offset' => $offset));
9082
+		$sth->execute(array(':country' => $country, ':offset' => $offset));
9083 9083
       
9084 9084
 		$hour_array = array();
9085 9085
 		$temp_array = array();
9086 9086
         
9087
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9087
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9088 9088
 		{
9089 9089
 			$temp_array['hour_name'] = $row['hour_name'];
9090 9090
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9106,8 +9106,8 @@  discard block
 block discarded – undo
9106 9106
 	*/
9107 9107
 	public function countOverallAircrafts($filters = array())
9108 9108
 	{
9109
-		$filter_query = $this->getFilter($filters,true,true);
9110
-		$query  = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
9109
+		$filter_query = $this->getFilter($filters, true, true);
9110
+		$query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
9111 9111
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
9112 9112
 		$sth = $this->db->prepare($query);
9113 9113
 		$sth->execute();
@@ -9122,8 +9122,8 @@  discard block
 block discarded – undo
9122 9122
 	*/
9123 9123
 	public function countOverallArrival($filters = array())
9124 9124
 	{
9125
-		$filter_query = $this->getFilter($filters,true,true);
9126
-		$query  = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
9125
+		$filter_query = $this->getFilter($filters, true, true);
9126
+		$query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
9127 9127
                     FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''";
9128 9128
 		
9129 9129
 		$sth = $this->db->prepare($query);
@@ -9139,8 +9139,8 @@  discard block
 block discarded – undo
9139 9139
 	*/
9140 9140
 	public function countOverallPilots($filters = array())
9141 9141
 	{
9142
-		$filter_query = $this->getFilter($filters,true,true);
9143
-		$query  = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
9142
+		$filter_query = $this->getFilter($filters, true, true);
9143
+		$query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
9144 9144
                     FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''";
9145 9145
 		$sth = $this->db->prepare($query);
9146 9146
 		$sth->execute();
@@ -9155,8 +9155,8 @@  discard block
 block discarded – undo
9155 9155
 	*/
9156 9156
 	public function countOverallOwners($filters = array())
9157 9157
 	{
9158
-		$filter_query = $this->getFilter($filters,true,true);
9159
-		$query  = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
9158
+		$filter_query = $this->getFilter($filters, true, true);
9159
+		$query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
9160 9160
                     FROM spotter_output".$filter_query." spotter_output.owner_name <> ''";
9161 9161
 		$sth = $this->db->prepare($query);
9162 9162
 		$sth->execute();
@@ -9189,8 +9189,8 @@  discard block
 block discarded – undo
9189 9189
 	*/
9190 9190
 	public function countOverallMilitaryFlights($filters = array())
9191 9191
 	{
9192
-		$filter_query = $this->getFilter($filters,true,true);
9193
-		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
9192
+		$filter_query = $this->getFilter($filters, true, true);
9193
+		$query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
9194 9194
                     FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'";
9195 9195
       
9196 9196
 		$sth = $this->db->prepare($query);
@@ -9227,7 +9227,7 @@  discard block
 block discarded – undo
9227 9227
 	public function countAllHoursFromToday($filters = array())
9228 9228
 	{
9229 9229
 		global $globalTimezone, $globalDBdriver;
9230
-		$filter_query = $this->getFilter($filters,true,true);
9230
+		$filter_query = $this->getFilter($filters, true, true);
9231 9231
 		if ($globalTimezone != '') {
9232 9232
 			date_default_timezone_set($globalTimezone);
9233 9233
 			$datetime = new DateTime();
@@ -9235,12 +9235,12 @@  discard block
 block discarded – undo
9235 9235
 		} else $offset = '+00:00';
9236 9236
 
9237 9237
 		if ($globalDBdriver == 'mysql') {
9238
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9238
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9239 9239
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE()
9240 9240
 								GROUP BY hour_name 
9241 9241
 								ORDER BY hour_name ASC";
9242 9242
 		} else {
9243
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9243
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9244 9244
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
9245 9245
 								GROUP BY hour_name 
9246 9246
 								ORDER BY hour_name ASC";
@@ -9252,7 +9252,7 @@  discard block
 block discarded – undo
9252 9252
 		$hour_array = array();
9253 9253
 		$temp_array = array();
9254 9254
         
9255
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9255
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9256 9256
 		{
9257 9257
 			$temp_array['hour_name'] = $row['hour_name'];
9258 9258
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9271,14 +9271,14 @@  discard block
 block discarded – undo
9271 9271
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
9272 9272
 	{
9273 9273
 		global $global_query, $globalDBdriver, $globalTimezone;
9274
-		$filter_query = $this->getFilter($filters,true,true);
9274
+		$filter_query = $this->getFilter($filters, true, true);
9275 9275
 		date_default_timezone_set('UTC');
9276 9276
 		$limit_query = '';
9277 9277
 		if ($limit != "")
9278 9278
 		{
9279 9279
 			$limit_array = explode(",", $limit);
9280
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
9281
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
9280
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
9281
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
9282 9282
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
9283 9283
 			{
9284 9284
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -9331,7 +9331,7 @@  discard block
 block discarded – undo
9331 9331
 			    GROUP BY spotter_output.ident,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time, to_char(spotter_output.date,'HH')
9332 9332
 			    HAVING count(spotter_output.ident) > 5$orderby_query";
9333 9333
 			//echo $query;
9334
-			$spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone));
9334
+			$spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone));
9335 9335
 			/*
9336 9336
 			$sth = $this->db->prepare($query);
9337 9337
 			$sth->execute(array(':timezone' => $globalTimezone));
@@ -9350,9 +9350,9 @@  discard block
 block discarded – undo
9350 9350
 	*/
9351 9351
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
9352 9352
 	{
9353
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
9353
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
9354 9354
 
9355
-		$query  = "SELECT spotter_output.spotter_id
9355
+		$query = "SELECT spotter_output.spotter_id
9356 9356
 								FROM spotter_output 
9357 9357
 								WHERE spotter_output.flightaware_id = '".$flightaware_id."'";
9358 9358
         
@@ -9360,7 +9360,7 @@  discard block
 block discarded – undo
9360 9360
 		$sth = $this->db->prepare($query);
9361 9361
 		$sth->execute();
9362 9362
 
9363
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9363
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9364 9364
 		{
9365 9365
 			return $row['spotter_id'];
9366 9366
 		}
@@ -9385,23 +9385,23 @@  discard block
 block discarded – undo
9385 9385
 		}
9386 9386
 		
9387 9387
 		$current_date = date("Y-m-d H:i:s");
9388
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
9388
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
9389 9389
 		
9390 9390
 		$diff = abs(strtotime($current_date) - strtotime($date));
9391 9391
 
9392
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
9392
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
9393 9393
 		$years = $time_array['years'];
9394 9394
 		
9395
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
9395
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
9396 9396
 		$months = $time_array['months'];
9397 9397
 		
9398
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
9398
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
9399 9399
 		$days = $time_array['days'];
9400
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
9400
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
9401 9401
 		$hours = $time_array['hours'];
9402
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
9402
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
9403 9403
 		$minutes = $time_array['minutes'];
9404
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
9404
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
9405 9405
 		
9406 9406
 		return $time_array;	
9407 9407
 	}	
@@ -9427,63 +9427,63 @@  discard block
 block discarded – undo
9427 9427
 			$temp_array['direction_degree'] = $direction;
9428 9428
 			$temp_array['direction_shortname'] = "N";
9429 9429
 			$temp_array['direction_fullname'] = "North";
9430
-		} elseif ($direction >= 22.5 && $direction < 45){
9430
+		} elseif ($direction >= 22.5 && $direction < 45) {
9431 9431
 			$temp_array['direction_degree'] = $direction;
9432 9432
 			$temp_array['direction_shortname'] = "NNE";
9433 9433
 			$temp_array['direction_fullname'] = "North-Northeast";
9434
-		} elseif ($direction >= 45 && $direction < 67.5){
9434
+		} elseif ($direction >= 45 && $direction < 67.5) {
9435 9435
 			$temp_array['direction_degree'] = $direction;
9436 9436
 			$temp_array['direction_shortname'] = "NE";
9437 9437
 			$temp_array['direction_fullname'] = "Northeast";
9438
-		} elseif ($direction >= 67.5 && $direction < 90){
9438
+		} elseif ($direction >= 67.5 && $direction < 90) {
9439 9439
 			$temp_array['direction_degree'] = $direction;
9440 9440
 			$temp_array['direction_shortname'] = "ENE";
9441 9441
 			$temp_array['direction_fullname'] = "East-Northeast";
9442
-		} elseif ($direction >= 90 && $direction < 112.5){
9442
+		} elseif ($direction >= 90 && $direction < 112.5) {
9443 9443
 			$temp_array['direction_degree'] = $direction;
9444 9444
 			$temp_array['direction_shortname'] = "E";
9445 9445
 			$temp_array['direction_fullname'] = "East";
9446
-		} elseif ($direction >= 112.5 && $direction < 135){
9446
+		} elseif ($direction >= 112.5 && $direction < 135) {
9447 9447
 			$temp_array['direction_degree'] = $direction;
9448 9448
 			$temp_array['direction_shortname'] = "ESE";
9449 9449
 			$temp_array['direction_fullname'] = "East-Southeast";
9450
-		} elseif ($direction >= 135 && $direction < 157.5){
9450
+		} elseif ($direction >= 135 && $direction < 157.5) {
9451 9451
 			$temp_array['direction_degree'] = $direction;
9452 9452
 			$temp_array['direction_shortname'] = "SE";
9453 9453
 			$temp_array['direction_fullname'] = "Southeast";
9454
-		} elseif ($direction >= 157.5 && $direction < 180){
9454
+		} elseif ($direction >= 157.5 && $direction < 180) {
9455 9455
 			$temp_array['direction_degree'] = $direction;
9456 9456
 			$temp_array['direction_shortname'] = "SSE";
9457 9457
 			$temp_array['direction_fullname'] = "South-Southeast";
9458
-		} elseif ($direction >= 180 && $direction < 202.5){
9458
+		} elseif ($direction >= 180 && $direction < 202.5) {
9459 9459
 			$temp_array['direction_degree'] = $direction;
9460 9460
 			$temp_array['direction_shortname'] = "S";
9461 9461
 			$temp_array['direction_fullname'] = "South";
9462
-		} elseif ($direction >= 202.5 && $direction < 225){
9462
+		} elseif ($direction >= 202.5 && $direction < 225) {
9463 9463
 			$temp_array['direction_degree'] = $direction;
9464 9464
 			$temp_array['direction_shortname'] = "SSW";
9465 9465
 			$temp_array['direction_fullname'] = "South-Southwest";
9466
-		} elseif ($direction >= 225 && $direction < 247.5){
9466
+		} elseif ($direction >= 225 && $direction < 247.5) {
9467 9467
 			$temp_array['direction_degree'] = $direction;
9468 9468
 			$temp_array['direction_shortname'] = "SW";
9469 9469
 			$temp_array['direction_fullname'] = "Southwest";
9470
-		} elseif ($direction >= 247.5 && $direction < 270){
9470
+		} elseif ($direction >= 247.5 && $direction < 270) {
9471 9471
 			$temp_array['direction_degree'] = $direction;
9472 9472
 			$temp_array['direction_shortname'] = "WSW";
9473 9473
 			$temp_array['direction_fullname'] = "West-Southwest";
9474
-		} elseif ($direction >= 270 && $direction < 292.5){
9474
+		} elseif ($direction >= 270 && $direction < 292.5) {
9475 9475
 			$temp_array['direction_degree'] = $direction;
9476 9476
 			$temp_array['direction_shortname'] = "W";
9477 9477
 			$temp_array['direction_fullname'] = "West";
9478
-		} elseif ($direction >= 292.5 && $direction < 315){
9478
+		} elseif ($direction >= 292.5 && $direction < 315) {
9479 9479
 			$temp_array['direction_degree'] = $direction;
9480 9480
 			$temp_array['direction_shortname'] = "WNW";
9481 9481
 			$temp_array['direction_fullname'] = "West-Northwest";
9482
-		} elseif ($direction >= 315 && $direction < 337.5){
9482
+		} elseif ($direction >= 315 && $direction < 337.5) {
9483 9483
 			$temp_array['direction_degree'] = $direction;
9484 9484
 			$temp_array['direction_shortname'] = "NW";
9485 9485
 			$temp_array['direction_fullname'] = "Northwest";
9486
-		} elseif ($direction >= 337.5 && $direction < 360){
9486
+		} elseif ($direction >= 337.5 && $direction < 360) {
9487 9487
 			$temp_array['direction_degree'] = $direction;
9488 9488
 			$temp_array['direction_shortname'] = "NNW";
9489 9489
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -9536,9 +9536,9 @@  discard block
 block discarded – undo
9536 9536
 	*/
9537 9537
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
9538 9538
 	{
9539
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9539
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9540 9540
 	
9541
-		$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9541
+		$query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9542 9542
 		
9543 9543
 		$sth = $this->db->prepare($query);
9544 9544
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -9561,9 +9561,9 @@  discard block
 block discarded – undo
9561 9561
 	*/
9562 9562
 	public function getAircraftTypeBymodeS($aircraft_modes)
9563 9563
 	{
9564
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9564
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9565 9565
 	
9566
-		$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9566
+		$query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes LIMIT 1";
9567 9567
 		
9568 9568
 		$sth = $this->db->prepare($query);
9569 9569
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -9584,11 +9584,11 @@  discard block
 block discarded – undo
9584 9584
 	* @param Float $longitude longitute of the flight
9585 9585
 	* @return String the countrie
9586 9586
 	*/
9587
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
9587
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
9588 9588
 	{
9589 9589
 		global $globalDBdriver, $globalDebug;
9590
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9591
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9590
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9591
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9592 9592
 	
9593 9593
 		$Connection = new Connection($this->db);
9594 9594
 		if (!$Connection->tableExists('countries')) return '';
@@ -9628,19 +9628,19 @@  discard block
 block discarded – undo
9628 9628
 	*/
9629 9629
 	public function convertAircraftRegistration($registration)
9630 9630
 	{
9631
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9631
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9632 9632
 		$registration_prefix = '';
9633 9633
 		$registration_1 = substr($registration, 0, 1);
9634 9634
 		$registration_2 = substr($registration, 0, 2);
9635 9635
 
9636 9636
 		//first get the prefix based on two characters
9637
-		$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9637
+		$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9638 9638
       
9639 9639
 		
9640 9640
 		$sth = $this->db->prepare($query);
9641 9641
 		$sth->execute(array(':registration_2' => $registration_2));
9642 9642
         
9643
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9643
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9644 9644
 		{
9645 9645
 			$registration_prefix = $row['registration_prefix'];
9646 9646
 		}
@@ -9648,11 +9648,11 @@  discard block
 block discarded – undo
9648 9648
 		//if we didn't find a two chracter prefix lets just search the one with one character
9649 9649
 		if ($registration_prefix == '')
9650 9650
 		{
9651
-			$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9651
+			$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9652 9652
 			$sth = $this->db->prepare($query);
9653 9653
 			$sth->execute(array(':registration_1' => $registration_1));
9654 9654
 	        
9655
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9655
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9656 9656
 			{
9657 9657
 				$registration_prefix = $row['registration_prefix'];
9658 9658
 			}
@@ -9666,7 +9666,7 @@  discard block
 block discarded – undo
9666 9666
 			} else {
9667 9667
 				$registration = preg_replace("/^(.{1})/", "$1-", $registration);
9668 9668
 			}
9669
-		} else if(strlen($registration_prefix) == 2){
9669
+		} else if (strlen($registration_prefix) == 2) {
9670 9670
 			if (0 === strpos($registration, 'N')) {
9671 9671
 				$registration = preg_replace("/^(.{2})/", "$1", $registration);
9672 9672
 			} else {
@@ -9685,17 +9685,17 @@  discard block
 block discarded – undo
9685 9685
 	*/
9686 9686
 	public function countryFromAircraftRegistration($registration)
9687 9687
 	{
9688
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9688
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9689 9689
 		
9690 9690
 		$registration_prefix = '';
9691
-		$registration_test = explode('-',$registration);
9691
+		$registration_test = explode('-', $registration);
9692 9692
 		$country = '';
9693 9693
 		if ($registration_test[0] != $registration) {
9694 9694
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9695 9695
 	      
9696 9696
 			$sth = $this->db->prepare($query);
9697 9697
 			$sth->execute(array(':registration_1' => $registration_test[0]));
9698
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9698
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9699 9699
 			{
9700 9700
 				//$registration_prefix = $row['registration_prefix'];
9701 9701
 				$country = $row['country'];
@@ -9706,13 +9706,13 @@  discard block
 block discarded – undo
9706 9706
 
9707 9707
 			$country = '';
9708 9708
 			//first get the prefix based on two characters
9709
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9709
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9710 9710
       
9711 9711
 			
9712 9712
 			$sth = $this->db->prepare($query);
9713 9713
 			$sth->execute(array(':registration_2' => $registration_2));
9714 9714
         
9715
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9715
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9716 9716
 			{
9717 9717
 				$registration_prefix = $row['registration_prefix'];
9718 9718
 				$country = $row['country'];
@@ -9721,12 +9721,12 @@  discard block
 block discarded – undo
9721 9721
 			//if we didn't find a two chracter prefix lets just search the one with one character
9722 9722
 			if ($registration_prefix == "")
9723 9723
 			{
9724
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9724
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9725 9725
 	      
9726 9726
 				$sth = $this->db->prepare($query);
9727 9727
 				$sth->execute(array(':registration_1' => $registration_1));
9728 9728
 	        
9729
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
9729
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9730 9730
 				{
9731 9731
 					//$registration_prefix = $row['registration_prefix'];
9732 9732
 					$country = $row['country'];
@@ -9743,9 +9743,9 @@  discard block
 block discarded – undo
9743 9743
 	* @param String $flightaware_id flightaware_id from spotter_output table
9744 9744
 	* @param String $highlight New highlight value
9745 9745
 	*/
9746
-	public function setHighlightFlight($flightaware_id,$highlight) {
9746
+	public function setHighlightFlight($flightaware_id, $highlight) {
9747 9747
 		
9748
-		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9748
+		$query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9749 9749
 		$sth = $this->db->prepare($query);
9750 9750
 		$sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight));
9751 9751
 	}
@@ -9774,7 +9774,7 @@  discard block
 block discarded – undo
9774 9774
 		
9775 9775
 		$bitly_data = json_decode($bitly_data);
9776 9776
 		$bitly_url = '';
9777
-		if ($bitly_data->status_txt = "OK"){
9777
+		if ($bitly_data->status_txt = "OK") {
9778 9778
 			$bitly_url = $bitly_data->data->url;
9779 9779
 		}
9780 9780
 
@@ -9784,7 +9784,7 @@  discard block
 block discarded – undo
9784 9784
 
9785 9785
 	public function getOrderBy()
9786 9786
 	{
9787
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
9787
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
9788 9788
 		
9789 9789
 		return $orderby;
9790 9790
 		
@@ -9918,14 +9918,14 @@  discard block
 block discarded – undo
9918 9918
 		}
9919 9919
 		$sth = $this->db->prepare($query);
9920 9920
 		$sth->execute();
9921
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9921
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9922 9922
 		{
9923 9923
 			$departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']);
9924 9924
 			$arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']);
9925 9925
 			if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) {
9926
-				$update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
9926
+				$update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
9927 9927
 				$sthu = $this->db->prepare($update_query);
9928
-				$sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country']));
9928
+				$sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country']));
9929 9929
 			}
9930 9930
 		}
9931 9931
 		
@@ -9938,7 +9938,7 @@  discard block
 block discarded – undo
9938 9938
 		}
9939 9939
 		$sth = $this->db->prepare($query);
9940 9940
 		$sth->execute();
9941
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9941
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9942 9942
 		{
9943 9943
 			if (is_numeric(substr($row['ident'], -1, 1)))
9944 9944
 			{
@@ -9947,11 +9947,11 @@  discard block
 block discarded – undo
9947 9947
 				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
9948 9948
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
9949 9949
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
9950
-				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
9950
+				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
9951 9951
 				if (isset($airline_array[0]['name'])) {
9952
-					$update_query  = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
9952
+					$update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
9953 9953
 					$sthu = $this->db->prepare($update_query);
9954
-					$sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
9954
+					$sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
9955 9955
 				}
9956 9956
 			}
9957 9957
 		}
@@ -9971,18 +9971,18 @@  discard block
 block discarded – undo
9971 9971
 		}
9972 9972
 		$sth = $this->db->prepare($query);
9973 9973
 		$sth->execute();
9974
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9974
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9975 9975
 		{
9976 9976
 			if ($row['aircraft_icao'] != '') {
9977 9977
 				$aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']);
9978
-				if ($row['registration'] != ""){
9978
+				if ($row['registration'] != "") {
9979 9979
 					$image_array = $Image->getSpotterImage($row['registration']);
9980 9980
 					if (count($image_array) == 0) {
9981 9981
 						$Image->addSpotterImage($row['registration']);
9982 9982
 					}
9983 9983
 				}
9984 9984
 				if (count($aircraft_name) > 0) {
9985
-					$update_query  = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
9985
+					$update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
9986 9986
 					$sthu = $this->db->prepare($update_query);
9987 9987
 					$sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id']));
9988 9988
 				}
@@ -9997,10 +9997,10 @@  discard block
 block discarded – undo
9997 9997
 		$query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output";
9998 9998
 		$sth = $this->db->prepare($query);
9999 9999
 		$sth->execute();
10000
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10000
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10001 10001
 		{
10002 10002
 			if ($row['last_latitude'] != '' && $row['last_longitude'] != '') {
10003
-				$closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist);
10003
+				$closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist);
10004 10004
 				$airport_icao = '';
10005 10005
 				 if (isset($closestAirports[0])) {
10006 10006
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
@@ -10014,7 +10014,7 @@  discard block
 block discarded – undo
10014 10014
 								break;
10015 10015
 							}
10016 10016
 						}
10017
-					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10017
+					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) {
10018 10018
 						$airport_icao = $closestAirports[0]['icao'];
10019 10019
 						if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10020 10020
 					} else {
@@ -10025,28 +10025,28 @@  discard block
 block discarded – undo
10025 10025
 				}
10026 10026
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10027 10027
 					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10028
-					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10028
+					$update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10029 10029
 					$sthu = $this->db->prepare($update_query);
10030
-					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
10030
+					$sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id']));
10031 10031
 				}
10032 10032
 			}
10033 10033
 		}
10034 10034
 	}
10035 10035
 	
10036
-	public function closestAirports($origLat,$origLon,$dist = 10) {
10036
+	public function closestAirports($origLat, $origLon, $dist = 10) {
10037 10037
 		global $globalDBdriver;
10038
-		$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
10038
+		$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
10039 10039
 /*
10040 10040
 		$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
10041 10041
                       FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
10042 10042
                       having distance < $dist ORDER BY distance limit 100;";
10043 10043
 */
10044 10044
 		if ($globalDBdriver == 'mysql') {
10045
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
10045
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
10046 10046
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
10047 10047
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10048 10048
                 } else {
10049
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
10049
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
10050 10050
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
10051 10051
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10052 10052
     		}
Please login to merge, or discard this patch.
Braces   +667 added lines, -231 removed lines patch added patch discarded remove patch
@@ -19,8 +19,12 @@  discard block
 block discarded – undo
19 19
 	*/
20 20
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
22
-		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) $filter = array_merge($globalStatsFilters[$globalFilterName],$filter);
23
-		if (is_array($globalFilter)) $filter = array_merge($globalFilter,$filter);
22
+		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
23
+			$filter = array_merge($globalStatsFilters[$globalFilterName],$filter);
24
+		}
25
+		if (is_array($globalFilter)) {
26
+			$filter = array_merge($globalFilter,$filter);
27
+		}
24 28
 		$filter_query_join = '';
25 29
 		$filter_query_where = '';
26 30
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
@@ -48,8 +52,11 @@  discard block
 block discarded – undo
48 52
 				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
49 53
 			}
50 54
 		}
51
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
52
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
55
+		if ($filter_query_where == '' && $where) {
56
+			$filter_query_where = ' WHERE';
57
+		} elseif ($filter_query_where != '' && $and) {
58
+			$filter_query_where .= ' AND';
59
+		}
53 60
 		$filter_query = $filter_query_join.$filter_query_where;
54 61
 		return $filter_query;
55 62
 	}
@@ -69,10 +76,18 @@  discard block
 block discarded – undo
69 76
 		$Image = new Image($this->db);
70 77
 		$Schedule = new Schedule($this->db);
71 78
 		$ACARS = new ACARS($this->db);
72
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
73
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
74
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
75
-		if (!isset($globalVAM)) $globalVAM = FALSE;
79
+		if (!isset($globalIVAO)) {
80
+			$globalIVAO = FALSE;
81
+		}
82
+		if (!isset($globalVATSIM)) {
83
+			$globalVATSIM = FALSE;
84
+		}
85
+		if (!isset($globalphpVMS)) {
86
+			$globalphpVMS = FALSE;
87
+		}
88
+		if (!isset($globalVAM)) {
89
+			$globalVAM = FALSE;
90
+		}
76 91
 		date_default_timezone_set('UTC');
77 92
 		
78 93
 		if (!is_string($query))
@@ -119,21 +134,35 @@  discard block
 block discarded – undo
119 134
 			} else {
120 135
 				$temp_array['spotter_id'] = '';
121 136
 			}
122
-			if (isset($row['flightaware_id'])) $temp_array['flightaware_id'] = $row['flightaware_id'];
123
-			if (isset($row['modes'])) $temp_array['modes'] = $row['modes'];
137
+			if (isset($row['flightaware_id'])) {
138
+				$temp_array['flightaware_id'] = $row['flightaware_id'];
139
+			}
140
+			if (isset($row['modes'])) {
141
+				$temp_array['modes'] = $row['modes'];
142
+			}
124 143
 			$temp_array['ident'] = $row['ident'];
125 144
 			if (isset($row['registration']) && $row['registration'] != '') {
126 145
 				$temp_array['registration'] = $row['registration'];
127 146
 			} elseif (isset($temp_array['modes'])) {
128 147
 				$temp_array['registration'] = $this->getAircraftRegistrationBymodeS($temp_array['modes']);
129
-			} else $temp_array['registration'] = '';
130
-			if (isset($row['aircraft_icao'])) $temp_array['aircraft_type'] = $row['aircraft_icao'];
148
+			} else {
149
+				$temp_array['registration'] = '';
150
+			}
151
+			if (isset($row['aircraft_icao'])) {
152
+				$temp_array['aircraft_type'] = $row['aircraft_icao'];
153
+			}
131 154
 			
132 155
 			$temp_array['departure_airport'] = $row['departure_airport_icao'];
133 156
 			$temp_array['arrival_airport'] = $row['arrival_airport_icao'];
134
-			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) $temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
135
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
136
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
157
+			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) {
158
+				$temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
159
+			}
160
+			if (isset($row['latitude'])) {
161
+				$temp_array['latitude'] = $row['latitude'];
162
+			}
163
+			if (isset($row['longitude'])) {
164
+				$temp_array['longitude'] = $row['longitude'];
165
+			}
137 166
 			/*
138 167
 			if (Connection->tableExists('countries')) {
139 168
 				$country_info = $this->getCountryFromLatitudeLongitude($temp_array['latitude'],$temp_array['longitude']);
@@ -143,8 +172,12 @@  discard block
 block discarded – undo
143 172
 				}
144 173
 			}
145 174
 			*/
146
-			if (isset($row['waypoints'])) $temp_array['waypoints'] = $row['waypoints'];
147
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
175
+			if (isset($row['waypoints'])) {
176
+				$temp_array['waypoints'] = $row['waypoints'];
177
+			}
178
+			if (isset($row['format_source'])) {
179
+				$temp_array['format_source'] = $row['format_source'];
180
+			}
148 181
 			if (isset($row['route_stop'])) {
149 182
 				$temp_array['route_stop'] = $row['route_stop'];
150 183
 				if ($row['route_stop'] != '') {
@@ -163,13 +196,19 @@  discard block
 block discarded – undo
163 196
 					}
164 197
 				}
165 198
 			}
166
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
199
+			if (isset($row['altitude'])) {
200
+				$temp_array['altitude'] = $row['altitude'];
201
+			}
167 202
 			if (isset($row['heading'])) {
168 203
 				$temp_array['heading'] = $row['heading'];
169 204
 				$heading_direction = $this->parseDirection($row['heading']);
170
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
205
+				if (isset($heading_direction[0]['direction_fullname'])) {
206
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
207
+				}
208
+			}
209
+			if (isset($row['ground_speed'])) {
210
+				$temp_array['ground_speed'] = $row['ground_speed'];
171 211
 			}
172
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
173 212
 			$temp_array['image'] = "";
174 213
 			$temp_array['image_thumbnail'] = "";
175 214
 			$temp_array['image_source'] = "";
@@ -177,7 +216,9 @@  discard block
 block discarded – undo
177 216
  
178 217
 			if (isset($row['highlight'])) {
179 218
 				$temp_array['highlight'] = $row['highlight'];
180
-			} else $temp_array['highlight'] = '';
219
+			} else {
220
+				$temp_array['highlight'] = '';
221
+			}
181 222
 			
182 223
 			if (isset($row['date'])) {
183 224
 				$dateArray = $this->parseDateString($row['date']);
@@ -225,7 +266,9 @@  discard block
 block discarded – undo
225 266
 				
226 267
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
227 268
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
228
-					} else $temp_array['aircraft_shadow'] = 'default.png';
269
+					} else {
270
+						$temp_array['aircraft_shadow'] = 'default.png';
271
+					}
229 272
                                 } else {
230 273
                             		$temp_array['aircraft_shadow'] = 'default.png';
231 274
 					$temp_array['aircraft_name'] = 'N/A';
@@ -233,11 +276,17 @@  discard block
 block discarded – undo
233 276
                             	}
234 277
 			}
235 278
 			$fromsource = NULL;
236
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
237
-			elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
238
-			elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
239
-			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
240
-			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
279
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
280
+				$fromsource = $globalAirlinesSource;
281
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
282
+				$fromsource = 'vatsim';
283
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') {
284
+				$fromsource = 'ivao';
285
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
286
+				$fromsource = 'vatsim';
287
+			} elseif (isset($globalIVAO) && $globalIVAO) {
288
+				$fromsource = 'ivao';
289
+			}
241 290
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
242 291
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
243 292
 					if (is_numeric(substr($row['ident'], 2, 1))) {
@@ -260,12 +309,18 @@  discard block
 block discarded – undo
260 309
 				}
261 310
 			} else {
262 311
 				$temp_array['airline_icao'] = $row['airline_icao'];
263
-				if (isset($row['airline_iata'])) $temp_array['airline_iata'] = $row['airline_iata'];
264
-				else $temp_array['airline_iata'] = '';
312
+				if (isset($row['airline_iata'])) {
313
+					$temp_array['airline_iata'] = $row['airline_iata'];
314
+				} else {
315
+					$temp_array['airline_iata'] = '';
316
+				}
265 317
 				$temp_array['airline_name'] = $row['airline_name'];
266 318
 				$temp_array['airline_country'] = $row['airline_country'];
267
-				if (isset($row['airline_callsign'])) $temp_array['airline_callsign'] = $row['airline_callsign'];
268
-				else $temp_array['airline_callsign'] = 'N/A';
319
+				if (isset($row['airline_callsign'])) {
320
+					$temp_array['airline_callsign'] = $row['airline_callsign'];
321
+				} else {
322
+					$temp_array['airline_callsign'] = 'N/A';
323
+				}
269 324
 				$temp_array['airline_type'] = $row['airline_type'];
270 325
 			}
271 326
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
@@ -281,7 +336,9 @@  discard block
 block discarded – undo
281 336
 			}
282 337
 			if ($temp_array['registration'] != "" && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && !isset($temp_array['aircraft_owner'])) {
283 338
 				$owner_info = $this->getAircraftOwnerByRegistration($temp_array['registration']);
284
-				if ($owner_info['owner'] != '') $temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
339
+				if ($owner_info['owner'] != '') {
340
+					$temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
341
+				}
285 342
 				$temp_array['aircraft_base'] = $owner_info['base'];
286 343
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
287 344
 			}
@@ -289,9 +346,14 @@  discard block
 block discarded – undo
289 346
 			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
290 347
 			{
291 348
 				if ($globalIVAO) {
292
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
293
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
294
-				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
349
+					if (isset($temp_array['airline_icao'])) {
350
+						$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
351
+					} else {
352
+						$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
353
+					}
354
+				} else {
355
+					$image_array = $Image->getSpotterImage($temp_array['registration']);
356
+				}
295 357
 				if (count($image_array) > 0) {
296 358
 					$temp_array['image'] = $image_array[0]['image'];
297 359
 					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -341,7 +403,9 @@  discard block
 block discarded – undo
341 403
 			//if ($row['departure_airport_icao'] != '' && $row['departure_airport_name'] == '') {
342 404
 			if ($row['departure_airport_icao'] != '') {
343 405
 				$departure_airport_array = $this->getAllAirportInfo($row['departure_airport_icao']);
344
-				if (!isset($departure_airport_array[0]['name'])) $departure_airport_array = $this->getAllAirportInfo('NA');
406
+				if (!isset($departure_airport_array[0]['name'])) {
407
+					$departure_airport_array = $this->getAllAirportInfo('NA');
408
+				}
345 409
 			/*
346 410
 			} elseif ($row['departure_airport_name'] != '') {
347 411
 				$temp_array['departure_airport_name'] = $row['departure_airport_name'];
@@ -349,7 +413,9 @@  discard block
 block discarded – undo
349 413
 				$temp_array['departure_airport_country'] = $row['departure_airport_country'];
350 414
 				$temp_array['departure_airport_icao'] = $row['departure_airport_icao'];
351 415
 			*/
352
-			} else $departure_airport_array = $this->getAllAirportInfo('NA');
416
+			} else {
417
+				$departure_airport_array = $this->getAllAirportInfo('NA');
418
+			}
353 419
 			if (isset($departure_airport_array[0]['name'])) {
354 420
 				$temp_array['departure_airport_name'] = $departure_airport_array[0]['name'];
355 421
 				$temp_array['departure_airport_city'] = $departure_airport_array[0]['city'];
@@ -369,8 +435,12 @@  discard block
 block discarded – undo
369 435
 			
370 436
 			if ($row['arrival_airport_icao'] != '') {
371 437
 				$arrival_airport_array = $this->getAllAirportInfo($row['arrival_airport_icao']);
372
-				if (count($arrival_airport_array) == 0) $arrival_airport_array = $this->getAllAirportInfo('NA');
373
-			} else $arrival_airport_array = $this->getAllAirportInfo('NA');
438
+				if (count($arrival_airport_array) == 0) {
439
+					$arrival_airport_array = $this->getAllAirportInfo('NA');
440
+				}
441
+			} else {
442
+				$arrival_airport_array = $this->getAllAirportInfo('NA');
443
+			}
374 444
 			if (isset($arrival_airport_array[0]['name'])) {
375 445
 				$temp_array['arrival_airport_name'] = $arrival_airport_array[0]['name'];
376 446
 				$temp_array['arrival_airport_city'] = $arrival_airport_array[0]['city'];
@@ -386,27 +456,45 @@  discard block
 block discarded – undo
386 456
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
387 457
 			}
388 458
 			*/
389
-			if (isset($row['pilot_id']) && $row['pilot_id'] != '') $temp_array['pilot_id'] = $row['pilot_id'];
390
-			if (isset($row['pilot_name']) && $row['pilot_name'] != '') $temp_array['pilot_name'] = $row['pilot_name'];
391
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
392
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
393
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
459
+			if (isset($row['pilot_id']) && $row['pilot_id'] != '') {
460
+				$temp_array['pilot_id'] = $row['pilot_id'];
461
+			}
462
+			if (isset($row['pilot_name']) && $row['pilot_name'] != '') {
463
+				$temp_array['pilot_name'] = $row['pilot_name'];
464
+			}
465
+			if (isset($row['source_name']) && $row['source_name'] != '') {
466
+				$temp_array['source_name'] = $row['source_name'];
467
+			}
468
+			if (isset($row['over_country']) && $row['over_country'] != '') {
469
+				$temp_array['over_country'] = $row['over_country'];
470
+			}
471
+			if (isset($row['distance']) && $row['distance'] != '') {
472
+				$temp_array['distance'] = $row['distance'];
473
+			}
394 474
 			if (isset($row['squawk'])) {
395 475
 				$temp_array['squawk'] = $row['squawk'];
396 476
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
397 477
 					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
398
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
478
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) {
479
+						$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
480
+					}
399 481
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
400 482
 					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
401
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
402
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
483
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) {
484
+						$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
485
+					}
486
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) {
487
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
488
+				}
403 489
 			}
404 490
     			
405 491
 			$temp_array['query_number_rows'] = $num_rows;
406 492
 			
407 493
 			$spotter_array[] = $temp_array;
408 494
 		}
409
-		if ($num_rows == 0) return array();
495
+		if ($num_rows == 0) {
496
+			return array();
497
+		}
410 498
 		$spotter_array[0]['query_number_rows'] = $num_rows;
411 499
 		return $spotter_array;
412 500
 	}	
@@ -439,7 +527,9 @@  discard block
 block discarded – undo
439 527
 				foreach ($q_array as $q_item){
440 528
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
441 529
 					$additional_query .= " AND (";
442
-					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
530
+					if (is_int($q_item)) {
531
+						$additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
532
+					}
443 533
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
444 534
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
445 535
 					$additional_query .= "(spotter_output.aircraft_manufacturer like '%".$q_item."%') OR ";
@@ -460,7 +550,9 @@  discard block
 block discarded – undo
460 550
 					$additional_query .= "(spotter_output.pilot_name like '%".$q_item."%') OR ";
461 551
 					$additional_query .= "(spotter_output.ident like '%".$q_item."%') OR ";
462 552
 					$translate = $Translation->ident2icao($q_item);
463
-					if ($translate != $q_item) $additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
553
+					if ($translate != $q_item) {
554
+						$additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
555
+					}
464 556
 					$additional_query .= "(spotter_output.highlight like '%".$q_item."%')";
465 557
 					$additional_query .= ")";
466 558
 				}
@@ -687,7 +779,9 @@  discard block
 block discarded – undo
687 779
 				date_default_timezone_set($globalTimezone);
688 780
 				$datetime = new DateTime();
689 781
 				$offset = $datetime->format('P');
690
-			} else $offset = '+00:00';
782
+			} else {
783
+				$offset = '+00:00';
784
+			}
691 785
 
692 786
 			if ($date_array[1] != "")
693 787
 			{
@@ -719,8 +813,12 @@  discard block
 block discarded – undo
719 813
 			{
720 814
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
721 815
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
722
-			} else $limit_query = "";
723
-		} else $limit_query = "";
816
+			} else {
817
+				$limit_query = "";
818
+			}
819
+		} else {
820
+			$limit_query = "";
821
+		}
724 822
 
725 823
 
726 824
 		if ($sort != "")
@@ -788,8 +886,12 @@  discard block
 block discarded – undo
788 886
 			{
789 887
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
790 888
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
791
-			} else $limit_query = "";
792
-		} else $limit_query = "";
889
+			} else {
890
+				$limit_query = "";
891
+			}
892
+		} else {
893
+			$limit_query = "";
894
+		}
793 895
 		
794 896
 		if ($sort != "")
795 897
 		{
@@ -1113,7 +1215,9 @@  discard block
 block discarded – undo
1113 1215
 		global $global_query;
1114 1216
 		
1115 1217
 		date_default_timezone_set('UTC');
1116
-		if ($id == '') return array();
1218
+		if ($id == '') {
1219
+			return array();
1220
+		}
1117 1221
 		$additional_query = "spotter_output.spotter_id = :id";
1118 1222
 		$query_values = array(':id' => $id);
1119 1223
 
@@ -1739,7 +1843,9 @@  discard block
 block discarded – undo
1739 1843
 		{
1740 1844
 			$highlight = $row['highlight'];
1741 1845
 		}
1742
-		if (isset($highlight)) return $highlight;
1846
+		if (isset($highlight)) {
1847
+			return $highlight;
1848
+		}
1743 1849
 	}
1744 1850
 
1745 1851
 	
@@ -1767,7 +1873,9 @@  discard block
 block discarded – undo
1767 1873
 		$sth->closeCursor();
1768 1874
 		if (count($row) > 0) {
1769 1875
 			return $row['usage'];
1770
-		} else return '';
1876
+		} else {
1877
+			return '';
1878
+		}
1771 1879
 	}
1772 1880
 
1773 1881
 	/**
@@ -1792,7 +1900,9 @@  discard block
 block discarded – undo
1792 1900
 		$sth->closeCursor();
1793 1901
 		if (count($row) > 0) {
1794 1902
 			return $row['icao'];
1795
-		} else return '';
1903
+		} else {
1904
+			return '';
1905
+		}
1796 1906
 	}
1797 1907
 
1798 1908
 	/**
@@ -1820,7 +1930,9 @@  discard block
 block discarded – undo
1820 1930
 			$airport_longitude = $row['longitude'];
1821 1931
 			$Common = new Common();
1822 1932
 			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1823
-		} else return '';
1933
+		} else {
1934
+			return '';
1935
+		}
1824 1936
 	}
1825 1937
 	
1826 1938
 	/**
@@ -1932,7 +2044,9 @@  discard block
 block discarded – undo
1932 2044
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1933 2045
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1934 2046
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1935
-		} else return array();
2047
+		} else {
2048
+			return array();
2049
+		}
1936 2050
 		if ($globalDBdriver == 'mysql') {
1937 2051
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
1938 2052
 		} else {
@@ -1967,7 +2081,9 @@  discard block
 block discarded – undo
1967 2081
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1968 2082
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1969 2083
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1970
-		} else return array();
2084
+		} else {
2085
+			return array();
2086
+		}
1971 2087
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
1972 2088
 		$query  = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
1973 2089
 		//$query  = "SELECT waypoints.* FROM waypoints";
@@ -2002,7 +2118,9 @@  discard block
 block discarded – undo
2002 2118
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
2003 2119
 	{
2004 2120
 		global $globalUseRealAirlines;
2005
-		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2121
+		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) {
2122
+			$fromsource = NULL;
2123
+		}
2006 2124
 		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2007 2125
 		if ($airline_icao == 'NA') {
2008 2126
 			$airline_array = array();
@@ -2052,7 +2170,9 @@  discard block
 block discarded – undo
2052 2170
 				$sth->execute(array(':fromsource' => $fromsource));
2053 2171
 				$row = $sth->fetch(PDO::FETCH_ASSOC);
2054 2172
 				$sth->closeCursor();
2055
-				if ($row['nb'] == 0) $result = $this->getAllAirlineInfo($airline_icao);
2173
+				if ($row['nb'] == 0) {
2174
+					$result = $this->getAllAirlineInfo($airline_icao);
2175
+				}
2056 2176
 			}
2057 2177
 			return $result;
2058 2178
 		}
@@ -2116,15 +2236,20 @@  discard block
 block discarded – undo
2116 2236
 				'A320-211' => 'A320',
2117 2237
 				'747-8i' => 'B748',
2118 2238
 				'A380' => 'A388');
2119
-		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2239
+		if (isset($all_aircraft[$aircraft_type])) {
2240
+			return $all_aircraft[$aircraft_type];
2241
+		}
2120 2242
 
2121 2243
 		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2122 2244
 		$aircraft_type = strtoupper($aircraft_type);
2123 2245
 		$sth = $this->db->prepare($query);
2124 2246
 		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2125 2247
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2126
-		if (isset($result[0]['icao'])) return $result[0]['icao'];
2127
-		else return '';
2248
+		if (isset($result[0]['icao'])) {
2249
+			return $result[0]['icao'];
2250
+		} else {
2251
+			return '';
2252
+		}
2128 2253
 	}
2129 2254
 	
2130 2255
 	/**
@@ -2147,7 +2272,9 @@  discard block
 block discarded – undo
2147 2272
 		$sth->closeCursor();
2148 2273
 		if (isset($row['icaotypecode'])) {
2149 2274
 			return $row['icaotypecode'];
2150
-		} else return '';
2275
+		} else {
2276
+			return '';
2277
+		}
2151 2278
 	}
2152 2279
 
2153 2280
 	/**
@@ -2169,7 +2296,9 @@  discard block
 block discarded – undo
2169 2296
 		$sth->closeCursor();
2170 2297
 		if (isset($row['operator_correct'])) {
2171 2298
 			return $row['operator_correct'];
2172
-		} else return $operator;
2299
+		} else {
2300
+			return $operator;
2301
+		}
2173 2302
 	}
2174 2303
 
2175 2304
 	/**
@@ -2182,7 +2311,9 @@  discard block
 block discarded – undo
2182 2311
 	public function getRouteInfo($callsign)
2183 2312
 	{
2184 2313
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2185
-                if ($callsign == '') return array();
2314
+                if ($callsign == '') {
2315
+                	return array();
2316
+                }
2186 2317
 		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2187 2318
 		
2188 2319
 		$sth = $this->db->prepare($query);
@@ -2192,7 +2323,9 @@  discard block
 block discarded – undo
2192 2323
 		$sth->closeCursor();
2193 2324
 		if (count($row) > 0) {
2194 2325
 			return $row;
2195
-		} else return array();
2326
+		} else {
2327
+			return array();
2328
+		}
2196 2329
 	}
2197 2330
 	
2198 2331
 	/**
@@ -2245,7 +2378,9 @@  discard block
 block discarded – undo
2245 2378
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
2246 2379
 			$sth->closeCursor();
2247 2380
 			return $result;
2248
-		} else return array();
2381
+		} else {
2382
+			return array();
2383
+		}
2249 2384
 	}
2250 2385
 	
2251 2386
   
@@ -2402,8 +2537,11 @@  discard block
 block discarded – undo
2402 2537
 		$query .= " ORDER BY spotter_output.source_name ASC";
2403 2538
 
2404 2539
 		$sth = $this->db->prepare($query);
2405
-		if (!empty($query_values)) $sth->execute($query_values);
2406
-		else $sth->execute();
2540
+		if (!empty($query_values)) {
2541
+			$sth->execute($query_values);
2542
+		} else {
2543
+			$sth->execute();
2544
+		}
2407 2545
 
2408 2546
 		$source_array = array();
2409 2547
 		$temp_array = array();
@@ -2436,9 +2574,13 @@  discard block
 block discarded – undo
2436 2574
 								WHERE spotter_output.airline_icao <> '' 
2437 2575
 								ORDER BY spotter_output.airline_name ASC";
2438 2576
 			*/
2439
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource;
2440
-			elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim';
2441
-			elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao';
2577
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
2578
+				$forsource = $globalAirlinesSource;
2579
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
2580
+				$forsource = 'vatsim';
2581
+			} elseif (isset($globalIVAO) && $globalIVAO) {
2582
+				$forsource = 'ivao';
2583
+			}
2442 2584
 			if ($forsource === NULL) {
2443 2585
 				$query = "SELECT DISTINCT icao AS airline_icao, name AS airline_name, type AS airline_type FROM airlines WHERE forsource IS NULL ORDER BY name ASC";
2444 2586
 				$query_data = array();
@@ -2730,7 +2872,9 @@  discard block
 block discarded – undo
2730 2872
 			date_default_timezone_set($globalTimezone);
2731 2873
 			$datetime = new DateTime();
2732 2874
 			$offset = $datetime->format('P');
2733
-		} else $offset = '+00:00';
2875
+		} else {
2876
+			$offset = '+00:00';
2877
+		}
2734 2878
 		if ($airport_icao == '') {
2735 2879
 			if ($globalDBdriver == 'mysql') {
2736 2880
 				$query = "SELECT COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' GROUP BY departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC";
@@ -2762,7 +2906,9 @@  discard block
 block discarded – undo
2762 2906
 			date_default_timezone_set($globalTimezone);
2763 2907
 			$datetime = new DateTime();
2764 2908
 			$offset = $datetime->format('P');
2765
-		} else $offset = '+00:00';
2909
+		} else {
2910
+			$offset = '+00:00';
2911
+		}
2766 2912
 		if ($airport_icao == '') {
2767 2913
 			if ($globalDBdriver == 'mysql') {
2768 2914
 				$query = "SELECT spotter_output.airline_icao, COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC";
@@ -2795,7 +2941,9 @@  discard block
 block discarded – undo
2795 2941
 			date_default_timezone_set($globalTimezone);
2796 2942
 			$datetime = new DateTime();
2797 2943
 			$offset = $datetime->format('P');
2798
-		} else $offset = '+00:00';
2944
+		} else {
2945
+			$offset = '+00:00';
2946
+		}
2799 2947
 		if ($airport_icao == '') {
2800 2948
 			if ($globalDBdriver == 'mysql') {
2801 2949
 				$query = "SELECT COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -2834,7 +2982,9 @@  discard block
 block discarded – undo
2834 2982
 			date_default_timezone_set($globalTimezone);
2835 2983
 			$datetime = new DateTime();
2836 2984
 			$offset = $datetime->format('P');
2837
-		} else $offset = '+00:00';
2985
+		} else {
2986
+			$offset = '+00:00';
2987
+		}
2838 2988
 		if ($airport_icao == '') {
2839 2989
 			if ($globalDBdriver == 'mysql') {
2840 2990
 				$query = "SELECT spotter_output.airline_icao, COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -2879,7 +3029,9 @@  discard block
 block discarded – undo
2879 3029
 			date_default_timezone_set($globalTimezone);
2880 3030
 			$datetime = new DateTime();
2881 3031
 			$offset = $datetime->format('P');
2882
-		} else $offset = '+00:00';
3032
+		} else {
3033
+			$offset = '+00:00';
3034
+		}
2883 3035
 		if ($airport_icao == '') {
2884 3036
 			if ($globalDBdriver == 'mysql') {
2885 3037
 				$query = "SELECT COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' GROUP BY arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC";
@@ -2914,7 +3066,9 @@  discard block
 block discarded – undo
2914 3066
 			date_default_timezone_set($globalTimezone);
2915 3067
 			$datetime = new DateTime();
2916 3068
 			$offset = $datetime->format('P');
2917
-		} else $offset = '+00:00';
3069
+		} else {
3070
+			$offset = '+00:00';
3071
+		}
2918 3072
 		if ($airport_icao == '') {
2919 3073
 			if ($globalDBdriver == 'mysql') {
2920 3074
 				$query = "SELECT COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -2956,7 +3110,9 @@  discard block
 block discarded – undo
2956 3110
 			date_default_timezone_set($globalTimezone);
2957 3111
 			$datetime = new DateTime();
2958 3112
 			$offset = $datetime->format('P');
2959
-		} else $offset = '+00:00';
3113
+		} else {
3114
+			$offset = '+00:00';
3115
+		}
2960 3116
 		if ($airport_icao == '') {
2961 3117
 			if ($globalDBdriver == 'mysql') {
2962 3118
 				$query = "SELECT spotter_output.airline_icao, COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC";
@@ -2990,7 +3146,9 @@  discard block
 block discarded – undo
2990 3146
 			date_default_timezone_set($globalTimezone);
2991 3147
 			$datetime = new DateTime();
2992 3148
 			$offset = $datetime->format('P');
2993
-		} else $offset = '+00:00';
3149
+		} else {
3150
+			$offset = '+00:00';
3151
+		}
2994 3152
 		if ($airport_icao == '') {
2995 3153
 			if ($globalDBdriver == 'mysql') {
2996 3154
 				$query = "SELECT spotter_output.airline_icao, COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -3038,7 +3196,9 @@  discard block
 block discarded – undo
3038 3196
 			date_default_timezone_set($globalTimezone);
3039 3197
 			$datetime = new DateTime();
3040 3198
 			$offset = $datetime->format('P');
3041
-		} else $offset = '+00:00';
3199
+		} else {
3200
+			$offset = '+00:00';
3201
+		}
3042 3202
 
3043 3203
 		if ($globalDBdriver == 'mysql') {
3044 3204
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
@@ -3158,7 +3318,9 @@  discard block
 block discarded – undo
3158 3318
 	*/	
3159 3319
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3160 3320
 	{
3161
-		if ($groundspeed == '') $groundspeed = NULL;
3321
+		if ($groundspeed == '') {
3322
+			$groundspeed = NULL;
3323
+		}
3162 3324
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
3163 3325
                 $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3164 3326
 
@@ -3208,10 +3370,18 @@  discard block
 block discarded – undo
3208 3370
 		$Image = new Image($this->db);
3209 3371
 		$Common = new Common();
3210 3372
 		
3211
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
3212
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
3213
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
3214
-		if (!isset($globalVAM)) $globalVAM = FALSE;
3373
+		if (!isset($globalIVAO)) {
3374
+			$globalIVAO = FALSE;
3375
+		}
3376
+		if (!isset($globalVATSIM)) {
3377
+			$globalVATSIM = FALSE;
3378
+		}
3379
+		if (!isset($globalphpVMS)) {
3380
+			$globalphpVMS = FALSE;
3381
+		}
3382
+		if (!isset($globalVAM)) {
3383
+			$globalVAM = FALSE;
3384
+		}
3215 3385
 		date_default_timezone_set('UTC');
3216 3386
 		
3217 3387
 		//getting the registration
@@ -3224,23 +3394,33 @@  discard block
 block discarded – undo
3224 3394
 				if ($ModeS != '') {
3225 3395
 					$timeelapsed = microtime(true);
3226 3396
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3227
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3397
+					if ($globalDebugTimeElapsed) {
3398
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3399
+					}
3228 3400
 				} else {
3229 3401
 					$myhex = explode('-',$flightaware_id);
3230 3402
 					if (count($myhex) > 0) {
3231 3403
 						$timeelapsed = microtime(true);
3232 3404
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3233
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3405
+						if ($globalDebugTimeElapsed) {
3406
+							echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3407
+						}
3234 3408
 					}
3235 3409
 				}
3236 3410
 			}
3237 3411
 		}
3238 3412
 		$fromsource = NULL;
3239
-		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
3240
-		elseif ($format_source == 'vatsimtxt') $fromsource = 'vatsim';
3241
-		elseif ($format_source == 'whazzup') $fromsource = 'ivao';
3242
-		elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
3243
-		elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
3413
+		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
3414
+			$fromsource = $globalAirlinesSource;
3415
+		} elseif ($format_source == 'vatsimtxt') {
3416
+			$fromsource = 'vatsim';
3417
+		} elseif ($format_source == 'whazzup') {
3418
+			$fromsource = 'ivao';
3419
+		} elseif (isset($globalVATSIM) && $globalVATSIM) {
3420
+			$fromsource = 'vatsim';
3421
+		} elseif (isset($globalIVAO) && $globalIVAO) {
3422
+			$fromsource = 'ivao';
3423
+		}
3244 3424
 		//getting the airline information
3245 3425
 		if ($ident != "")
3246 3426
 		{
@@ -3264,15 +3444,21 @@  discard block
 block discarded – undo
3264 3444
 					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3265 3445
 						$airline_array = $this->getAllAirlineInfo("NA");
3266 3446
 					}
3267
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3447
+					if ($globalDebugTimeElapsed) {
3448
+						echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3449
+					}
3268 3450
 
3269 3451
 				} else {
3270 3452
 					$timeelapsed = microtime(true);
3271 3453
 					$airline_array = $this->getAllAirlineInfo("NA");
3272
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3454
+					if ($globalDebugTimeElapsed) {
3455
+						echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3456
+					}
3273 3457
 				}
3274 3458
 			}
3275
-		} else $airline_array = array();
3459
+		} else {
3460
+			$airline_array = array();
3461
+		}
3276 3462
 		
3277 3463
 		//getting the aircraft information
3278 3464
 		$aircraft_array = array();
@@ -3286,27 +3472,37 @@  discard block
 block discarded – undo
3286 3472
 				{
3287 3473
 					$timeelapsed = microtime(true);
3288 3474
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3289
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3475
+					if ($globalDebugTimeElapsed) {
3476
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3477
+					}
3290 3478
 				} else {
3291 3479
 					$timeelapsed = microtime(true);
3292 3480
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3293
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3481
+					if ($globalDebugTimeElapsed) {
3482
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3483
+					}
3294 3484
 				}
3295 3485
 			}
3296 3486
 		} else {
3297 3487
 			if ($ModeS != '') {
3298 3488
 				$timeelapsed = microtime(true);
3299 3489
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3300
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3490
+				if ($globalDebugTimeElapsed) {
3491
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3492
+				}
3301 3493
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3302 3494
 				{
3303 3495
 					$timeelapsed = microtime(true);
3304 3496
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3305
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3497
+					if ($globalDebugTimeElapsed) {
3498
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3499
+					}
3306 3500
 				} else {
3307 3501
 					$timeelapsed = microtime(true);
3308 3502
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3309
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3503
+					if ($globalDebugTimeElapsed) {
3504
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3505
+					}
3310 3506
 				}
3311 3507
 			}
3312 3508
 		}
@@ -3321,7 +3517,9 @@  discard block
 block discarded – undo
3321 3517
 			} else {
3322 3518
 				$timeelapsed = microtime(true);
3323 3519
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3324
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3520
+				if ($globalDebugTimeElapsed) {
3521
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3522
+				}
3325 3523
 			}
3326 3524
 		}
3327 3525
 		
@@ -3335,7 +3533,9 @@  discard block
 block discarded – undo
3335 3533
 			} else {
3336 3534
 				$timeelapsed = microtime(true);
3337 3535
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3338
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3536
+				if ($globalDebugTimeElapsed) {
3537
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3538
+				}
3339 3539
 			}
3340 3540
 		}
3341 3541
 
@@ -3370,7 +3570,9 @@  discard block
 block discarded – undo
3370 3570
 			{
3371 3571
 				return false;
3372 3572
 			}
3373
-		} else $altitude = 0;
3573
+		} else {
3574
+			$altitude = 0;
3575
+		}
3374 3576
 		
3375 3577
 		if ($heading != "")
3376 3578
 		{
@@ -3399,7 +3601,9 @@  discard block
 block discarded – undo
3399 3601
 		{
3400 3602
 			$timeelapsed = microtime(true);
3401 3603
 			$image_array = $Image->getSpotterImage($registration);
3402
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3604
+			if ($globalDebugTimeElapsed) {
3605
+				echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3606
+			}
3403 3607
 			if (!isset($image_array[0]['registration']))
3404 3608
 			{
3405 3609
 				//echo "Add image !!!! \n";
@@ -3407,14 +3611,21 @@  discard block
 block discarded – undo
3407 3611
 			}
3408 3612
 			$timeelapsed = microtime(true);
3409 3613
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3410
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3411
-			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3614
+			if ($globalDebugTimeElapsed) {
3615
+				echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3616
+			}
3617
+			if ($owner_info['owner'] != '') {
3618
+				$aircraft_owner = ucwords(strtolower($owner_info['owner']));
3619
+			}
3412 3620
 		}
3413 3621
     
3414 3622
 		if ($globalIVAO && $aircraft_icao != '')
3415 3623
 		{
3416
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3417
-            		else $airline_icao = '';
3624
+            		if (isset($airline_array[0]['icao'])) {
3625
+            			$airline_icao = $airline_array[0]['icao'];
3626
+            		} else {
3627
+            			$airline_icao = '';
3628
+            		}
3418 3629
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3419 3630
 			if (!isset($image_array[0]['registration']))
3420 3631
 			{
@@ -3459,12 +3670,24 @@  discard block
 block discarded – undo
3459 3670
                 {
3460 3671
                         $arrival_airport_array = $this->getAllAirportInfo('NA');
3461 3672
                 }
3462
-                if ($registration == '') $registration = 'NA';
3463
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
3464
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
3465
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3466
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3467
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3673
+                if ($registration == '') {
3674
+                	$registration = 'NA';
3675
+                }
3676
+                if ($squawk == '' || $Common->isInteger($squawk) === false) {
3677
+                	$squawk = NULL;
3678
+                }
3679
+                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) {
3680
+                	$verticalrate = NULL;
3681
+                }
3682
+                if ($heading == '' || $Common->isInteger($heading) === false) {
3683
+                	$heading = 0;
3684
+                }
3685
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
3686
+                	$groundspeed = 0;
3687
+                }
3688
+                if (!isset($aircraft_owner)) {
3689
+                	$aircraft_owner = NULL;
3690
+                }
3468 3691
                 $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
3469 3692
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
3470 3693
 
@@ -3475,9 +3698,13 @@  discard block
 block discarded – undo
3475 3698
 		if ($airline_type == '') {
3476 3699
 			$timeelapsed = microtime(true);
3477 3700
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3478
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3701
+			if ($globalDebugTimeElapsed) {
3702
+				echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3703
+			}
3704
+		}
3705
+		if ($airline_type == null) {
3706
+			$airline_type = '';
3479 3707
 		}
3480
-		if ($airline_type == null) $airline_type = '';
3481 3708
                 $aircraft_type = $aircraft_array[0]['type'];
3482 3709
                 $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
3483 3710
                 $departure_airport_name = $departure_airport_array[0]['name'];
@@ -3612,7 +3839,9 @@  discard block
 block discarded – undo
3612 3839
 			}
3613 3840
 		}
3614 3841
 		$query .= "GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC";
3615
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3842
+		if ($limit) {
3843
+			$query .= " LIMIT 10 OFFSET 0";
3844
+		}
3616 3845
 		
3617 3846
 		$sth = $this->db->prepare($query);
3618 3847
 		$sth->execute();
@@ -3657,7 +3886,9 @@  discard block
 block discarded – undo
3657 3886
 			}
3658 3887
 		}
3659 3888
 		$query .= "GROUP BY spotter_output.pilot_id,spotter_output.pilot_name ORDER BY pilot_count DESC";
3660
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3889
+		if ($limit) {
3890
+			$query .= " LIMIT 10 OFFSET 0";
3891
+		}
3661 3892
       
3662 3893
 		
3663 3894
 		$sth = $this->db->prepare($query);
@@ -3702,7 +3933,9 @@  discard block
 block discarded – undo
3702 3933
 			}
3703 3934
 		}
3704 3935
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.pilot_id,spotter_output.pilot_name ORDER BY pilot_count DESC";
3705
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3936
+		if ($limit) {
3937
+			$query .= " LIMIT 10 OFFSET 0";
3938
+		}
3706 3939
       
3707 3940
 		
3708 3941
 		$sth = $this->db->prepare($query);
@@ -3749,7 +3982,9 @@  discard block
 block discarded – undo
3749 3982
 			}
3750 3983
 		}
3751 3984
 		$query .= "GROUP BY spotter_output.owner_name ORDER BY owner_count DESC";
3752
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3985
+		if ($limit) {
3986
+			$query .= " LIMIT 10 OFFSET 0";
3987
+		}
3753 3988
       
3754 3989
 		
3755 3990
 		$sth = $this->db->prepare($query);
@@ -3794,7 +4029,9 @@  discard block
 block discarded – undo
3794 4029
 			}
3795 4030
 		}
3796 4031
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.owner_name ORDER BY owner_count DESC";
3797
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4032
+		if ($limit) {
4033
+			$query .= " LIMIT 10 OFFSET 0";
4034
+		}
3798 4035
       
3799 4036
 		
3800 4037
 		$sth = $this->db->prepare($query);
@@ -4037,7 +4274,9 @@  discard block
 block discarded – undo
4037 4274
 			date_default_timezone_set($globalTimezone);
4038 4275
 			$datetime = new DateTime($date);
4039 4276
 			$offset = $datetime->format('P');
4040
-		} else $offset = '+00:00';
4277
+		} else {
4278
+			$offset = '+00:00';
4279
+		}
4041 4280
 
4042 4281
 		if ($globalDBdriver == 'mysql') {
4043 4282
 			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
@@ -4085,7 +4324,9 @@  discard block
 block discarded – undo
4085 4324
 			date_default_timezone_set($globalTimezone);
4086 4325
 			$datetime = new DateTime($date);
4087 4326
 			$offset = $datetime->format('P');
4088
-		} else $offset = '+00:00';
4327
+		} else {
4328
+			$offset = '+00:00';
4329
+		}
4089 4330
 		
4090 4331
 		if ($globalDBdriver == 'mysql') {
4091 4332
 			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
@@ -4303,7 +4544,9 @@  discard block
 block discarded – undo
4303 4544
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA' 
4304 4545
 					GROUP BY spotter_output.airline_country
4305 4546
 					ORDER BY airline_country_count DESC";
4306
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4547
+		if ($limit) {
4548
+			$query .= " LIMIT 10 OFFSET 0";
4549
+		}
4307 4550
       
4308 4551
 		$sth = $this->db->prepare($query);
4309 4552
 		$sth->execute();
@@ -4331,7 +4574,9 @@  discard block
 block discarded – undo
4331 4574
 		global $globalDBdriver;
4332 4575
 		//$filter_query = $this->getFilter($filters,true,true);
4333 4576
 		$Connection= new Connection($this->db);
4334
-		if (!$Connection->tableExists('countries')) return array();
4577
+		if (!$Connection->tableExists('countries')) {
4578
+			return array();
4579
+		}
4335 4580
 		/*
4336 4581
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
4337 4582
 					FROM countries c, spotter_output s
@@ -4356,7 +4601,9 @@  discard block
 block discarded – undo
4356 4601
 		}
4357 4602
 
4358 4603
 		$query .= "GROUP BY c.name ORDER BY nb DESC";
4359
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4604
+		if ($limit) {
4605
+			$query .= " LIMIT 10 OFFSET 0";
4606
+		}
4360 4607
       
4361 4608
 		
4362 4609
 		$sth = $this->db->prepare($query);
@@ -4406,7 +4653,9 @@  discard block
 block discarded – undo
4406 4653
 		}
4407 4654
 
4408 4655
 		$query .= " GROUP BY spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
4409
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4656
+		if ($limit) {
4657
+			$query .= " LIMIT 10 OFFSET 0";
4658
+		}
4410 4659
  
4411 4660
 		$sth = $this->db->prepare($query);
4412 4661
 		$sth->execute();
@@ -4452,7 +4701,9 @@  discard block
 block discarded – undo
4452 4701
 		}
4453 4702
 
4454 4703
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
4455
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4704
+		if ($limit) {
4705
+			$query .= " LIMIT 10 OFFSET 0";
4706
+		}
4456 4707
  
4457 4708
 		$sth = $this->db->prepare($query);
4458 4709
 		$sth->execute();
@@ -4505,7 +4756,9 @@  discard block
 block discarded – undo
4505 4756
 			if($row['registration'] != "")
4506 4757
 			{
4507 4758
 				$image_array = $Image->getSpotterImage($row['registration']);
4508
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4759
+				if (isset($image_array[0]['image_thumbnail'])) {
4760
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4761
+				}
4509 4762
 			}
4510 4763
 			$temp_array['registration_count'] = $row['registration_count'];
4511 4764
 
@@ -4580,7 +4833,9 @@  discard block
 block discarded – undo
4580 4833
 			if($row['registration'] != "")
4581 4834
 			{
4582 4835
 				$image_array = $Image->getSpotterImage($row['registration']);
4583
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4836
+				if (isset($image_array[0]['image_thumbnail'])) {
4837
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4838
+				}
4584 4839
 			}
4585 4840
 			$temp_array['registration_count'] = $row['registration_count'];
4586 4841
 
@@ -4687,7 +4942,9 @@  discard block
 block discarded – undo
4687 4942
 			if($row['registration'] != "")
4688 4943
 			{
4689 4944
 				$image_array = $Image->getSpotterImage($row['registration']);
4690
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4945
+				if (isset($image_array[0]['image_thumbnail'])) {
4946
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4947
+				}
4691 4948
 			}
4692 4949
 			$temp_array['registration_count'] = $row['registration_count'];
4693 4950
 			$aircraft_array[] = $temp_array;
@@ -4812,7 +5069,9 @@  discard block
 block discarded – undo
4812 5069
 			date_default_timezone_set($globalTimezone);
4813 5070
 			$datetime = new DateTime($date);
4814 5071
 			$offset = $datetime->format('P');
4815
-		} else $offset = '+00:00';
5072
+		} else {
5073
+			$offset = '+00:00';
5074
+		}
4816 5075
 
4817 5076
 		if ($globalDBdriver == 'mysql') {
4818 5077
 			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
@@ -4859,7 +5118,9 @@  discard block
 block discarded – undo
4859 5118
 			date_default_timezone_set($globalTimezone);
4860 5119
 			$datetime = new DateTime($date);
4861 5120
 			$offset = $datetime->format('P');
4862
-		} else $offset = '+00:00';
5121
+		} else {
5122
+			$offset = '+00:00';
5123
+		}
4863 5124
 
4864 5125
 		if ($globalDBdriver == 'mysql') {
4865 5126
 			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
@@ -4888,7 +5149,9 @@  discard block
 block discarded – undo
4888 5149
 			if($row['registration'] != "")
4889 5150
 			{
4890 5151
 				$image_array = $Image->getSpotterImage($row['registration']);
4891
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5152
+				if (isset($image_array[0]['image_thumbnail'])) {
5153
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5154
+				}
4892 5155
 			}
4893 5156
 			$temp_array['registration_count'] = $row['registration_count'];
4894 5157
  
@@ -4913,7 +5176,9 @@  discard block
 block discarded – undo
4913 5176
 			date_default_timezone_set($globalTimezone);
4914 5177
 			$datetime = new DateTime($date);
4915 5178
 			$offset = $datetime->format('P');
4916
-		} else $offset = '+00:00';
5179
+		} else {
5180
+			$offset = '+00:00';
5181
+		}
4917 5182
 
4918 5183
 		if ($globalDBdriver == 'mysql') {
4919 5184
 			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
@@ -5011,8 +5276,11 @@  discard block
 block discarded – undo
5011 5276
 			if($row['registration'] != "")
5012 5277
 			{
5013 5278
 				$image_array = $Image->getSpotterImage($row['registration']);
5014
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5015
-				else $temp_array['image_thumbnail'] = '';
5279
+				if (isset($image_array[0]['image_thumbnail'])) {
5280
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5281
+				} else {
5282
+					$temp_array['image_thumbnail'] = '';
5283
+				}
5016 5284
 			}
5017 5285
 			$temp_array['registration_count'] = $row['registration_count'];
5018 5286
 			$aircraft_array[] = $temp_array;
@@ -5119,7 +5387,9 @@  discard block
 block discarded – undo
5119 5387
 			if($row['registration'] != "")
5120 5388
 			{
5121 5389
 				$image_array = $Image->getSpotterImage($row['registration']);
5122
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5390
+				if (isset($image_array[0]['image_thumbnail'])) {
5391
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5392
+				}
5123 5393
 			}
5124 5394
 			$temp_array['registration_count'] = $row['registration_count'];
5125 5395
           
@@ -5236,7 +5506,9 @@  discard block
 block discarded – undo
5236 5506
 			if($row['registration'] != "")
5237 5507
 			{
5238 5508
 				$image_array = $Image->getSpotterImage($row['registration']);
5239
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5509
+				if (isset($image_array[0]['image_thumbnail'])) {
5510
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5511
+				}
5240 5512
 			}
5241 5513
 			$temp_array['registration_count'] = $row['registration_count'];
5242 5514
           
@@ -5348,7 +5620,9 @@  discard block
 block discarded – undo
5348 5620
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5349 5621
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5350 5622
                 $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
5351
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5623
+		if ($limit) {
5624
+			$query .= " LIMIT 10 OFFSET 0";
5625
+		}
5352 5626
 		
5353 5627
 		$sth = $this->db->prepare($query);
5354 5628
 		$sth->execute();
@@ -5367,7 +5641,9 @@  discard block
 block discarded – undo
5367 5641
 			if($row['registration'] != "")
5368 5642
 			{
5369 5643
 				$image_array = $Image->getSpotterImage($row['registration']);
5370
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5644
+				if (isset($image_array[0]['image_thumbnail'])) {
5645
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5646
+				}
5371 5647
 			}
5372 5648
           
5373 5649
 			$aircraft_array[] = $temp_array;
@@ -5408,7 +5684,9 @@  discard block
 block discarded – undo
5408 5684
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5409 5685
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5410 5686
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
5411
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5687
+		if ($limit) {
5688
+			$query .= " LIMIT 10 OFFSET 0";
5689
+		}
5412 5690
 		
5413 5691
 		$sth = $this->db->prepare($query);
5414 5692
 		$sth->execute();
@@ -5428,7 +5706,9 @@  discard block
 block discarded – undo
5428 5706
 			if($row['registration'] != "")
5429 5707
 			{
5430 5708
 				$image_array = $Image->getSpotterImage($row['registration']);
5431
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5709
+				if (isset($image_array[0]['image_thumbnail'])) {
5710
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5711
+				}
5432 5712
 			}
5433 5713
           
5434 5714
 			$aircraft_array[] = $temp_array;
@@ -5469,7 +5749,9 @@  discard block
 block discarded – undo
5469 5749
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5470 5750
                 $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5471 5751
 				ORDER BY airport_departure_icao_count DESC";
5472
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5752
+		if ($limit) {
5753
+			$query .= " LIMIT 10 OFFSET 0";
5754
+		}
5473 5755
       
5474 5756
 		$sth = $this->db->prepare($query);
5475 5757
 		$sth->execute();
@@ -5521,7 +5803,9 @@  discard block
 block discarded – undo
5521 5803
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5522 5804
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5523 5805
 				ORDER BY airport_departure_icao_count DESC";
5524
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5806
+		if ($limit) {
5807
+			$query .= " LIMIT 10 OFFSET 0";
5808
+		}
5525 5809
       
5526 5810
 		$sth = $this->db->prepare($query);
5527 5811
 		$sth->execute();
@@ -5573,7 +5857,9 @@  discard block
 block discarded – undo
5573 5857
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5574 5858
                 $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5575 5859
 				ORDER BY airport_departure_icao_count DESC";
5576
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5860
+		if ($limit) {
5861
+			$query .= " LIMIT 10 OFFSET 0";
5862
+		}
5577 5863
     		//echo $query;
5578 5864
 		$sth = $this->db->prepare($query);
5579 5865
 		$sth->execute();
@@ -5625,7 +5911,9 @@  discard block
 block discarded – undo
5625 5911
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5626 5912
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5627 5913
 				ORDER BY airport_departure_icao_count DESC";
5628
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5914
+		if ($limit) {
5915
+			$query .= " LIMIT 10 OFFSET 0";
5916
+		}
5629 5917
       
5630 5918
 		$sth = $this->db->prepare($query);
5631 5919
 		$sth->execute();
@@ -6020,7 +6308,9 @@  discard block
 block discarded – undo
6020 6308
 			date_default_timezone_set($globalTimezone);
6021 6309
 			$datetime = new DateTime($date);
6022 6310
 			$offset = $datetime->format('P');
6023
-		} else $offset = '+00:00';
6311
+		} else {
6312
+			$offset = '+00:00';
6313
+		}
6024 6314
 
6025 6315
 		if ($globalDBdriver == 'mysql') {
6026 6316
 			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
@@ -6070,7 +6360,9 @@  discard block
 block discarded – undo
6070 6360
 			date_default_timezone_set($globalTimezone);
6071 6361
 			$datetime = new DateTime($date);
6072 6362
 			$offset = $datetime->format('P');
6073
-		} else $offset = '+00:00';
6363
+		} else {
6364
+			$offset = '+00:00';
6365
+		}
6074 6366
 
6075 6367
 		if ($globalDBdriver == 'mysql') {
6076 6368
 			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
@@ -6283,7 +6575,9 @@  discard block
 block discarded – undo
6283 6575
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6284 6576
                 $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6285 6577
 					ORDER BY airport_arrival_icao_count DESC";
6286
-		if ($limit) $query .= " LIMIT 10";
6578
+		if ($limit) {
6579
+			$query .= " LIMIT 10";
6580
+		}
6287 6581
       
6288 6582
 		
6289 6583
 		$sth = $this->db->prepare($query);
@@ -6303,7 +6597,9 @@  discard block
 block discarded – undo
6303 6597
 			if ($icaoaskey) {
6304 6598
 				$icao = $row['arrival_airport_icao'];
6305 6599
 				$airport_array[$icao] = $temp_array;
6306
-			} else $airport_array[] = $temp_array;
6600
+			} else {
6601
+				$airport_array[] = $temp_array;
6602
+			}
6307 6603
 		}
6308 6604
 
6309 6605
 		return $airport_array;
@@ -6345,7 +6641,9 @@  discard block
 block discarded – undo
6345 6641
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6346 6642
                 $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6347 6643
 					ORDER BY airport_arrival_icao_count DESC";
6348
-		if ($limit) $query .= " LIMIT 10";
6644
+		if ($limit) {
6645
+			$query .= " LIMIT 10";
6646
+		}
6349 6647
       
6350 6648
 		
6351 6649
 		$sth = $this->db->prepare($query);
@@ -6366,7 +6664,9 @@  discard block
 block discarded – undo
6366 6664
 			if ($icaoaskey) {
6367 6665
 				$icao = $row['arrival_airport_icao'];
6368 6666
 				$airport_array[$icao] = $temp_array;
6369
-			} else $airport_array[] = $temp_array;
6667
+			} else {
6668
+				$airport_array[] = $temp_array;
6669
+			}
6370 6670
 		}
6371 6671
 
6372 6672
 		return $airport_array;
@@ -6408,7 +6708,9 @@  discard block
 block discarded – undo
6408 6708
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6409 6709
                 $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6410 6710
 					ORDER BY airport_arrival_icao_count DESC";
6411
-		if ($limit) $query .= " LIMIT 10";
6711
+		if ($limit) {
6712
+			$query .= " LIMIT 10";
6713
+		}
6412 6714
       
6413 6715
 		
6414 6716
 		$sth = $this->db->prepare($query);
@@ -6428,7 +6730,9 @@  discard block
 block discarded – undo
6428 6730
 			if ($icaoaskey) {
6429 6731
 				$icao = $row['arrival_airport_icao'];
6430 6732
 				$airport_array[$icao] = $temp_array;
6431
-			} else $airport_array[] = $temp_array;
6733
+			} else {
6734
+				$airport_array[] = $temp_array;
6735
+			}
6432 6736
 		}
6433 6737
 
6434 6738
 		return $airport_array;
@@ -6470,7 +6774,9 @@  discard block
 block discarded – undo
6470 6774
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6471 6775
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6472 6776
 					ORDER BY airport_arrival_icao_count DESC";
6473
-		if ($limit) $query .= " LIMIT 10";
6777
+		if ($limit) {
6778
+			$query .= " LIMIT 10";
6779
+		}
6474 6780
       
6475 6781
 		
6476 6782
 		$sth = $this->db->prepare($query);
@@ -6491,7 +6797,9 @@  discard block
 block discarded – undo
6491 6797
 			if ($icaoaskey) {
6492 6798
 				$icao = $row['arrival_airport_icao'];
6493 6799
 				$airport_array[$icao] = $temp_array;
6494
-			} else $airport_array[] = $temp_array;
6800
+			} else {
6801
+				$airport_array[] = $temp_array;
6802
+			}
6495 6803
 		}
6496 6804
 
6497 6805
 		return $airport_array;
@@ -6872,7 +7180,9 @@  discard block
 block discarded – undo
6872 7180
 			date_default_timezone_set($globalTimezone);
6873 7181
 			$datetime = new DateTime($date);
6874 7182
 			$offset = $datetime->format('P');
6875
-		} else $offset = '+00:00';
7183
+		} else {
7184
+			$offset = '+00:00';
7185
+		}
6876 7186
 
6877 7187
 		if ($globalDBdriver == 'mysql') {
6878 7188
 			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
@@ -6922,7 +7232,9 @@  discard block
 block discarded – undo
6922 7232
 			date_default_timezone_set($globalTimezone);
6923 7233
 			$datetime = new DateTime($date);
6924 7234
 			$offset = $datetime->format('P');
6925
-		} else $offset = '+00:00';
7235
+		} else {
7236
+			$offset = '+00:00';
7237
+		}
6926 7238
 
6927 7239
 		if ($globalDBdriver == 'mysql') {
6928 7240
 			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
@@ -7145,7 +7457,9 @@  discard block
 block discarded – undo
7145 7457
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
7146 7458
 		$query .= " GROUP BY spotter_output.arrival_airport_country
7147 7459
 					ORDER BY airport_arrival_country_count DESC";
7148
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
7460
+		if ($limit) {
7461
+			$query .= " LIMIT 10 OFFSET 0";
7462
+		}
7149 7463
       
7150 7464
 		
7151 7465
 		$sth = $this->db->prepare($query);
@@ -7432,7 +7746,9 @@  discard block
 block discarded – undo
7432 7746
 			date_default_timezone_set($globalTimezone);
7433 7747
 			$datetime = new DateTime($date);
7434 7748
 			$offset = $datetime->format('P');
7435
-		} else $offset = '+00:00';
7749
+		} else {
7750
+			$offset = '+00:00';
7751
+		}
7436 7752
 		
7437 7753
 		if ($globalDBdriver == 'mysql') {
7438 7754
 			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
@@ -7608,15 +7924,23 @@  discard block
 block discarded – undo
7608 7924
 		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7609 7925
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7610 7926
 		 if ($olderthanmonths > 0) {
7611
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
7612
-			else $query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
7927
+			if ($globalDBdriver == 'mysql') {
7928
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
7929
+			} else {
7930
+				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
7931
+			}
7613 7932
 		}
7614 7933
 		if ($sincedate != '') {
7615
-			if ($globalDBdriver == 'mysql') $query .= " AND spotter_output.date > '".$sincedate."'";
7616
-			else $query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
7934
+			if ($globalDBdriver == 'mysql') {
7935
+				$query .= " AND spotter_output.date > '".$sincedate."'";
7936
+			} else {
7937
+				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
7938
+			}
7617 7939
 		}
7618 7940
 		$query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
7619
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
7941
+		if ($limit) {
7942
+			$query .= " LIMIT 10 OFFSET 0";
7943
+		}
7620 7944
       		
7621 7945
 		$sth = $this->db->prepare($query);
7622 7946
 		$sth->execute();
@@ -7650,15 +7974,23 @@  discard block
 block discarded – undo
7650 7974
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7651 7975
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7652 7976
 		 if ($olderthanmonths > 0) {
7653
-			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
7654
-			else $query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
7977
+			if ($globalDBdriver == 'mysql') {
7978
+				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
7979
+			} else {
7980
+				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
7981
+			}
7655 7982
 		}
7656 7983
 		if ($sincedate != '') {
7657
-			if ($globalDBdriver == 'mysql') $query .= "AND spotter_output.date > '".$sincedate."' ";
7658
-			else $query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
7984
+			if ($globalDBdriver == 'mysql') {
7985
+				$query .= "AND spotter_output.date > '".$sincedate."' ";
7986
+			} else {
7987
+				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
7988
+			}
7659 7989
 		}
7660 7990
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
7661
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
7991
+		if ($limit) {
7992
+			$query .= " LIMIT 10 OFFSET 0";
7993
+		}
7662 7994
       		
7663 7995
 		$sth = $this->db->prepare($query);
7664 7996
 		$sth->execute();
@@ -7695,7 +8027,9 @@  discard block
 block discarded – undo
7695 8027
 			date_default_timezone_set($globalTimezone);
7696 8028
 			$datetime = new DateTime();
7697 8029
 			$offset = $datetime->format('P');
7698
-		} else $offset = '+00:00';
8030
+		} else {
8031
+			$offset = '+00:00';
8032
+		}
7699 8033
 
7700 8034
 		if ($globalDBdriver == 'mysql') {
7701 8035
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7744,7 +8078,9 @@  discard block
 block discarded – undo
7744 8078
 			date_default_timezone_set($globalTimezone);
7745 8079
 			$datetime = new DateTime();
7746 8080
 			$offset = $datetime->format('P');
7747
-		} else $offset = '+00:00';
8081
+		} else {
8082
+			$offset = '+00:00';
8083
+		}
7748 8084
 		$filter_query = $this->getFilter($filters,true,true);
7749 8085
 		if ($globalDBdriver == 'mysql') {
7750 8086
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7793,7 +8129,9 @@  discard block
 block discarded – undo
7793 8129
 			date_default_timezone_set($globalTimezone);
7794 8130
 			$datetime = new DateTime();
7795 8131
 			$offset = $datetime->format('P');
7796
-		} else $offset = '+00:00';
8132
+		} else {
8133
+			$offset = '+00:00';
8134
+		}
7797 8135
 		$filter_query = $this->getFilter($filters,true,true);
7798 8136
 		if ($globalDBdriver == 'mysql') {
7799 8137
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7839,7 +8177,9 @@  discard block
 block discarded – undo
7839 8177
 			date_default_timezone_set($globalTimezone);
7840 8178
 			$datetime = new DateTime();
7841 8179
 			$offset = $datetime->format('P');
7842
-		} else $offset = '+00:00';
8180
+		} else {
8181
+			$offset = '+00:00';
8182
+		}
7843 8183
 		$filter_query = $this->getFilter($filters,true,true);
7844 8184
 		if ($globalDBdriver == 'mysql') {
7845 8185
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7887,7 +8227,9 @@  discard block
 block discarded – undo
7887 8227
 			date_default_timezone_set($globalTimezone);
7888 8228
 			$datetime = new DateTime();
7889 8229
 			$offset = $datetime->format('P');
7890
-		} else $offset = '+00:00';
8230
+		} else {
8231
+			$offset = '+00:00';
8232
+		}
7891 8233
 		
7892 8234
 		if ($globalDBdriver == 'mysql') {
7893 8235
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7935,7 +8277,9 @@  discard block
 block discarded – undo
7935 8277
 			date_default_timezone_set($globalTimezone);
7936 8278
 			$datetime = new DateTime();
7937 8279
 			$offset = $datetime->format('P');
7938
-		} else $offset = '+00:00';
8280
+		} else {
8281
+			$offset = '+00:00';
8282
+		}
7939 8283
 
7940 8284
 		if ($globalDBdriver == 'mysql') {
7941 8285
 			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -7982,7 +8326,9 @@  discard block
 block discarded – undo
7982 8326
 			date_default_timezone_set($globalTimezone);
7983 8327
 			$datetime = new DateTime();
7984 8328
 			$offset = $datetime->format('P');
7985
-		} else $offset = '+00:00';
8329
+		} else {
8330
+			$offset = '+00:00';
8331
+		}
7986 8332
 
7987 8333
 		if ($globalDBdriver == 'mysql') {
7988 8334
 			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -8030,7 +8376,9 @@  discard block
 block discarded – undo
8030 8376
 			date_default_timezone_set($globalTimezone);
8031 8377
 			$datetime = new DateTime();
8032 8378
 			$offset = $datetime->format('P');
8033
-		} else $offset = '+00:00';
8379
+		} else {
8380
+			$offset = '+00:00';
8381
+		}
8034 8382
 		$filter_query = $this->getFilter($filters,true,true);
8035 8383
 		if ($globalDBdriver == 'mysql') {
8036 8384
 			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -8075,7 +8423,9 @@  discard block
 block discarded – undo
8075 8423
 			date_default_timezone_set($globalTimezone);
8076 8424
 			$datetime = new DateTime();
8077 8425
 			$offset = $datetime->format('P');
8078
-		} else $offset = '+00:00';
8426
+		} else {
8427
+			$offset = '+00:00';
8428
+		}
8079 8429
 		$filter_query = $this->getFilter($filters,true,true);
8080 8430
 
8081 8431
 		if ($globalDBdriver == 'mysql') {
@@ -8122,7 +8472,9 @@  discard block
 block discarded – undo
8122 8472
 			date_default_timezone_set($globalTimezone);
8123 8473
 			$datetime = new DateTime();
8124 8474
 			$offset = $datetime->format('P');
8125
-		} else $offset = '+00:00';
8475
+		} else {
8476
+			$offset = '+00:00';
8477
+		}
8126 8478
 
8127 8479
 		if ($globalDBdriver == 'mysql') {
8128 8480
 			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
@@ -8168,7 +8520,9 @@  discard block
 block discarded – undo
8168 8520
 			date_default_timezone_set($globalTimezone);
8169 8521
 			$datetime = new DateTime();
8170 8522
 			$offset = $datetime->format('P');
8171
-		} else $offset = '+00:00';
8523
+		} else {
8524
+			$offset = '+00:00';
8525
+		}
8172 8526
 		$filter_query = $this->getFilter($filters,true,true);
8173 8527
 
8174 8528
 		if ($globalDBdriver == 'mysql') {
@@ -8215,7 +8569,9 @@  discard block
 block discarded – undo
8215 8569
 			date_default_timezone_set($globalTimezone);
8216 8570
 			$datetime = new DateTime();
8217 8571
 			$offset = $datetime->format('P');
8218
-		} else $offset = '+00:00';
8572
+		} else {
8573
+			$offset = '+00:00';
8574
+		}
8219 8575
 
8220 8576
 		if ($globalDBdriver == 'mysql') {
8221 8577
 			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
@@ -8262,7 +8618,9 @@  discard block
 block discarded – undo
8262 8618
 			date_default_timezone_set($globalTimezone);
8263 8619
 			$datetime = new DateTime();
8264 8620
 			$offset = $datetime->format('P');
8265
-		} else $offset = '+00:00';
8621
+		} else {
8622
+			$offset = '+00:00';
8623
+		}
8266 8624
 
8267 8625
 		if ($globalDBdriver == 'mysql') {
8268 8626
 			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
@@ -8307,7 +8665,9 @@  discard block
 block discarded – undo
8307 8665
 			date_default_timezone_set($globalTimezone);
8308 8666
 			$datetime = new DateTime();
8309 8667
 			$offset = $datetime->format('P');
8310
-		} else $offset = '+00:00';
8668
+		} else {
8669
+			$offset = '+00:00';
8670
+		}
8311 8671
 		$filter_query = $this->getFilter($filters,true,true);
8312 8672
 
8313 8673
 		if ($globalDBdriver == 'mysql') {
@@ -8355,7 +8715,9 @@  discard block
 block discarded – undo
8355 8715
 			date_default_timezone_set($globalTimezone);
8356 8716
 			$datetime = new DateTime();
8357 8717
 			$offset = $datetime->format('P');
8358
-		} else $offset = '+00:00';
8718
+		} else {
8719
+			$offset = '+00:00';
8720
+		}
8359 8721
 
8360 8722
 		if ($globalDBdriver == 'mysql') {
8361 8723
 			$query  = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
@@ -8401,7 +8763,9 @@  discard block
 block discarded – undo
8401 8763
 			date_default_timezone_set($globalTimezone);
8402 8764
 			$datetime = new DateTime();
8403 8765
 			$offset = $datetime->format('P');
8404
-		} else $offset = '+00:00';
8766
+		} else {
8767
+			$offset = '+00:00';
8768
+		}
8405 8769
 		$filter_query = $this->getFilter($filters,true,true);
8406 8770
 
8407 8771
 		if ($globalDBdriver == 'mysql') {
@@ -8449,7 +8813,9 @@  discard block
 block discarded – undo
8449 8813
 			date_default_timezone_set($globalTimezone);
8450 8814
 			$datetime = new DateTime();
8451 8815
 			$offset = $datetime->format('P');
8452
-		} else $offset = '+00:00';
8816
+		} else {
8817
+			$offset = '+00:00';
8818
+		}
8453 8819
 
8454 8820
 		if ($globalDBdriver == 'mysql') {
8455 8821
 			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
@@ -8496,7 +8862,9 @@  discard block
 block discarded – undo
8496 8862
 			date_default_timezone_set($globalTimezone);
8497 8863
 			$datetime = new DateTime();
8498 8864
 			$offset = $datetime->format('P');
8499
-		} else $offset = '+00:00';
8865
+		} else {
8866
+			$offset = '+00:00';
8867
+		}
8500 8868
 		$filter_query = $this->getFilter($filters,true,true);
8501 8869
 		if ($globalDBdriver == 'mysql') {
8502 8870
 			$query  = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
@@ -8545,7 +8913,9 @@  discard block
 block discarded – undo
8545 8913
 			date_default_timezone_set($globalTimezone);
8546 8914
 			$datetime = new DateTime();
8547 8915
 			$offset = $datetime->format('P');
8548
-		} else $offset = '+00:00';
8916
+		} else {
8917
+			$offset = '+00:00';
8918
+		}
8549 8919
 
8550 8920
 		$orderby_sql = '';
8551 8921
 		if ($orderby == "hour")
@@ -8611,7 +8981,9 @@  discard block
 block discarded – undo
8611 8981
 			date_default_timezone_set($globalTimezone);
8612 8982
 			$datetime = new DateTime();
8613 8983
 			$offset = $datetime->format('P');
8614
-		} else $offset = '+00:00';
8984
+		} else {
8985
+			$offset = '+00:00';
8986
+		}
8615 8987
 
8616 8988
 		$orderby_sql = '';
8617 8989
 		if ($orderby == "hour")
@@ -8678,7 +9050,9 @@  discard block
 block discarded – undo
8678 9050
 			date_default_timezone_set($globalTimezone);
8679 9051
 			$datetime = new DateTime();
8680 9052
 			$offset = $datetime->format('P');
8681
-		} else $offset = '+00:00';
9053
+		} else {
9054
+			$offset = '+00:00';
9055
+		}
8682 9056
 
8683 9057
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8684 9058
 
@@ -8729,7 +9103,9 @@  discard block
 block discarded – undo
8729 9103
 			date_default_timezone_set($globalTimezone);
8730 9104
 			$datetime = new DateTime();
8731 9105
 			$offset = $datetime->format('P');
8732
-		} else $offset = '+00:00';
9106
+		} else {
9107
+			$offset = '+00:00';
9108
+		}
8733 9109
 
8734 9110
 		if ($globalDBdriver == 'mysql') {
8735 9111
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8776,7 +9152,9 @@  discard block
 block discarded – undo
8776 9152
 			date_default_timezone_set($globalTimezone);
8777 9153
 			$datetime = new DateTime();
8778 9154
 			$offset = $datetime->format('P');
8779
-		} else $offset = '+00:00';
9155
+		} else {
9156
+			$offset = '+00:00';
9157
+		}
8780 9158
 
8781 9159
 		if ($globalDBdriver == 'mysql') {
8782 9160
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8823,7 +9201,9 @@  discard block
 block discarded – undo
8823 9201
 			date_default_timezone_set($globalTimezone);
8824 9202
 			$datetime = new DateTime();
8825 9203
 			$offset = $datetime->format('P');
8826
-		} else $offset = '+00:00';
9204
+		} else {
9205
+			$offset = '+00:00';
9206
+		}
8827 9207
 
8828 9208
 		if ($globalDBdriver == 'mysql') {
8829 9209
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8871,7 +9251,9 @@  discard block
 block discarded – undo
8871 9251
 			date_default_timezone_set($globalTimezone);
8872 9252
 			$datetime = new DateTime();
8873 9253
 			$offset = $datetime->format('P');
8874
-		} else $offset = '+00:00';
9254
+		} else {
9255
+			$offset = '+00:00';
9256
+		}
8875 9257
 
8876 9258
 		if ($globalDBdriver == 'mysql') {
8877 9259
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8919,7 +9301,9 @@  discard block
 block discarded – undo
8919 9301
 			date_default_timezone_set($globalTimezone);
8920 9302
 			$datetime = new DateTime($date);
8921 9303
 			$offset = $datetime->format('P');
8922
-		} else $offset = '+00:00';
9304
+		} else {
9305
+			$offset = '+00:00';
9306
+		}
8923 9307
 
8924 9308
 		if ($globalDBdriver == 'mysql') {
8925 9309
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8967,7 +9351,9 @@  discard block
 block discarded – undo
8967 9351
 			date_default_timezone_set($globalTimezone);
8968 9352
 			$datetime = new DateTime();
8969 9353
 			$offset = $datetime->format('P');
8970
-		} else $offset = '+00:00';
9354
+		} else {
9355
+			$offset = '+00:00';
9356
+		}
8971 9357
 
8972 9358
 		if ($globalDBdriver == 'mysql') {
8973 9359
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9017,7 +9403,9 @@  discard block
 block discarded – undo
9017 9403
 			date_default_timezone_set($globalTimezone);
9018 9404
 			$datetime = new DateTime();
9019 9405
 			$offset = $datetime->format('P');
9020
-		} else $offset = '+00:00';
9406
+		} else {
9407
+			$offset = '+00:00';
9408
+		}
9021 9409
 
9022 9410
 		if ($globalDBdriver == 'mysql') {
9023 9411
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9064,7 +9452,9 @@  discard block
 block discarded – undo
9064 9452
 			date_default_timezone_set($globalTimezone);
9065 9453
 			$datetime = new DateTime();
9066 9454
 			$offset = $datetime->format('P');
9067
-		} else $offset = '+00:00';
9455
+		} else {
9456
+			$offset = '+00:00';
9457
+		}
9068 9458
 
9069 9459
 		if ($globalDBdriver == 'mysql') {
9070 9460
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9232,7 +9622,9 @@  discard block
 block discarded – undo
9232 9622
 			date_default_timezone_set($globalTimezone);
9233 9623
 			$datetime = new DateTime();
9234 9624
 			$offset = $datetime->format('P');
9235
-		} else $offset = '+00:00';
9625
+		} else {
9626
+			$offset = '+00:00';
9627
+		}
9236 9628
 
9237 9629
 		if ($globalDBdriver == 'mysql') {
9238 9630
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9418,7 +9810,9 @@  discard block
 block discarded – undo
9418 9810
 	*/
9419 9811
 	public function parseDirection($direction = 0)
9420 9812
 	{
9421
-		if ($direction == '') $direction = 0;
9813
+		if ($direction == '') {
9814
+			$direction = 0;
9815
+		}
9422 9816
 		$direction_array = array();
9423 9817
 		$temp_array = array();
9424 9818
 
@@ -9519,7 +9913,9 @@  discard block
 block discarded – undo
9519 9913
 		if (isset($result->AirlineFlightInfoResult))
9520 9914
 		{
9521 9915
 			$registration = $result->AirlineFlightInfoResult->tailnumber;
9522
-		} else return '';
9916
+		} else {
9917
+			return '';
9918
+		}
9523 9919
 		
9524 9920
 		$registration = $this->convertAircraftRegistration($registration);
9525 9921
 		
@@ -9548,7 +9944,9 @@  discard block
 block discarded – undo
9548 9944
 		if (count($row) > 0) {
9549 9945
 		    //return $row['Registration'];
9550 9946
 		    return $row['registration'];
9551
-		} else return '';
9947
+		} else {
9948
+			return '';
9949
+		}
9552 9950
 	
9553 9951
 	}
9554 9952
 
@@ -9571,9 +9969,14 @@  discard block
 block discarded – undo
9571 9969
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
9572 9970
 		$sth->closeCursor();
9573 9971
 		if (count($row) > 0) {
9574
-		    if ($row['type_flight'] == null) return '';
9575
-		    else return $row['type_flight'];
9576
-		} else return '';
9972
+		    if ($row['type_flight'] == null) {
9973
+		    	return '';
9974
+		    } else {
9975
+		    	return $row['type_flight'];
9976
+		    }
9977
+		} else {
9978
+			return '';
9979
+		}
9577 9980
 	
9578 9981
 	}
9579 9982
 
@@ -9591,7 +9994,9 @@  discard block
 block discarded – undo
9591 9994
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9592 9995
 	
9593 9996
 		$Connection = new Connection($this->db);
9594
-		if (!$Connection->tableExists('countries')) return '';
9997
+		if (!$Connection->tableExists('countries')) {
9998
+			return '';
9999
+		}
9595 10000
 	
9596 10001
 		try {
9597 10002
 			/*
@@ -9611,9 +10016,13 @@  discard block
 block discarded – undo
9611 10016
 			$sth->closeCursor();
9612 10017
 			if (count($row) > 0) {
9613 10018
 				return $row;
9614
-			} else return '';
10019
+			} else {
10020
+				return '';
10021
+			}
9615 10022
 		} catch (PDOException $e) {
9616
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
10023
+			if (isset($globalDebug) && $globalDebug) {
10024
+				echo 'Error : '.$e->getMessage()."\n";
10025
+			}
9617 10026
 			return '';
9618 10027
 		}
9619 10028
 	
@@ -9761,7 +10170,9 @@  discard block
 block discarded – undo
9761 10170
 	{
9762 10171
 		global $globalBitlyAccessToken;
9763 10172
 		
9764
-		if ($globalBitlyAccessToken == '') return $url;
10173
+		if ($globalBitlyAccessToken == '') {
10174
+			return $url;
10175
+		}
9765 10176
         
9766 10177
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
9767 10178
 		
@@ -9910,7 +10321,9 @@  discard block
 block discarded – undo
9910 10321
 		
9911 10322
 
9912 10323
 		// routes
9913
-		if ($globalDebug) print "Routes...\n";
10324
+		if ($globalDebug) {
10325
+			print "Routes...\n";
10326
+		}
9914 10327
 		if ($globalDBdriver == 'mysql') {
9915 10328
 			$query = "SELECT spotter_output.spotter_id, routes.FromAirport_ICAO, routes.ToAirport_ICAO FROM spotter_output, routes WHERE spotter_output.ident = routes.CallSign AND ( spotter_output.departure_airport_icao != routes.FromAirport_ICAO OR spotter_output.arrival_airport_icao != routes.ToAirport_ICAO) AND routes.FromAirport_ICAO != '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)";
9916 10329
 		} else {
@@ -9929,7 +10342,9 @@  discard block
 block discarded – undo
9929 10342
 			}
9930 10343
 		}
9931 10344
 		
9932
-		if ($globalDebug) print "Airlines...\n";
10345
+		if ($globalDebug) {
10346
+			print "Airlines...\n";
10347
+		}
9933 10348
 		//airlines
9934 10349
 		if ($globalDBdriver == 'mysql') {
9935 10350
 			$query  = "SELECT spotter_output.spotter_id, spotter_output.ident FROM spotter_output WHERE (spotter_output.airline_name = '' OR spotter_output.airline_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)";
@@ -9943,10 +10358,15 @@  discard block
 block discarded – undo
9943 10358
 			if (is_numeric(substr($row['ident'], -1, 1)))
9944 10359
 			{
9945 10360
 				$fromsource = NULL;
9946
-				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
9947
-				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
9948
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
9949
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
10361
+				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
10362
+					$fromsource = 'vatsim';
10363
+				} elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') {
10364
+					$fromsource = 'ivao';
10365
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
10366
+					$fromsource = 'vatsim';
10367
+				} elseif (isset($globalIVAO) && $globalIVAO) {
10368
+					$fromsource = 'ivao';
10369
+				}
9950 10370
 				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
9951 10371
 				if (isset($airline_array[0]['name'])) {
9952 10372
 					$update_query  = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
@@ -9956,13 +10376,17 @@  discard block
 block discarded – undo
9956 10376
 			}
9957 10377
 		}
9958 10378
 
9959
-		if ($globalDebug) print "Remove Duplicate in aircraft_modes...\n";
10379
+		if ($globalDebug) {
10380
+			print "Remove Duplicate in aircraft_modes...\n";
10381
+		}
9960 10382
 		//duplicate modes
9961 10383
 		$query = "DELETE aircraft_modes FROM aircraft_modes LEFT OUTER JOIN (SELECT max(`AircraftID`) as `AircraftID`,`ModeS` FROM `aircraft_modes` group by ModeS) as KeepRows ON aircraft_modes.AircraftID = KeepRows.AircraftID WHERE KeepRows.AircraftID IS NULL";
9962 10384
 		$sth = $this->db->prepare($query);
9963 10385
 		$sth->execute();
9964 10386
 		
9965
-		if ($globalDebug) print "Aircraft...\n";
10387
+		if ($globalDebug) {
10388
+			print "Aircraft...\n";
10389
+		}
9966 10390
 		//aircraft
9967 10391
 		if ($globalDBdriver == 'mysql') {
9968 10392
 			$query  = "SELECT spotter_output.spotter_id, spotter_output.aircraft_icao, spotter_output.registration FROM spotter_output WHERE (spotter_output.aircraft_name = '' OR spotter_output.aircraft_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -10005,26 +10429,38 @@  discard block
 block discarded – undo
10005 10429
 				 if (isset($closestAirports[0])) {
10006 10430
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
10007 10431
 						$airport_icao = $closestAirports[0]['icao'];
10008
-						if ($globalDebug) echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10432
+						if ($globalDebug) {
10433
+							echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10434
+						}
10009 10435
 					} elseif (count($closestAirports > 1) && $row['arrival_airport_icao'] != '' && $row['arrival_airport_icao'] != 'NA') {
10010 10436
 						foreach ($closestAirports as $airport) {
10011 10437
 							if ($row['arrival_airport_icao'] == $airport['icao']) {
10012 10438
 								$airport_icao = $airport['icao'];
10013
-								if ($globalDebug) echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10439
+								if ($globalDebug) {
10440
+									echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10441
+								}
10014 10442
 								break;
10015 10443
 							}
10016 10444
 						}
10017 10445
 					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10018 10446
 						$airport_icao = $closestAirports[0]['icao'];
10019
-						if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10447
+						if ($globalDebug) {
10448
+							echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10449
+						}
10020 10450
 					} else {
10021
-						if ($globalDebug) echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10451
+						if ($globalDebug) {
10452
+							echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10453
+						}
10022 10454
 					}
10023 10455
 				} else {
10024
-					if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
10456
+					if ($globalDebug) {
10457
+						echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
10458
+					}
10025 10459
 				}
10026 10460
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10027
-					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10461
+					if ($globalDebug) {
10462
+						echo "Updating airport to ".$airport_icao."...\n";
10463
+					}
10028 10464
 					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10029 10465
 					$sthu = $this->db->prepare($update_query);
10030 10466
 					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
Please login to merge, or discard this patch.