Completed
Push — master ( e47bfe...1fed4c )
by Yannick
05:31
created
require/class.Spotter.php 4 patches
Doc Comments   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 	/**
16 16
 	* Get SQL query part for filter used
17 17
 	* @param Array $filter the filter
18
-	* @return Array the SQL part
18
+	* @return string the SQL part
19 19
 	*/
20 20
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
@@ -2198,7 +2198,7 @@  discard block
 block discarded – undo
2198 2198
 	/**
2199 2199
 	* Gets the aircraft info based on the aircraft registration
2200 2200
 	*
2201
-	* @param String $aircraft_registration the aircraft registration
2201
+	* @param String $registration the aircraft registration
2202 2202
 	* @return String aircraft type
2203 2203
 	*
2204 2204
 	*/
@@ -8663,6 +8663,7 @@  discard block
 block discarded – undo
8663 8663
 	/**
8664 8664
 	* Counts all hours
8665 8665
 	*
8666
+	* @param string $orderby
8666 8667
 	* @return Array the hour list
8667 8668
 	*
8668 8669
 	*/
@@ -8728,6 +8729,7 @@  discard block
 block discarded – undo
8728 8729
 	/**
8729 8730
 	* Counts all hours
8730 8731
 	*
8732
+	* @param string $orderby
8731 8733
 	* @return Array the hour list
8732 8734
 	*
8733 8735
 	*/
@@ -9540,7 +9542,7 @@  discard block
 block discarded – undo
9540 9542
 	/**
9541 9543
 	* Parses the direction degrees to working
9542 9544
 	*
9543
-	* @param Float $direction the direction in degrees
9545
+	* @param integer $direction the direction in degrees
9544 9546
 	* @return Array the direction information
9545 9547
 	*
9546 9548
 	*/
Please login to merge, or discard this patch.
Indentation   +1292 added lines, -1292 removed lines patch added patch discarded remove patch
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	/**
16
-	* Get SQL query part for filter used
17
-	* @param Array $filter the filter
18
-	* @return Array the SQL part
19
-	*/
16
+	 * Get SQL query part for filter used
17
+	 * @param Array $filter the filter
18
+	 * @return Array the SQL part
19
+	 */
20 20
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
22 22
 		$filters = array();
@@ -84,14 +84,14 @@  discard block
 block discarded – undo
84 84
 	}
85 85
 
86 86
 	/**
87
-	* Executes the SQL statements to get the spotter information
88
-	*
89
-	* @param String $query the SQL query
90
-	* @param Array $params parameter of the query
91
-	* @param String $limitQuery the limit query
92
-	* @return Array the spotter information
93
-	*
94
-	*/
87
+	 * Executes the SQL statements to get the spotter information
88
+	 *
89
+	 * @param String $query the SQL query
90
+	 * @param Array $params parameter of the query
91
+	 * @param String $limitQuery the limit query
92
+	 * @return Array the spotter information
93
+	 *
94
+	 */
95 95
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
96 96
 	{
97 97
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
@@ -255,11 +255,11 @@  discard block
 block discarded – undo
255 255
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
256 256
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
257 257
 					} else $temp_array['aircraft_shadow'] = 'default.png';
258
-                                } else {
259
-                            		$temp_array['aircraft_shadow'] = 'default.png';
258
+								} else {
259
+									$temp_array['aircraft_shadow'] = 'default.png';
260 260
 					$temp_array['aircraft_name'] = 'N/A';
261 261
 					$temp_array['aircraft_manufacturer'] = 'N/A';
262
-                            	}
262
+								}
263 263
 			}
264 264
 			$fromsource = NULL;
265 265
 			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
@@ -455,11 +455,11 @@  discard block
 block discarded – undo
455 455
 	
456 456
 	
457 457
 	/**
458
-	* Gets all the spotter information
459
-	*
460
-	* @return Array the spotter information
461
-	*
462
-	*/
458
+	 * Gets all the spotter information
459
+	 *
460
+	 * @return Array the spotter information
461
+	 *
462
+	 */
463 463
 	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())
464 464
 	{
465 465
 		global $globalTimezone, $globalDBdriver;
@@ -806,11 +806,11 @@  discard block
 block discarded – undo
806 806
 	
807 807
 	
808 808
 	/**
809
-	* Gets all the spotter information based on the latest data entry
810
-	*
811
-	* @return Array the spotter information
812
-	*
813
-	*/
809
+	 * Gets all the spotter information based on the latest data entry
810
+	 *
811
+	 * @return Array the spotter information
812
+	 *
813
+	 */
814 814
 	public function getLatestSpotterData($limit = '', $sort = '', $filter = array())
815 815
 	{
816 816
 		global $global_query;
@@ -849,12 +849,12 @@  discard block
 block discarded – undo
849 849
 	}
850 850
     
851 851
     
852
-    /**
853
-	* Gets all the spotter information based on a user's latitude and longitude
854
-	*
855
-	* @return Array the spotter information
856
-	*
857
-	*/
852
+	/**
853
+	 * Gets all the spotter information based on a user's latitude and longitude
854
+	 *
855
+	 * @return Array the spotter information
856
+	 *
857
+	 */
858 858
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
859 859
 	{
860 860
 		date_default_timezone_set('UTC');
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 				return false;
883 883
 			}
884 884
 		}
885
-    		$additional_query = '';
885
+			$additional_query = '';
886 886
 		if ($interval != "")
887 887
 		{
888 888
 			if (!is_string($interval))
@@ -922,12 +922,12 @@  discard block
 block discarded – undo
922 922
 	}
923 923
     
924 924
     
925
-    /**
926
-	* Gets all the spotter information sorted by the newest aircraft type
927
-	*
928
-	* @return Array the spotter information
929
-	*
930
-	*/
925
+	/**
926
+	 * Gets all the spotter information sorted by the newest aircraft type
927
+	 *
928
+	 * @return Array the spotter information
929
+	 *
930
+	 */
931 931
 	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
932 932
 	{
933 933
 		global $global_query;
@@ -968,11 +968,11 @@  discard block
 block discarded – undo
968 968
     
969 969
     
970 970
 	/**
971
-	* Gets all the spotter information sorted by the newest aircraft registration
972
-	*
973
-	* @return Array the spotter information
974
-	*
975
-	*/
971
+	 * Gets all the spotter information sorted by the newest aircraft registration
972
+	 *
973
+	 * @return Array the spotter information
974
+	 *
975
+	 */
976 976
 	public function getNewestSpotterDataSortedByAircraftRegistration($limit = '', $sort = '', $filter = array())
977 977
 	{
978 978
 		global $global_query;
@@ -1012,11 +1012,11 @@  discard block
 block discarded – undo
1012 1012
 
1013 1013
 
1014 1014
 	/**
1015
-	* Gets all the spotter information sorted by the newest airline
1016
-	*
1017
-	* @return Array the spotter information
1018
-	*
1019
-	*/
1015
+	 * Gets all the spotter information sorted by the newest airline
1016
+	 *
1017
+	 * @return Array the spotter information
1018
+	 *
1019
+	 */
1020 1020
 	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
1021 1021
 	{
1022 1022
 		global $global_query;
@@ -1055,12 +1055,12 @@  discard block
 block discarded – undo
1055 1055
 	}
1056 1056
     
1057 1057
     
1058
-    /**
1059
-	* Gets all the spotter information sorted by the newest departure airport
1060
-	*
1061
-	* @return Array the spotter information
1062
-	*
1063
-	*/
1058
+	/**
1059
+	 * Gets all the spotter information sorted by the newest departure airport
1060
+	 *
1061
+	 * @return Array the spotter information
1062
+	 *
1063
+	 */
1064 1064
 	public function getNewestSpotterDataSortedByDepartureAirport($limit = '', $sort = '', $filter = array())
1065 1065
 	{
1066 1066
 		global $global_query;
@@ -1102,11 +1102,11 @@  discard block
 block discarded – undo
1102 1102
 
1103 1103
 
1104 1104
 	/**
1105
-	* Gets all the spotter information sorted by the newest arrival airport
1106
-	*
1107
-	* @return Array the spotter information
1108
-	*
1109
-	*/
1105
+	 * Gets all the spotter information sorted by the newest arrival airport
1106
+	 *
1107
+	 * @return Array the spotter information
1108
+	 *
1109
+	 */
1110 1110
 	public function getNewestSpotterDataSortedByArrivalAirport($limit = '', $sort = '', $filter = array())
1111 1111
 	{
1112 1112
 		global $global_query;
@@ -1145,11 +1145,11 @@  discard block
 block discarded – undo
1145 1145
 	
1146 1146
 
1147 1147
 	/**
1148
-	* Gets all the spotter information based on the spotter id
1149
-	*
1150
-	* @return Array the spotter information
1151
-	*
1152
-	*/
1148
+	 * Gets all the spotter information based on the spotter id
1149
+	 *
1150
+	 * @return Array the spotter information
1151
+	 *
1152
+	 */
1153 1153
 	public function getSpotterDataByID($id = '')
1154 1154
 	{
1155 1155
 		global $global_query;
@@ -1171,11 +1171,11 @@  discard block
 block discarded – undo
1171 1171
 	
1172 1172
 	
1173 1173
 	/**
1174
-	* Gets all the spotter information based on the callsign
1175
-	*
1176
-	* @return Array the spotter information
1177
-	*
1178
-	*/
1174
+	 * Gets all the spotter information based on the callsign
1175
+	 *
1176
+	 * @return Array the spotter information
1177
+	 *
1178
+	 */
1179 1179
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
1180 1180
 	{
1181 1181
 		global $global_query;
@@ -1228,11 +1228,11 @@  discard block
 block discarded – undo
1228 1228
 	
1229 1229
 	
1230 1230
 	/**
1231
-	* Gets all the spotter information based on the aircraft type
1232
-	*
1233
-	* @return Array the spotter information
1234
-	*
1235
-	*/
1231
+	 * Gets all the spotter information based on the aircraft type
1232
+	 *
1233
+	 * @return Array the spotter information
1234
+	 *
1235
+	 */
1236 1236
 	public function getSpotterDataByAircraft($aircraft_type = '', $limit = '', $sort = '', $filter = array())
1237 1237
 	{
1238 1238
 		global $global_query;
@@ -1286,11 +1286,11 @@  discard block
 block discarded – undo
1286 1286
 	
1287 1287
 	
1288 1288
 	/**
1289
-	* Gets all the spotter information based on the aircraft registration
1290
-	*
1291
-	* @return Array the spotter information
1292
-	*
1293
-	*/
1289
+	 * Gets all the spotter information based on the aircraft registration
1290
+	 *
1291
+	 * @return Array the spotter information
1292
+	 *
1293
+	 */
1294 1294
 	public function getSpotterDataByRegistration($registration = '', $limit = '', $sort = '', $filter = array())
1295 1295
 	{
1296 1296
 		global $global_query;
@@ -1347,11 +1347,11 @@  discard block
 block discarded – undo
1347 1347
 	
1348 1348
 	
1349 1349
 	/**
1350
-	* Gets all the spotter information based on the airline
1351
-	*
1352
-	* @return Array the spotter information
1353
-	*
1354
-	*/
1350
+	 * Gets all the spotter information based on the airline
1351
+	 *
1352
+	 * @return Array the spotter information
1353
+	 *
1354
+	 */
1355 1355
 	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
1356 1356
 	{
1357 1357
 		global $global_query;
@@ -1404,11 +1404,11 @@  discard block
 block discarded – undo
1404 1404
 	
1405 1405
 	
1406 1406
 	/**
1407
-	* Gets all the spotter information based on the airport
1408
-	*
1409
-	* @return Array the spotter information
1410
-	*
1411
-	*/
1407
+	 * Gets all the spotter information based on the airport
1408
+	 *
1409
+	 * @return Array the spotter information
1410
+	 *
1411
+	 */
1412 1412
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1413 1413
 	{
1414 1414
 		global $global_query;
@@ -1462,11 +1462,11 @@  discard block
 block discarded – undo
1462 1462
 
1463 1463
 
1464 1464
 	/**
1465
-	* Gets all the spotter information based on the date
1466
-	*
1467
-	* @return Array the spotter information
1468
-	*
1469
-	*/
1465
+	 * Gets all the spotter information based on the date
1466
+	 *
1467
+	 * @return Array the spotter information
1468
+	 *
1469
+	 */
1470 1470
 	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
1471 1471
 	{
1472 1472
 		global $global_query, $globalTimezone, $globalDBdriver;
@@ -1527,11 +1527,11 @@  discard block
 block discarded – undo
1527 1527
 
1528 1528
 
1529 1529
 	/**
1530
-	* Gets all the spotter information based on the country name
1531
-	*
1532
-	* @return Array the spotter information
1533
-	*
1534
-	*/
1530
+	 * Gets all the spotter information based on the country name
1531
+	 *
1532
+	 * @return Array the spotter information
1533
+	 *
1534
+	 */
1535 1535
 	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
1536 1536
 	{
1537 1537
 		global $global_query;
@@ -1585,11 +1585,11 @@  discard block
 block discarded – undo
1585 1585
 	
1586 1586
 	
1587 1587
 	/**
1588
-	* Gets all the spotter information based on the manufacturer name
1589
-	*
1590
-	* @return Array the spotter information
1591
-	*
1592
-	*/
1588
+	 * Gets all the spotter information based on the manufacturer name
1589
+	 *
1590
+	 * @return Array the spotter information
1591
+	 *
1592
+	 */
1593 1593
 	public function getSpotterDataByManufacturer($aircraft_manufacturer = '', $limit = '', $sort = '', $filters = array())
1594 1594
 	{
1595 1595
 		global $global_query;
@@ -1645,13 +1645,13 @@  discard block
 block discarded – undo
1645 1645
   
1646 1646
   
1647 1647
 	/**
1648
-	* Gets a list of all aircraft that take a route
1649
-	*
1650
-	* @param String $departure_airport_icao ICAO code of departure airport
1651
-	* @param String $arrival_airport_icao ICAO code of arrival airport
1652
-	* @return Array the spotter information
1653
-	*
1654
-	*/
1648
+	 * Gets a list of all aircraft that take a route
1649
+	 *
1650
+	 * @param String $departure_airport_icao ICAO code of departure airport
1651
+	 * @param String $arrival_airport_icao ICAO code of arrival airport
1652
+	 * @return Array the spotter information
1653
+	 *
1654
+	 */
1655 1655
 	public function getSpotterDataByRoute($departure_airport_icao = '', $arrival_airport_icao = '', $limit = '', $sort = '', $filters = array())
1656 1656
 	{
1657 1657
 		global $global_query;
@@ -1720,11 +1720,11 @@  discard block
 block discarded – undo
1720 1720
 	
1721 1721
 	
1722 1722
 	/**
1723
-	* Gets all the spotter information based on the special column in the table
1724
-	*
1725
-	* @return Array the spotter information
1726
-	*
1727
-	*/
1723
+	 * Gets all the spotter information based on the special column in the table
1724
+	 *
1725
+	 * @return Array the spotter information
1726
+	 *
1727
+	 */
1728 1728
 	public function getSpotterDataByHighlight($limit = '', $sort = '', $filter = array())
1729 1729
 	{
1730 1730
 		global $global_query;
@@ -1763,11 +1763,11 @@  discard block
 block discarded – undo
1763 1763
 	}
1764 1764
 
1765 1765
 	/**
1766
-	* Gets all the highlight based on a aircraft registration
1767
-	*
1768
-	* @return String the highlight text
1769
-	*
1770
-	*/
1766
+	 * Gets all the highlight based on a aircraft registration
1767
+	 *
1768
+	 * @return String the highlight text
1769
+	 *
1770
+	 */
1771 1771
 	public function getHighlightByRegistration($registration,$filter = array())
1772 1772
 	{
1773 1773
 		global $global_query;
@@ -1789,13 +1789,13 @@  discard block
 block discarded – undo
1789 1789
 
1790 1790
 	
1791 1791
 	/**
1792
-	* Gets the squawk usage from squawk code
1793
-	*
1794
-	* @param String $squawk squawk code
1795
-	* @param String $country country
1796
-	* @return String usage
1797
-	*
1798
-	*/
1792
+	 * Gets the squawk usage from squawk code
1793
+	 *
1794
+	 * @param String $squawk squawk code
1795
+	 * @param String $country country
1796
+	 * @return String usage
1797
+	 *
1798
+	 */
1799 1799
 	public function getSquawkUsage($squawk = '',$country = 'FR')
1800 1800
 	{
1801 1801
 		
@@ -1816,12 +1816,12 @@  discard block
 block discarded – undo
1816 1816
 	}
1817 1817
 
1818 1818
 	/**
1819
-	* Gets the airport icao from the iata
1820
-	*
1821
-	* @param String $airport_iata the iata code of the airport
1822
-	* @return String airport iata
1823
-	*
1824
-	*/
1819
+	 * Gets the airport icao from the iata
1820
+	 *
1821
+	 * @param String $airport_iata the iata code of the airport
1822
+	 * @return String airport iata
1823
+	 *
1824
+	 */
1825 1825
 	public function getAirportIcao($airport_iata = '')
1826 1826
 	{
1827 1827
 		
@@ -1841,14 +1841,14 @@  discard block
 block discarded – undo
1841 1841
 	}
1842 1842
 
1843 1843
 	/**
1844
-	* Gets the airport distance
1845
-	*
1846
-	* @param String $airport_icao the icao code of the airport
1847
-	* @param Float $latitude the latitude
1848
-	* @param Float $longitude the longitude
1849
-	* @return Float distance to the airport
1850
-	*
1851
-	*/
1844
+	 * Gets the airport distance
1845
+	 *
1846
+	 * @param String $airport_icao the icao code of the airport
1847
+	 * @param Float $latitude the latitude
1848
+	 * @param Float $longitude the longitude
1849
+	 * @return Float distance to the airport
1850
+	 *
1851
+	 */
1852 1852
 	public function getAirportDistance($airport_icao,$latitude,$longitude)
1853 1853
 	{
1854 1854
 		
@@ -1869,12 +1869,12 @@  discard block
 block discarded – undo
1869 1869
 	}
1870 1870
 	
1871 1871
 	/**
1872
-	* Gets the airport info based on the icao
1873
-	*
1874
-	* @param String $airport the icao code of the airport
1875
-	* @return Array airport information
1876
-	*
1877
-	*/
1872
+	 * Gets the airport info based on the icao
1873
+	 *
1874
+	 * @param String $airport the icao code of the airport
1875
+	 * @return Array airport information
1876
+	 *
1877
+	 */
1878 1878
 	public function getAllAirportInfo($airport = '')
1879 1879
 	{
1880 1880
 		
@@ -1920,12 +1920,12 @@  discard block
 block discarded – undo
1920 1920
 	}
1921 1921
 	
1922 1922
 	/**
1923
-	* Gets the airport info based on the country
1924
-	*
1925
-	* @param Array $countries Airports countries
1926
-	* @return Array airport information
1927
-	*
1928
-	*/
1923
+	 * Gets the airport info based on the country
1924
+	 *
1925
+	 * @param Array $countries Airports countries
1926
+	 * @return Array airport information
1927
+	 *
1928
+	 */
1929 1929
 	public function getAllAirportInfobyCountry($countries)
1930 1930
 	{
1931 1931
 		$lst_countries = '';
@@ -1963,12 +1963,12 @@  discard block
 block discarded – undo
1963 1963
 	}
1964 1964
 	
1965 1965
 	/**
1966
-	* Gets airports info based on the coord
1967
-	*
1968
-	* @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
1969
-	* @return Array airport information
1970
-	*
1971
-	*/
1966
+	 * Gets airports info based on the coord
1967
+	 *
1968
+	 * @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
1969
+	 * @return Array airport information
1970
+	 *
1971
+	 */
1972 1972
 	public function getAllAirportInfobyCoord($coord)
1973 1973
 	{
1974 1974
 		global $globalDBdriver;
@@ -1999,12 +1999,12 @@  discard block
 block discarded – undo
1999 1999
 	}
2000 2000
 
2001 2001
 	/**
2002
-	* Gets waypoints info based on the coord
2003
-	*
2004
-	* @param Array $coord waypoints coord
2005
-	* @return Array airport information
2006
-	*
2007
-	*/
2002
+	 * Gets waypoints info based on the coord
2003
+	 *
2004
+	 * @param Array $coord waypoints coord
2005
+	 * @return Array airport information
2006
+	 *
2007
+	 */
2008 2008
 	public function getAllWaypointsInfobyCoord($coord)
2009 2009
 	{
2010 2010
 		if (is_array($coord)) {
@@ -2038,12 +2038,12 @@  discard block
 block discarded – undo
2038 2038
 	
2039 2039
 	
2040 2040
 	/**
2041
-	* Gets the airline info based on the icao code or iata code
2042
-	*
2043
-	* @param String $airline_icao the iata code of the airport
2044
-	* @return Array airport information
2045
-	*
2046
-	*/
2041
+	 * Gets the airline info based on the icao code or iata code
2042
+	 *
2043
+	 * @param String $airline_icao the iata code of the airport
2044
+	 * @return Array airport information
2045
+	 *
2046
+	 */
2047 2047
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
2048 2048
 	{
2049 2049
 		global $globalUseRealAirlines;
@@ -2074,7 +2074,7 @@  discard block
 block discarded – undo
2074 2074
 			} else {
2075 2075
 				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
2076 2076
 			}
2077
-                        /*
2077
+						/*
2078 2078
 			$airline_array = array();
2079 2079
 			$temp_array = array();
2080 2080
 		
@@ -2106,12 +2106,12 @@  discard block
 block discarded – undo
2106 2106
 	
2107 2107
 	
2108 2108
 	/**
2109
-	* Gets the aircraft info based on the aircraft type
2110
-	*
2111
-	* @param String $aircraft_type the aircraft type
2112
-	* @return Array aircraft information
2113
-	*
2114
-	*/
2109
+	 * Gets the aircraft info based on the aircraft type
2110
+	 *
2111
+	 * @param String $aircraft_type the aircraft type
2112
+	 * @return Array aircraft information
2113
+	 *
2114
+	 */
2115 2115
 	public function getAllAircraftInfo($aircraft_type)
2116 2116
 	{
2117 2117
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2143,12 +2143,12 @@  discard block
 block discarded – undo
2143 2143
 	}
2144 2144
 
2145 2145
 	/**
2146
-	* Gets the aircraft icao based on the aircraft name/type
2147
-	*
2148
-	* @param String $aircraft_type the aircraft type
2149
-	* @return String aircraft information
2150
-	*
2151
-	*/
2146
+	 * Gets the aircraft icao based on the aircraft name/type
2147
+	 *
2148
+	 * @param String $aircraft_type the aircraft type
2149
+	 * @return String aircraft information
2150
+	 *
2151
+	 */
2152 2152
 	public function getAircraftIcao($aircraft_type)
2153 2153
 	{
2154 2154
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2173,12 +2173,12 @@  discard block
 block discarded – undo
2173 2173
 	}
2174 2174
 	
2175 2175
 	/**
2176
-	* Gets the aircraft info based on the aircraft modes
2177
-	*
2178
-	* @param String $aircraft_modes the aircraft ident (hex)
2179
-	* @return String aircraft type
2180
-	*
2181
-	*/
2176
+	 * Gets the aircraft info based on the aircraft modes
2177
+	 *
2178
+	 * @param String $aircraft_modes the aircraft ident (hex)
2179
+	 * @return String aircraft type
2180
+	 *
2181
+	 */
2182 2182
 	public function getAllAircraftType($aircraft_modes)
2183 2183
 	{
2184 2184
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -2196,12 +2196,12 @@  discard block
 block discarded – undo
2196 2196
 	}
2197 2197
 
2198 2198
 	/**
2199
-	* Gets the aircraft info based on the aircraft registration
2200
-	*
2201
-	* @param String $aircraft_registration the aircraft registration
2202
-	* @return String aircraft type
2203
-	*
2204
-	*/
2199
+	 * Gets the aircraft info based on the aircraft registration
2200
+	 *
2201
+	 * @param String $aircraft_registration the aircraft registration
2202
+	 * @return String aircraft type
2203
+	 *
2204
+	 */
2205 2205
 	public function getAllAircraftTypeByRegistration($registration)
2206 2206
 	{
2207 2207
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2219,12 +2219,12 @@  discard block
 block discarded – undo
2219 2219
 	}
2220 2220
 
2221 2221
 	/**
2222
-	* Gets correct aircraft operator corde
2223
-	*
2224
-	* @param String $operator the aircraft operator code (callsign)
2225
-	* @return String aircraft operator code
2226
-	*
2227
-	*/
2222
+	 * Gets correct aircraft operator corde
2223
+	 *
2224
+	 * @param String $operator the aircraft operator code (callsign)
2225
+	 * @return String aircraft operator code
2226
+	 *
2227
+	 */
2228 2228
 	public function getOperator($operator)
2229 2229
 	{
2230 2230
 		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
@@ -2241,16 +2241,16 @@  discard block
 block discarded – undo
2241 2241
 	}
2242 2242
 
2243 2243
 	/**
2244
-	* Gets the aircraft route based on the aircraft callsign
2245
-	*
2246
-	* @param String $callsign the aircraft callsign
2247
-	* @return Array aircraft type
2248
-	*
2249
-	*/
2244
+	 * Gets the aircraft route based on the aircraft callsign
2245
+	 *
2246
+	 * @param String $callsign the aircraft callsign
2247
+	 * @return Array aircraft type
2248
+	 *
2249
+	 */
2250 2250
 	public function getRouteInfo($callsign)
2251 2251
 	{
2252 2252
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2253
-                if ($callsign == '') return array();
2253
+				if ($callsign == '') return array();
2254 2254
 		$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";
2255 2255
 		
2256 2256
 		$sth = $this->db->prepare($query);
@@ -2264,12 +2264,12 @@  discard block
 block discarded – undo
2264 2264
 	}
2265 2265
 	
2266 2266
 	/**
2267
-	* Gets the aircraft info based on the aircraft registration
2268
-	*
2269
-	* @param String $registration the aircraft registration
2270
-	* @return Array aircraft information
2271
-	*
2272
-	*/
2267
+	 * Gets the aircraft info based on the aircraft registration
2268
+	 *
2269
+	 * @param String $registration the aircraft registration
2270
+	 * @return Array aircraft information
2271
+	 *
2272
+	 */
2273 2273
 	public function getAircraftInfoByRegistration($registration)
2274 2274
 	{
2275 2275
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2296,12 +2296,12 @@  discard block
 block discarded – undo
2296 2296
 	}
2297 2297
 	
2298 2298
 	/**
2299
-	* Gets the aircraft owner & base based on the aircraft registration
2300
-	*
2301
-	* @param String $registration the aircraft registration
2302
-	* @return Array aircraft information
2303
-	*
2304
-	*/
2299
+	 * Gets the aircraft owner & base based on the aircraft registration
2300
+	 *
2301
+	 * @param String $registration the aircraft registration
2302
+	 * @return Array aircraft information
2303
+	 *
2304
+	 */
2305 2305
 	public function getAircraftOwnerByRegistration($registration)
2306 2306
 	{
2307 2307
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2318,11 +2318,11 @@  discard block
 block discarded – undo
2318 2318
 	
2319 2319
   
2320 2320
   /**
2321
-	* Gets all flights (but with only little info)
2322
-	*
2323
-	* @return Array basic flight information
2324
-	*
2325
-	*/
2321
+   * Gets all flights (but with only little info)
2322
+   *
2323
+   * @return Array basic flight information
2324
+   *
2325
+   */
2326 2326
 	public function getAllFlightsforSitemap()
2327 2327
 	{
2328 2328
 		//$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 ";
@@ -2330,7 +2330,7 @@  discard block
 block discarded – undo
2330 2330
 		
2331 2331
 		$sth = $this->db->prepare($query);
2332 2332
 		$sth->execute();
2333
-                  /*
2333
+				  /*
2334 2334
 		$flight_array = array();
2335 2335
 		$temp_array = array();
2336 2336
 		
@@ -2352,11 +2352,11 @@  discard block
 block discarded – undo
2352 2352
 	}
2353 2353
   
2354 2354
 	/**
2355
-	* Gets a list of all aircraft manufacturers
2356
-	*
2357
-	* @return Array list of aircraft types
2358
-	*
2359
-	*/
2355
+	 * Gets a list of all aircraft manufacturers
2356
+	 *
2357
+	 * @return Array list of aircraft types
2358
+	 *
2359
+	 */
2360 2360
 	public function getAllManufacturers()
2361 2361
 	{
2362 2362
 		/*
@@ -2385,11 +2385,11 @@  discard block
 block discarded – undo
2385 2385
   
2386 2386
   
2387 2387
   /**
2388
-	* Gets a list of all aircraft types
2389
-	*
2390
-	* @return Array list of aircraft types
2391
-	*
2392
-	*/
2388
+   * Gets a list of all aircraft types
2389
+   *
2390
+   * @return Array list of aircraft types
2391
+   *
2392
+   */
2393 2393
 	public function getAllAircraftTypes($filters = array())
2394 2394
 	{
2395 2395
 		/*
@@ -2422,11 +2422,11 @@  discard block
 block discarded – undo
2422 2422
 	
2423 2423
 	
2424 2424
 	/**
2425
-	* Gets a list of all aircraft registrations
2426
-	*
2427
-	* @return Array list of aircraft registrations
2428
-	*
2429
-	*/
2425
+	 * Gets a list of all aircraft registrations
2426
+	 *
2427
+	 * @return Array list of aircraft registrations
2428
+	 *
2429
+	 */
2430 2430
 	public function getAllAircraftRegistrations($filters = array())
2431 2431
 	{
2432 2432
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2451,12 +2451,12 @@  discard block
 block discarded – undo
2451 2451
 	}
2452 2452
 
2453 2453
 	/**
2454
-	* Gets all source name
2455
-	*
2456
-	* @param String type format of source
2457
-	* @return Array list of source name
2458
-	*
2459
-	*/
2454
+	 * Gets all source name
2455
+	 *
2456
+	 * @param String type format of source
2457
+	 * @return Array list of source name
2458
+	 *
2459
+	 */
2460 2460
 	public function getAllSourceName($type = '',$filters = array())
2461 2461
 	{
2462 2462
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2487,11 +2487,11 @@  discard block
 block discarded – undo
2487 2487
 
2488 2488
 
2489 2489
 	/**
2490
-	* Gets a list of all airline names
2491
-	*
2492
-	* @return Array list of airline names
2493
-	*
2494
-	*/
2490
+	 * Gets a list of all airline names
2491
+	 *
2492
+	 * @return Array list of airline names
2493
+	 *
2494
+	 */
2495 2495
 	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
2496 2496
 	{
2497 2497
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2541,11 +2541,11 @@  discard block
 block discarded – undo
2541 2541
 	
2542 2542
 	
2543 2543
 	/**
2544
-	* Gets a list of all airline countries
2545
-	*
2546
-	* @return Array list of airline countries
2547
-	*
2548
-	*/
2544
+	 * Gets a list of all airline countries
2545
+	 *
2546
+	 * @return Array list of airline countries
2547
+	 *
2548
+	 */
2549 2549
 	public function getAllAirlineCountries($filters = array())
2550 2550
 	{
2551 2551
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2573,11 +2573,11 @@  discard block
 block discarded – undo
2573 2573
 	
2574 2574
 	
2575 2575
 	/**
2576
-	* Gets a list of all departure & arrival names
2577
-	*
2578
-	* @return Array list of airport names
2579
-	*
2580
-	*/
2576
+	 * Gets a list of all departure & arrival names
2577
+	 *
2578
+	 * @return Array list of airport names
2579
+	 *
2580
+	 */
2581 2581
 	public function getAllAirportNames($filters = array())
2582 2582
 	{
2583 2583
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2626,11 +2626,11 @@  discard block
 block discarded – undo
2626 2626
 	
2627 2627
 	
2628 2628
 	/**
2629
-	* Gets a list of all departure & arrival airport countries
2630
-	*
2631
-	* @return Array list of airport countries
2632
-	*
2633
-	*/
2629
+	 * Gets a list of all departure & arrival airport countries
2630
+	 *
2631
+	 * @return Array list of airport countries
2632
+	 *
2633
+	 */
2634 2634
 	public function getAllAirportCountries($filters = array())
2635 2635
 	{
2636 2636
 		$airport_array = array();
@@ -2678,11 +2678,11 @@  discard block
 block discarded – undo
2678 2678
 	
2679 2679
 	
2680 2680
 	/**
2681
-	* Gets a list of all countries (airline, departure airport & arrival airport)
2682
-	*
2683
-	* @return Array list of countries
2684
-	*
2685
-	*/
2681
+	 * Gets a list of all countries (airline, departure airport & arrival airport)
2682
+	 *
2683
+	 * @return Array list of countries
2684
+	 *
2685
+	 */
2686 2686
 	public function getAllCountries($filters = array())
2687 2687
 	{
2688 2688
 		$Connection= new Connection($this->db);
@@ -2759,11 +2759,11 @@  discard block
 block discarded – undo
2759 2759
 	
2760 2760
 	
2761 2761
 	/**
2762
-	* Gets a list of all idents/callsigns
2763
-	*
2764
-	* @return Array list of ident/callsign names
2765
-	*
2766
-	*/
2762
+	 * Gets a list of all idents/callsigns
2763
+	 *
2764
+	 * @return Array list of ident/callsign names
2765
+	 *
2766
+	 */
2767 2767
 	public function getAllIdents($filters = array())
2768 2768
 	{
2769 2769
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2787,9 +2787,9 @@  discard block
 block discarded – undo
2787 2787
 	}
2788 2788
 
2789 2789
 	/**
2790
-	* Get a list of flights from airport since 7 days
2791
-	* @return Array number, icao, name and city of airports
2792
-	*/
2790
+	 * Get a list of flights from airport since 7 days
2791
+	 * @return Array number, icao, name and city of airports
2792
+	 */
2793 2793
 
2794 2794
 	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
2795 2795
 		global $globalTimezone, $globalDBdriver;
@@ -2820,9 +2820,9 @@  discard block
 block discarded – undo
2820 2820
 	}
2821 2821
 
2822 2822
 	/**
2823
-	* Get a list of flights from airport since 7 days
2824
-	* @return Array number, icao, name and city of airports
2825
-	*/
2823
+	 * Get a list of flights from airport since 7 days
2824
+	 * @return Array number, icao, name and city of airports
2825
+	 */
2826 2826
 
2827 2827
 	public function getLast7DaysAirportsDepartureByAirlines($airport_icao = '') {
2828 2828
 		global $globalTimezone, $globalDBdriver;
@@ -2852,9 +2852,9 @@  discard block
 block discarded – undo
2852 2852
 	}
2853 2853
 
2854 2854
 	/**
2855
-	* Get a list of flights from detected airport since 7 days
2856
-	* @return Array number, icao, name and city of airports
2857
-	*/
2855
+	 * Get a list of flights from detected airport since 7 days
2856
+	 * @return Array number, icao, name and city of airports
2857
+	 */
2858 2858
 
2859 2859
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
2860 2860
 		global $globalTimezone, $globalDBdriver;
@@ -2892,9 +2892,9 @@  discard block
 block discarded – undo
2892 2892
 	}
2893 2893
 
2894 2894
 	/**
2895
-	* Get a list of flights from detected airport since 7 days
2896
-	* @return Array number, icao, name and city of airports
2897
-	*/
2895
+	 * Get a list of flights from detected airport since 7 days
2896
+	 * @return Array number, icao, name and city of airports
2897
+	 */
2898 2898
 
2899 2899
 	public function getLast7DaysDetectedAirportsDepartureByAirlines($airport_icao = '') {
2900 2900
 		global $globalTimezone, $globalDBdriver;
@@ -2936,9 +2936,9 @@  discard block
 block discarded – undo
2936 2936
 
2937 2937
 
2938 2938
 	/**
2939
-	* Get a list of flights to airport since 7 days
2940
-	* @return Array number, icao, name and city of airports
2941
-	*/
2939
+	 * Get a list of flights to airport since 7 days
2940
+	 * @return Array number, icao, name and city of airports
2941
+	 */
2942 2942
 
2943 2943
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
2944 2944
 		global $globalTimezone, $globalDBdriver;
@@ -2971,9 +2971,9 @@  discard block
 block discarded – undo
2971 2971
 
2972 2972
 
2973 2973
 	/**
2974
-	* Get a list of flights detected to airport since 7 days
2975
-	* @return Array number, icao, name and city of airports
2976
-	*/
2974
+	 * Get a list of flights detected to airport since 7 days
2975
+	 * @return Array number, icao, name and city of airports
2976
+	 */
2977 2977
 
2978 2978
 	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
2979 2979
 		global $globalTimezone, $globalDBdriver;
@@ -3014,9 +3014,9 @@  discard block
 block discarded – undo
3014 3014
 
3015 3015
 
3016 3016
 	/**
3017
-	* Get a list of flights to airport since 7 days
3018
-	* @return Array number, icao, name and city of airports
3019
-	*/
3017
+	 * Get a list of flights to airport since 7 days
3018
+	 * @return Array number, icao, name and city of airports
3019
+	 */
3020 3020
 
3021 3021
 	public function getLast7DaysAirportsArrivalByAirlines($airport_icao = '') {
3022 3022
 		global $globalTimezone, $globalDBdriver;
@@ -3048,9 +3048,9 @@  discard block
 block discarded – undo
3048 3048
 
3049 3049
 
3050 3050
 	/**
3051
-	* Get a list of flights detected to airport since 7 days
3052
-	* @return Array number, icao, name and city of airports
3053
-	*/
3051
+	 * Get a list of flights detected to airport since 7 days
3052
+	 * @return Array number, icao, name and city of airports
3053
+	 */
3054 3054
 
3055 3055
 	public function getLast7DaysDetectedAirportsArrivalByAirlines($airport_icao = '') {
3056 3056
 		global $globalTimezone, $globalDBdriver;
@@ -3094,11 +3094,11 @@  discard block
 block discarded – undo
3094 3094
 
3095 3095
 
3096 3096
 	/**
3097
-	* Gets a list of all dates
3098
-	*
3099
-	* @return Array list of date names
3100
-	*
3101
-	*/
3097
+	 * Gets a list of all dates
3098
+	 *
3099
+	 * @return Array list of date names
3100
+	 *
3101
+	 */
3102 3102
 	public function getAllDates()
3103 3103
 	{
3104 3104
 		global $globalTimezone, $globalDBdriver;
@@ -3139,11 +3139,11 @@  discard block
 block discarded – undo
3139 3139
 	
3140 3140
 	
3141 3141
 	/**
3142
-	* Gets all route combinations
3143
-	*
3144
-	* @return Array the route list
3145
-	*
3146
-	*/
3142
+	 * Gets all route combinations
3143
+	 *
3144
+	 * @return Array the route list
3145
+	 *
3146
+	 */
3147 3147
 	public function getAllRoutes()
3148 3148
 	{
3149 3149
 		$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 
@@ -3169,13 +3169,13 @@  discard block
 block discarded – undo
3169 3169
 	}
3170 3170
 
3171 3171
 	/**
3172
-	* Update ident spotter data
3173
-	*
3174
-	* @param String $flightaware_id the ID from flightaware
3175
-	* @param String $ident the flight ident
3176
-	* @return String success or false
3177
-	*
3178
-	*/	
3172
+	 * Update ident spotter data
3173
+	 *
3174
+	 * @param String $flightaware_id the ID from flightaware
3175
+	 * @param String $ident the flight ident
3176
+	 * @return String success or false
3177
+	 *
3178
+	 */	
3179 3179
 	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
3180 3180
 	{
3181 3181
 		if (!is_numeric(substr($ident, 0, 3)))
@@ -3196,14 +3196,14 @@  discard block
 block discarded – undo
3196 3196
 		} else {
3197 3197
 			$airline_array = $this->getAllAirlineInfo("NA");
3198 3198
 		}
3199
-                $airline_name = $airline_array[0]['name'];
3200
-                $airline_icao = $airline_array[0]['icao'];
3201
-                $airline_country = $airline_array[0]['country'];
3202
-                $airline_type = $airline_array[0]['type'];
3199
+				$airline_name = $airline_array[0]['name'];
3200
+				$airline_icao = $airline_array[0]['icao'];
3201
+				$airline_country = $airline_array[0]['country'];
3202
+				$airline_type = $airline_array[0]['type'];
3203 3203
 
3204 3204
 
3205 3205
 		$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';
3206
-                $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);
3206
+				$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);
3207 3207
 
3208 3208
 		try {
3209 3209
 			$sth = $this->db->prepare($query);
@@ -3216,19 +3216,19 @@  discard block
 block discarded – undo
3216 3216
 
3217 3217
 	}
3218 3218
 	/**
3219
-	* Update latest spotter data
3220
-	*
3221
-	* @param String $flightaware_id the ID from flightaware
3222
-	* @param String $ident the flight ident
3223
-	* @param String $arrival_airport_icao the arrival airport
3224
-	* @return String success or false
3225
-	*
3226
-	*/	
3219
+	 * Update latest spotter data
3220
+	 *
3221
+	 * @param String $flightaware_id the ID from flightaware
3222
+	 * @param String $ident the flight ident
3223
+	 * @param String $arrival_airport_icao the arrival airport
3224
+	 * @return String success or false
3225
+	 *
3226
+	 */	
3227 3227
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3228 3228
 	{
3229 3229
 		if ($groundspeed == '') $groundspeed = NULL;
3230 3230
 		$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';
3231
-                $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);
3231
+				$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);
3232 3232
 
3233 3233
 		try {
3234 3234
 			$sth = $this->db->prepare($query);
@@ -3242,32 +3242,32 @@  discard block
 block discarded – undo
3242 3242
 	}
3243 3243
 
3244 3244
 	/**
3245
-	* Adds a new spotter data
3246
-	*
3247
-	* @param String $flightaware_id the ID from flightaware
3248
-	* @param String $ident the flight ident
3249
-	* @param String $aircraft_icao the aircraft type
3250
-	* @param String $departure_airport_icao the departure airport
3251
-	* @param String $arrival_airport_icao the arrival airport
3252
-	* @param String $latitude latitude of flight
3253
-	* @param String $longitude latitude of flight
3254
-	* @param String $waypoints waypoints of flight
3255
-	* @param String $altitude altitude of flight
3256
-	* @param String $heading heading of flight
3257
-	* @param String $groundspeed speed of flight
3258
-	* @param String $date date of flight
3259
-	* @param String $departure_airport_time departure time of flight
3260
-	* @param String $arrival_airport_time arrival time of flight
3261
-	* @param String $squawk squawk code of flight
3262
-	* @param String $route_stop route stop of flight
3263
-	* @param String $highlight highlight or not
3264
-	* @param String $ModeS ModesS code of flight
3265
-	* @param String $registration registration code of flight
3266
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
3267
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
3268
-	* @param String $verticalrate vertival rate of flight
3269
-	* @return String success or false
3270
-	*/
3245
+	 * Adds a new spotter data
3246
+	 *
3247
+	 * @param String $flightaware_id the ID from flightaware
3248
+	 * @param String $ident the flight ident
3249
+	 * @param String $aircraft_icao the aircraft type
3250
+	 * @param String $departure_airport_icao the departure airport
3251
+	 * @param String $arrival_airport_icao the arrival airport
3252
+	 * @param String $latitude latitude of flight
3253
+	 * @param String $longitude latitude of flight
3254
+	 * @param String $waypoints waypoints of flight
3255
+	 * @param String $altitude altitude of flight
3256
+	 * @param String $heading heading of flight
3257
+	 * @param String $groundspeed speed of flight
3258
+	 * @param String $date date of flight
3259
+	 * @param String $departure_airport_time departure time of flight
3260
+	 * @param String $arrival_airport_time arrival time of flight
3261
+	 * @param String $squawk squawk code of flight
3262
+	 * @param String $route_stop route stop of flight
3263
+	 * @param String $highlight highlight or not
3264
+	 * @param String $ModeS ModesS code of flight
3265
+	 * @param String $registration registration code of flight
3266
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
3267
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
3268
+	 * @param String $verticalrate vertival rate of flight
3269
+	 * @return String success or false
3270
+	 */
3271 3271
 	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 = '')
3272 3272
 	{
3273 3273
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
@@ -3481,8 +3481,8 @@  discard block
 block discarded – undo
3481 3481
     
3482 3482
 		if ($globalIVAO && $aircraft_icao != '')
3483 3483
 		{
3484
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3485
-            		else $airline_icao = '';
3484
+					if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3485
+					else $airline_icao = '';
3486 3486
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3487 3487
 			if (!isset($image_array[0]['registration']))
3488 3488
 			{
@@ -3513,52 +3513,52 @@  discard block
 block discarded – undo
3513 3513
 	
3514 3514
 		if (count($airline_array) == 0) 
3515 3515
 		{
3516
-                        $airline_array = $this->getAllAirlineInfo('NA');
3517
-                }
3518
-                if (count($aircraft_array) == 0) 
3519
-                {
3520
-                        $aircraft_array = $this->getAllAircraftInfo('NA');
3521
-                }
3522
-                if (count($departure_airport_array) == 0) 
3523
-                {
3524
-                        $departure_airport_array = $this->getAllAirportInfo('NA');
3525
-                }
3526
-                if (count($arrival_airport_array) == 0) 
3527
-                {
3528
-                        $arrival_airport_array = $this->getAllAirportInfo('NA');
3529
-                }
3530
-                if ($registration == '') $registration = 'NA';
3531
-                if ($latitude == '' && $longitude == '') {
3532
-            		$latitude = 0;
3533
-            		$longitude = 0;
3534
-            	}
3535
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
3536
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
3537
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3538
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3539
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3540
-                $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) 
3516
+						$airline_array = $this->getAllAirlineInfo('NA');
3517
+				}
3518
+				if (count($aircraft_array) == 0) 
3519
+				{
3520
+						$aircraft_array = $this->getAllAircraftInfo('NA');
3521
+				}
3522
+				if (count($departure_airport_array) == 0) 
3523
+				{
3524
+						$departure_airport_array = $this->getAllAirportInfo('NA');
3525
+				}
3526
+				if (count($arrival_airport_array) == 0) 
3527
+				{
3528
+						$arrival_airport_array = $this->getAllAirportInfo('NA');
3529
+				}
3530
+				if ($registration == '') $registration = 'NA';
3531
+				if ($latitude == '' && $longitude == '') {
3532
+					$latitude = 0;
3533
+					$longitude = 0;
3534
+				}
3535
+				if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
3536
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
3537
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3538
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3539
+				if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3540
+				$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) 
3541 3541
                 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)";
3542 3542
 
3543
-                $airline_name = $airline_array[0]['name'];
3544
-                $airline_icao = $airline_array[0]['icao'];
3545
-                $airline_country = $airline_array[0]['country'];
3546
-                $airline_type = $airline_array[0]['type'];
3543
+				$airline_name = $airline_array[0]['name'];
3544
+				$airline_icao = $airline_array[0]['icao'];
3545
+				$airline_country = $airline_array[0]['country'];
3546
+				$airline_type = $airline_array[0]['type'];
3547 3547
 		if ($airline_type == '') {
3548 3548
 			$timeelapsed = microtime(true);
3549 3549
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3550 3550
 			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3551 3551
 		}
3552 3552
 		if ($airline_type == null) $airline_type = '';
3553
-                $aircraft_type = $aircraft_array[0]['type'];
3554
-                $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
3555
-                $departure_airport_name = $departure_airport_array[0]['name'];
3556
-                $departure_airport_city = $departure_airport_array[0]['city'];
3557
-                $departure_airport_country = $departure_airport_array[0]['country'];
3558
-                $arrival_airport_name = $arrival_airport_array[0]['name'];
3559
-                $arrival_airport_city = $arrival_airport_array[0]['city'];
3560
-                $arrival_airport_country = $arrival_airport_array[0]['country'];
3561
-                $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);
3553
+				$aircraft_type = $aircraft_array[0]['type'];
3554
+				$aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
3555
+				$departure_airport_name = $departure_airport_array[0]['name'];
3556
+				$departure_airport_city = $departure_airport_array[0]['city'];
3557
+				$departure_airport_country = $departure_airport_array[0]['country'];
3558
+				$arrival_airport_name = $arrival_airport_array[0]['name'];
3559
+				$arrival_airport_city = $arrival_airport_array[0]['city'];
3560
+				$arrival_airport_country = $arrival_airport_array[0]['country'];
3561
+				$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);
3562 3562
 
3563 3563
 		try {
3564 3564
 		        
@@ -3566,7 +3566,7 @@  discard block
 block discarded – undo
3566 3566
 			$sth->execute($query_values);
3567 3567
 			$this->db = null;
3568 3568
 		} catch (PDOException $e) {
3569
-		    return "error : ".$e->getMessage();
3569
+			return "error : ".$e->getMessage();
3570 3570
 		}
3571 3571
 		
3572 3572
 		return "success";
@@ -3575,11 +3575,11 @@  discard block
 block discarded – undo
3575 3575
 	
3576 3576
   
3577 3577
 	/**
3578
-	* Gets the aircraft ident within the last hour
3579
-	*
3580
-	* @return String the ident
3581
-	*
3582
-	*/
3578
+	 * Gets the aircraft ident within the last hour
3579
+	 *
3580
+	 * @return String the ident
3581
+	 *
3582
+	 */
3583 3583
 	public function getIdentFromLastHour($ident)
3584 3584
 	{
3585 3585
 		global $globalDBdriver, $globalTimezone;
@@ -3595,11 +3595,11 @@  discard block
 block discarded – undo
3595 3595
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
3596 3596
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
3597 3597
 			$query_data = array(':ident' => $ident);
3598
-    		}
3598
+			}
3599 3599
 		
3600 3600
 		$sth = $this->db->prepare($query);
3601 3601
 		$sth->execute($query_data);
3602
-    		$ident_result='';
3602
+			$ident_result='';
3603 3603
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3604 3604
 		{
3605 3605
 			$ident_result = $row['ident'];
@@ -3610,11 +3610,11 @@  discard block
 block discarded – undo
3610 3610
 	
3611 3611
 	
3612 3612
 	/**
3613
-	* Gets the aircraft data from the last 20 seconds
3614
-	*
3615
-	* @return Array the spotter data
3616
-	*
3617
-	*/
3613
+	 * Gets the aircraft data from the last 20 seconds
3614
+	 *
3615
+	 * @return Array the spotter data
3616
+	 *
3617
+	 */
3618 3618
 	public function getRealTimeData($q = '')
3619 3619
 	{
3620 3620
 		global $globalDBdriver;
@@ -3658,11 +3658,11 @@  discard block
 block discarded – undo
3658 3658
 	
3659 3659
 	
3660 3660
 	 /**
3661
-	* Gets all airlines that have flown over
3662
-	*
3663
-	* @return Array the airline list
3664
-	*
3665
-	*/
3661
+	  * Gets all airlines that have flown over
3662
+	  *
3663
+	  * @return Array the airline list
3664
+	  *
3665
+	  */
3666 3666
 	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3667 3667
 	{
3668 3668
 		global $globalDBdriver;
@@ -3676,7 +3676,7 @@  discard block
 block discarded – undo
3676 3676
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
3677 3677
 			}
3678 3678
 		}
3679
-                if ($sincedate != '') {
3679
+				if ($sincedate != '') {
3680 3680
 			if ($globalDBdriver == 'mysql') {
3681 3681
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
3682 3682
 			} else {
@@ -3703,26 +3703,26 @@  discard block
 block discarded – undo
3703 3703
 	}
3704 3704
 
3705 3705
 	 /**
3706
-	* Gets all pilots that have flown over
3707
-	*
3708
-	* @return Array the pilots list
3709
-	*
3710
-	*/
3706
+	  * Gets all pilots that have flown over
3707
+	  *
3708
+	  * @return Array the pilots list
3709
+	  *
3710
+	  */
3711 3711
 	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3712 3712
 	{
3713 3713
 		global $globalDBdriver;
3714 3714
 		$filter_query = $this->getFilter($filters,true,true);
3715 3715
 		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3716 3716
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
3717
-                if ($olderthanmonths > 0) {
3718
-            		if ($globalDBdriver == 'mysql') {
3717
+				if ($olderthanmonths > 0) {
3718
+					if ($globalDBdriver == 'mysql') {
3719 3719
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
3720 3720
 			} else {
3721 3721
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
3722 3722
 			}
3723 3723
 		}
3724
-                if ($sincedate != '') {
3725
-            		if ($globalDBdriver == 'mysql') {
3724
+				if ($sincedate != '') {
3725
+					if ($globalDBdriver == 'mysql') {
3726 3726
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
3727 3727
 			} else {
3728 3728
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3750,25 +3750,25 @@  discard block
 block discarded – undo
3750 3750
 	}
3751 3751
 	
3752 3752
 		 /**
3753
-	* Gets all pilots that have flown over
3754
-	*
3755
-	* @return Array the pilots list
3756
-	*
3757
-	*/
3753
+		  * Gets all pilots that have flown over
3754
+		  *
3755
+		  * @return Array the pilots list
3756
+		  *
3757
+		  */
3758 3758
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
3759 3759
 	{
3760 3760
 		global $globalDBdriver;
3761 3761
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3762 3762
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
3763
-                if ($olderthanmonths > 0) {
3764
-            		if ($globalDBdriver == 'mysql') {
3763
+				if ($olderthanmonths > 0) {
3764
+					if ($globalDBdriver == 'mysql') {
3765 3765
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
3766 3766
 			} else {
3767 3767
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
3768 3768
 			}
3769 3769
 		}
3770
-                if ($sincedate != '') {
3771
-            		if ($globalDBdriver == 'mysql') {
3770
+				if ($sincedate != '') {
3771
+					if ($globalDBdriver == 'mysql') {
3772 3772
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
3773 3773
 			} else {
3774 3774
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3797,26 +3797,26 @@  discard block
 block discarded – undo
3797 3797
 	}
3798 3798
 	
3799 3799
 	 /**
3800
-	* Gets all owner that have flown over
3801
-	*
3802
-	* @return Array the pilots list
3803
-	*
3804
-	*/
3800
+	  * Gets all owner that have flown over
3801
+	  *
3802
+	  * @return Array the pilots list
3803
+	  *
3804
+	  */
3805 3805
 	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3806 3806
 	{
3807 3807
 		global $globalDBdriver;
3808 3808
 		$filter_query = $this->getFilter($filters,true,true);
3809 3809
 		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3810 3810
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3811
-                if ($olderthanmonths > 0) {
3812
-            		if ($globalDBdriver == 'mysql') {
3811
+				if ($olderthanmonths > 0) {
3812
+					if ($globalDBdriver == 'mysql') {
3813 3813
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
3814 3814
 			} else {
3815 3815
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
3816 3816
 			}
3817 3817
 		}
3818
-                if ($sincedate != '') {
3819
-            		if ($globalDBdriver == 'mysql') {
3818
+				if ($sincedate != '') {
3819
+					if ($globalDBdriver == 'mysql') {
3820 3820
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
3821 3821
 			} else {
3822 3822
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3842,26 +3842,26 @@  discard block
 block discarded – undo
3842 3842
 	}
3843 3843
 	
3844 3844
 	 /**
3845
-	* Gets all owner that have flown over
3846
-	*
3847
-	* @return Array the pilots list
3848
-	*
3849
-	*/
3845
+	  * Gets all owner that have flown over
3846
+	  *
3847
+	  * @return Array the pilots list
3848
+	  *
3849
+	  */
3850 3850
 	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3851 3851
 	{
3852 3852
 		global $globalDBdriver;
3853 3853
 		$filter_query = $this->getFilter($filters,true,true);
3854 3854
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3855 3855
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3856
-                if ($olderthanmonths > 0) {
3857
-            		if ($globalDBdriver == 'mysql') {
3856
+				if ($olderthanmonths > 0) {
3857
+					if ($globalDBdriver == 'mysql') {
3858 3858
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
3859 3859
 			} else {
3860 3860
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
3861 3861
 			}
3862 3862
 		}
3863
-                if ($sincedate != '') {
3864
-            		if ($globalDBdriver == 'mysql') {
3863
+				if ($sincedate != '') {
3864
+					if ($globalDBdriver == 'mysql') {
3865 3865
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
3866 3866
 			} else {
3867 3867
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -3888,11 +3888,11 @@  discard block
 block discarded – undo
3888 3888
 	}
3889 3889
 
3890 3890
 	/**
3891
-	* Gets all airlines that have flown over by aircraft
3892
-	*
3893
-	* @return Array the airline list
3894
-	*
3895
-	*/
3891
+	 * Gets all airlines that have flown over by aircraft
3892
+	 *
3893
+	 * @return Array the airline list
3894
+	 *
3895
+	 */
3896 3896
 	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
3897 3897
 	{
3898 3898
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -3924,11 +3924,11 @@  discard block
 block discarded – undo
3924 3924
 
3925 3925
 
3926 3926
 	/**
3927
-	* Gets all airline countries that have flown over by aircraft
3928
-	*
3929
-	* @return Array the airline country list
3930
-	*
3931
-	*/
3927
+	 * Gets all airline countries that have flown over by aircraft
3928
+	 *
3929
+	 * @return Array the airline country list
3930
+	 *
3931
+	 */
3932 3932
 	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
3933 3933
 	{
3934 3934
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -3960,11 +3960,11 @@  discard block
 block discarded – undo
3960 3960
 	
3961 3961
 	
3962 3962
 	/**
3963
-	* Gets all airlines that have flown over by airport
3964
-	*
3965
-	* @return Array the airline list
3966
-	*
3967
-	*/
3963
+	 * Gets all airlines that have flown over by airport
3964
+	 *
3965
+	 * @return Array the airline list
3966
+	 *
3967
+	 */
3968 3968
 	public function countAllAirlinesByAirport($airport_icao,$filters = array())
3969 3969
 	{
3970 3970
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -3995,11 +3995,11 @@  discard block
 block discarded – undo
3995 3995
 
3996 3996
 
3997 3997
 	/**
3998
-	* Gets all airline countries that have flown over by airport icao
3999
-	*
4000
-	* @return Array the airline country list
4001
-	*
4002
-	*/
3998
+	 * Gets all airline countries that have flown over by airport icao
3999
+	 *
4000
+	 * @return Array the airline country list
4001
+	 *
4002
+	 */
4003 4003
 	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
4004 4004
 	{
4005 4005
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4029,11 +4029,11 @@  discard block
 block discarded – undo
4029 4029
 
4030 4030
 
4031 4031
 	/**
4032
-	* Gets all airlines that have flown over by aircraft manufacturer
4033
-	*
4034
-	* @return Array the airline list
4035
-	*
4036
-	*/
4032
+	 * Gets all airlines that have flown over by aircraft manufacturer
4033
+	 *
4034
+	 * @return Array the airline list
4035
+	 *
4036
+	 */
4037 4037
 	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
4038 4038
 	{
4039 4039
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4064,11 +4064,11 @@  discard block
 block discarded – undo
4064 4064
 
4065 4065
 
4066 4066
 	/**
4067
-	* Gets all airline countries that have flown over by aircraft manufacturer
4068
-	*
4069
-	* @return Array the airline country list
4070
-	*
4071
-	*/
4067
+	 * Gets all airline countries that have flown over by aircraft manufacturer
4068
+	 *
4069
+	 * @return Array the airline country list
4070
+	 *
4071
+	 */
4072 4072
 	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
4073 4073
 	{
4074 4074
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4097,11 +4097,11 @@  discard block
 block discarded – undo
4097 4097
 
4098 4098
 
4099 4099
 	/**
4100
-	* Gets all airlines that have flown over by date
4101
-	*
4102
-	* @return Array the airline list
4103
-	*
4104
-	*/
4100
+	 * Gets all airlines that have flown over by date
4101
+	 *
4102
+	 * @return Array the airline list
4103
+	 *
4104
+	 */
4105 4105
 	public function countAllAirlinesByDate($date,$filters = array())
4106 4106
 	{
4107 4107
 		global $globalTimezone, $globalDBdriver;
@@ -4145,11 +4145,11 @@  discard block
 block discarded – undo
4145 4145
 	
4146 4146
 	
4147 4147
 	/**
4148
-	* Gets all airline countries that have flown over by date
4149
-	*
4150
-	* @return Array the airline country list
4151
-	*
4152
-	*/
4148
+	 * Gets all airline countries that have flown over by date
4149
+	 *
4150
+	 * @return Array the airline country list
4151
+	 *
4152
+	 */
4153 4153
 	public function countAllAirlineCountriesByDate($date,$filters = array())
4154 4154
 	{
4155 4155
 		global $globalTimezone, $globalDBdriver;
@@ -4192,11 +4192,11 @@  discard block
 block discarded – undo
4192 4192
 
4193 4193
 
4194 4194
 	/**
4195
-	* Gets all airlines that have flown over by ident/callsign
4196
-	*
4197
-	* @return Array the airline list
4198
-	*
4199
-	*/
4195
+	 * Gets all airlines that have flown over by ident/callsign
4196
+	 *
4197
+	 * @return Array the airline list
4198
+	 *
4199
+	 */
4200 4200
 	public function countAllAirlinesByIdent($ident,$filters = array())
4201 4201
 	{
4202 4202
 		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
@@ -4226,11 +4226,11 @@  discard block
 block discarded – undo
4226 4226
 	}
4227 4227
 
4228 4228
 	/**
4229
-	* Gets all airlines that have flown over by route
4230
-	*
4231
-	* @return Array the airline list
4232
-	*
4233
-	*/
4229
+	 * Gets all airlines that have flown over by route
4230
+	 *
4231
+	 * @return Array the airline list
4232
+	 *
4233
+	 */
4234 4234
 	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
4235 4235
 	{
4236 4236
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4262,11 +4262,11 @@  discard block
 block discarded – undo
4262 4262
 	}
4263 4263
 
4264 4264
 	/**
4265
-	* Gets all airline countries that have flown over by route
4266
-	*
4267
-	* @return Array the airline country list
4268
-	*
4269
-	*/
4265
+	 * Gets all airline countries that have flown over by route
4266
+	 *
4267
+	 * @return Array the airline country list
4268
+	 *
4269
+	 */
4270 4270
 	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
4271 4271
 	{
4272 4272
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4298,11 +4298,11 @@  discard block
 block discarded – undo
4298 4298
 
4299 4299
 
4300 4300
 	/**
4301
-	* Gets all airlines that have flown over by country
4302
-	*
4303
-	* @return Array the airline list
4304
-	*
4305
-	*/
4301
+	 * Gets all airlines that have flown over by country
4302
+	 *
4303
+	 * @return Array the airline list
4304
+	 *
4305
+	 */
4306 4306
 	public function countAllAirlinesByCountry($country,$filters = array())
4307 4307
 	{
4308 4308
 		$country = filter_var($country,FILTER_SANITIZE_STRING);
@@ -4332,11 +4332,11 @@  discard block
 block discarded – undo
4332 4332
 
4333 4333
 
4334 4334
 	/**
4335
-	* Gets all airline countries that have flown over by country
4336
-	*
4337
-	* @return Array the airline country list
4338
-	*
4339
-	*/
4335
+	 * Gets all airline countries that have flown over by country
4336
+	 *
4337
+	 * @return Array the airline country list
4338
+	 *
4339
+	 */
4340 4340
 	public function countAllAirlineCountriesByCountry($country,$filters = array())
4341 4341
 	{
4342 4342
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4365,11 +4365,11 @@  discard block
 block discarded – undo
4365 4365
 
4366 4366
 
4367 4367
 	/**
4368
-	* Gets all airlines countries
4369
-	*
4370
-	* @return Array the airline country list
4371
-	*
4372
-	*/
4368
+	 * Gets all airlines countries
4369
+	 *
4370
+	 * @return Array the airline country list
4371
+	 *
4372
+	 */
4373 4373
 	public function countAllAirlineCountries($limit = true, $filters = array())
4374 4374
 	{
4375 4375
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4395,11 +4395,11 @@  discard block
 block discarded – undo
4395 4395
 	}
4396 4396
 
4397 4397
 	/**
4398
-	* Gets all number of flight over countries
4399
-	*
4400
-	* @return Array the airline country list
4401
-	*
4402
-	*/
4398
+	 * Gets all number of flight over countries
4399
+	 *
4400
+	 * @return Array the airline country list
4401
+	 *
4402
+	 */
4403 4403
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4404 4404
 	{
4405 4405
 		global $globalDBdriver;
@@ -4421,15 +4421,15 @@  discard block
 block discarded – undo
4421 4421
 		$SpotterLive = new SpotterLive();
4422 4422
 		$filter_query = $SpotterLive->getFilter($filters,true,true);
4423 4423
 		$filter_query .= ' over_country IS NOT NULL';
4424
-                if ($olderthanmonths > 0) {
4424
+				if ($olderthanmonths > 0) {
4425 4425
 			if ($globalDBdriver == 'mysql') {
4426 4426
 				$filter_query .= ' AND spotter_live.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
4427 4427
 			} else {
4428 4428
 				$filter_query .= " AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
4429 4429
 			}
4430 4430
 		}
4431
-                if ($sincedate != '') {
4432
-            		if ($globalDBdriver == 'mysql') {
4431
+				if ($sincedate != '') {
4432
+					if ($globalDBdriver == 'mysql') {
4433 4433
 				$filter_query .= " AND spotter_live.date > '".$sincedate."' ";
4434 4434
 			} else {
4435 4435
 				$filter_query .= " AND spotter_live.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4459,11 +4459,11 @@  discard block
 block discarded – undo
4459 4459
 	
4460 4460
 	
4461 4461
 	/**
4462
-	* Gets all aircraft types that have flown over
4463
-	*
4464
-	* @return Array the aircraft list
4465
-	*
4466
-	*/
4462
+	 * Gets all aircraft types that have flown over
4463
+	 *
4464
+	 * @return Array the aircraft list
4465
+	 *
4466
+	 */
4467 4467
 	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4468 4468
 	{
4469 4469
 		global $globalDBdriver;
@@ -4506,11 +4506,11 @@  discard block
 block discarded – undo
4506 4506
 	}
4507 4507
 
4508 4508
 	/**
4509
-	* Gets all aircraft types that have flown over by airline
4510
-	*
4511
-	* @return Array the aircraft list
4512
-	*
4513
-	*/
4509
+	 * Gets all aircraft types that have flown over by airline
4510
+	 *
4511
+	 * @return Array the aircraft list
4512
+	 *
4513
+	 */
4514 4514
 	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4515 4515
 	{
4516 4516
 		global $globalDBdriver;
@@ -4553,11 +4553,11 @@  discard block
 block discarded – undo
4553 4553
 	}
4554 4554
 
4555 4555
 	/**
4556
-	* Gets all aircraft types that have flown over by months
4557
-	*
4558
-	* @return Array the aircraft list
4559
-	*
4560
-	*/
4556
+	 * Gets all aircraft types that have flown over by months
4557
+	 *
4558
+	 * @return Array the aircraft list
4559
+	 *
4560
+	 */
4561 4561
 	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4562 4562
 	{
4563 4563
 		global $globalDBdriver;
@@ -4601,11 +4601,11 @@  discard block
 block discarded – undo
4601 4601
 
4602 4602
 
4603 4603
 	/**
4604
-	* Gets all aircraft registration that have flown over by aircaft icao
4605
-	*
4606
-	* @return Array the aircraft list
4607
-	*
4608
-	*/
4604
+	 * Gets all aircraft registration that have flown over by aircaft icao
4605
+	 *
4606
+	 * @return Array the aircraft list
4607
+	 *
4608
+	 */
4609 4609
 	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
4610 4610
 	{
4611 4611
 		$Image = new Image($this->db);
@@ -4644,11 +4644,11 @@  discard block
 block discarded – undo
4644 4644
 
4645 4645
 
4646 4646
 	/**
4647
-	* Gets all aircraft types that have flown over by airline icao
4648
-	*
4649
-	* @return Array the aircraft list
4650
-	*
4651
-	*/
4647
+	 * Gets all aircraft types that have flown over by airline icao
4648
+	 *
4649
+	 * @return Array the aircraft list
4650
+	 *
4651
+	 */
4652 4652
 	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
4653 4653
 	{
4654 4654
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4677,11 +4677,11 @@  discard block
 block discarded – undo
4677 4677
 
4678 4678
 
4679 4679
 	/**
4680
-	* Gets all aircraft registration that have flown over by airline icao
4681
-	*
4682
-	* @return Array the aircraft list
4683
-	*
4684
-	*/
4680
+	 * Gets all aircraft registration that have flown over by airline icao
4681
+	 *
4682
+	 * @return Array the aircraft list
4683
+	 *
4684
+	 */
4685 4685
 	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
4686 4686
 	{
4687 4687
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4719,11 +4719,11 @@  discard block
 block discarded – undo
4719 4719
 
4720 4720
 
4721 4721
 	/**
4722
-	* Gets all aircraft manufacturer that have flown over by airline icao
4723
-	*
4724
-	* @return Array the aircraft list
4725
-	*
4726
-	*/
4722
+	 * Gets all aircraft manufacturer that have flown over by airline icao
4723
+	 *
4724
+	 * @return Array the aircraft list
4725
+	 *
4726
+	 */
4727 4727
 	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
4728 4728
 	{
4729 4729
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4751,11 +4751,11 @@  discard block
 block discarded – undo
4751 4751
 
4752 4752
 
4753 4753
 	/**
4754
-	* Gets all aircraft types that have flown over by airline icao
4755
-	*
4756
-	* @return Array the aircraft list
4757
-	*
4758
-	*/
4754
+	 * Gets all aircraft types that have flown over by airline icao
4755
+	 *
4756
+	 * @return Array the aircraft list
4757
+	 *
4758
+	 */
4759 4759
 	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
4760 4760
 	{
4761 4761
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4784,11 +4784,11 @@  discard block
 block discarded – undo
4784 4784
 
4785 4785
 
4786 4786
 	/**
4787
-	* Gets all aircraft registration that have flown over by airport icao
4788
-	*
4789
-	* @return Array the aircraft list
4790
-	*
4791
-	*/
4787
+	 * Gets all aircraft registration that have flown over by airport icao
4788
+	 *
4789
+	 * @return Array the aircraft list
4790
+	 *
4791
+	 */
4792 4792
 	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
4793 4793
 	{
4794 4794
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4825,11 +4825,11 @@  discard block
 block discarded – undo
4825 4825
 	
4826 4826
 	
4827 4827
 	/**
4828
-	* Gets all aircraft manufacturer that have flown over by airport icao
4829
-	*
4830
-	* @return Array the aircraft list
4831
-	*
4832
-	*/
4828
+	 * Gets all aircraft manufacturer that have flown over by airport icao
4829
+	 *
4830
+	 * @return Array the aircraft list
4831
+	 *
4832
+	 */
4833 4833
 	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
4834 4834
 	{
4835 4835
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4855,11 +4855,11 @@  discard block
 block discarded – undo
4855 4855
 	}
4856 4856
 
4857 4857
 	/**
4858
-	* Gets all aircraft types that have flown over by aircraft manufacturer
4859
-	*
4860
-	* @return Array the aircraft list
4861
-	*
4862
-	*/
4858
+	 * Gets all aircraft types that have flown over by aircraft manufacturer
4859
+	 *
4860
+	 * @return Array the aircraft list
4861
+	 *
4862
+	 */
4863 4863
 	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
4864 4864
 	{
4865 4865
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4886,11 +4886,11 @@  discard block
 block discarded – undo
4886 4886
 
4887 4887
 
4888 4888
 	/**
4889
-	* Gets all aircraft registration that have flown over by aircaft manufacturer
4890
-	*
4891
-	* @return Array the aircraft list
4892
-	*
4893
-	*/
4889
+	 * Gets all aircraft registration that have flown over by aircaft manufacturer
4890
+	 *
4891
+	 * @return Array the aircraft list
4892
+	 *
4893
+	 */
4894 4894
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
4895 4895
 	{
4896 4896
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4926,11 +4926,11 @@  discard block
 block discarded – undo
4926 4926
 	}
4927 4927
 
4928 4928
 	/**
4929
-	* Gets all aircraft types that have flown over by date
4930
-	*
4931
-	* @return Array the aircraft list
4932
-	*
4933
-	*/
4929
+	 * Gets all aircraft types that have flown over by date
4930
+	 *
4931
+	 * @return Array the aircraft list
4932
+	 *
4933
+	 */
4934 4934
 	public function countAllAircraftTypesByDate($date,$filters = array())
4935 4935
 	{
4936 4936
 		global $globalTimezone, $globalDBdriver;
@@ -4972,11 +4972,11 @@  discard block
 block discarded – undo
4972 4972
 
4973 4973
 
4974 4974
 	/**
4975
-	* Gets all aircraft registration that have flown over by date
4976
-	*
4977
-	* @return Array the aircraft list
4978
-	*
4979
-	*/
4975
+	 * Gets all aircraft registration that have flown over by date
4976
+	 *
4977
+	 * @return Array the aircraft list
4978
+	 *
4979
+	 */
4980 4980
 	public function countAllAircraftRegistrationByDate($date,$filters = array())
4981 4981
 	{
4982 4982
 		global $globalTimezone, $globalDBdriver;
@@ -5027,11 +5027,11 @@  discard block
 block discarded – undo
5027 5027
 
5028 5028
 
5029 5029
 	/**
5030
-	* Gets all aircraft manufacturer that have flown over by date
5031
-	*
5032
-	* @return Array the aircraft manufacturer list
5033
-	*
5034
-	*/
5030
+	 * Gets all aircraft manufacturer that have flown over by date
5031
+	 *
5032
+	 * @return Array the aircraft manufacturer list
5033
+	 *
5034
+	 */
5035 5035
 	public function countAllAircraftManufacturerByDate($date,$filters = array())
5036 5036
 	{
5037 5037
 		global $globalTimezone, $globalDBdriver;
@@ -5073,11 +5073,11 @@  discard block
 block discarded – undo
5073 5073
 
5074 5074
 
5075 5075
 	/**
5076
-	* Gets all aircraft types that have flown over by ident/callsign
5077
-	*
5078
-	* @return Array the aircraft list
5079
-	*
5080
-	*/
5076
+	 * Gets all aircraft types that have flown over by ident/callsign
5077
+	 *
5078
+	 * @return Array the aircraft list
5079
+	 *
5080
+	 */
5081 5081
 	public function countAllAircraftTypesByIdent($ident,$filters = array())
5082 5082
 	{
5083 5083
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5106,11 +5106,11 @@  discard block
 block discarded – undo
5106 5106
 
5107 5107
 
5108 5108
 	/**
5109
-	* Gets all aircraft registration that have flown over by ident/callsign
5110
-	*
5111
-	* @return Array the aircraft list
5112
-	*
5113
-	*/
5109
+	 * Gets all aircraft registration that have flown over by ident/callsign
5110
+	 *
5111
+	 * @return Array the aircraft list
5112
+	 *
5113
+	 */
5114 5114
 	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
5115 5115
 	{
5116 5116
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5150,11 +5150,11 @@  discard block
 block discarded – undo
5150 5150
 
5151 5151
 
5152 5152
 	/**
5153
-	* Gets all aircraft manufacturer that have flown over by ident/callsign
5154
-	*
5155
-	* @return Array the aircraft manufacturer list
5156
-	*
5157
-	*/
5153
+	 * Gets all aircraft manufacturer that have flown over by ident/callsign
5154
+	 *
5155
+	 * @return Array the aircraft manufacturer list
5156
+	 *
5157
+	 */
5158 5158
 	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
5159 5159
 	{
5160 5160
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5180,11 +5180,11 @@  discard block
 block discarded – undo
5180 5180
 
5181 5181
 
5182 5182
 	/**
5183
-	* Gets all aircraft types that have flown over by route
5184
-	*
5185
-	* @return Array the aircraft list
5186
-	*
5187
-	*/
5183
+	 * Gets all aircraft types that have flown over by route
5184
+	 *
5185
+	 * @return Array the aircraft list
5186
+	 *
5187
+	 */
5188 5188
 	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5189 5189
 	{
5190 5190
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5213,11 +5213,11 @@  discard block
 block discarded – undo
5213 5213
 	}
5214 5214
 
5215 5215
 	/**
5216
-	* Gets all aircraft registration that have flown over by route
5217
-	*
5218
-	* @return Array the aircraft list
5219
-	*
5220
-	*/
5216
+	 * Gets all aircraft registration that have flown over by route
5217
+	 *
5218
+	 * @return Array the aircraft list
5219
+	 *
5220
+	 */
5221 5221
 	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5222 5222
 	{
5223 5223
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5259,11 +5259,11 @@  discard block
 block discarded – undo
5259 5259
 	
5260 5260
 	
5261 5261
 	/**
5262
-	* Gets all aircraft manufacturer that have flown over by route
5263
-	*
5264
-	* @return Array the aircraft manufacturer list
5265
-	*
5266
-	*/
5262
+	 * Gets all aircraft manufacturer that have flown over by route
5263
+	 *
5264
+	 * @return Array the aircraft manufacturer list
5265
+	 *
5266
+	 */
5267 5267
 	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5268 5268
 	{
5269 5269
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5297,11 +5297,11 @@  discard block
 block discarded – undo
5297 5297
 	
5298 5298
 	
5299 5299
 	/**
5300
-	* Gets all aircraft types that have flown over by country
5301
-	*
5302
-	* @return Array the aircraft list
5303
-	*
5304
-	*/
5300
+	 * Gets all aircraft types that have flown over by country
5301
+	 *
5302
+	 * @return Array the aircraft list
5303
+	 *
5304
+	 */
5305 5305
 	public function countAllAircraftTypesByCountry($country,$filters = array())
5306 5306
 	{
5307 5307
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5332,11 +5332,11 @@  discard block
 block discarded – undo
5332 5332
 
5333 5333
 
5334 5334
 	/**
5335
-	* Gets all aircraft registration that have flown over by country
5336
-	*
5337
-	* @return Array the aircraft list
5338
-	*
5339
-	*/
5335
+	 * Gets all aircraft registration that have flown over by country
5336
+	 *
5337
+	 * @return Array the aircraft list
5338
+	 *
5339
+	 */
5340 5340
 	public function countAllAircraftRegistrationByCountry($country,$filters = array())
5341 5341
 	{
5342 5342
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5376,11 +5376,11 @@  discard block
 block discarded – undo
5376 5376
 	
5377 5377
 	
5378 5378
 	/**
5379
-	* Gets all aircraft manufacturer that have flown over by country
5380
-	*
5381
-	* @return Array the aircraft manufacturer list
5382
-	*
5383
-	*/
5379
+	 * Gets all aircraft manufacturer that have flown over by country
5380
+	 *
5381
+	 * @return Array the aircraft manufacturer list
5382
+	 *
5383
+	 */
5384 5384
 	public function countAllAircraftManufacturerByCountry($country,$filters = array())
5385 5385
 	{
5386 5386
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5411,17 +5411,17 @@  discard block
 block discarded – undo
5411 5411
 	
5412 5412
 	
5413 5413
 	/**
5414
-	* Gets all aircraft manufacturers that have flown over
5415
-	*
5416
-	* @return Array the aircraft list
5417
-	*
5418
-	*/
5414
+	 * Gets all aircraft manufacturers that have flown over
5415
+	 *
5416
+	 * @return Array the aircraft list
5417
+	 *
5418
+	 */
5419 5419
 	public function countAllAircraftManufacturers($filters = array())
5420 5420
 	{
5421 5421
 		$filter_query = $this->getFilter($filters,true,true);
5422 5422
 		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5423 5423
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
5424
-                $query .= " GROUP BY spotter_output.aircraft_manufacturer
5424
+				$query .= " GROUP BY spotter_output.aircraft_manufacturer
5425 5425
 					ORDER BY aircraft_manufacturer_count DESC
5426 5426
 					LIMIT 10";
5427 5427
       
@@ -5446,11 +5446,11 @@  discard block
 block discarded – undo
5446 5446
 	
5447 5447
 	
5448 5448
 	/**
5449
-	* Gets all aircraft registrations that have flown over
5450
-	*
5451
-	* @return Array the aircraft list
5452
-	*
5453
-	*/
5449
+	 * Gets all aircraft registrations that have flown over
5450
+	 *
5451
+	 * @return Array the aircraft list
5452
+	 *
5453
+	 */
5454 5454
 	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5455 5455
 	{
5456 5456
 		global $globalDBdriver;
@@ -5458,15 +5458,15 @@  discard block
 block discarded – undo
5458 5458
 		$filter_query = $this->getFilter($filters,true,true);
5459 5459
 		$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    
5460 5460
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
5461
-                if ($olderthanmonths > 0) {
5462
-            		if ($globalDBdriver == 'mysql') {
5461
+				if ($olderthanmonths > 0) {
5462
+					if ($globalDBdriver == 'mysql') {
5463 5463
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
5464 5464
 			} else {
5465 5465
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
5466 5466
 			}
5467 5467
 		}
5468
-                if ($sincedate != '') {
5469
-            		if ($globalDBdriver == 'mysql') {
5468
+				if ($sincedate != '') {
5469
+					if ($globalDBdriver == 'mysql') {
5470 5470
 				$query .= " AND spotter_output.date > '".$sincedate."'";
5471 5471
 			} else {
5472 5472
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5475,7 +5475,7 @@  discard block
 block discarded – undo
5475 5475
 
5476 5476
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5477 5477
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5478
-                $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
5478
+				$query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
5479 5479
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5480 5480
 		
5481 5481
 		$sth = $this->db->prepare($query);
@@ -5506,11 +5506,11 @@  discard block
 block discarded – undo
5506 5506
 
5507 5507
 
5508 5508
 	/**
5509
-	* Gets all aircraft registrations that have flown over
5510
-	*
5511
-	* @return Array the aircraft list
5512
-	*
5513
-	*/
5509
+	 * Gets all aircraft registrations that have flown over
5510
+	 *
5511
+	 * @return Array the aircraft list
5512
+	 *
5513
+	 */
5514 5514
 	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5515 5515
 	{
5516 5516
 		global $globalDBdriver;
@@ -5518,15 +5518,15 @@  discard block
 block discarded – undo
5518 5518
 		$Image = new Image($this->db);
5519 5519
 		$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    
5520 5520
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
5521
-                if ($olderthanmonths > 0) {
5522
-            		if ($globalDBdriver == 'mysql') {
5521
+				if ($olderthanmonths > 0) {
5522
+					if ($globalDBdriver == 'mysql') {
5523 5523
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
5524 5524
 			} else {
5525 5525
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
5526 5526
 			}
5527 5527
 		}
5528
-                if ($sincedate != '') {
5529
-            		if ($globalDBdriver == 'mysql') {
5528
+				if ($sincedate != '') {
5529
+					if ($globalDBdriver == 'mysql') {
5530 5530
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
5531 5531
 			} else {
5532 5532
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5535,7 +5535,7 @@  discard block
 block discarded – undo
5535 5535
 
5536 5536
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5537 5537
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5538
-                $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";
5538
+				$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";
5539 5539
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5540 5540
 		
5541 5541
 		$sth = $this->db->prepare($query);
@@ -5567,35 +5567,35 @@  discard block
 block discarded – undo
5567 5567
 	
5568 5568
 	
5569 5569
 	/**
5570
-	* Gets all departure airports of the airplanes that have flown over
5571
-	*
5572
-	* @return Array the airport list
5573
-	*
5574
-	*/
5570
+	 * Gets all departure airports of the airplanes that have flown over
5571
+	 *
5572
+	 * @return Array the airport list
5573
+	 *
5574
+	 */
5575 5575
 	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5576 5576
 	{
5577 5577
 		global $globalDBdriver;
5578 5578
 		$filter_query = $this->getFilter($filters,true,true);
5579 5579
 		$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 
5580 5580
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA'";
5581
-                if ($olderthanmonths > 0) {
5582
-            		if ($globalDBdriver == 'mysql') {
5581
+				if ($olderthanmonths > 0) {
5582
+					if ($globalDBdriver == 'mysql') {
5583 5583
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
5584 5584
 			} else {
5585 5585
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
5586 5586
 			}
5587
-                }
5588
-                if ($sincedate != '') {
5589
-            		if ($globalDBdriver == 'mysql') {
5587
+				}
5588
+				if ($sincedate != '') {
5589
+					if ($globalDBdriver == 'mysql') {
5590 5590
 				$query .= " AND spotter_output.date > '".$sincedate."'";
5591 5591
 			} else {
5592 5592
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
5593 5593
 			}
5594 5594
 		}
5595 5595
 
5596
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5597
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5598
-                $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5596
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5597
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5598
+				$query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5599 5599
 				ORDER BY airport_departure_icao_count DESC";
5600 5600
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5601 5601
       
@@ -5619,35 +5619,35 @@  discard block
 block discarded – undo
5619 5619
 	}
5620 5620
 
5621 5621
 	/**
5622
-	* Gets all departure airports of the airplanes that have flown over
5623
-	*
5624
-	* @return Array the airport list
5625
-	*
5626
-	*/
5622
+	 * Gets all departure airports of the airplanes that have flown over
5623
+	 *
5624
+	 * @return Array the airport list
5625
+	 *
5626
+	 */
5627 5627
 	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5628 5628
 	{
5629 5629
 		global $globalDBdriver;
5630 5630
 		$filter_query = $this->getFilter($filters,true,true);
5631 5631
 		$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 
5632 5632
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' ";
5633
-                if ($olderthanmonths > 0) {
5634
-            		if ($globalDBdriver == 'mysql') {
5633
+				if ($olderthanmonths > 0) {
5634
+					if ($globalDBdriver == 'mysql') {
5635 5635
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
5636 5636
 			} else {
5637 5637
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
5638 5638
 			}
5639
-                }
5640
-                if ($sincedate != '') {
5641
-            		if ($globalDBdriver == 'mysql') {
5639
+				}
5640
+				if ($sincedate != '') {
5641
+					if ($globalDBdriver == 'mysql') {
5642 5642
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
5643 5643
 			} else {
5644 5644
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
5645 5645
 			}
5646 5646
 		}
5647 5647
 
5648
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5649
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5650
-                $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
5648
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5649
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5650
+				$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
5651 5651
 				ORDER BY airport_departure_icao_count DESC";
5652 5652
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5653 5653
       
@@ -5672,37 +5672,37 @@  discard block
 block discarded – undo
5672 5672
 	}
5673 5673
 
5674 5674
 	/**
5675
-	* Gets all detected departure airports of the airplanes that have flown over
5676
-	*
5677
-	* @return Array the airport list
5678
-	*
5679
-	*/
5675
+	 * Gets all detected departure airports of the airplanes that have flown over
5676
+	 *
5677
+	 * @return Array the airport list
5678
+	 *
5679
+	 */
5680 5680
 	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5681 5681
 	{
5682 5682
 		global $globalDBdriver;
5683 5683
 		$filter_query = $this->getFilter($filters,true,true);
5684 5684
 		$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
5685 5685
 				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";
5686
-                if ($olderthanmonths > 0) {
5687
-            		if ($globalDBdriver == 'mysql') {
5686
+				if ($olderthanmonths > 0) {
5687
+					if ($globalDBdriver == 'mysql') {
5688 5688
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
5689 5689
 			} else {
5690 5690
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
5691 5691
 			}
5692
-                }
5693
-                if ($sincedate != '') {
5694
-            		if ($globalDBdriver == 'mysql') {
5692
+				}
5693
+				if ($sincedate != '') {
5694
+					if ($globalDBdriver == 'mysql') {
5695 5695
 				$query .= " AND spotter_output.date > '".$sincedate."'";
5696 5696
 			} else {
5697 5697
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
5698 5698
 			}
5699 5699
 		}
5700
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5701
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5702
-                $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5700
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5701
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5702
+				$query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5703 5703
 				ORDER BY airport_departure_icao_count DESC";
5704 5704
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5705
-    		//echo $query;
5705
+			//echo $query;
5706 5706
 		$sth = $this->db->prepare($query);
5707 5707
 		$sth->execute();
5708 5708
       
@@ -5723,35 +5723,35 @@  discard block
 block discarded – undo
5723 5723
 	}
5724 5724
 	
5725 5725
 	/**
5726
-	* Gets all detected departure airports of the airplanes that have flown over
5727
-	*
5728
-	* @return Array the airport list
5729
-	*
5730
-	*/
5726
+	 * Gets all detected departure airports of the airplanes that have flown over
5727
+	 *
5728
+	 * @return Array the airport list
5729
+	 *
5730
+	 */
5731 5731
 	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5732 5732
 	{
5733 5733
 		global $globalDBdriver;
5734 5734
 		$filter_query = $this->getFilter($filters,true,true);
5735 5735
 		$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
5736 5736
 				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 ";
5737
-                if ($olderthanmonths > 0) {
5738
-            		if ($globalDBdriver == 'mysql') {
5737
+				if ($olderthanmonths > 0) {
5738
+					if ($globalDBdriver == 'mysql') {
5739 5739
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
5740 5740
 			} else {
5741 5741
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
5742 5742
 			}
5743
-                }
5744
-                if ($sincedate != '') {
5745
-            		if ($globalDBdriver == 'mysql') {
5743
+				}
5744
+				if ($sincedate != '') {
5745
+					if ($globalDBdriver == 'mysql') {
5746 5746
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
5747 5747
 			} else {
5748 5748
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
5749 5749
 			}
5750 5750
 		}
5751 5751
 
5752
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5753
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5754
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5752
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5753
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5754
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5755 5755
 				ORDER BY airport_departure_icao_count DESC";
5756 5756
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5757 5757
       
@@ -5776,11 +5776,11 @@  discard block
 block discarded – undo
5776 5776
 	}	
5777 5777
 	
5778 5778
 	/**
5779
-	* Gets all departure airports of the airplanes that have flown over based on an airline icao
5780
-	*
5781
-	* @return Array the airport list
5782
-	*
5783
-	*/
5779
+	 * Gets all departure airports of the airplanes that have flown over based on an airline icao
5780
+	 *
5781
+	 * @return Array the airport list
5782
+	 *
5783
+	 */
5784 5784
 	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
5785 5785
 	{
5786 5786
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5814,11 +5814,11 @@  discard block
 block discarded – undo
5814 5814
 	
5815 5815
 	
5816 5816
 	/**
5817
-	* Gets all departure airports by country of the airplanes that have flown over based on an airline icao
5818
-	*
5819
-	* @return Array the airport list
5820
-	*
5821
-	*/
5817
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airline icao
5818
+	 *
5819
+	 * @return Array the airport list
5820
+	 *
5821
+	 */
5822 5822
 	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
5823 5823
 	{
5824 5824
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5849,11 +5849,11 @@  discard block
 block discarded – undo
5849 5849
 	
5850 5850
 	
5851 5851
 	/**
5852
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft icao
5853
-	*
5854
-	* @return Array the airport list
5855
-	*
5856
-	*/
5852
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft icao
5853
+	 *
5854
+	 * @return Array the airport list
5855
+	 *
5856
+	 */
5857 5857
 	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
5858 5858
 	{
5859 5859
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5886,11 +5886,11 @@  discard block
 block discarded – undo
5886 5886
 	
5887 5887
 	
5888 5888
 	/**
5889
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
5890
-	*
5891
-	* @return Array the airport list
5892
-	*
5893
-	*/
5889
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
5890
+	 *
5891
+	 * @return Array the airport list
5892
+	 *
5893
+	 */
5894 5894
 	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
5895 5895
 	{
5896 5896
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5920,11 +5920,11 @@  discard block
 block discarded – undo
5920 5920
 	
5921 5921
 	
5922 5922
 	/**
5923
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft registration
5924
-	*
5925
-	* @return Array the airport list
5926
-	*
5927
-	*/
5923
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft registration
5924
+	 *
5925
+	 * @return Array the airport list
5926
+	 *
5927
+	 */
5928 5928
 	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
5929 5929
 	{
5930 5930
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5957,11 +5957,11 @@  discard block
 block discarded – undo
5957 5957
 	
5958 5958
 	
5959 5959
 	/**
5960
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
5961
-	*
5962
-	* @return Array the airport list
5963
-	*
5964
-	*/
5960
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
5961
+	 *
5962
+	 * @return Array the airport list
5963
+	 *
5964
+	 */
5965 5965
 	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
5966 5966
 	{
5967 5967
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5991,11 +5991,11 @@  discard block
 block discarded – undo
5991 5991
 	
5992 5992
 	
5993 5993
 	/**
5994
-	* Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
5995
-	*
5996
-	* @return Array the airport list
5997
-	*
5998
-	*/
5994
+	 * Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
5995
+	 *
5996
+	 * @return Array the airport list
5997
+	 *
5998
+	 */
5999 5999
 	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
6000 6000
 	{
6001 6001
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6028,11 +6028,11 @@  discard block
 block discarded – undo
6028 6028
 	
6029 6029
 	
6030 6030
 	/**
6031
-	* Gets all departure airports by country of the airplanes that have flown over based on an airport icao
6032
-	*
6033
-	* @return Array the airport list
6034
-	*
6035
-	*/
6031
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airport icao
6032
+	 *
6033
+	 * @return Array the airport list
6034
+	 *
6035
+	 */
6036 6036
 	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
6037 6037
 	{
6038 6038
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6063,11 +6063,11 @@  discard block
 block discarded – undo
6063 6063
 	
6064 6064
 	
6065 6065
 	/**
6066
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
6067
-	*
6068
-	* @return Array the airport list
6069
-	*
6070
-	*/
6066
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
6067
+	 *
6068
+	 * @return Array the airport list
6069
+	 *
6070
+	 */
6071 6071
 	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6072 6072
 	{
6073 6073
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6100,11 +6100,11 @@  discard block
 block discarded – undo
6100 6100
 	
6101 6101
 	
6102 6102
 	/**
6103
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
6104
-	*
6105
-	* @return Array the airport list
6106
-	*
6107
-	*/
6103
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
6104
+	 *
6105
+	 * @return Array the airport list
6106
+	 *
6107
+	 */
6108 6108
 	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6109 6109
 	{
6110 6110
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6134,11 +6134,11 @@  discard block
 block discarded – undo
6134 6134
 	
6135 6135
 	
6136 6136
 	/**
6137
-	* Gets all departure airports of the airplanes that have flown over based on a date
6138
-	*
6139
-	* @return Array the airport list
6140
-	*
6141
-	*/
6137
+	 * Gets all departure airports of the airplanes that have flown over based on a date
6138
+	 *
6139
+	 * @return Array the airport list
6140
+	 *
6141
+	 */
6142 6142
 	public function countAllDepartureAirportsByDate($date,$filters = array())
6143 6143
 	{
6144 6144
 		global $globalTimezone, $globalDBdriver;
@@ -6184,11 +6184,11 @@  discard block
 block discarded – undo
6184 6184
 	
6185 6185
 	
6186 6186
 	/**
6187
-	* Gets all departure airports by country of the airplanes that have flown over based on a date
6188
-	*
6189
-	* @return Array the airport list
6190
-	*
6191
-	*/
6187
+	 * Gets all departure airports by country of the airplanes that have flown over based on a date
6188
+	 *
6189
+	 * @return Array the airport list
6190
+	 *
6191
+	 */
6192 6192
 	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
6193 6193
 	{
6194 6194
 		global $globalTimezone, $globalDBdriver;
@@ -6231,11 +6231,11 @@  discard block
 block discarded – undo
6231 6231
 	
6232 6232
 	
6233 6233
 	/**
6234
-	* Gets all departure airports of the airplanes that have flown over based on a ident/callsign
6235
-	*
6236
-	* @return Array the airport list
6237
-	*
6238
-	*/
6234
+	 * Gets all departure airports of the airplanes that have flown over based on a ident/callsign
6235
+	 *
6236
+	 * @return Array the airport list
6237
+	 *
6238
+	 */
6239 6239
 	public function countAllDepartureAirportsByIdent($ident,$filters = array())
6240 6240
 	{
6241 6241
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6269,11 +6269,11 @@  discard block
 block discarded – undo
6269 6269
 	
6270 6270
 	
6271 6271
 	/**
6272
-	* Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
6273
-	*
6274
-	* @return Array the airport list
6275
-	*
6276
-	*/
6272
+	 * Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
6273
+	 *
6274
+	 * @return Array the airport list
6275
+	 *
6276
+	 */
6277 6277
 	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
6278 6278
 	{
6279 6279
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6304,11 +6304,11 @@  discard block
 block discarded – undo
6304 6304
 	
6305 6305
 	
6306 6306
 	/**
6307
-	* Gets all departure airports of the airplanes that have flown over based on a country
6308
-	*
6309
-	* @return Array the airport list
6310
-	*
6311
-	*/
6307
+	 * Gets all departure airports of the airplanes that have flown over based on a country
6308
+	 *
6309
+	 * @return Array the airport list
6310
+	 *
6311
+	 */
6312 6312
 	public function countAllDepartureAirportsByCountry($country,$filters = array())
6313 6313
 	{
6314 6314
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6342,11 +6342,11 @@  discard block
 block discarded – undo
6342 6342
 
6343 6343
 
6344 6344
 	/**
6345
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
6346
-	*
6347
-	* @return Array the airport list
6348
-	*
6349
-	*/
6345
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
6346
+	 *
6347
+	 * @return Array the airport list
6348
+	 *
6349
+	 */
6350 6350
 	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
6351 6351
 	{
6352 6352
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6376,40 +6376,40 @@  discard block
 block discarded – undo
6376 6376
 	
6377 6377
 
6378 6378
 	/**
6379
-	* Gets all arrival airports of the airplanes that have flown over
6380
-	*
6381
-	* @return Array the airport list
6382
-	*
6383
-	*/
6379
+	 * Gets all arrival airports of the airplanes that have flown over
6380
+	 *
6381
+	 * @return Array the airport list
6382
+	 *
6383
+	 */
6384 6384
 	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6385 6385
 	{
6386 6386
 		global $globalDBdriver;
6387 6387
 		$filter_query = $this->getFilter($filters,true,true);
6388 6388
 		$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 
6389 6389
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
6390
-                if ($olderthanmonths > 0) {
6391
-            		if ($globalDBdriver == 'mysql') {
6390
+				if ($olderthanmonths > 0) {
6391
+					if ($globalDBdriver == 'mysql') {
6392 6392
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
6393 6393
 			} else {
6394 6394
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
6395 6395
 			}
6396
-                if ($sincedate != '') {
6397
-            		if ($globalDBdriver == 'mysql') {
6396
+				if ($sincedate != '') {
6397
+					if ($globalDBdriver == 'mysql') {
6398 6398
 				$query .= " AND spotter_output.date > '".$sincedate."'";
6399 6399
 			} else {
6400 6400
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6401 6401
 			}
6402 6402
 		}
6403
-            		if ($globalDBdriver == 'mysql') {
6403
+					if ($globalDBdriver == 'mysql') {
6404 6404
 				$query .= " AND spotter_output.date > '".$sincedate."'";
6405 6405
 			} else {
6406 6406
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6407 6407
 			}
6408 6408
 		}
6409 6409
 
6410
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6411
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6412
-                $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6410
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6411
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6412
+				$query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6413 6413
 					ORDER BY airport_arrival_icao_count DESC";
6414 6414
 		if ($limit) $query .= " LIMIT 10";
6415 6415
       
@@ -6438,40 +6438,40 @@  discard block
 block discarded – undo
6438 6438
 	}
6439 6439
 
6440 6440
 	/**
6441
-	* Gets all arrival airports of the airplanes that have flown over
6442
-	*
6443
-	* @return Array the airport list
6444
-	*
6445
-	*/
6441
+	 * Gets all arrival airports of the airplanes that have flown over
6442
+	 *
6443
+	 * @return Array the airport list
6444
+	 *
6445
+	 */
6446 6446
 	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6447 6447
 	{
6448 6448
 		global $globalDBdriver;
6449 6449
 		$filter_query = $this->getFilter($filters,true,true);
6450 6450
 		$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 
6451 6451
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' ";
6452
-                if ($olderthanmonths > 0) {
6453
-            		if ($globalDBdriver == 'mysql') {
6452
+				if ($olderthanmonths > 0) {
6453
+					if ($globalDBdriver == 'mysql') {
6454 6454
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
6455 6455
 			} else {
6456 6456
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
6457 6457
 			}
6458
-                if ($sincedate != '') {
6459
-            		if ($globalDBdriver == 'mysql') {
6458
+				if ($sincedate != '') {
6459
+					if ($globalDBdriver == 'mysql') {
6460 6460
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
6461 6461
 			} else {
6462 6462
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6463 6463
 			}
6464 6464
 		}
6465
-            		if ($globalDBdriver == 'mysql') {
6465
+					if ($globalDBdriver == 'mysql') {
6466 6466
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
6467 6467
 			} else {
6468 6468
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6469 6469
 			}
6470 6470
 		}
6471 6471
 
6472
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6473
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6474
-                $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
6472
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6473
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6474
+				$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
6475 6475
 					ORDER BY airport_arrival_icao_count DESC";
6476 6476
 		if ($limit) $query .= " LIMIT 10";
6477 6477
       
@@ -6502,39 +6502,39 @@  discard block
 block discarded – undo
6502 6502
 
6503 6503
 
6504 6504
 	/**
6505
-	* Gets all detected arrival airports of the airplanes that have flown over
6506
-	*
6507
-	* @return Array the airport list
6508
-	*
6509
-	*/
6505
+	 * Gets all detected arrival airports of the airplanes that have flown over
6506
+	 *
6507
+	 * @return Array the airport list
6508
+	 *
6509
+	 */
6510 6510
 	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6511 6511
 	{
6512 6512
 		global $globalDBdriver;
6513 6513
 		$filter_query = $this->getFilter($filters,true,true);
6514 6514
 		$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 
6515 6515
 			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";
6516
-                if ($olderthanmonths > 0) {
6517
-            		if ($globalDBdriver == 'mysql') {
6516
+				if ($olderthanmonths > 0) {
6517
+					if ($globalDBdriver == 'mysql') {
6518 6518
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
6519 6519
 			} else {
6520 6520
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
6521 6521
 			}
6522
-                if ($sincedate != '') {
6523
-            		if ($globalDBdriver == 'mysql') {
6522
+				if ($sincedate != '') {
6523
+					if ($globalDBdriver == 'mysql') {
6524 6524
 				$query .= " AND spotter_output.date > '".$sincedate."'";
6525 6525
 			} else {
6526 6526
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6527 6527
 			}
6528 6528
 		}
6529
-            		if ($globalDBdriver == 'mysql') {
6529
+					if ($globalDBdriver == 'mysql') {
6530 6530
 				$query .= " AND spotter_output.date > '".$sincedate."'";
6531 6531
 			} else {
6532 6532
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6533 6533
 			}
6534 6534
 		}
6535
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6536
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6537
-                $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6535
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6536
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6537
+				$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6538 6538
 					ORDER BY airport_arrival_icao_count DESC";
6539 6539
 		if ($limit) $query .= " LIMIT 10";
6540 6540
       
@@ -6563,40 +6563,40 @@  discard block
 block discarded – undo
6563 6563
 	}
6564 6564
 	
6565 6565
 	/**
6566
-	* Gets all detected arrival airports of the airplanes that have flown over
6567
-	*
6568
-	* @return Array the airport list
6569
-	*
6570
-	*/
6566
+	 * Gets all detected arrival airports of the airplanes that have flown over
6567
+	 *
6568
+	 * @return Array the airport list
6569
+	 *
6570
+	 */
6571 6571
 	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6572 6572
 	{
6573 6573
 		global $globalDBdriver;
6574 6574
 		$filter_query = $this->getFilter($filters,true,true);
6575 6575
 		$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 
6576 6576
 			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 ";
6577
-                if ($olderthanmonths > 0) {
6578
-            		if ($globalDBdriver == 'mysql') {
6577
+				if ($olderthanmonths > 0) {
6578
+					if ($globalDBdriver == 'mysql') {
6579 6579
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
6580 6580
 			} else {
6581 6581
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
6582 6582
 			}
6583
-                if ($sincedate != '') {
6584
-            		if ($globalDBdriver == 'mysql') {
6583
+				if ($sincedate != '') {
6584
+					if ($globalDBdriver == 'mysql') {
6585 6585
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
6586 6586
 			} else {
6587 6587
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6588 6588
 			}
6589 6589
 		}
6590
-            		if ($globalDBdriver == 'mysql') {
6590
+					if ($globalDBdriver == 'mysql') {
6591 6591
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
6592 6592
 			} else {
6593 6593
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
6594 6594
 			}
6595 6595
 		}
6596 6596
 
6597
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6598
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6599
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6597
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
6598
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6599
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6600 6600
 					ORDER BY airport_arrival_icao_count DESC";
6601 6601
 		if ($limit) $query .= " LIMIT 10";
6602 6602
       
@@ -6626,11 +6626,11 @@  discard block
 block discarded – undo
6626 6626
 	}	
6627 6627
 	
6628 6628
 	/**
6629
-	* Gets all arrival airports of the airplanes that have flown over based on an airline icao
6630
-	*
6631
-	* @return Array the airport list
6632
-	*
6633
-	*/
6629
+	 * Gets all arrival airports of the airplanes that have flown over based on an airline icao
6630
+	 *
6631
+	 * @return Array the airport list
6632
+	 *
6633
+	 */
6634 6634
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
6635 6635
 	{
6636 6636
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6662,11 +6662,11 @@  discard block
 block discarded – undo
6662 6662
 	
6663 6663
 	
6664 6664
 	/**
6665
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
6666
-	*
6667
-	* @return Array the airport list
6668
-	*
6669
-	*/
6665
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
6666
+	 *
6667
+	 * @return Array the airport list
6668
+	 *
6669
+	 */
6670 6670
 	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
6671 6671
 	{
6672 6672
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6697,11 +6697,11 @@  discard block
 block discarded – undo
6697 6697
 	
6698 6698
 	
6699 6699
 	/**
6700
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
6701
-	*
6702
-	* @return Array the airport list
6703
-	*
6704
-	*/
6700
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
6701
+	 *
6702
+	 * @return Array the airport list
6703
+	 *
6704
+	 */
6705 6705
 	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
6706 6706
 	{
6707 6707
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6735,11 +6735,11 @@  discard block
 block discarded – undo
6735 6735
 	
6736 6736
 	
6737 6737
 	/**
6738
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
6739
-	*
6740
-	* @return Array the airport list
6741
-	*
6742
-	*/
6738
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
6739
+	 *
6740
+	 * @return Array the airport list
6741
+	 *
6742
+	 */
6743 6743
 	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
6744 6744
 	{
6745 6745
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6769,11 +6769,11 @@  discard block
 block discarded – undo
6769 6769
 	
6770 6770
 	
6771 6771
 	/**
6772
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
6773
-	*
6774
-	* @return Array the airport list
6775
-	*
6776
-	*/
6772
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
6773
+	 *
6774
+	 * @return Array the airport list
6775
+	 *
6776
+	 */
6777 6777
 	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
6778 6778
 	{
6779 6779
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6807,11 +6807,11 @@  discard block
 block discarded – undo
6807 6807
 	
6808 6808
 	
6809 6809
 	/**
6810
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
6811
-	*
6812
-	* @return Array the airport list
6813
-	*
6814
-	*/
6810
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
6811
+	 *
6812
+	 * @return Array the airport list
6813
+	 *
6814
+	 */
6815 6815
 	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
6816 6816
 	{
6817 6817
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6842,11 +6842,11 @@  discard block
 block discarded – undo
6842 6842
 	
6843 6843
 	
6844 6844
 	/**
6845
-	* Gets all arrival airports of the airplanes that have flown over based on an departure airport
6846
-	*
6847
-	* @return Array the airport list
6848
-	*
6849
-	*/
6845
+	 * Gets all arrival airports of the airplanes that have flown over based on an departure airport
6846
+	 *
6847
+	 * @return Array the airport list
6848
+	 *
6849
+	 */
6850 6850
 	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
6851 6851
 	{
6852 6852
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6879,11 +6879,11 @@  discard block
 block discarded – undo
6879 6879
 	
6880 6880
 	
6881 6881
 	/**
6882
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
6883
-	*
6884
-	* @return Array the airport list
6885
-	*
6886
-	*/
6882
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
6883
+	 *
6884
+	 * @return Array the airport list
6885
+	 *
6886
+	 */
6887 6887
 	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
6888 6888
 	{
6889 6889
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6913,11 +6913,11 @@  discard block
 block discarded – undo
6913 6913
 	
6914 6914
 	
6915 6915
 	/**
6916
-	* Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
6917
-	*
6918
-	* @return Array the airport list
6919
-	*
6920
-	*/
6916
+	 * Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
6917
+	 *
6918
+	 * @return Array the airport list
6919
+	 *
6920
+	 */
6921 6921
 	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6922 6922
 	{
6923 6923
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6951,11 +6951,11 @@  discard block
 block discarded – undo
6951 6951
 	
6952 6952
 	
6953 6953
 	/**
6954
-	* Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
6955
-	*
6956
-	* @return Array the airport list
6957
-	*
6958
-	*/
6954
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
6955
+	 *
6956
+	 * @return Array the airport list
6957
+	 *
6958
+	 */
6959 6959
 	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6960 6960
 	{
6961 6961
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6986,11 +6986,11 @@  discard block
 block discarded – undo
6986 6986
 	
6987 6987
 	
6988 6988
 	/**
6989
-	* Gets all arrival airports of the airplanes that have flown over based on a date
6990
-	*
6991
-	* @return Array the airport list
6992
-	*
6993
-	*/
6989
+	 * Gets all arrival airports of the airplanes that have flown over based on a date
6990
+	 *
6991
+	 * @return Array the airport list
6992
+	 *
6993
+	 */
6994 6994
 	public function countAllArrivalAirportsByDate($date,$filters = array())
6995 6995
 	{
6996 6996
 		global $globalTimezone, $globalDBdriver;
@@ -7036,11 +7036,11 @@  discard block
 block discarded – undo
7036 7036
 	
7037 7037
 	
7038 7038
 	/**
7039
-	* Gets all arrival airports by country of the airplanes that have flown over based on a date
7040
-	*
7041
-	* @return Array the airport list
7042
-	*
7043
-	*/
7039
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a date
7040
+	 *
7041
+	 * @return Array the airport list
7042
+	 *
7043
+	 */
7044 7044
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
7045 7045
 	{
7046 7046
 		global $globalTimezone, $globalDBdriver;
@@ -7083,11 +7083,11 @@  discard block
 block discarded – undo
7083 7083
 	
7084 7084
 	
7085 7085
 	/**
7086
-	* Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
7087
-	*
7088
-	* @return Array the airport list
7089
-	*
7090
-	*/
7086
+	 * Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
7087
+	 *
7088
+	 * @return Array the airport list
7089
+	 *
7090
+	 */
7091 7091
 	public function countAllArrivalAirportsByIdent($ident,$filters = array())
7092 7092
 	{
7093 7093
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7120,11 +7120,11 @@  discard block
 block discarded – undo
7120 7120
 	
7121 7121
 	
7122 7122
 	/**
7123
-	* Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
7124
-	*
7125
-	* @return Array the airport list
7126
-	*
7127
-	*/
7123
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
7124
+	 *
7125
+	 * @return Array the airport list
7126
+	 *
7127
+	 */
7128 7128
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
7129 7129
 	{
7130 7130
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7155,11 +7155,11 @@  discard block
 block discarded – undo
7155 7155
 	
7156 7156
 	
7157 7157
 	/**
7158
-	* Gets all arrival airports of the airplanes that have flown over based on a country
7159
-	*
7160
-	* @return Array the airport list
7161
-	*
7162
-	*/
7158
+	 * Gets all arrival airports of the airplanes that have flown over based on a country
7159
+	 *
7160
+	 * @return Array the airport list
7161
+	 *
7162
+	 */
7163 7163
 	public function countAllArrivalAirportsByCountry($country,$filters = array())
7164 7164
 	{
7165 7165
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7192,11 +7192,11 @@  discard block
 block discarded – undo
7192 7192
 	
7193 7193
 	
7194 7194
 	/**
7195
-	* Gets all arrival airports by country of the airplanes that have flown over based on a country
7196
-	*
7197
-	* @return Array the airport list
7198
-	*
7199
-	*/
7195
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a country
7196
+	 *
7197
+	 * @return Array the airport list
7198
+	 *
7199
+	 */
7200 7200
 	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
7201 7201
 	{
7202 7202
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7227,11 +7227,11 @@  discard block
 block discarded – undo
7227 7227
 
7228 7228
 
7229 7229
 	/**
7230
-	* Counts all airport departure countries
7231
-	*
7232
-	* @return Array the airport departure list
7233
-	*
7234
-	*/
7230
+	 * Counts all airport departure countries
7231
+	 *
7232
+	 * @return Array the airport departure list
7233
+	 *
7234
+	 */
7235 7235
 	public function countAllDepartureCountries($filters = array())
7236 7236
 	{
7237 7237
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7261,11 +7261,11 @@  discard block
 block discarded – undo
7261 7261
 	
7262 7262
 	
7263 7263
 	/**
7264
-	* Counts all airport arrival countries
7265
-	*
7266
-	* @return Array the airport arrival list
7267
-	*
7268
-	*/
7264
+	 * Counts all airport arrival countries
7265
+	 *
7266
+	 * @return Array the airport arrival list
7267
+	 *
7268
+	 */
7269 7269
 	public function countAllArrivalCountries($limit = true,$filters = array())
7270 7270
 	{
7271 7271
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7298,11 +7298,11 @@  discard block
 block discarded – undo
7298 7298
 
7299 7299
 
7300 7300
 	/**
7301
-	* Gets all route combinations
7302
-	*
7303
-	* @return Array the route list
7304
-	*
7305
-	*/
7301
+	 * Gets all route combinations
7302
+	 *
7303
+	 * @return Array the route list
7304
+	 *
7305
+	 */
7306 7306
 	public function countAllRoutes($filters = array())
7307 7307
 	{
7308 7308
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7341,11 +7341,11 @@  discard block
 block discarded – undo
7341 7341
 	
7342 7342
 	
7343 7343
 	/**
7344
-	* Gets all route combinations based on an aircraft
7345
-	*
7346
-	* @return Array the route list
7347
-	*
7348
-	*/
7344
+	 * Gets all route combinations based on an aircraft
7345
+	 *
7346
+	 * @return Array the route list
7347
+	 *
7348
+	 */
7349 7349
 	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
7350 7350
 	{
7351 7351
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7381,11 +7381,11 @@  discard block
 block discarded – undo
7381 7381
 	
7382 7382
 	
7383 7383
 	/**
7384
-	* Gets all route combinations based on an aircraft registration
7385
-	*
7386
-	* @return Array the route list
7387
-	*
7388
-	*/
7384
+	 * Gets all route combinations based on an aircraft registration
7385
+	 *
7386
+	 * @return Array the route list
7387
+	 *
7388
+	 */
7389 7389
 	public function countAllRoutesByRegistration($registration, $filters = array())
7390 7390
 	{
7391 7391
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7423,11 +7423,11 @@  discard block
 block discarded – undo
7423 7423
 	
7424 7424
 	
7425 7425
 	/**
7426
-	* Gets all route combinations based on an airline
7427
-	*
7428
-	* @return Array the route list
7429
-	*
7430
-	*/
7426
+	 * Gets all route combinations based on an airline
7427
+	 *
7428
+	 * @return Array the route list
7429
+	 *
7430
+	 */
7431 7431
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
7432 7432
 	{
7433 7433
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7465,11 +7465,11 @@  discard block
 block discarded – undo
7465 7465
 	
7466 7466
 	
7467 7467
 	/**
7468
-	* Gets all route combinations based on an airport
7469
-	*
7470
-	* @return Array the route list
7471
-	*
7472
-	*/
7468
+	 * Gets all route combinations based on an airport
7469
+	 *
7470
+	 * @return Array the route list
7471
+	 *
7472
+	 */
7473 7473
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
7474 7474
 	{
7475 7475
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7506,11 +7506,11 @@  discard block
 block discarded – undo
7506 7506
 	
7507 7507
 	
7508 7508
 	/**
7509
-	* Gets all route combinations based on an country
7510
-	*
7511
-	* @return Array the route list
7512
-	*
7513
-	*/
7509
+	 * Gets all route combinations based on an country
7510
+	 *
7511
+	 * @return Array the route list
7512
+	 *
7513
+	 */
7514 7514
 	public function countAllRoutesByCountry($country, $filters = array())
7515 7515
 	{
7516 7516
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7546,11 +7546,11 @@  discard block
 block discarded – undo
7546 7546
 
7547 7547
 
7548 7548
 	/**
7549
-	* Gets all route combinations based on an date
7550
-	*
7551
-	* @return Array the route list
7552
-	*
7553
-	*/
7549
+	 * Gets all route combinations based on an date
7550
+	 *
7551
+	 * @return Array the route list
7552
+	 *
7553
+	 */
7554 7554
 	public function countAllRoutesByDate($date, $filters = array())
7555 7555
 	{
7556 7556
 		global $globalTimezone, $globalDBdriver;
@@ -7600,11 +7600,11 @@  discard block
 block discarded – undo
7600 7600
 	
7601 7601
 	
7602 7602
 	/**
7603
-	* Gets all route combinations based on an ident/callsign
7604
-	*
7605
-	* @return Array the route list
7606
-	*
7607
-	*/
7603
+	 * Gets all route combinations based on an ident/callsign
7604
+	 *
7605
+	 * @return Array the route list
7606
+	 *
7607
+	 */
7608 7608
 	public function countAllRoutesByIdent($ident, $filters = array())
7609 7609
 	{
7610 7610
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7641,11 +7641,11 @@  discard block
 block discarded – undo
7641 7641
 	
7642 7642
 	
7643 7643
 	/**
7644
-	* Gets all route combinations based on an manufacturer
7645
-	*
7646
-	* @return Array the route list
7647
-	*
7648
-	*/
7644
+	 * Gets all route combinations based on an manufacturer
7645
+	 *
7646
+	 * @return Array the route list
7647
+	 *
7648
+	 */
7649 7649
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
7650 7650
 	{
7651 7651
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7683,11 +7683,11 @@  discard block
 block discarded – undo
7683 7683
 	
7684 7684
 	
7685 7685
 	/**
7686
-	* Gets all route combinations with waypoints
7687
-	*
7688
-	* @return Array the route list
7689
-	*
7690
-	*/
7686
+	 * Gets all route combinations with waypoints
7687
+	 *
7688
+	 * @return Array the route list
7689
+	 *
7690
+	 */
7691 7691
 	public function countAllRoutesWithWaypoints($filters = array())
7692 7692
 	{
7693 7693
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7724,11 +7724,11 @@  discard block
 block discarded – undo
7724 7724
 	}
7725 7725
 	
7726 7726
 	/**
7727
-	* Gets all callsigns that have flown over
7728
-	*
7729
-	* @return Array the callsign list
7730
-	*
7731
-	*/
7727
+	 * Gets all callsigns that have flown over
7728
+	 *
7729
+	 * @return Array the callsign list
7730
+	 *
7731
+	 */
7732 7732
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
7733 7733
 	{
7734 7734
 		global $globalDBdriver;
@@ -7766,11 +7766,11 @@  discard block
 block discarded – undo
7766 7766
 	}
7767 7767
 
7768 7768
 	/**
7769
-	* Gets all callsigns that have flown over
7770
-	*
7771
-	* @return Array the callsign list
7772
-	*
7773
-	*/
7769
+	 * Gets all callsigns that have flown over
7770
+	 *
7771
+	 * @return Array the callsign list
7772
+	 *
7773
+	 */
7774 7774
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7775 7775
 	{
7776 7776
 		global $globalDBdriver;
@@ -7811,11 +7811,11 @@  discard block
 block discarded – undo
7811 7811
 
7812 7812
 
7813 7813
 	/**
7814
-	* Counts all dates
7815
-	*
7816
-	* @return Array the date list
7817
-	*
7818
-	*/
7814
+	 * Counts all dates
7815
+	 *
7816
+	 * @return Array the date list
7817
+	 *
7818
+	 */
7819 7819
 	public function countAllDates($filters = array())
7820 7820
 	{
7821 7821
 		global $globalTimezone, $globalDBdriver;
@@ -7860,11 +7860,11 @@  discard block
 block discarded – undo
7860 7860
 	}
7861 7861
 	
7862 7862
 	/**
7863
-	* Counts all dates
7864
-	*
7865
-	* @return Array the date list
7866
-	*
7867
-	*/
7863
+	 * Counts all dates
7864
+	 *
7865
+	 * @return Array the date list
7866
+	 *
7867
+	 */
7868 7868
 	public function countAllDatesByAirlines($filters = array())
7869 7869
 	{
7870 7870
 		global $globalTimezone, $globalDBdriver;
@@ -7909,11 +7909,11 @@  discard block
 block discarded – undo
7909 7909
 	}	
7910 7910
 	
7911 7911
 	/**
7912
-	* Counts all dates during the last 7 days
7913
-	*
7914
-	* @return Array the date list
7915
-	*
7916
-	*/
7912
+	 * Counts all dates during the last 7 days
7913
+	 *
7914
+	 * @return Array the date list
7915
+	 *
7916
+	 */
7917 7917
 	public function countAllDatesLast7Days($filters = array())
7918 7918
 	{
7919 7919
 		global $globalTimezone, $globalDBdriver;
@@ -7935,7 +7935,7 @@  discard block
 block discarded – undo
7935 7935
 			$query .= " GROUP BY date_name 
7936 7936
 								ORDER BY date_name ASC";
7937 7937
 			$query_data = array(':offset' => $offset);
7938
-    		}
7938
+			}
7939 7939
 		
7940 7940
 		$sth = $this->db->prepare($query);
7941 7941
 		$sth->execute($query_data);
@@ -7955,11 +7955,11 @@  discard block
 block discarded – undo
7955 7955
 	}
7956 7956
 
7957 7957
 	/**
7958
-	* Counts all dates during the last month
7959
-	*
7960
-	* @return Array the date list
7961
-	*
7962
-	*/
7958
+	 * Counts all dates during the last month
7959
+	 *
7960
+	 * @return Array the date list
7961
+	 *
7962
+	 */
7963 7963
 	public function countAllDatesLastMonth($filters = array())
7964 7964
 	{
7965 7965
 		global $globalTimezone, $globalDBdriver;
@@ -7981,7 +7981,7 @@  discard block
 block discarded – undo
7981 7981
 			$query .= " GROUP BY date_name 
7982 7982
 								ORDER BY date_name ASC";
7983 7983
 			$query_data = array(':offset' => $offset);
7984
-    		}
7984
+			}
7985 7985
 		
7986 7986
 		$sth = $this->db->prepare($query);
7987 7987
 		$sth->execute($query_data);
@@ -8002,11 +8002,11 @@  discard block
 block discarded – undo
8002 8002
 
8003 8003
 
8004 8004
 	/**
8005
-	* Counts all dates during the last month
8006
-	*
8007
-	* @return Array the date list
8008
-	*
8009
-	*/
8005
+	 * Counts all dates during the last month
8006
+	 *
8007
+	 * @return Array the date list
8008
+	 *
8009
+	 */
8010 8010
 	public function countAllDatesLastMonthByAirlines($filters = array())
8011 8011
 	{
8012 8012
 		global $globalTimezone, $globalDBdriver;
@@ -8029,7 +8029,7 @@  discard block
 block discarded – undo
8029 8029
 								GROUP BY spotter_output.airline_icao, date_name 
8030 8030
 								ORDER BY date_name ASC";
8031 8031
 			$query_data = array(':offset' => $offset);
8032
-    		}
8032
+			}
8033 8033
 		
8034 8034
 		$sth = $this->db->prepare($query);
8035 8035
 		$sth->execute($query_data);
@@ -8051,11 +8051,11 @@  discard block
 block discarded – undo
8051 8051
 	
8052 8052
 
8053 8053
 	/**
8054
-	* Counts all month
8055
-	*
8056
-	* @return Array the month list
8057
-	*
8058
-	*/
8054
+	 * Counts all month
8055
+	 *
8056
+	 * @return Array the month list
8057
+	 *
8058
+	 */
8059 8059
 	public function countAllMonths($filters = array())
8060 8060
 	{
8061 8061
 		global $globalTimezone, $globalDBdriver;
@@ -8097,11 +8097,11 @@  discard block
 block discarded – undo
8097 8097
 	}
8098 8098
 
8099 8099
 	/**
8100
-	* Counts all month
8101
-	*
8102
-	* @return Array the month list
8103
-	*
8104
-	*/
8100
+	 * Counts all month
8101
+	 *
8102
+	 * @return Array the month list
8103
+	 *
8104
+	 */
8105 8105
 	public function countAllMonthsByAirlines($filters = array())
8106 8106
 	{
8107 8107
 		global $globalTimezone, $globalDBdriver;
@@ -8146,11 +8146,11 @@  discard block
 block discarded – undo
8146 8146
 	}
8147 8147
 
8148 8148
 	/**
8149
-	* Counts all military month
8150
-	*
8151
-	* @return Array the month list
8152
-	*
8153
-	*/
8149
+	 * Counts all military month
8150
+	 *
8151
+	 * @return Array the month list
8152
+	 *
8153
+	 */
8154 8154
 	public function countAllMilitaryMonths($filters = array())
8155 8155
 	{
8156 8156
 		global $globalTimezone, $globalDBdriver;
@@ -8191,11 +8191,11 @@  discard block
 block discarded – undo
8191 8191
 	}
8192 8192
 	
8193 8193
 	/**
8194
-	* Counts all month owners
8195
-	*
8196
-	* @return Array the month list
8197
-	*
8198
-	*/
8194
+	 * Counts all month owners
8195
+	 *
8196
+	 * @return Array the month list
8197
+	 *
8198
+	 */
8199 8199
 	public function countAllMonthsOwners($filters = array())
8200 8200
 	{
8201 8201
 		global $globalTimezone, $globalDBdriver;
@@ -8237,11 +8237,11 @@  discard block
 block discarded – undo
8237 8237
 	}
8238 8238
 	
8239 8239
 	/**
8240
-	* Counts all month owners
8241
-	*
8242
-	* @return Array the month list
8243
-	*
8244
-	*/
8240
+	 * Counts all month owners
8241
+	 *
8242
+	 * @return Array the month list
8243
+	 *
8244
+	 */
8245 8245
 	public function countAllMonthsOwnersByAirlines($filters = array())
8246 8246
 	{
8247 8247
 		global $globalTimezone, $globalDBdriver;
@@ -8284,11 +8284,11 @@  discard block
 block discarded – undo
8284 8284
 	}
8285 8285
 
8286 8286
 	/**
8287
-	* Counts all month pilot
8288
-	*
8289
-	* @return Array the month list
8290
-	*
8291
-	*/
8287
+	 * Counts all month pilot
8288
+	 *
8289
+	 * @return Array the month list
8290
+	 *
8291
+	 */
8292 8292
 	public function countAllMonthsPilots($filters = array())
8293 8293
 	{
8294 8294
 		global $globalTimezone, $globalDBdriver;
@@ -8330,11 +8330,11 @@  discard block
 block discarded – undo
8330 8330
 	}
8331 8331
 	
8332 8332
 	/**
8333
-	* Counts all month pilot
8334
-	*
8335
-	* @return Array the month list
8336
-	*
8337
-	*/
8333
+	 * Counts all month pilot
8334
+	 *
8335
+	 * @return Array the month list
8336
+	 *
8337
+	 */
8338 8338
 	public function countAllMonthsPilotsByAirlines($filters = array())
8339 8339
 	{
8340 8340
 		global $globalTimezone, $globalDBdriver;
@@ -8377,11 +8377,11 @@  discard block
 block discarded – undo
8377 8377
 	}
8378 8378
 
8379 8379
 	/**
8380
-	* Counts all month airline
8381
-	*
8382
-	* @return Array the month list
8383
-	*
8384
-	*/
8380
+	 * Counts all month airline
8381
+	 *
8382
+	 * @return Array the month list
8383
+	 *
8384
+	 */
8385 8385
 	public function countAllMonthsAirlines($filters = array())
8386 8386
 	{
8387 8387
 		global $globalTimezone, $globalDBdriver;
@@ -8423,11 +8423,11 @@  discard block
 block discarded – undo
8423 8423
 	}
8424 8424
 	
8425 8425
 	/**
8426
-	* Counts all month aircraft
8427
-	*
8428
-	* @return Array the month list
8429
-	*
8430
-	*/
8426
+	 * Counts all month aircraft
8427
+	 *
8428
+	 * @return Array the month list
8429
+	 *
8430
+	 */
8431 8431
 	public function countAllMonthsAircrafts($filters = array())
8432 8432
 	{
8433 8433
 		global $globalTimezone, $globalDBdriver;
@@ -8470,11 +8470,11 @@  discard block
 block discarded – undo
8470 8470
 	
8471 8471
 
8472 8472
 	/**
8473
-	* Counts all month aircraft
8474
-	*
8475
-	* @return Array the month list
8476
-	*
8477
-	*/
8473
+	 * Counts all month aircraft
8474
+	 *
8475
+	 * @return Array the month list
8476
+	 *
8477
+	 */
8478 8478
 	public function countAllMonthsAircraftsByAirlines($filters = array())
8479 8479
 	{
8480 8480
 		global $globalTimezone, $globalDBdriver;
@@ -8517,11 +8517,11 @@  discard block
 block discarded – undo
8517 8517
 	}
8518 8518
 
8519 8519
 	/**
8520
-	* Counts all month real arrival
8521
-	*
8522
-	* @return Array the month list
8523
-	*
8524
-	*/
8520
+	 * Counts all month real arrival
8521
+	 *
8522
+	 * @return Array the month list
8523
+	 *
8524
+	 */
8525 8525
 	public function countAllMonthsRealArrivals($filters = array())
8526 8526
 	{
8527 8527
 		global $globalTimezone, $globalDBdriver;
@@ -8564,11 +8564,11 @@  discard block
 block discarded – undo
8564 8564
 	
8565 8565
 
8566 8566
 	/**
8567
-	* Counts all month real arrival
8568
-	*
8569
-	* @return Array the month list
8570
-	*
8571
-	*/
8567
+	 * Counts all month real arrival
8568
+	 *
8569
+	 * @return Array the month list
8570
+	 *
8571
+	 */
8572 8572
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
8573 8573
 	{
8574 8574
 		global $globalTimezone, $globalDBdriver;
@@ -8612,11 +8612,11 @@  discard block
 block discarded – undo
8612 8612
 	
8613 8613
 
8614 8614
 	/**
8615
-	* Counts all dates during the last year
8616
-	*
8617
-	* @return Array the date list
8618
-	*
8619
-	*/
8615
+	 * Counts all dates during the last year
8616
+	 *
8617
+	 * @return Array the date list
8618
+	 *
8619
+	 */
8620 8620
 	public function countAllMonthsLastYear($filters)
8621 8621
 	{
8622 8622
 		global $globalTimezone, $globalDBdriver;
@@ -8638,7 +8638,7 @@  discard block
 block discarded – undo
8638 8638
 			$query .= " GROUP BY year_name, month_name
8639 8639
 								ORDER BY year_name, month_name ASC";
8640 8640
 			$query_data = array(':offset' => $offset);
8641
-    		}
8641
+			}
8642 8642
 		
8643 8643
 		$sth = $this->db->prepare($query);
8644 8644
 		$sth->execute($query_data);
@@ -8661,11 +8661,11 @@  discard block
 block discarded – undo
8661 8661
 	
8662 8662
 	
8663 8663
 	/**
8664
-	* Counts all hours
8665
-	*
8666
-	* @return Array the hour list
8667
-	*
8668
-	*/
8664
+	 * Counts all hours
8665
+	 *
8666
+	 * @return Array the hour list
8667
+	 *
8668
+	 */
8669 8669
 	public function countAllHours($orderby,$filters = array())
8670 8670
 	{
8671 8671
 		global $globalTimezone, $globalDBdriver;
@@ -8726,11 +8726,11 @@  discard block
 block discarded – undo
8726 8726
 	}
8727 8727
 	
8728 8728
 	/**
8729
-	* Counts all hours
8730
-	*
8731
-	* @return Array the hour list
8732
-	*
8733
-	*/
8729
+	 * Counts all hours
8730
+	 *
8731
+	 * @return Array the hour list
8732
+	 *
8733
+	 */
8734 8734
 	public function countAllHoursByAirlines($orderby, $filters = array())
8735 8735
 	{
8736 8736
 		global $globalTimezone, $globalDBdriver;
@@ -8793,11 +8793,11 @@  discard block
 block discarded – undo
8793 8793
 
8794 8794
 
8795 8795
 	/**
8796
-	* Counts all hours by airline
8797
-	*
8798
-	* @return Array the hour list
8799
-	*
8800
-	*/
8796
+	 * Counts all hours by airline
8797
+	 *
8798
+	 * @return Array the hour list
8799
+	 *
8800
+	 */
8801 8801
 	public function countAllHoursByAirline($airline_icao, $filters = array())
8802 8802
 	{
8803 8803
 		global $globalTimezone, $globalDBdriver;
@@ -8843,11 +8843,11 @@  discard block
 block discarded – undo
8843 8843
 	
8844 8844
 	
8845 8845
 	/**
8846
-	* Counts all hours by aircraft
8847
-	*
8848
-	* @return Array the hour list
8849
-	*
8850
-	*/
8846
+	 * Counts all hours by aircraft
8847
+	 *
8848
+	 * @return Array the hour list
8849
+	 *
8850
+	 */
8851 8851
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
8852 8852
 	{
8853 8853
 		global $globalTimezone, $globalDBdriver;
@@ -8890,11 +8890,11 @@  discard block
 block discarded – undo
8890 8890
 	
8891 8891
 	
8892 8892
 	/**
8893
-	* Counts all hours by aircraft registration
8894
-	*
8895
-	* @return Array the hour list
8896
-	*
8897
-	*/
8893
+	 * Counts all hours by aircraft registration
8894
+	 *
8895
+	 * @return Array the hour list
8896
+	 *
8897
+	 */
8898 8898
 	public function countAllHoursByRegistration($registration, $filters = array())
8899 8899
 	{
8900 8900
 		global $globalTimezone, $globalDBdriver;
@@ -8937,11 +8937,11 @@  discard block
 block discarded – undo
8937 8937
 	
8938 8938
 	
8939 8939
 	/**
8940
-	* Counts all hours by airport
8941
-	*
8942
-	* @return Array the hour list
8943
-	*
8944
-	*/
8940
+	 * Counts all hours by airport
8941
+	 *
8942
+	 * @return Array the hour list
8943
+	 *
8944
+	 */
8945 8945
 	public function countAllHoursByAirport($airport_icao, $filters = array())
8946 8946
 	{
8947 8947
 		global $globalTimezone, $globalDBdriver;
@@ -8985,11 +8985,11 @@  discard block
 block discarded – undo
8985 8985
 	
8986 8986
 	
8987 8987
 	/**
8988
-	* Counts all hours by manufacturer
8989
-	*
8990
-	* @return Array the hour list
8991
-	*
8992
-	*/
8988
+	 * Counts all hours by manufacturer
8989
+	 *
8990
+	 * @return Array the hour list
8991
+	 *
8992
+	 */
8993 8993
 	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
8994 8994
 	{
8995 8995
 		global $globalTimezone, $globalDBdriver;
@@ -9033,11 +9033,11 @@  discard block
 block discarded – undo
9033 9033
 	
9034 9034
 	
9035 9035
 	/**
9036
-	* Counts all hours by date
9037
-	*
9038
-	* @return Array the hour list
9039
-	*
9040
-	*/
9036
+	 * Counts all hours by date
9037
+	 *
9038
+	 * @return Array the hour list
9039
+	 *
9040
+	 */
9041 9041
 	public function countAllHoursByDate($date, $filters = array())
9042 9042
 	{
9043 9043
 		global $globalTimezone, $globalDBdriver;
@@ -9081,11 +9081,11 @@  discard block
 block discarded – undo
9081 9081
 	
9082 9082
 	
9083 9083
 	/**
9084
-	* Counts all hours by a ident/callsign
9085
-	*
9086
-	* @return Array the hour list
9087
-	*
9088
-	*/
9084
+	 * Counts all hours by a ident/callsign
9085
+	 *
9086
+	 * @return Array the hour list
9087
+	 *
9088
+	 */
9089 9089
 	public function countAllHoursByIdent($ident, $filters = array())
9090 9090
 	{
9091 9091
 		global $globalTimezone, $globalDBdriver;
@@ -9130,11 +9130,11 @@  discard block
 block discarded – undo
9130 9130
 	
9131 9131
 	
9132 9132
 	/**
9133
-	* Counts all hours by route
9134
-	*
9135
-	* @return Array the hour list
9136
-	*
9137
-	*/
9133
+	 * Counts all hours by route
9134
+	 *
9135
+	 * @return Array the hour list
9136
+	 *
9137
+	 */
9138 9138
 	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
9139 9139
 	{
9140 9140
 		global $globalTimezone, $globalDBdriver;
@@ -9178,11 +9178,11 @@  discard block
 block discarded – undo
9178 9178
 	
9179 9179
 	
9180 9180
 	/**
9181
-	* Counts all hours by country
9182
-	*
9183
-	* @return Array the hour list
9184
-	*
9185
-	*/
9181
+	 * Counts all hours by country
9182
+	 *
9183
+	 * @return Array the hour list
9184
+	 *
9185
+	 */
9186 9186
 	public function countAllHoursByCountry($country, $filters = array())
9187 9187
 	{
9188 9188
 		global $globalTimezone, $globalDBdriver;
@@ -9227,11 +9227,11 @@  discard block
 block discarded – undo
9227 9227
 
9228 9228
 
9229 9229
 	/**
9230
-	* Counts all aircraft that have flown over
9231
-	*
9232
-	* @return Integer the number of aircrafts
9233
-	*
9234
-	*/
9230
+	 * Counts all aircraft that have flown over
9231
+	 *
9232
+	 * @return Integer the number of aircrafts
9233
+	 *
9234
+	 */
9235 9235
 	public function countOverallAircrafts($filters = array())
9236 9236
 	{
9237 9237
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9243,11 +9243,11 @@  discard block
 block discarded – undo
9243 9243
 	}
9244 9244
 
9245 9245
 	/**
9246
-	* Counts all flight that really arrival
9247
-	*
9248
-	* @return Integer the number of aircrafts
9249
-	*
9250
-	*/
9246
+	 * Counts all flight that really arrival
9247
+	 *
9248
+	 * @return Integer the number of aircrafts
9249
+	 *
9250
+	 */
9251 9251
 	public function countOverallArrival($filters = array())
9252 9252
 	{
9253 9253
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9260,11 +9260,11 @@  discard block
 block discarded – undo
9260 9260
 	}
9261 9261
 
9262 9262
 	/**
9263
-	* Counts all pilots that have flown over
9264
-	*
9265
-	* @return Integer the number of pilots
9266
-	*
9267
-	*/
9263
+	 * Counts all pilots that have flown over
9264
+	 *
9265
+	 * @return Integer the number of pilots
9266
+	 *
9267
+	 */
9268 9268
 	public function countOverallPilots($filters = array())
9269 9269
 	{
9270 9270
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9276,11 +9276,11 @@  discard block
 block discarded – undo
9276 9276
 	}
9277 9277
 
9278 9278
 	/**
9279
-	* Counts all owners that have flown over
9280
-	*
9281
-	* @return Integer the number of owners
9282
-	*
9283
-	*/
9279
+	 * Counts all owners that have flown over
9280
+	 *
9281
+	 * @return Integer the number of owners
9282
+	 *
9283
+	 */
9284 9284
 	public function countOverallOwners($filters = array())
9285 9285
 	{
9286 9286
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9293,11 +9293,11 @@  discard block
 block discarded – undo
9293 9293
 	
9294 9294
 	
9295 9295
 	/**
9296
-	* Counts all flights that have flown over
9297
-	*
9298
-	* @return Integer the number of flights
9299
-	*
9300
-	*/
9296
+	 * Counts all flights that have flown over
9297
+	 *
9298
+	 * @return Integer the number of flights
9299
+	 *
9300
+	 */
9301 9301
 	public function countOverallFlights($filters = array())
9302 9302
 	{
9303 9303
 		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
@@ -9310,11 +9310,11 @@  discard block
 block discarded – undo
9310 9310
 	}
9311 9311
 	
9312 9312
 	/**
9313
-	* Counts all military flights that have flown over
9314
-	*
9315
-	* @return Integer the number of flights
9316
-	*
9317
-	*/
9313
+	 * Counts all military flights that have flown over
9314
+	 *
9315
+	 * @return Integer the number of flights
9316
+	 *
9317
+	 */
9318 9318
 	public function countOverallMilitaryFlights($filters = array())
9319 9319
 	{
9320 9320
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9329,11 +9329,11 @@  discard block
 block discarded – undo
9329 9329
 	
9330 9330
 	
9331 9331
 	/**
9332
-	* Counts all airlines that have flown over
9333
-	*
9334
-	* @return Integer the number of airlines
9335
-	*
9336
-	*/
9332
+	 * Counts all airlines that have flown over
9333
+	 *
9334
+	 * @return Integer the number of airlines
9335
+	 *
9336
+	 */
9337 9337
 	public function countOverallAirlines($filters = array())
9338 9338
 	{
9339 9339
 		$query  = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count 
@@ -9347,11 +9347,11 @@  discard block
 block discarded – undo
9347 9347
 
9348 9348
   
9349 9349
 	/**
9350
-	* Counts all hours of today
9351
-	*
9352
-	* @return Array the hour list
9353
-	*
9354
-	*/
9350
+	 * Counts all hours of today
9351
+	 *
9352
+	 * @return Array the hour list
9353
+	 *
9354
+	 */
9355 9355
 	public function countAllHoursFromToday($filters = array())
9356 9356
 	{
9357 9357
 		global $globalTimezone, $globalDBdriver;
@@ -9391,11 +9391,11 @@  discard block
 block discarded – undo
9391 9391
 	}
9392 9392
     
9393 9393
 	/**
9394
-	* Gets all the spotter information based on calculated upcoming flights
9395
-	*
9396
-	* @return Array the spotter information
9397
-	*
9398
-	*/
9394
+	 * Gets all the spotter information based on calculated upcoming flights
9395
+	 *
9396
+	 * @return Array the spotter information
9397
+	 *
9398
+	 */
9399 9399
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
9400 9400
 	{
9401 9401
 		global $global_query, $globalDBdriver, $globalTimezone;
@@ -9470,12 +9470,12 @@  discard block
 block discarded – undo
9470 9470
 	}
9471 9471
     
9472 9472
     
9473
-     /**
9474
-	* Gets the Barrie Spotter ID based on the FlightAware ID
9475
-	*
9476
-	* @return Integer the Barrie Spotter ID
9473
+	 /**
9474
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
9475
+	  *
9476
+	  * @return Integer the Barrie Spotter ID
9477 9477
 q	*
9478
-	*/
9478
+	  */
9479 9479
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
9480 9480
 	{
9481 9481
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -9496,13 +9496,13 @@  discard block
 block discarded – undo
9496 9496
   
9497 9497
  
9498 9498
 	/**
9499
-	* Parses a date string
9500
-	*
9501
-	* @param String $dateString the date string
9502
-	* @param String $timezone the timezone of a user
9503
-	* @return Array the time information
9504
-	*
9505
-	*/
9499
+	 * Parses a date string
9500
+	 *
9501
+	 * @param String $dateString the date string
9502
+	 * @param String $timezone the timezone of a user
9503
+	 * @return Array the time information
9504
+	 *
9505
+	 */
9506 9506
 	public function parseDateString($dateString, $timezone = '')
9507 9507
 	{
9508 9508
 		$time_array = array();
@@ -9538,12 +9538,12 @@  discard block
 block discarded – undo
9538 9538
 	
9539 9539
 	
9540 9540
 	/**
9541
-	* Parses the direction degrees to working
9542
-	*
9543
-	* @param Float $direction the direction in degrees
9544
-	* @return Array the direction information
9545
-	*
9546
-	*/
9541
+	 * Parses the direction degrees to working
9542
+	 *
9543
+	 * @param Float $direction the direction in degrees
9544
+	 * @return Array the direction information
9545
+	 *
9546
+	 */
9547 9547
 	public function parseDirection($direction = 0)
9548 9548
 	{
9549 9549
 		if ($direction == '') $direction = 0;
@@ -9622,12 +9622,12 @@  discard block
 block discarded – undo
9622 9622
 	
9623 9623
 	
9624 9624
 	/**
9625
-	* Gets the aircraft registration
9626
-	*
9627
-	* @param String $flightaware_id the flight aware id
9628
-	* @return String the aircraft registration
9629
-	*
9630
-	*/
9625
+	 * Gets the aircraft registration
9626
+	 *
9627
+	 * @param String $flightaware_id the flight aware id
9628
+	 * @return String the aircraft registration
9629
+	 *
9630
+	 */
9631 9631
 	
9632 9632
 	public function getAircraftRegistration($flightaware_id)
9633 9633
 	{
@@ -9656,12 +9656,12 @@  discard block
 block discarded – undo
9656 9656
 
9657 9657
 
9658 9658
 	/**
9659
-	* Gets the aircraft registration from ModeS
9660
-	*
9661
-	* @param String $aircraft_modes the flight ModeS in hex
9662
-	* @return String the aircraft registration
9663
-	*
9664
-	*/
9659
+	 * Gets the aircraft registration from ModeS
9660
+	 *
9661
+	 * @param String $aircraft_modes the flight ModeS in hex
9662
+	 * @return String the aircraft registration
9663
+	 *
9664
+	 */
9665 9665
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
9666 9666
 	{
9667 9667
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9674,19 +9674,19 @@  discard block
 block discarded – undo
9674 9674
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
9675 9675
 		$sth->closeCursor();
9676 9676
 		if (count($row) > 0) {
9677
-		    //return $row['Registration'];
9678
-		    return $row['registration'];
9677
+			//return $row['Registration'];
9678
+			return $row['registration'];
9679 9679
 		} else return '';
9680 9680
 	
9681 9681
 	}
9682 9682
 
9683 9683
 	/**
9684
-	* Gets the aircraft type from ModeS
9685
-	*
9686
-	* @param String $aircraft_modes the flight ModeS in hex
9687
-	* @return String the aircraft type
9688
-	*
9689
-	*/
9684
+	 * Gets the aircraft type from ModeS
9685
+	 *
9686
+	 * @param String $aircraft_modes the flight ModeS in hex
9687
+	 * @return String the aircraft type
9688
+	 *
9689
+	 */
9690 9690
 	public function getAircraftTypeBymodeS($aircraft_modes)
9691 9691
 	{
9692 9692
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -9699,19 +9699,19 @@  discard block
 block discarded – undo
9699 9699
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
9700 9700
 		$sth->closeCursor();
9701 9701
 		if (count($row) > 0) {
9702
-		    if ($row['type_flight'] == null) return '';
9703
-		    else return $row['type_flight'];
9702
+			if ($row['type_flight'] == null) return '';
9703
+			else return $row['type_flight'];
9704 9704
 		} else return '';
9705 9705
 	
9706 9706
 	}
9707 9707
 
9708 9708
 	/**
9709
-	* Gets Country from latitude/longitude
9710
-	*
9711
-	* @param Float $latitude latitute of the flight
9712
-	* @param Float $longitude longitute of the flight
9713
-	* @return String the countrie
9714
-	*/
9709
+	 * Gets Country from latitude/longitude
9710
+	 *
9711
+	 * @param Float $latitude latitute of the flight
9712
+	 * @param Float $longitude longitute of the flight
9713
+	 * @return String the countrie
9714
+	 */
9715 9715
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
9716 9716
 	{
9717 9717
 		global $globalDBdriver, $globalDebug;
@@ -9748,11 +9748,11 @@  discard block
 block discarded – undo
9748 9748
 	}
9749 9749
 
9750 9750
 	/**
9751
-	* Gets Country from iso2
9752
-	*
9753
-	* @param String $iso2 ISO2 country code
9754
-	* @return String the countrie
9755
-	*/
9751
+	 * Gets Country from iso2
9752
+	 *
9753
+	 * @param String $iso2 ISO2 country code
9754
+	 * @return String the countrie
9755
+	 */
9756 9756
 	public function getCountryFromISO2($iso2)
9757 9757
 	{
9758 9758
 		global $globalDBdriver, $globalDebug;
@@ -9780,12 +9780,12 @@  discard block
 block discarded – undo
9780 9780
 	}
9781 9781
 
9782 9782
 	/**
9783
-	* converts the registration code using the country prefix
9784
-	*
9785
-	* @param String $registration the aircraft registration
9786
-	* @return String the aircraft registration
9787
-	*
9788
-	*/
9783
+	 * converts the registration code using the country prefix
9784
+	 *
9785
+	 * @param String $registration the aircraft registration
9786
+	 * @return String the aircraft registration
9787
+	 *
9788
+	 */
9789 9789
 	public function convertAircraftRegistration($registration)
9790 9790
 	{
9791 9791
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9837,12 +9837,12 @@  discard block
 block discarded – undo
9837 9837
 	}
9838 9838
 
9839 9839
 	/**
9840
-	* Country from the registration code
9841
-	*
9842
-	* @param String $registration the aircraft registration
9843
-	* @return String the country
9844
-	*
9845
-	*/
9840
+	 * Country from the registration code
9841
+	 *
9842
+	 * @param String $registration the aircraft registration
9843
+	 * @return String the country
9844
+	 *
9845
+	 */
9846 9846
 	public function countryFromAircraftRegistration($registration)
9847 9847
 	{
9848 9848
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9861,8 +9861,8 @@  discard block
 block discarded – undo
9861 9861
 				$country = $row['country'];
9862 9862
 			}
9863 9863
 		} else {
9864
-    			$registration_1 = substr($registration, 0, 1);
9865
-		        $registration_2 = substr($registration, 0, 2);
9864
+				$registration_1 = substr($registration, 0, 1);
9865
+				$registration_2 = substr($registration, 0, 2);
9866 9866
 
9867 9867
 			$country = '';
9868 9868
 			//first get the prefix based on two characters
@@ -9898,12 +9898,12 @@  discard block
 block discarded – undo
9898 9898
 	}
9899 9899
 
9900 9900
 	/**
9901
-	* Country from the registration code
9902
-	*
9903
-	* @param String $registration the aircraft registration
9904
-	* @return String the country
9905
-	*
9906
-	*/
9901
+	 * Country from the registration code
9902
+	 *
9903
+	 * @param String $registration the aircraft registration
9904
+	 * @return String the country
9905
+	 *
9906
+	 */
9907 9907
 	public function countryFromAircraftRegistrationCode($registration)
9908 9908
 	{
9909 9909
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -9920,11 +9920,11 @@  discard block
 block discarded – undo
9920 9920
 	}
9921 9921
 	
9922 9922
 	/**
9923
-	* Set a new highlight value for a flight
9924
-	*
9925
-	* @param String $flightaware_id flightaware_id from spotter_output table
9926
-	* @param String $highlight New highlight value
9927
-	*/
9923
+	 * Set a new highlight value for a flight
9924
+	 *
9925
+	 * @param String $flightaware_id flightaware_id from spotter_output table
9926
+	 * @param String $highlight New highlight value
9927
+	 */
9928 9928
 	public function setHighlightFlight($flightaware_id,$highlight) {
9929 9929
 		
9930 9930
 		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
@@ -9933,12 +9933,12 @@  discard block
 block discarded – undo
9933 9933
 	}
9934 9934
 	
9935 9935
 	/**
9936
-	* Gets the short url from bit.ly
9937
-	*
9938
-	* @param String $url the full url
9939
-	* @return String the bit.ly url
9940
-	*
9941
-	*/
9936
+	 * Gets the short url from bit.ly
9937
+	 *
9938
+	 * @param String $url the full url
9939
+	 * @return String the bit.ly url
9940
+	 *
9941
+	 */
9942 9942
 	public function getBitlyURL($url)
9943 9943
 	{
9944 9944
 		global $globalBitlyAccessToken;
@@ -10227,11 +10227,11 @@  discard block
 block discarded – undo
10227 10227
 			$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 
10228 10228
 	                      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)) 
10229 10229
 	                      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;";
10230
-                } else {
10230
+				} else {
10231 10231
 			$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 
10232 10232
 	                      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)) 
10233 10233
 	                      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;";
10234
-    		}
10234
+			}
10235 10235
 		$sth = $this->db->prepare($query);
10236 10236
 		$sth->execute();
10237 10237
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
Spacing   +1011 added lines, -1011 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,64 +17,64 @@  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 22
 		$filters = array();
23 23
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
24 24
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
25 25
 				$filters = $globalStatsFilters[$globalFilterName];
26 26
 			} else {
27
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
27
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
28 28
 			}
29 29
 		}
30
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
31 31
 		$filter_query_join = '';
32 32
 		$filter_query_where = '';
33
-		foreach($filters as $flt) {
33
+		foreach ($filters as $flt) {
34 34
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
35 35
 				if ($flt['airlines'][0] != '') {
36 36
 					if (isset($flt['source'])) {
37
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
37
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
38 38
 					} else {
39
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
39
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
40 40
 					}
41 41
 				}
42 42
 			}
43 43
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
44 44
 				if (isset($flt['source'])) {
45
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
45
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
46 46
 				} else {
47
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
47
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
48 48
 				}
49 49
 			}
50 50
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
51 51
 				if (isset($flt['source'])) {
52
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
52
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
53 53
 				}
54 54
 			}
55 55
 		}
56 56
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
57 57
 			if ($filter['airlines'][0] != '') {
58
-					$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";
58
+					$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";
59 59
 			}
60 60
 		}
61 61
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
62 62
 			$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 ";
63 63
 		}
64 64
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
65
-				$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";
65
+				$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";
66 66
 			}
67 67
 		if (isset($filter['source']) && !empty($filter['source'])) {
68
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
68
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
69 69
 		}
70 70
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
71 71
 			$filter_query_where = " WHERE ident = '".$filter['ident']."'";
72 72
 		}
73 73
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 74
 			if ($filter_query_where == '') {
75
-				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75
+				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
76 76
 			} else {
77
-				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
77
+				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
78 78
 			}
79 79
 		}
80 80
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	* @return Array the spotter information
93 93
 	*
94 94
 	*/
95
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
95
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
96 96
 	{
97 97
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
98 98
 		$Image = new Image($this->db);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 			$sth = $this->db->prepare($query.$limitQuery);
123 123
 			$sth->execute($params);
124 124
 		} catch (PDOException $e) {
125
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
125
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
126 126
 			exit();
127 127
 		}
128 128
 		
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$spotter_array = array();
133 133
 		
134 134
 
135
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
135
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
136 136
 		{
137 137
 			$num_rows++;
138 138
 			$temp_array = array();
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 			if (isset($row['route_stop'])) {
178 178
 				$temp_array['route_stop'] = $row['route_stop'];
179 179
 				if ($row['route_stop'] != '') {
180
-					$allroute = explode(' ',$row['route_stop']);
180
+					$allroute = explode(' ', $row['route_stop']);
181 181
 			
182 182
 					foreach ($allroute as $route) {
183 183
 						$route_airport_array = $this->getAllAirportInfo($route);
@@ -232,11 +232,11 @@  discard block
 block discarded – undo
232 232
 				{
233 233
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
234 234
 				} else {
235
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
235
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
236 236
 				}
237 237
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
238
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
239
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
238
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
239
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
240 240
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
241 241
 			}
242 242
 			
@@ -270,9 +270,9 @@  discard block
 block discarded – undo
270 270
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
271 271
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
272 272
 					if (is_numeric(substr($row['ident'], 2, 1))) {
273
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource);
273
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource);
274 274
 					} elseif (is_numeric(substr($row['ident'], 3, 1))) {
275
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
275
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
276 276
 					} else {
277 277
 						$airline_array = $this->getAllAirlineInfo('NA');
278 278
 					}
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 				}
310 310
 			}
311 311
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
312
-				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3));
312
+				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3));
313 313
 				//$acars_array = ACARS->getLiveAcarsData('BA40YL');
314 314
 				if (count($acars_array) > 0) {
315 315
 					$temp_array['acars'] = $acars_array;
@@ -326,11 +326,11 @@  discard block
 block discarded – undo
326 326
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
327 327
 			}
328 328
 
329
-			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
329
+			if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
330 330
 			{
331 331
 				if ($globalIVAO) {
332
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
333
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
332
+					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']);
333
+					else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']);
334 334
 				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
335 335
 				if (count($image_array) > 0) {
336 336
 					$temp_array['image'] = $image_array[0]['image'];
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
355 355
 			}
356 356
 			
357
-			if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
357
+			if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
358 358
 				if ($schedules === true) {
359 359
 					$schedule_array = $Schedule->getSchedule($temp_array['ident']);
360 360
 					//print_r($schedule_array);
@@ -436,12 +436,12 @@  discard block
 block discarded – undo
436 436
 			if (isset($row['squawk'])) {
437 437
 				$temp_array['squawk'] = $row['squawk'];
438 438
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
439
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
440
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
439
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']);
440
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
441 441
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
442
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
443
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
444
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
442
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']);
443
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
444
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
445 445
 			}
446 446
     			
447 447
 			$temp_array['query_number_rows'] = $num_rows;
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 	* @return Array the spotter information
461 461
 	*
462 462
 	*/
463
-	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())
463
+	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())
464 464
 	{
465 465
 		global $globalTimezone, $globalDBdriver;
466 466
 		require_once(dirname(__FILE__).'/class.Translation.php');
@@ -470,7 +470,7 @@  discard block
 block discarded – undo
470 470
 
471 471
 		$query_values = array();
472 472
 		$additional_query = '';
473
-		$filter_query = $this->getFilter($filters,true,true);
473
+		$filter_query = $this->getFilter($filters, true, true);
474 474
 		if ($q != "")
475 475
 		{
476 476
 			if (!is_string($q))
@@ -478,8 +478,8 @@  discard block
 block discarded – undo
478 478
 				return false;
479 479
 			} else {
480 480
 				$q_array = explode(" ", $q);
481
-				foreach ($q_array as $q_item){
482
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
481
+				foreach ($q_array as $q_item) {
482
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
483 483
 					$additional_query .= " AND (";
484 484
 					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
485 485
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -511,37 +511,37 @@  discard block
 block discarded – undo
511 511
 
512 512
 		if ($registration != "")
513 513
 		{
514
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
514
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
515 515
 			if (!is_string($registration))
516 516
 			{
517 517
 				return false;
518 518
 			} else {
519 519
 				$additional_query .= " AND spotter_output.registration = :registration";
520
-				$query_values = array_merge($query_values,array(':registration' => $registration));
520
+				$query_values = array_merge($query_values, array(':registration' => $registration));
521 521
 			}
522 522
 		}
523 523
 
524 524
 		if ($aircraft_icao != "")
525 525
 		{
526
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
526
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
527 527
 			if (!is_string($aircraft_icao))
528 528
 			{
529 529
 				return false;
530 530
 			} else {
531 531
 				$additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao";
532
-				$query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao));
532
+				$query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao));
533 533
 			}
534 534
 		}
535 535
 
536 536
 		if ($aircraft_manufacturer != "")
537 537
 		{
538
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
538
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
539 539
 			if (!is_string($aircraft_manufacturer))
540 540
 			{
541 541
 				return false;
542 542
 			} else {
543 543
 				$additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer";
544
-				$query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer));
544
+				$query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer));
545 545
 			}
546 546
 		}
547 547
 
@@ -557,25 +557,25 @@  discard block
 block discarded – undo
557 557
 
558 558
 		if ($airline_icao != "")
559 559
 		{
560
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
560
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
561 561
 			if (!is_string($airline_icao))
562 562
 			{
563 563
 				return false;
564 564
 			} else {
565 565
 				$additional_query .= " AND spotter_output.airline_icao = :airline_icao";
566
-				$query_values = array_merge($query_values,array(':airline_icao' => $airline_icao));
566
+				$query_values = array_merge($query_values, array(':airline_icao' => $airline_icao));
567 567
 			}
568 568
 		}
569 569
 
570 570
 		if ($airline_country != "")
571 571
 		{
572
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
572
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
573 573
 			if (!is_string($airline_country))
574 574
 			{
575 575
 				return false;
576 576
 			} else {
577 577
 				$additional_query .= " AND spotter_output.airline_country = :airline_country";
578
-				$query_values = array_merge($query_values,array(':airline_country' => $airline_country));
578
+				$query_values = array_merge($query_values, array(':airline_country' => $airline_country));
579 579
 			}
580 580
 		}
581 581
 
@@ -602,31 +602,31 @@  discard block
 block discarded – undo
602 602
 
603 603
 		if ($airport != "")
604 604
 		{
605
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
605
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
606 606
 			if (!is_string($airport))
607 607
 			{
608 608
 				return false;
609 609
 			} else {
610 610
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)";
611
-				$query_values = array_merge($query_values,array(':airport' => $airport));
611
+				$query_values = array_merge($query_values, array(':airport' => $airport));
612 612
 			}
613 613
 		}
614 614
 
615 615
 		if ($airport_country != "")
616 616
 		{
617
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
617
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
618 618
 			if (!is_string($airport_country))
619 619
 			{
620 620
 				return false;
621 621
 			} else {
622 622
 				$additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)";
623
-				$query_values = array_merge($query_values,array(':airport_country' => $airport_country));
623
+				$query_values = array_merge($query_values, array(':airport_country' => $airport_country));
624 624
 			}
625 625
 		}
626 626
     
627 627
 		if ($callsign != "")
628 628
 		{
629
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
629
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
630 630
 			if (!is_string($callsign))
631 631
 			{
632 632
 				return false;
@@ -634,79 +634,79 @@  discard block
 block discarded – undo
634 634
 				$translate = $Translation->ident2icao($callsign);
635 635
 				if ($translate != $callsign) {
636 636
 					$additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)";
637
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
637
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
638 638
 				} else {
639 639
 					$additional_query .= " AND spotter_output.ident = :callsign";
640
-					$query_values = array_merge($query_values,array(':callsign' => $callsign));
640
+					$query_values = array_merge($query_values, array(':callsign' => $callsign));
641 641
 				}
642 642
 			}
643 643
 		}
644 644
 
645 645
 		if ($owner != "")
646 646
 		{
647
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
647
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
648 648
 			if (!is_string($owner))
649 649
 			{
650 650
 				return false;
651 651
 			} else {
652 652
 				$additional_query .= " AND spotter_output.owner_name = :owner";
653
-				$query_values = array_merge($query_values,array(':owner' => $owner));
653
+				$query_values = array_merge($query_values, array(':owner' => $owner));
654 654
 			}
655 655
 		}
656 656
 
657 657
 		if ($pilot_name != "")
658 658
 		{
659
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
659
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
660 660
 			if (!is_string($pilot_name))
661 661
 			{
662 662
 				return false;
663 663
 			} else {
664 664
 				$additional_query .= " AND spotter_output.pilot_name = :pilot_name";
665
-				$query_values = array_merge($query_values,array(':pilot_name' => $pilot_name));
665
+				$query_values = array_merge($query_values, array(':pilot_name' => $pilot_name));
666 666
 			}
667 667
 		}
668 668
 
669 669
 		if ($pilot_id != "")
670 670
 		{
671
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
671
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
672 672
 			if (!is_string($pilot_id))
673 673
 			{
674 674
 				return false;
675 675
 			} else {
676 676
 				$additional_query .= " AND spotter_output.pilot_id = :pilot_id";
677
-				$query_values = array_merge($query_values,array(':pilot_id' => $pilot_id));
677
+				$query_values = array_merge($query_values, array(':pilot_id' => $pilot_id));
678 678
 			}
679 679
 		}
680 680
 
681 681
 		if ($departure_airport_route != "")
682 682
 		{
683
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
683
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
684 684
 			if (!is_string($departure_airport_route))
685 685
 			{
686 686
 				return false;
687 687
 			} else {
688 688
 				$additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route";
689
-				$query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route));
689
+				$query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route));
690 690
 			}
691 691
 		}
692 692
 
693 693
 		if ($arrival_airport_route != "")
694 694
 		{
695
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
695
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
696 696
 			if (!is_string($arrival_airport_route))
697 697
 			{
698 698
 				return false;
699 699
 			} else {
700 700
 				$additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route";
701
-				$query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route));
701
+				$query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route));
702 702
 			}
703 703
 		}
704 704
 
705 705
 		if ($altitude != "")
706 706
 		{
707 707
 			$altitude_array = explode(",", $altitude);
708
-			$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
709
-			$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
708
+			$altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
709
+			$altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
710 710
 
711 711
 			if ($altitude_array[1] != "")
712 712
 			{                
@@ -722,8 +722,8 @@  discard block
 block discarded – undo
722 722
 		if ($date_posted != "")
723 723
 		{
724 724
 			$date_array = explode(",", $date_posted);
725
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
726
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
725
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
726
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
727 727
 
728 728
 			if ($globalTimezone != '') {
729 729
 				date_default_timezone_set($globalTimezone);
@@ -754,8 +754,8 @@  discard block
 block discarded – undo
754 754
 		{
755 755
 			$limit_array = explode(",", $limit);
756 756
 			
757
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
758
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
757
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
758
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
759 759
 			
760 760
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
761 761
 			{
@@ -784,23 +784,23 @@  discard block
 block discarded – undo
784 784
 
785 785
 
786 786
 		if ($origLat != "" && $origLon != "" && $dist != "") {
787
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
787
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
788 788
 
789 789
 			if ($globalDBdriver == 'mysql') {
790
-				$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 
790
+				$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 
791 791
 						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)) 
792 792
 						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;
793 793
 			} else {
794
-				$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 
794
+				$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 
795 795
 						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)) 
796 796
 						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;
797 797
 			}
798 798
 		} else {		
799
-			$query  = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
799
+			$query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
800 800
 					".$additional_query."
801 801
 					".$orderby_query;
802 802
 		}
803
-		$spotter_array = $this->getDataFromDB($query, $query_values,$limit_query);
803
+		$spotter_array = $this->getDataFromDB($query, $query_values, $limit_query);
804 804
 		return $spotter_array;
805 805
 	}
806 806
 	
@@ -823,8 +823,8 @@  discard block
 block discarded – undo
823 823
 		{
824 824
 			$limit_array = explode(",", $limit);
825 825
 			
826
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
827
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
826
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
827
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
828 828
 			
829 829
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
830 830
 			{
@@ -841,9 +841,9 @@  discard block
 block discarded – undo
841 841
 			$orderby_query = " ORDER BY spotter_output.date DESC";
842 842
 		}
843 843
 
844
-		$query  = $global_query.$filter_query." ".$orderby_query;
844
+		$query = $global_query.$filter_query." ".$orderby_query;
845 845
 
846
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
846
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
847 847
 
848 848
 		return $spotter_array;
849 849
 	}
@@ -889,34 +889,34 @@  discard block
 block discarded – undo
889 889
 			{
890 890
 				return false;
891 891
 			} else {
892
-				if ($interval == "30m"){
892
+				if ($interval == "30m") {
893 893
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date ';
894
-				} else if ($interval == "1h"){
894
+				} else if ($interval == "1h") {
895 895
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date ';
896
-				} else if ($interval == "3h"){
896
+				} else if ($interval == "3h") {
897 897
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date ';
898
-				} else if ($interval == "6h"){
898
+				} else if ($interval == "6h") {
899 899
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date ';
900
-				} else if ($interval == "12h"){
900
+				} else if ($interval == "12h") {
901 901
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date ';
902
-				} else if ($interval == "24h"){
902
+				} else if ($interval == "24h") {
903 903
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date ';
904
-				} else if ($interval == "7d"){
904
+				} else if ($interval == "7d") {
905 905
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date ';
906
-				} else if ($interval == "30d"){
906
+				} else if ($interval == "30d") {
907 907
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date ';
908 908
 				} 
909 909
 			}
910 910
 		}
911 911
 
912
-		$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 
912
+		$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 
913 913
                    WHERE spotter_output.latitude <> '' 
914 914
 				   AND spotter_output.longitude <> '' 
915 915
                    ".$additional_query."
916 916
                    HAVING distance < :radius  
917 917
 				   ORDER BY distance";
918 918
 
919
-		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query);
919
+		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query);
920 920
 
921 921
 		return $spotter_array;
922 922
 	}
@@ -928,21 +928,21 @@  discard block
 block discarded – undo
928 928
 	* @return Array the spotter information
929 929
 	*
930 930
 	*/
931
-	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
931
+	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array())
932 932
 	{
933 933
 		global $global_query;
934 934
 		
935 935
 		date_default_timezone_set('UTC');
936 936
 
937
-		$filter_query = $this->getFilter($filter,true,true);
937
+		$filter_query = $this->getFilter($filter, true, true);
938 938
 
939 939
 		$limit_query = '';
940 940
 		if ($limit != "")
941 941
 		{
942 942
 			$limit_array = explode(",", $limit);
943 943
 			
944
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
945
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
944
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
945
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
946 946
 			
947 947
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
948 948
 			{
@@ -959,7 +959,7 @@  discard block
 block discarded – undo
959 959
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
960 960
 		}
961 961
 
962
-		$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;
962
+		$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;
963 963
 
964 964
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
965 965
 
@@ -978,15 +978,15 @@  discard block
 block discarded – undo
978 978
 		global $global_query;
979 979
 		
980 980
 		date_default_timezone_set('UTC');
981
-		$filter_query = $this->getFilter($filter,true,true);
981
+		$filter_query = $this->getFilter($filter, true, true);
982 982
 
983 983
 		$limit_query = '';
984 984
 		if ($limit != "")
985 985
 		{
986 986
 			$limit_array = explode(",", $limit);
987 987
 			
988
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
989
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
988
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
989
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
990 990
 			
991 991
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
992 992
 			{
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1004 1004
 		}
1005 1005
 
1006
-		$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;
1006
+		$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;
1007 1007
 
1008 1008
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1009 1009
 
@@ -1017,20 +1017,20 @@  discard block
 block discarded – undo
1017 1017
 	* @return Array the spotter information
1018 1018
 	*
1019 1019
 	*/
1020
-	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
1020
+	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array())
1021 1021
 	{
1022 1022
 		global $global_query;
1023 1023
 		
1024 1024
 		date_default_timezone_set('UTC');
1025
-		$filter_query = $this->getFilter($filter,true,true);
1025
+		$filter_query = $this->getFilter($filter, true, true);
1026 1026
 		
1027 1027
 		$limit_query = '';
1028 1028
 		if ($limit != "")
1029 1029
 		{
1030 1030
 			$limit_array = explode(",", $limit);
1031 1031
 			
1032
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1033
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1032
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1033
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1034 1034
 			
1035 1035
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1036 1036
 			{
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1048 1048
 		}
1049 1049
 
1050
-		$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;
1050
+		$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;
1051 1051
 
1052 1052
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1053 1053
 
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
 		
1068 1068
 		date_default_timezone_set('UTC');
1069 1069
 		
1070
-		$filter_query = $this->getFilter($filter,true,true);
1070
+		$filter_query = $this->getFilter($filter, true, true);
1071 1071
 		
1072 1072
 		$limit_query = '';
1073 1073
 		
@@ -1075,8 +1075,8 @@  discard block
 block discarded – undo
1075 1075
 		{
1076 1076
 			$limit_array = explode(",", $limit);
1077 1077
 			
1078
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1079
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1078
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1079
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1080 1080
 			
1081 1081
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1082 1082
 			{
@@ -1093,7 +1093,7 @@  discard block
 block discarded – undo
1093 1093
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1094 1094
 		}
1095 1095
 
1096
-		$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;
1096
+		$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;
1097 1097
 
1098 1098
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1099 1099
 
@@ -1112,14 +1112,14 @@  discard block
 block discarded – undo
1112 1112
 		global $global_query;
1113 1113
 		
1114 1114
 		date_default_timezone_set('UTC');
1115
-		$filter_query = $this->getFilter($filter,true,true);
1115
+		$filter_query = $this->getFilter($filter, true, true);
1116 1116
 		$limit_query = '';
1117 1117
 		if ($limit != "")
1118 1118
 		{
1119 1119
 			$limit_array = explode(",", $limit);
1120 1120
 			
1121
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1122
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1121
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1122
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1123 1123
 			
1124 1124
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1125 1125
 			{
@@ -1136,7 +1136,7 @@  discard block
 block discarded – undo
1136 1136
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1137 1137
 		}
1138 1138
 
1139
-		$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;
1139
+		$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;
1140 1140
 
1141 1141
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1142 1142
 
@@ -1160,9 +1160,9 @@  discard block
 block discarded – undo
1160 1160
 		$query_values = array(':id' => $id);
1161 1161
 
1162 1162
 		//$query  = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." ";
1163
-		$query  = $global_query." WHERE ".$additional_query." ";
1163
+		$query = $global_query." WHERE ".$additional_query." ";
1164 1164
 
1165
-		$spotter_array = $this->getDataFromDB($query,$query_values);
1165
+		$spotter_array = $this->getDataFromDB($query, $query_values);
1166 1166
 
1167 1167
 		return $spotter_array;
1168 1168
 	}
@@ -1200,8 +1200,8 @@  discard block
 block discarded – undo
1200 1200
 		{
1201 1201
 			$limit_array = explode(",", $limit);
1202 1202
 			
1203
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1204
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1203
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1204
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1205 1205
 			
1206 1206
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1207 1207
 			{
@@ -1242,7 +1242,7 @@  discard block
 block discarded – undo
1242 1242
 		$query_values = array();
1243 1243
 		$limit_query = '';
1244 1244
 		$additional_query = '';
1245
-		$filter_query = $this->getFilter($filter,true,true);
1245
+		$filter_query = $this->getFilter($filter, true, true);
1246 1246
 		
1247 1247
 		if ($aircraft_type != "")
1248 1248
 		{
@@ -1259,8 +1259,8 @@  discard block
 block discarded – undo
1259 1259
 		{
1260 1260
 			$limit_array = explode(",", $limit);
1261 1261
 			
1262
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1263
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1262
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1263
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1264 1264
 			
1265 1265
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1266 1266
 			{
@@ -1316,8 +1316,8 @@  discard block
 block discarded – undo
1316 1316
 		{
1317 1317
 			$limit_array = explode(",", $limit);
1318 1318
 			
1319
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1320
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1319
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1320
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1321 1321
 			
1322 1322
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1323 1323
 			{
@@ -1333,7 +1333,7 @@  discard block
 block discarded – undo
1333 1333
 		} else {
1334 1334
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1335 1335
 		}
1336
-		$filter_query = $this->getFilter($filter,true,true);
1336
+		$filter_query = $this->getFilter($filter, true, true);
1337 1337
 
1338 1338
 		//$query = $global_query.$filter_query." spotter_output.ident <> '' ".$additional_query." ".$orderby_query;
1339 1339
 		$query = $global_query.$filter_query." ".$additional_query." ".$orderby_query;
@@ -1352,7 +1352,7 @@  discard block
 block discarded – undo
1352 1352
 	* @return Array the spotter information
1353 1353
 	*
1354 1354
 	*/
1355
-	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
1355
+	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array())
1356 1356
 	{
1357 1357
 		global $global_query;
1358 1358
 		
@@ -1361,7 +1361,7 @@  discard block
 block discarded – undo
1361 1361
 		$query_values = array();
1362 1362
 		$limit_query = '';
1363 1363
 		$additional_query = '';
1364
-		$filter_query = $this->getFilter($filters,true,true);
1364
+		$filter_query = $this->getFilter($filters, true, true);
1365 1365
 		
1366 1366
 		if ($airline != "")
1367 1367
 		{
@@ -1378,8 +1378,8 @@  discard block
 block discarded – undo
1378 1378
 		{
1379 1379
 			$limit_array = explode(",", $limit);
1380 1380
 			
1381
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1382
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1381
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1382
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1383 1383
 			
1384 1384
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1385 1385
 			{
@@ -1409,7 +1409,7 @@  discard block
 block discarded – undo
1409 1409
 	* @return Array the spotter information
1410 1410
 	*
1411 1411
 	*/
1412
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1412
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1413 1413
 	{
1414 1414
 		global $global_query;
1415 1415
 		
@@ -1417,7 +1417,7 @@  discard block
 block discarded – undo
1417 1417
 		$query_values = array();
1418 1418
 		$limit_query = '';
1419 1419
 		$additional_query = '';
1420
-		$filter_query = $this->getFilter($filters,true,true);
1420
+		$filter_query = $this->getFilter($filters, true, true);
1421 1421
 		
1422 1422
 		if ($airport != "")
1423 1423
 		{
@@ -1434,8 +1434,8 @@  discard block
 block discarded – undo
1434 1434
 		{
1435 1435
 			$limit_array = explode(",", $limit);
1436 1436
 			
1437
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1438
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1437
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1438
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1439 1439
 			
1440 1440
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1441 1441
 			{
@@ -1467,7 +1467,7 @@  discard block
 block discarded – undo
1467 1467
 	* @return Array the spotter information
1468 1468
 	*
1469 1469
 	*/
1470
-	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
1470
+	public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array())
1471 1471
 	{
1472 1472
 		global $global_query, $globalTimezone, $globalDBdriver;
1473 1473
 		
@@ -1475,7 +1475,7 @@  discard block
 block discarded – undo
1475 1475
 		$limit_query = '';
1476 1476
 		$additional_query = '';
1477 1477
 
1478
-		$filter_query = $this->getFilter($filter,true,true);
1478
+		$filter_query = $this->getFilter($filter, true, true);
1479 1479
 		
1480 1480
 		if ($date != "")
1481 1481
 		{
@@ -1501,8 +1501,8 @@  discard block
 block discarded – undo
1501 1501
 		{
1502 1502
 			$limit_array = explode(",", $limit);
1503 1503
 			
1504
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1505
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1504
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1505
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1506 1506
 			
1507 1507
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1508 1508
 			{
@@ -1532,7 +1532,7 @@  discard block
 block discarded – undo
1532 1532
 	* @return Array the spotter information
1533 1533
 	*
1534 1534
 	*/
1535
-	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
1535
+	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array())
1536 1536
 	{
1537 1537
 		global $global_query;
1538 1538
 		
@@ -1541,7 +1541,7 @@  discard block
 block discarded – undo
1541 1541
 		$query_values = array();
1542 1542
 		$limit_query = '';
1543 1543
 		$additional_query = '';
1544
-		$filter_query = $this->getFilter($filters,true,true);
1544
+		$filter_query = $this->getFilter($filters, true, true);
1545 1545
 		if ($country != "")
1546 1546
 		{
1547 1547
 			if (!is_string($country))
@@ -1558,8 +1558,8 @@  discard block
 block discarded – undo
1558 1558
 		{
1559 1559
 			$limit_array = explode(",", $limit);
1560 1560
 			
1561
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1562
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1561
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1562
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1563 1563
 			
1564 1564
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1565 1565
 			{
@@ -1599,7 +1599,7 @@  discard block
 block discarded – undo
1599 1599
 		$query_values = array();
1600 1600
 		$additional_query = '';
1601 1601
 		$limit_query = '';
1602
-		$filter_query = $this->getFilter($filters,true,true);
1602
+		$filter_query = $this->getFilter($filters, true, true);
1603 1603
 		
1604 1604
 		if ($aircraft_manufacturer != "")
1605 1605
 		{
@@ -1616,8 +1616,8 @@  discard block
 block discarded – undo
1616 1616
 		{
1617 1617
 			$limit_array = explode(",", $limit);
1618 1618
 			
1619
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1620
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1619
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1620
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1621 1621
 			
1622 1622
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1623 1623
 			{
@@ -1659,14 +1659,14 @@  discard block
 block discarded – undo
1659 1659
 		$query_values = array();
1660 1660
 		$additional_query = '';
1661 1661
 		$limit_query = '';
1662
-		$filter_query = $this->getFilter($filters,true,true);
1662
+		$filter_query = $this->getFilter($filters, true, true);
1663 1663
 		if ($departure_airport_icao != "")
1664 1664
 		{
1665 1665
 			if (!is_string($departure_airport_icao))
1666 1666
 			{
1667 1667
 				return false;
1668 1668
 			} else {
1669
-				$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1669
+				$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1670 1670
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)";
1671 1671
 				//$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao AND spotter_output.real_departure_airport_icao IS NULL) OR spotter_output.real_departure_airport_icao = :departure_airport_icao";
1672 1672
 				$query_values = array(':departure_airport_icao' => $departure_airport_icao);
@@ -1679,10 +1679,10 @@  discard block
 block discarded – undo
1679 1679
 			{
1680 1680
 				return false;
1681 1681
 			} else {
1682
-				$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1682
+				$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1683 1683
 				$additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)";
1684 1684
 				//$additional_query .= " AND ((spotter_output.arrival_airport_icao = :arrival_airport_icao AND spotter_output.real_arrival_airport_icao IS NULL) OR spotter_output.real_arrival_airport_icao = :arrival_airport_icao)";
1685
-				$query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao));
1685
+				$query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao));
1686 1686
 			}
1687 1687
 		}
1688 1688
 		
@@ -1690,8 +1690,8 @@  discard block
 block discarded – undo
1690 1690
 		{
1691 1691
 			$limit_array = explode(",", $limit);
1692 1692
 			
1693
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1694
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1693
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1694
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1695 1695
 			
1696 1696
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1697 1697
 			{
@@ -1730,15 +1730,15 @@  discard block
 block discarded – undo
1730 1730
 		global $global_query;
1731 1731
 		
1732 1732
 		date_default_timezone_set('UTC');
1733
-		$filter_query = $this->getFilter($filter,true,true);
1733
+		$filter_query = $this->getFilter($filter, true, true);
1734 1734
 		$limit_query = '';
1735 1735
 		
1736 1736
 		if ($limit != "")
1737 1737
 		{
1738 1738
 			$limit_array = explode(",", $limit);
1739 1739
 			
1740
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1741
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1740
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1741
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1742 1742
 			
1743 1743
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1744 1744
 			{
@@ -1755,7 +1755,7 @@  discard block
 block discarded – undo
1755 1755
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1756 1756
 		}
1757 1757
 
1758
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1758
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1759 1759
 
1760 1760
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1761 1761
 
@@ -1768,19 +1768,19 @@  discard block
 block discarded – undo
1768 1768
 	* @return String the highlight text
1769 1769
 	*
1770 1770
 	*/
1771
-	public function getHighlightByRegistration($registration,$filter = array())
1771
+	public function getHighlightByRegistration($registration, $filter = array())
1772 1772
 	{
1773 1773
 		global $global_query;
1774 1774
 		
1775 1775
 		date_default_timezone_set('UTC');
1776
-		$filter_query = $this->getFilter($filter,true,true);
1777
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
1776
+		$filter_query = $this->getFilter($filter, true, true);
1777
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
1778 1778
 		
1779
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1779
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1780 1780
 		$sth = $this->db->prepare($query);
1781 1781
 		$sth->execute(array(':registration' => $registration));
1782 1782
 
1783
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1783
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1784 1784
 		{
1785 1785
 			$highlight = $row['highlight'];
1786 1786
 		}
@@ -1796,14 +1796,14 @@  discard block
 block discarded – undo
1796 1796
 	* @return String usage
1797 1797
 	*
1798 1798
 	*/
1799
-	public function getSquawkUsage($squawk = '',$country = 'FR')
1799
+	public function getSquawkUsage($squawk = '', $country = 'FR')
1800 1800
 	{
1801 1801
 		
1802
-		$squawk = filter_var($squawk,FILTER_SANITIZE_STRING);
1803
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
1802
+		$squawk = filter_var($squawk, FILTER_SANITIZE_STRING);
1803
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
1804 1804
 
1805 1805
 		$query  = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1";
1806
-		$query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country);
1806
+		$query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country);
1807 1807
 		
1808 1808
 		$sth = $this->db->prepare($query);
1809 1809
 		$sth->execute($query_values);
@@ -1825,9 +1825,9 @@  discard block
 block discarded – undo
1825 1825
 	public function getAirportIcao($airport_iata = '')
1826 1826
 	{
1827 1827
 		
1828
-		$airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING);
1828
+		$airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING);
1829 1829
 
1830
-		$query  = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1830
+		$query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1831 1831
 		$query_values = array(':airport' => $airport_iata);
1832 1832
 		
1833 1833
 		$sth = $this->db->prepare($query);
@@ -1849,12 +1849,12 @@  discard block
 block discarded – undo
1849 1849
 	* @return Float distance to the airport
1850 1850
 	*
1851 1851
 	*/
1852
-	public function getAirportDistance($airport_icao,$latitude,$longitude)
1852
+	public function getAirportDistance($airport_icao, $latitude, $longitude)
1853 1853
 	{
1854 1854
 		
1855
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
1855
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
1856 1856
 
1857
-		$query  = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1857
+		$query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1858 1858
 		$query_values = array(':airport' => $airport_icao);
1859 1859
 		$sth = $this->db->prepare($query);
1860 1860
 		$sth->execute($query_values);
@@ -1864,7 +1864,7 @@  discard block
 block discarded – undo
1864 1864
 			$airport_latitude = $row['latitude'];
1865 1865
 			$airport_longitude = $row['longitude'];
1866 1866
 			$Common = new Common();
1867
-			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1867
+			return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude);
1868 1868
 		} else return '';
1869 1869
 	}
1870 1870
 	
@@ -1878,11 +1878,11 @@  discard block
 block discarded – undo
1878 1878
 	public function getAllAirportInfo($airport = '')
1879 1879
 	{
1880 1880
 		
1881
-		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
1881
+		$airport = filter_var($airport, FILTER_SANITIZE_STRING);
1882 1882
 
1883 1883
 		$query_values = array();
1884 1884
 		if ($airport == 'NA') {
1885
-			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' => ''));
1885
+			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' => ''));
1886 1886
 		} elseif ($airport == '') {
1887 1887
 			$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";
1888 1888
 		} else {
@@ -1930,14 +1930,14 @@  discard block
 block discarded – undo
1930 1930
 	{
1931 1931
 		$lst_countries = '';
1932 1932
 		foreach ($countries as $country) {
1933
-			$country = filter_var($country,FILTER_SANITIZE_STRING);
1933
+			$country = filter_var($country, FILTER_SANITIZE_STRING);
1934 1934
 			if ($lst_countries == '') {
1935 1935
 				$lst_countries = "'".$country."'";
1936 1936
 			} else {
1937 1937
 				$lst_countries .= ",'".$country."'";
1938 1938
 			}
1939 1939
 		}
1940
-		$query  = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1940
+		$query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1941 1941
 		
1942 1942
 		$sth = $this->db->prepare($query);
1943 1943
 		$sth->execute();
@@ -1945,7 +1945,7 @@  discard block
 block discarded – undo
1945 1945
 		$airport_array = array();
1946 1946
 		$temp_array = array();
1947 1947
 		
1948
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1948
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1949 1949
 		{
1950 1950
 			$temp_array['name'] = $row['name'];
1951 1951
 			$temp_array['city'] = $row['city'];
@@ -1973,10 +1973,10 @@  discard block
 block discarded – undo
1973 1973
 	{
1974 1974
 		global $globalDBdriver;
1975 1975
 		if (is_array($coord)) {
1976
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1977
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1978
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1979
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1976
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1977
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1978
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1979
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1980 1980
 		} else return array();
1981 1981
 		if ($globalDBdriver == 'mysql') {
1982 1982
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
@@ -1988,7 +1988,7 @@  discard block
 block discarded – undo
1988 1988
     
1989 1989
 		$airport_array = array();
1990 1990
 		
1991
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1991
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1992 1992
 		{
1993 1993
 			$temp_array = $row;
1994 1994
 
@@ -2008,13 +2008,13 @@  discard block
 block discarded – undo
2008 2008
 	public function getAllWaypointsInfobyCoord($coord)
2009 2009
 	{
2010 2010
 		if (is_array($coord)) {
2011
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2012
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2013
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2014
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2011
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2012
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2013
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2014
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2015 2015
 		} else return array();
2016 2016
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
2017
-		$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.")";
2017
+		$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.")";
2018 2018
 		//$query  = "SELECT waypoints.* FROM waypoints";
2019 2019
 		//$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";
2020 2020
 		//$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;
@@ -2026,7 +2026,7 @@  discard block
 block discarded – undo
2026 2026
     
2027 2027
 		$waypoints_array = array();
2028 2028
 		
2029
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2029
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2030 2030
 		{
2031 2031
 			$temp_array = $row;
2032 2032
 
@@ -2048,10 +2048,10 @@  discard block
 block discarded – undo
2048 2048
 	{
2049 2049
 		global $globalUseRealAirlines;
2050 2050
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2051
-		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2051
+		$airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING));
2052 2052
 		if ($airline_icao == 'NA') {
2053 2053
 			$airline_array = array();
2054
-			$airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2054
+			$airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2055 2055
 			return $airline_array;
2056 2056
 		} else {
2057 2057
 			if (strlen($airline_icao) == 2) {
@@ -2072,7 +2072,7 @@  discard block
 block discarded – undo
2072 2072
 			if ($fromsource === NULL) {
2073 2073
 				$sth->execute(array(':airline_icao' => $airline_icao));
2074 2074
 			} else {
2075
-				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
2075
+				$sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource));
2076 2076
 			}
2077 2077
                         /*
2078 2078
 			$airline_array = array();
@@ -2114,12 +2114,12 @@  discard block
 block discarded – undo
2114 2114
 	*/
2115 2115
 	public function getAllAircraftInfo($aircraft_type)
2116 2116
 	{
2117
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2117
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2118 2118
 
2119 2119
 		if ($aircraft_type == 'NA') {
2120
-			return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2120
+			return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2121 2121
 		}
2122
-		$query  = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2122
+		$query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2123 2123
 		
2124 2124
 		$sth = $this->db->prepare($query);
2125 2125
 		$sth->execute(array(':aircraft_type' => $aircraft_type));
@@ -2151,7 +2151,7 @@  discard block
 block discarded – undo
2151 2151
 	*/
2152 2152
 	public function getAircraftIcao($aircraft_type)
2153 2153
 	{
2154
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2154
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2155 2155
 		$all_aircraft = array('737-300' => 'B733',
2156 2156
 				'777-200' => 'B772',
2157 2157
 				'777-200ER' => 'B772',
@@ -2163,10 +2163,10 @@  discard block
 block discarded – undo
2163 2163
 				'A380' => 'A388');
2164 2164
 		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2165 2165
 
2166
-		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2166
+		$query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2167 2167
 		$aircraft_type = strtoupper($aircraft_type);
2168 2168
 		$sth = $this->db->prepare($query);
2169
-		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2169
+		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,));
2170 2170
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2171 2171
 		if (isset($result[0]['icao'])) return $result[0]['icao'];
2172 2172
 		else return '';
@@ -2181,9 +2181,9 @@  discard block
 block discarded – undo
2181 2181
 	*/
2182 2182
 	public function getAllAircraftType($aircraft_modes)
2183 2183
 	{
2184
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
2184
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
2185 2185
 
2186
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
2186
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
2187 2187
 		
2188 2188
 		$sth = $this->db->prepare($query);
2189 2189
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -2204,9 +2204,9 @@  discard block
 block discarded – undo
2204 2204
 	*/
2205 2205
 	public function getAllAircraftTypeByRegistration($registration)
2206 2206
 	{
2207
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2207
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2208 2208
 
2209
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
2209
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
2210 2210
 		
2211 2211
 		$sth = $this->db->prepare($query);
2212 2212
 		$sth->execute(array(':registration' => $registration));
@@ -2227,8 +2227,8 @@  discard block
 block discarded – undo
2227 2227
 	*/
2228 2228
 	public function getOperator($operator)
2229 2229
 	{
2230
-		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
2231
-		$query  = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2230
+		$operator = filter_var($operator, FILTER_SANITIZE_STRING);
2231
+		$query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2232 2232
 		
2233 2233
 		$sth = $this->db->prepare($query);
2234 2234
 		$sth->execute(array(':operator' => $operator));
@@ -2249,9 +2249,9 @@  discard block
 block discarded – undo
2249 2249
 	*/
2250 2250
 	public function getRouteInfo($callsign)
2251 2251
 	{
2252
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2252
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
2253 2253
                 if ($callsign == '') return array();
2254
-		$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";
2254
+		$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";
2255 2255
 		
2256 2256
 		$sth = $this->db->prepare($query);
2257 2257
 		$sth->execute(array(':callsign' => $callsign));
@@ -2272,9 +2272,9 @@  discard block
 block discarded – undo
2272 2272
 	*/
2273 2273
 	public function getAircraftInfoByRegistration($registration)
2274 2274
 	{
2275
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2275
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2276 2276
 
2277
-		$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";
2277
+		$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";
2278 2278
 		
2279 2279
 		$sth = $this->db->prepare($query);
2280 2280
 		$sth->execute(array(':registration' => $registration));
@@ -2282,7 +2282,7 @@  discard block
 block discarded – undo
2282 2282
 		$aircraft_array = array();
2283 2283
 		$temp_array = array();
2284 2284
 		
2285
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2285
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2286 2286
 		{
2287 2287
 			$temp_array['airline_icao'] = $row['airline_icao'];
2288 2288
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
@@ -2304,7 +2304,7 @@  discard block
 block discarded – undo
2304 2304
 	*/
2305 2305
 	public function getAircraftOwnerByRegistration($registration)
2306 2306
 	{
2307
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2307
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2308 2308
 		$Connection = new Connection($this->db);
2309 2309
 		if ($Connection->tableExists('aircraft_owner')) {
2310 2310
 			$query  = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1";
@@ -2326,7 +2326,7 @@  discard block
 block discarded – undo
2326 2326
 	public function getAllFlightsforSitemap()
2327 2327
 	{
2328 2328
 		//$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 ";
2329
-		$query  = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2329
+		$query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2330 2330
 		
2331 2331
 		$sth = $this->db->prepare($query);
2332 2332
 		$sth->execute();
@@ -2373,7 +2373,7 @@  discard block
 block discarded – undo
2373 2373
 		$manufacturer_array = array();
2374 2374
 		$temp_array = array();
2375 2375
 		
2376
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2376
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2377 2377
 		{
2378 2378
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
2379 2379
 
@@ -2399,7 +2399,7 @@  discard block
 block discarded – undo
2399 2399
 								ORDER BY spotter_output.aircraft_name ASC";
2400 2400
 								
2401 2401
 		*/
2402
-		$filter_query = $this->getFilter($filters,true,true);
2402
+		$filter_query = $this->getFilter($filters, true, true);
2403 2403
 		$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";
2404 2404
 		
2405 2405
 		$sth = $this->db->prepare($query);
@@ -2408,7 +2408,7 @@  discard block
 block discarded – undo
2408 2408
 		$aircraft_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['aircraft_icao'] = $row['aircraft_icao'];
2414 2414
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
@@ -2429,8 +2429,8 @@  discard block
 block discarded – undo
2429 2429
 	*/
2430 2430
 	public function getAllAircraftRegistrations($filters = array())
2431 2431
 	{
2432
-		$filter_query = $this->getFilter($filters,true,true);
2433
-		$query  = "SELECT DISTINCT spotter_output.registration 
2432
+		$filter_query = $this->getFilter($filters, true, true);
2433
+		$query = "SELECT DISTINCT spotter_output.registration 
2434 2434
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' 
2435 2435
 				ORDER BY spotter_output.registration ASC";
2436 2436
 
@@ -2440,7 +2440,7 @@  discard block
 block discarded – undo
2440 2440
 		$aircraft_array = array();
2441 2441
 		$temp_array = array();
2442 2442
 		
2443
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2443
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2444 2444
 		{
2445 2445
 			$temp_array['registration'] = $row['registration'];
2446 2446
 
@@ -2457,11 +2457,11 @@  discard block
 block discarded – undo
2457 2457
 	* @return Array list of source name
2458 2458
 	*
2459 2459
 	*/
2460
-	public function getAllSourceName($type = '',$filters = array())
2460
+	public function getAllSourceName($type = '', $filters = array())
2461 2461
 	{
2462
-		$filter_query = $this->getFilter($filters,true,true);
2462
+		$filter_query = $this->getFilter($filters, true, true);
2463 2463
 		$query_values = array();
2464
-		$query  = "SELECT DISTINCT spotter_output.source_name 
2464
+		$query = "SELECT DISTINCT spotter_output.source_name 
2465 2465
 				FROM spotter_output".$filter_query." spotter_output.source_name <> ''";
2466 2466
 		if ($type != '') {
2467 2467
 			$query_values = array(':type' => $type);
@@ -2476,7 +2476,7 @@  discard block
 block discarded – undo
2476 2476
 		$source_array = array();
2477 2477
 		$temp_array = array();
2478 2478
 		
2479
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2479
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2480 2480
 		{
2481 2481
 			$temp_array['source_name'] = $row['source_name'];
2482 2482
 			$source_array[] = $temp_array;
@@ -2492,11 +2492,11 @@  discard block
 block discarded – undo
2492 2492
 	* @return Array list of airline names
2493 2493
 	*
2494 2494
 	*/
2495
-	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
2495
+	public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array())
2496 2496
 	{
2497
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
2498
-		$filter_query = $this->getFilter($filters,true,true);
2499
-		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
2497
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
2498
+		$filter_query = $this->getFilter($filters, true, true);
2499
+		$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
2500 2500
 		if ($airline_type == '' || $airline_type == 'all') {
2501 2501
 			/*
2502 2502
 			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
@@ -2515,7 +2515,7 @@  discard block
 block discarded – undo
2515 2515
 				$query_data = array(':forsource' => $forsource);
2516 2516
 			}
2517 2517
 		} else {
2518
-			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2518
+			$query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2519 2519
 					FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
2520 2520
 					AND spotter_output.airline_type = :airline_type 
2521 2521
 					ORDER BY spotter_output.airline_icao ASC";
@@ -2528,7 +2528,7 @@  discard block
 block discarded – undo
2528 2528
 		$airline_array = array();
2529 2529
 		$temp_array = array();
2530 2530
 		
2531
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2531
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2532 2532
 		{
2533 2533
 			$temp_array['airline_icao'] = $row['airline_icao'];
2534 2534
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -2548,8 +2548,8 @@  discard block
 block discarded – undo
2548 2548
 	*/
2549 2549
 	public function getAllAirlineCountries($filters = array())
2550 2550
 	{
2551
-		$filter_query = $this->getFilter($filters,true,true);
2552
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2551
+		$filter_query = $this->getFilter($filters, true, true);
2552
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2553 2553
 				FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
2554 2554
 				ORDER BY spotter_output.airline_country ASC";
2555 2555
 		
@@ -2560,7 +2560,7 @@  discard block
 block discarded – undo
2560 2560
 		$airline_array = array();
2561 2561
 		$temp_array = array();
2562 2562
 		
2563
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2563
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2564 2564
 		{
2565 2565
 			$temp_array['airline_country'] = $row['airline_country'];
2566 2566
 
@@ -2580,9 +2580,9 @@  discard block
 block discarded – undo
2580 2580
 	*/
2581 2581
 	public function getAllAirportNames($filters = array())
2582 2582
 	{
2583
-		$filter_query = $this->getFilter($filters,true,true);
2583
+		$filter_query = $this->getFilter($filters, true, true);
2584 2584
 		$airport_array = array();
2585
-		$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
2585
+		$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
2586 2586
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA' 
2587 2587
 				ORDER BY spotter_output.departure_airport_city ASC";
2588 2588
 		
@@ -2591,7 +2591,7 @@  discard block
 block discarded – undo
2591 2591
 		$sth->execute();
2592 2592
 
2593 2593
 		$temp_array = array();
2594
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2594
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2595 2595
 		{
2596 2596
 			$temp_array['airport_icao'] = $row['airport_icao'];
2597 2597
 			$temp_array['airport_name'] = $row['airport_name'];
@@ -2601,14 +2601,14 @@  discard block
 block discarded – undo
2601 2601
 			$airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array;
2602 2602
 		}
2603 2603
 
2604
-		$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
2604
+		$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
2605 2605
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' 
2606 2606
 								ORDER BY spotter_output.arrival_airport_city ASC";
2607 2607
 					
2608 2608
 		$sth = $this->db->prepare($query);
2609 2609
 		$sth->execute();
2610 2610
 
2611
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2611
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2612 2612
 			{
2613 2613
 		//	if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao'])
2614 2614
 		//	{
@@ -2648,21 +2648,21 @@  discard block
 block discarded – undo
2648 2648
    
2649 2649
 		$temp_array = array();
2650 2650
 		
2651
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2651
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2652 2652
 		{
2653 2653
 			$temp_array['airport_country'] = $row['airport_country'];
2654 2654
 
2655 2655
 			$airport_array[$row['airport_country']] = $temp_array;
2656 2656
 		}
2657
-		$filter_query = $this->getFilter($filters,true,true);
2658
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2657
+		$filter_query = $this->getFilter($filters, true, true);
2658
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2659 2659
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
2660 2660
 								ORDER BY spotter_output.arrival_airport_country ASC";
2661 2661
 					
2662 2662
 		$sth = $this->db->prepare($query);
2663 2663
 		$sth->execute();
2664 2664
 		
2665
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2665
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2666 2666
 		{
2667 2667
 			if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country'])
2668 2668
 			{
@@ -2685,9 +2685,9 @@  discard block
 block discarded – undo
2685 2685
 	*/
2686 2686
 	public function getAllCountries($filters = array())
2687 2687
 	{
2688
-		$Connection= new Connection($this->db);
2688
+		$Connection = new Connection($this->db);
2689 2689
 		if ($Connection->tableExists('countries')) {
2690
-			$query  = "SELECT countries.name AS airport_country
2690
+			$query = "SELECT countries.name AS airport_country
2691 2691
 				FROM countries
2692 2692
 				ORDER BY countries.name ASC";
2693 2693
 			$sth = $this->db->prepare($query);
@@ -2696,14 +2696,14 @@  discard block
 block discarded – undo
2696 2696
 			$temp_array = array();
2697 2697
 			$country_array = array();
2698 2698
 		
2699
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2699
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2700 2700
 			{
2701 2701
 				$temp_array['country'] = $row['airport_country'];
2702 2702
 				$country_array[$row['airport_country']] = $temp_array;
2703 2703
 			}
2704 2704
 		} else {
2705
-			$filter_query = $this->getFilter($filters,true,true);
2706
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2705
+			$filter_query = $this->getFilter($filters, true, true);
2706
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2707 2707
 								FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' 
2708 2708
 								ORDER BY spotter_output.departure_airport_country ASC";
2709 2709
 
@@ -2712,20 +2712,20 @@  discard block
 block discarded – undo
2712 2712
    
2713 2713
 			$temp_array = array();
2714 2714
 			$country_array = array();
2715
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2715
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2716 2716
 			{
2717 2717
 				$temp_array['country'] = $row['airport_country'];
2718 2718
 				$country_array[$row['airport_country']] = $temp_array;
2719 2719
 			}
2720 2720
 
2721
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2721
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2722 2722
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
2723 2723
 								ORDER BY spotter_output.arrival_airport_country ASC";
2724 2724
 					
2725 2725
 		$sth = $this->db->prepare($query);
2726 2726
 		$sth->execute();
2727 2727
 		
2728
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2728
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2729 2729
 		{
2730 2730
 			if ($country_array[$row['airport_country']]['country'] != $row['airport_country'])
2731 2731
 			{
@@ -2735,14 +2735,14 @@  discard block
 block discarded – undo
2735 2735
 			}
2736 2736
 		}
2737 2737
 		
2738
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2738
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2739 2739
 								FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
2740 2740
 								ORDER BY spotter_output.airline_country ASC";
2741 2741
 					
2742 2742
 		$sth = $this->db->prepare($query);
2743 2743
 		$sth->execute();
2744 2744
 		
2745
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2745
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2746 2746
 		{
2747 2747
 			if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country'])
2748 2748
 			{
@@ -2766,8 +2766,8 @@  discard block
 block discarded – undo
2766 2766
 	*/
2767 2767
 	public function getAllIdents($filters = array())
2768 2768
 	{
2769
-		$filter_query = $this->getFilter($filters,true,true);
2770
-		$query  = "SELECT DISTINCT spotter_output.ident
2769
+		$filter_query = $this->getFilter($filters, true, true);
2770
+		$query = "SELECT DISTINCT spotter_output.ident
2771 2771
 								FROM spotter_output".$filter_query." spotter_output.ident <> '' 
2772 2772
 								ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0";
2773 2773
 
@@ -2777,7 +2777,7 @@  discard block
 block discarded – undo
2777 2777
 		$ident_array = array();
2778 2778
 		$temp_array = array();
2779 2779
 		
2780
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2780
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2781 2781
 		{
2782 2782
 			$temp_array['ident'] = $row['ident'];
2783 2783
 			$ident_array[] = $temp_array;
@@ -2791,9 +2791,9 @@  discard block
 block discarded – undo
2791 2791
 	* @return Array number, icao, name and city of airports
2792 2792
 	*/
2793 2793
 
2794
-	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
2794
+	public function getLast7DaysAirportsDeparture($airport_icao = '', $filters = array()) {
2795 2795
 		global $globalTimezone, $globalDBdriver;
2796
-		$filter_query = $this->getFilter($filters,true,true);
2796
+		$filter_query = $this->getFilter($filters, true, true);
2797 2797
 		if ($globalTimezone != '') {
2798 2798
 			date_default_timezone_set($globalTimezone);
2799 2799
 			$datetime = new DateTime();
@@ -2858,7 +2858,7 @@  discard block
 block discarded – undo
2858 2858
 
2859 2859
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
2860 2860
 		global $globalTimezone, $globalDBdriver;
2861
-		$filter_query = $this->getFilter($filters,true,true);
2861
+		$filter_query = $this->getFilter($filters, true, true);
2862 2862
 		if ($globalTimezone != '') {
2863 2863
 			date_default_timezone_set($globalTimezone);
2864 2864
 			$datetime = new DateTime();
@@ -2942,7 +2942,7 @@  discard block
 block discarded – undo
2942 2942
 
2943 2943
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
2944 2944
 		global $globalTimezone, $globalDBdriver;
2945
-		$filter_query = $this->getFilter($filters,true,true);
2945
+		$filter_query = $this->getFilter($filters, true, true);
2946 2946
 		if ($globalTimezone != '') {
2947 2947
 			date_default_timezone_set($globalTimezone);
2948 2948
 			$datetime = new DateTime();
@@ -2975,9 +2975,9 @@  discard block
 block discarded – undo
2975 2975
 	* @return Array number, icao, name and city of airports
2976 2976
 	*/
2977 2977
 
2978
-	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
2978
+	public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $filters = array()) {
2979 2979
 		global $globalTimezone, $globalDBdriver;
2980
-		$filter_query = $this->getFilter($filters,true,true);
2980
+		$filter_query = $this->getFilter($filters, true, true);
2981 2981
 		if ($globalTimezone != '') {
2982 2982
 			date_default_timezone_set($globalTimezone);
2983 2983
 			$datetime = new DateTime();
@@ -3109,12 +3109,12 @@  discard block
 block discarded – undo
3109 3109
 		} else $offset = '+00:00';
3110 3110
 
3111 3111
 		if ($globalDBdriver == 'mysql') {
3112
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3112
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3113 3113
 								FROM spotter_output
3114 3114
 								WHERE spotter_output.date <> '' 
3115 3115
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
3116 3116
 		} else {
3117
-			$query  = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3117
+			$query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3118 3118
 								FROM spotter_output
3119 3119
 								WHERE spotter_output.date <> '' 
3120 3120
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
@@ -3126,7 +3126,7 @@  discard block
 block discarded – undo
3126 3126
 		$date_array = array();
3127 3127
 		$temp_array = array();
3128 3128
 		
3129
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3129
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3130 3130
 		{
3131 3131
 			$temp_array['date'] = $row['date'];
3132 3132
 
@@ -3146,7 +3146,7 @@  discard block
 block discarded – undo
3146 3146
 	*/
3147 3147
 	public function getAllRoutes()
3148 3148
 	{
3149
-		$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 
3149
+		$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 
3150 3150
 				FROM spotter_output
3151 3151
 				WHERE spotter_output.ident <> '' 
3152 3152
 				GROUP BY route
@@ -3157,7 +3157,7 @@  discard block
 block discarded – undo
3157 3157
 
3158 3158
 		$routes_array = array();
3159 3159
 		$temp_array = array();
3160
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3160
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3161 3161
 		{
3162 3162
 			$temp_array['route'] = $row['route'];
3163 3163
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -3176,21 +3176,21 @@  discard block
 block discarded – undo
3176 3176
 	* @return String success or false
3177 3177
 	*
3178 3178
 	*/	
3179
-	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
3179
+	public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL)
3180 3180
 	{
3181 3181
 		if (!is_numeric(substr($ident, 0, 3)))
3182 3182
 		{
3183 3183
 			if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3184
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3184
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3185 3185
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3186
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3186
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3187 3187
 			} else {
3188 3188
 				$airline_array = $this->getAllAirlineInfo("NA");
3189 3189
 			}
3190 3190
 			if (count($airline_array) == 0) {
3191 3191
 				$airline_array = $this->getAllAirlineInfo("NA");
3192 3192
 			}
3193
-			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3193
+			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3194 3194
 				$airline_array = $this->getAllAirlineInfo("NA");
3195 3195
 			}
3196 3196
 		} else {
@@ -3203,7 +3203,7 @@  discard block
 block discarded – undo
3203 3203
 
3204 3204
 
3205 3205
 		$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';
3206
-                $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);
3206
+                $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);
3207 3207
 
3208 3208
 		try {
3209 3209
 			$sth = $this->db->prepare($query);
@@ -3224,11 +3224,11 @@  discard block
 block discarded – undo
3224 3224
 	* @return String success or false
3225 3225
 	*
3226 3226
 	*/	
3227
-	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3227
+	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '')
3228 3228
 	{
3229 3229
 		if ($groundspeed == '') $groundspeed = NULL;
3230 3230
 		$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';
3231
-                $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);
3231
+                $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);
3232 3232
 
3233 3233
 		try {
3234 3234
 			$sth = $this->db->prepare($query);
@@ -3268,7 +3268,7 @@  discard block
 block discarded – undo
3268 3268
 	* @param String $verticalrate vertival rate of flight
3269 3269
 	* @return String success or false
3270 3270
 	*/
3271
-	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 = '')
3271
+	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 = '')
3272 3272
 	{
3273 3273
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
3274 3274
 		
@@ -3292,13 +3292,13 @@  discard block
 block discarded – undo
3292 3292
 				if ($ModeS != '') {
3293 3293
 					$timeelapsed = microtime(true);
3294 3294
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3295
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3295
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3296 3296
 				} else {
3297
-					$myhex = explode('-',$flightaware_id);
3297
+					$myhex = explode('-', $flightaware_id);
3298 3298
 					if (count($myhex) > 0) {
3299 3299
 						$timeelapsed = microtime(true);
3300 3300
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3301
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3301
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3302 3302
 					}
3303 3303
 				}
3304 3304
 			}
@@ -3320,24 +3320,24 @@  discard block
 block discarded – undo
3320 3320
 				{
3321 3321
 					$timeelapsed = microtime(true);
3322 3322
 					if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3323
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3323
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3324 3324
 					} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3325
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3325
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3326 3326
 					} else {
3327 3327
 						$airline_array = $this->getAllAirlineInfo("NA");
3328 3328
 					}
3329 3329
 					if (count($airline_array) == 0) {
3330 3330
 						$airline_array = $this->getAllAirlineInfo("NA");
3331 3331
 					}
3332
-					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3332
+					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3333 3333
 						$airline_array = $this->getAllAirlineInfo("NA");
3334 3334
 					}
3335
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3335
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3336 3336
 
3337 3337
 				} else {
3338 3338
 					$timeelapsed = microtime(true);
3339 3339
 					$airline_array = $this->getAllAirlineInfo("NA");
3340
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3340
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3341 3341
 				}
3342 3342
 			}
3343 3343
 		} else $airline_array = array();
@@ -3354,27 +3354,27 @@  discard block
 block discarded – undo
3354 3354
 				{
3355 3355
 					$timeelapsed = microtime(true);
3356 3356
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3357
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3357
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3358 3358
 				} else {
3359 3359
 					$timeelapsed = microtime(true);
3360 3360
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3361
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3361
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3362 3362
 				}
3363 3363
 			}
3364 3364
 		} else {
3365 3365
 			if ($ModeS != '') {
3366 3366
 				$timeelapsed = microtime(true);
3367 3367
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3368
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3368
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3369 3369
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3370 3370
 				{
3371 3371
 					$timeelapsed = microtime(true);
3372 3372
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3373
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3373
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3374 3374
 				} else {
3375 3375
 					$timeelapsed = microtime(true);
3376 3376
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3377
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3377
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3378 3378
 				}
3379 3379
 			}
3380 3380
 		}
@@ -3389,7 +3389,7 @@  discard block
 block discarded – undo
3389 3389
 			} else {
3390 3390
 				$timeelapsed = microtime(true);
3391 3391
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3392
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3392
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3393 3393
 			}
3394 3394
 		}
3395 3395
 		
@@ -3403,7 +3403,7 @@  discard block
 block discarded – undo
3403 3403
 			} else {
3404 3404
 				$timeelapsed = microtime(true);
3405 3405
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3406
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3406
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3407 3407
 			}
3408 3408
 		}
3409 3409
 
@@ -3467,7 +3467,7 @@  discard block
 block discarded – undo
3467 3467
 		{
3468 3468
 			$timeelapsed = microtime(true);
3469 3469
 			$image_array = $Image->getSpotterImage($registration);
3470
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3470
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3471 3471
 			if (!isset($image_array[0]['registration']))
3472 3472
 			{
3473 3473
 				//echo "Add image !!!! \n";
@@ -3475,7 +3475,7 @@  discard block
 block discarded – undo
3475 3475
 			}
3476 3476
 			$timeelapsed = microtime(true);
3477 3477
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3478
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3478
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3479 3479
 			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3480 3480
 		}
3481 3481
     
@@ -3483,33 +3483,33 @@  discard block
 block discarded – undo
3483 3483
 		{
3484 3484
             		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3485 3485
             		else $airline_icao = '';
3486
-			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3486
+			$image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao);
3487 3487
 			if (!isset($image_array[0]['registration']))
3488 3488
 			{
3489 3489
 				//echo "Add image !!!! \n";
3490
-				$Image->addSpotterImage('',$aircraft_icao,$airline_icao);
3490
+				$Image->addSpotterImage('', $aircraft_icao, $airline_icao);
3491 3491
 			}
3492 3492
 		}
3493 3493
     
3494
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
3495
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
3496
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
3497
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3498
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
3499
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
3500
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3501
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3502
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
3503
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3504
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
3505
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3506
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
3507
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
3508
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
3509
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
3510
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
3511
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
3512
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
3494
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
3495
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
3496
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
3497
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3498
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
3499
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
3500
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3501
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3502
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
3503
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3504
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
3505
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3506
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
3507
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
3508
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
3509
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
3510
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
3511
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
3512
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
3513 3513
 	
3514 3514
 		if (count($airline_array) == 0) 
3515 3515
 		{
@@ -3537,7 +3537,7 @@  discard block
 block discarded – undo
3537 3537
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3538 3538
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3539 3539
                 if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3540
-                $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) 
3540
+                $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) 
3541 3541
                 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)";
3542 3542
 
3543 3543
                 $airline_name = $airline_array[0]['name'];
@@ -3547,7 +3547,7 @@  discard block
 block discarded – undo
3547 3547
 		if ($airline_type == '') {
3548 3548
 			$timeelapsed = microtime(true);
3549 3549
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3550
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3550
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3551 3551
 		}
3552 3552
 		if ($airline_type == null) $airline_type = '';
3553 3553
                 $aircraft_type = $aircraft_array[0]['type'];
@@ -3558,7 +3558,7 @@  discard block
 block discarded – undo
3558 3558
                 $arrival_airport_name = $arrival_airport_array[0]['name'];
3559 3559
                 $arrival_airport_city = $arrival_airport_array[0]['city'];
3560 3560
                 $arrival_airport_country = $arrival_airport_array[0]['country'];
3561
-                $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);
3561
+                $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);
3562 3562
 
3563 3563
 		try {
3564 3564
 		        
@@ -3584,13 +3584,13 @@  discard block
 block discarded – undo
3584 3584
 	{
3585 3585
 		global $globalDBdriver, $globalTimezone;
3586 3586
 		if ($globalDBdriver == 'mysql') {
3587
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
3587
+			$query = "SELECT spotter_output.ident FROM spotter_output 
3588 3588
 								WHERE spotter_output.ident = :ident 
3589 3589
 								AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
3590 3590
 								AND spotter_output.date < UTC_TIMESTAMP()";
3591 3591
 			$query_data = array(':ident' => $ident);
3592 3592
 		} else {
3593
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
3593
+			$query = "SELECT spotter_output.ident FROM spotter_output 
3594 3594
 								WHERE spotter_output.ident = :ident 
3595 3595
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
3596 3596
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
@@ -3599,8 +3599,8 @@  discard block
 block discarded – undo
3599 3599
 		
3600 3600
 		$sth = $this->db->prepare($query);
3601 3601
 		$sth->execute($query_data);
3602
-    		$ident_result='';
3603
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3602
+    		$ident_result = '';
3603
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3604 3604
 		{
3605 3605
 			$ident_result = $row['ident'];
3606 3606
 		}
@@ -3626,8 +3626,8 @@  discard block
 block discarded – undo
3626 3626
 				return false;
3627 3627
 			} else {
3628 3628
 				$q_array = explode(" ", $q);
3629
-				foreach ($q_array as $q_item){
3630
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
3629
+				foreach ($q_array as $q_item) {
3630
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
3631 3631
 					$additional_query .= " AND (";
3632 3632
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
3633 3633
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
@@ -3642,11 +3642,11 @@  discard block
 block discarded – undo
3642 3642
 			}
3643 3643
 		}
3644 3644
 		if ($globalDBdriver == 'mysql') {
3645
-			$query  = "SELECT spotter_output.* FROM spotter_output 
3645
+			$query = "SELECT spotter_output.* FROM spotter_output 
3646 3646
 				WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
3647 3647
 				AND spotter_output.date < UTC_TIMESTAMP()";
3648 3648
 		} else {
3649
-			$query  = "SELECT spotter_output.* FROM spotter_output 
3649
+			$query = "SELECT spotter_output.* FROM spotter_output 
3650 3650
 				WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
3651 3651
 				AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
3652 3652
 		}
@@ -3663,11 +3663,11 @@  discard block
 block discarded – undo
3663 3663
 	* @return Array the airline list
3664 3664
 	*
3665 3665
 	*/
3666
-	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3666
+	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3667 3667
 	{
3668 3668
 		global $globalDBdriver;
3669
-		$filter_query = $this->getFilter($filters,true,true);
3670
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3669
+		$filter_query = $this->getFilter($filters, true, true);
3670
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3671 3671
 		 			FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA' ";
3672 3672
 		if ($olderthanmonths > 0) {
3673 3673
 			if ($globalDBdriver == 'mysql') {
@@ -3691,7 +3691,7 @@  discard block
 block discarded – undo
3691 3691
  
3692 3692
 		$airline_array = array();
3693 3693
 		$temp_array = array();
3694
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3694
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3695 3695
 		{
3696 3696
 			$temp_array['airline_name'] = $row['airline_name'];
3697 3697
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3708,11 +3708,11 @@  discard block
 block discarded – undo
3708 3708
 	* @return Array the pilots list
3709 3709
 	*
3710 3710
 	*/
3711
-	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3711
+	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3712 3712
 	{
3713 3713
 		global $globalDBdriver;
3714
-		$filter_query = $this->getFilter($filters,true,true);
3715
-		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3714
+		$filter_query = $this->getFilter($filters, true, true);
3715
+		$query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3716 3716
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
3717 3717
                 if ($olderthanmonths > 0) {
3718 3718
             		if ($globalDBdriver == 'mysql') {
@@ -3738,7 +3738,7 @@  discard block
 block discarded – undo
3738 3738
 		$airline_array = array();
3739 3739
 		$temp_array = array();
3740 3740
         
3741
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3741
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3742 3742
 		{
3743 3743
 			$temp_array['pilot_name'] = $row['pilot_name'];
3744 3744
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -3758,7 +3758,7 @@  discard block
 block discarded – undo
3758 3758
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
3759 3759
 	{
3760 3760
 		global $globalDBdriver;
3761
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3761
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3762 3762
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
3763 3763
                 if ($olderthanmonths > 0) {
3764 3764
             		if ($globalDBdriver == 'mysql') {
@@ -3784,7 +3784,7 @@  discard block
 block discarded – undo
3784 3784
 		$airline_array = array();
3785 3785
 		$temp_array = array();
3786 3786
         
3787
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3787
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3788 3788
 		{
3789 3789
 			$temp_array['pilot_name'] = $row['pilot_name'];
3790 3790
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -3802,11 +3802,11 @@  discard block
 block discarded – undo
3802 3802
 	* @return Array the pilots list
3803 3803
 	*
3804 3804
 	*/
3805
-	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3805
+	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3806 3806
 	{
3807 3807
 		global $globalDBdriver;
3808
-		$filter_query = $this->getFilter($filters,true,true);
3809
-		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3808
+		$filter_query = $this->getFilter($filters, true, true);
3809
+		$query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3810 3810
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3811 3811
                 if ($olderthanmonths > 0) {
3812 3812
             		if ($globalDBdriver == 'mysql') {
@@ -3832,7 +3832,7 @@  discard block
 block discarded – undo
3832 3832
 		$airline_array = array();
3833 3833
 		$temp_array = array();
3834 3834
         
3835
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3835
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3836 3836
 		{
3837 3837
 			$temp_array['owner_name'] = $row['owner_name'];
3838 3838
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -3847,11 +3847,11 @@  discard block
 block discarded – undo
3847 3847
 	* @return Array the pilots list
3848 3848
 	*
3849 3849
 	*/
3850
-	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3850
+	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3851 3851
 	{
3852 3852
 		global $globalDBdriver;
3853
-		$filter_query = $this->getFilter($filters,true,true);
3854
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3853
+		$filter_query = $this->getFilter($filters, true, true);
3854
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3855 3855
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3856 3856
                 if ($olderthanmonths > 0) {
3857 3857
             		if ($globalDBdriver == 'mysql') {
@@ -3877,7 +3877,7 @@  discard block
 block discarded – undo
3877 3877
 		$airline_array = array();
3878 3878
 		$temp_array = array();
3879 3879
         
3880
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3880
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3881 3881
 		{
3882 3882
 			$temp_array['owner_name'] = $row['owner_name'];
3883 3883
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -3893,11 +3893,11 @@  discard block
 block discarded – undo
3893 3893
 	* @return Array the airline list
3894 3894
 	*
3895 3895
 	*/
3896
-	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
3896
+	public function countAllAirlinesByAircraft($aircraft_icao, $filters = array())
3897 3897
 	{
3898
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3899
-		$filter_query = $this->getFilter($filters,true,true);
3900
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3898
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3899
+		$filter_query = $this->getFilter($filters, true, true);
3900
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3901 3901
 		 	    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
3902 3902
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
3903 3903
 			    ORDER BY airline_count DESC";
@@ -3909,7 +3909,7 @@  discard block
 block discarded – undo
3909 3909
 		$airline_array = array();
3910 3910
 		$temp_array = array();
3911 3911
         
3912
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3912
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3913 3913
 		{
3914 3914
 			$temp_array['airline_name'] = $row['airline_name'];
3915 3915
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -3929,11 +3929,11 @@  discard block
 block discarded – undo
3929 3929
 	* @return Array the airline country list
3930 3930
 	*
3931 3931
 	*/
3932
-	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
3932
+	public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array())
3933 3933
 	{
3934
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3935
-		$filter_query = $this->getFilter($filters,true,true);
3936
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3934
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3935
+		$filter_query = $this->getFilter($filters, true, true);
3936
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3937 3937
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3938 3938
                     GROUP BY spotter_output.airline_country
3939 3939
 					ORDER BY airline_country_count DESC
@@ -3946,7 +3946,7 @@  discard block
 block discarded – undo
3946 3946
 		$airline_country_array = array();
3947 3947
 		$temp_array = array();
3948 3948
         
3949
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3949
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3950 3950
 		{
3951 3951
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3952 3952
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -3965,11 +3965,11 @@  discard block
 block discarded – undo
3965 3965
 	* @return Array the airline list
3966 3966
 	*
3967 3967
 	*/
3968
-	public function countAllAirlinesByAirport($airport_icao,$filters = array())
3968
+	public function countAllAirlinesByAirport($airport_icao, $filters = array())
3969 3969
 	{
3970
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3971
-		$filter_query = $this->getFilter($filters,true,true);
3972
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3970
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3971
+		$filter_query = $this->getFilter($filters, true, true);
3972
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3973 3973
 		    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 ) 
3974 3974
                     GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3975 3975
 		    ORDER BY airline_count DESC";
@@ -3981,7 +3981,7 @@  discard block
 block discarded – undo
3981 3981
 		$airline_array = array();
3982 3982
 		$temp_array = array();
3983 3983
         
3984
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3984
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3985 3985
 		{
3986 3986
 			$temp_array['airline_name'] = $row['airline_name'];
3987 3987
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4000,11 +4000,11 @@  discard block
 block discarded – undo
4000 4000
 	* @return Array the airline country list
4001 4001
 	*
4002 4002
 	*/
4003
-	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
4003
+	public function countAllAirlineCountriesByAirport($airport_icao, $filters = array())
4004 4004
 	{
4005
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4006
-		$filter_query = $this->getFilter($filters,true,true);
4007
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4005
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4006
+		$filter_query = $this->getFilter($filters, true, true);
4007
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4008 4008
 		 			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 )
4009 4009
 					GROUP BY spotter_output.airline_country
4010 4010
 					ORDER BY airline_country_count DESC
@@ -4017,7 +4017,7 @@  discard block
 block discarded – undo
4017 4017
 		$airline_country_array = array();
4018 4018
 		$temp_array = array();
4019 4019
         
4020
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4020
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4021 4021
 		{
4022 4022
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4023 4023
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4034,11 +4034,11 @@  discard block
 block discarded – undo
4034 4034
 	* @return Array the airline list
4035 4035
 	*
4036 4036
 	*/
4037
-	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
4037
+	public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array())
4038 4038
 	{
4039
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4040
-		$filter_query = $this->getFilter($filters,true,true);
4041
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4039
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4040
+		$filter_query = $this->getFilter($filters, true, true);
4041
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4042 4042
 		 			FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
4043 4043
 					GROUP BY spotter_output.airline_name
4044 4044
 					ORDER BY airline_count DESC";
@@ -4049,7 +4049,7 @@  discard block
 block discarded – undo
4049 4049
 		$airline_array = array();
4050 4050
 		$temp_array = array();
4051 4051
         
4052
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4052
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4053 4053
 		{
4054 4054
 			$temp_array['airline_name'] = $row['airline_name'];
4055 4055
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4069,11 +4069,11 @@  discard block
 block discarded – undo
4069 4069
 	* @return Array the airline country list
4070 4070
 	*
4071 4071
 	*/
4072
-	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
4072
+	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array())
4073 4073
 	{
4074
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4075
-		$filter_query = $this->getFilter($filters,true,true);
4076
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4074
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4075
+		$filter_query = $this->getFilter($filters, true, true);
4076
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4077 4077
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
4078 4078
 					GROUP BY spotter_output.airline_country
4079 4079
 					ORDER BY airline_country_count DESC
@@ -4086,7 +4086,7 @@  discard block
 block discarded – undo
4086 4086
 		$airline_country_array = array();
4087 4087
 		$temp_array = array();
4088 4088
         
4089
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4089
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4090 4090
 		{
4091 4091
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4092 4092
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4102,11 +4102,11 @@  discard block
 block discarded – undo
4102 4102
 	* @return Array the airline list
4103 4103
 	*
4104 4104
 	*/
4105
-	public function countAllAirlinesByDate($date,$filters = array())
4105
+	public function countAllAirlinesByDate($date, $filters = array())
4106 4106
 	{
4107 4107
 		global $globalTimezone, $globalDBdriver;
4108
-		$filter_query = $this->getFilter($filters,true,true);
4109
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4108
+		$filter_query = $this->getFilter($filters, true, true);
4109
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4110 4110
 		if ($globalTimezone != '') {
4111 4111
 			date_default_timezone_set($globalTimezone);
4112 4112
 			$datetime = new DateTime($date);
@@ -4114,12 +4114,12 @@  discard block
 block discarded – undo
4114 4114
 		} else $offset = '+00:00';
4115 4115
 
4116 4116
 		if ($globalDBdriver == 'mysql') {
4117
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4117
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4118 4118
 		 			FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4119 4119
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country 
4120 4120
 					ORDER BY airline_count DESC";
4121 4121
 		} else {
4122
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4122
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4123 4123
 		 			FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4124 4124
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4125 4125
 					ORDER BY airline_count DESC";
@@ -4130,7 +4130,7 @@  discard block
 block discarded – undo
4130 4130
 
4131 4131
 		$airline_array = array();
4132 4132
 		$temp_array = array();
4133
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4133
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4134 4134
 		{
4135 4135
 			$temp_array['airline_name'] = $row['airline_name'];
4136 4136
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4150,11 +4150,11 @@  discard block
 block discarded – undo
4150 4150
 	* @return Array the airline country list
4151 4151
 	*
4152 4152
 	*/
4153
-	public function countAllAirlineCountriesByDate($date,$filters = array())
4153
+	public function countAllAirlineCountriesByDate($date, $filters = array())
4154 4154
 	{
4155 4155
 		global $globalTimezone, $globalDBdriver;
4156
-		$filter_query = $this->getFilter($filters,true,true);
4157
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4156
+		$filter_query = $this->getFilter($filters, true, true);
4157
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4158 4158
 		if ($globalTimezone != '') {
4159 4159
 			date_default_timezone_set($globalTimezone);
4160 4160
 			$datetime = new DateTime($date);
@@ -4162,13 +4162,13 @@  discard block
 block discarded – undo
4162 4162
 		} else $offset = '+00:00';
4163 4163
 		
4164 4164
 		if ($globalDBdriver == 'mysql') {
4165
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4165
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4166 4166
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4167 4167
 					GROUP BY spotter_output.airline_country
4168 4168
 					ORDER BY airline_country_count DESC
4169 4169
 					LIMIT 10 OFFSET 0";
4170 4170
 		} else {
4171
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4171
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4172 4172
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
4173 4173
 					GROUP BY spotter_output.airline_country
4174 4174
 					ORDER BY airline_country_count DESC
@@ -4180,7 +4180,7 @@  discard block
 block discarded – undo
4180 4180
  
4181 4181
 		$airline_country_array = array();
4182 4182
 		$temp_array = array();
4183
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4183
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4184 4184
 		{
4185 4185
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4186 4186
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4197,11 +4197,11 @@  discard block
 block discarded – undo
4197 4197
 	* @return Array the airline list
4198 4198
 	*
4199 4199
 	*/
4200
-	public function countAllAirlinesByIdent($ident,$filters = array())
4200
+	public function countAllAirlinesByIdent($ident, $filters = array())
4201 4201
 	{
4202
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4203
-		$filter_query = $this->getFilter($filters,true,true);
4204
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4202
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4203
+		$filter_query = $this->getFilter($filters, true, true);
4204
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4205 4205
 		 		FROM spotter_output".$filter_query." spotter_output.ident = :ident  
4206 4206
 				GROUP BY spotter_output.airline_name
4207 4207
 				ORDER BY airline_count DESC";
@@ -4213,7 +4213,7 @@  discard block
 block discarded – undo
4213 4213
 		$airline_array = array();
4214 4214
 		$temp_array = array();
4215 4215
         
4216
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4216
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4217 4217
 		{
4218 4218
 			$temp_array['airline_name'] = $row['airline_name'];
4219 4219
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4231,25 +4231,25 @@  discard block
 block discarded – undo
4231 4231
 	* @return Array the airline list
4232 4232
 	*
4233 4233
 	*/
4234
-	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
4234
+	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4235 4235
 	{
4236
-		$filter_query = $this->getFilter($filters,true,true);
4237
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4238
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4236
+		$filter_query = $this->getFilter($filters, true, true);
4237
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4238
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4239 4239
 
4240
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4240
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4241 4241
 		 			FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
4242 4242
 					GROUP BY spotter_output.airline_name
4243 4243
 					ORDER BY airline_count DESC";
4244 4244
       
4245 4245
 		
4246 4246
 		$sth = $this->db->prepare($query);
4247
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4247
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4248 4248
       
4249 4249
 		$airline_array = array();
4250 4250
 		$temp_array = array();
4251 4251
         
4252
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4252
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4253 4253
 		{
4254 4254
 			$temp_array['airline_name'] = $row['airline_name'];
4255 4255
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4267,13 +4267,13 @@  discard block
 block discarded – undo
4267 4267
 	* @return Array the airline country list
4268 4268
 	*
4269 4269
 	*/
4270
-	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
4270
+	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4271 4271
 	{
4272
-		$filter_query = $this->getFilter($filters,true,true);
4273
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4274
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4272
+		$filter_query = $this->getFilter($filters, true, true);
4273
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4274
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4275 4275
       
4276
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4276
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4277 4277
 		 		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) 
4278 4278
 				GROUP BY spotter_output.airline_country
4279 4279
 				ORDER BY airline_country_count DESC
@@ -4281,11 +4281,11 @@  discard block
 block discarded – undo
4281 4281
       
4282 4282
 		
4283 4283
 		$sth = $this->db->prepare($query);
4284
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4284
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4285 4285
       
4286 4286
 		$airline_country_array = array();
4287 4287
 		$temp_array = array();
4288
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4288
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4289 4289
 		{
4290 4290
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4291 4291
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4303,11 +4303,11 @@  discard block
 block discarded – undo
4303 4303
 	* @return Array the airline list
4304 4304
 	*
4305 4305
 	*/
4306
-	public function countAllAirlinesByCountry($country,$filters = array())
4306
+	public function countAllAirlinesByCountry($country, $filters = array())
4307 4307
 	{
4308
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4309
-		$filter_query = $this->getFilter($filters,true,true);
4310
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4308
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4309
+		$filter_query = $this->getFilter($filters, true, true);
4310
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4311 4311
 		 	    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
4312 4312
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
4313 4313
 			    ORDER BY airline_count DESC";
@@ -4318,7 +4318,7 @@  discard block
 block discarded – undo
4318 4318
 
4319 4319
 		$airline_array = array();
4320 4320
 		$temp_array = array();
4321
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4321
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4322 4322
 		{
4323 4323
 			$temp_array['airline_name'] = $row['airline_name'];
4324 4324
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4337,11 +4337,11 @@  discard block
 block discarded – undo
4337 4337
 	* @return Array the airline country list
4338 4338
 	*
4339 4339
 	*/
4340
-	public function countAllAirlineCountriesByCountry($country,$filters = array())
4340
+	public function countAllAirlineCountriesByCountry($country, $filters = array())
4341 4341
 	{
4342
-		$filter_query = $this->getFilter($filters,true,true);
4343
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4344
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4342
+		$filter_query = $this->getFilter($filters, true, true);
4343
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4344
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4345 4345
 		 		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 
4346 4346
 				GROUP BY spotter_output.airline_country
4347 4347
 				ORDER BY airline_country_count DESC
@@ -4353,7 +4353,7 @@  discard block
 block discarded – undo
4353 4353
 
4354 4354
 		$airline_country_array = array();
4355 4355
 		$temp_array = array();
4356
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4356
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4357 4357
 		{
4358 4358
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4359 4359
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4372,8 +4372,8 @@  discard block
 block discarded – undo
4372 4372
 	*/
4373 4373
 	public function countAllAirlineCountries($limit = true, $filters = array())
4374 4374
 	{
4375
-		$filter_query = $this->getFilter($filters,true,true);
4376
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4375
+		$filter_query = $this->getFilter($filters, true, true);
4376
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4377 4377
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA' 
4378 4378
 					GROUP BY spotter_output.airline_country
4379 4379
 					ORDER BY airline_country_count DESC";
@@ -4384,7 +4384,7 @@  discard block
 block discarded – undo
4384 4384
 
4385 4385
 		$airline_array = array();
4386 4386
 		$temp_array = array();
4387
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4387
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4388 4388
 		{
4389 4389
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4390 4390
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4400,11 +4400,11 @@  discard block
 block discarded – undo
4400 4400
 	* @return Array the airline country list
4401 4401
 	*
4402 4402
 	*/
4403
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4403
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4404 4404
 	{
4405 4405
 		global $globalDBdriver;
4406 4406
 		//$filter_query = $this->getFilter($filters,true,true);
4407
-		$Connection= new Connection($this->db);
4407
+		$Connection = new Connection($this->db);
4408 4408
 		if (!$Connection->tableExists('countries')) return array();
4409 4409
 		/*
4410 4410
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -4419,7 +4419,7 @@  discard block
 block discarded – undo
4419 4419
 */
4420 4420
 		require_once('class.SpotterLive.php');
4421 4421
 		$SpotterLive = new SpotterLive();
4422
-		$filter_query = $SpotterLive->getFilter($filters,true,true);
4422
+		$filter_query = $SpotterLive->getFilter($filters, true, true);
4423 4423
 		$filter_query .= ' over_country IS NOT NULL';
4424 4424
                 if ($olderthanmonths > 0) {
4425 4425
 			if ($globalDBdriver == 'mysql') {
@@ -4446,7 +4446,7 @@  discard block
 block discarded – undo
4446 4446
 		$flight_array = array();
4447 4447
 		$temp_array = array();
4448 4448
         
4449
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4449
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4450 4450
 		{
4451 4451
 			$temp_array['flight_count'] = $row['nb'];
4452 4452
 			$temp_array['flight_country'] = $row['name'];
@@ -4464,12 +4464,12 @@  discard block
 block discarded – undo
4464 4464
 	* @return Array the aircraft list
4465 4465
 	*
4466 4466
 	*/
4467
-	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4467
+	public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4468 4468
 	{
4469 4469
 		global $globalDBdriver;
4470
-		$filter_query = $this->getFilter($filters,true,true);
4470
+		$filter_query = $this->getFilter($filters, true, true);
4471 4471
 
4472
-		$query  = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4472
+		$query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4473 4473
 		    FROM spotter_output ".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> ''";
4474 4474
 		if ($olderthanmonths > 0) {
4475 4475
 			if ($globalDBdriver == 'mysql') {
@@ -4494,7 +4494,7 @@  discard block
 block discarded – undo
4494 4494
 
4495 4495
 		$aircraft_array = array();
4496 4496
 		$temp_array = array();
4497
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4497
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4498 4498
 		{
4499 4499
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4500 4500
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4511,11 +4511,11 @@  discard block
 block discarded – undo
4511 4511
 	* @return Array the aircraft list
4512 4512
 	*
4513 4513
 	*/
4514
-	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4514
+	public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4515 4515
 	{
4516 4516
 		global $globalDBdriver;
4517
-		$filter_query = $this->getFilter($filters,true,true);
4518
-		$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 
4517
+		$filter_query = $this->getFilter($filters, true, true);
4518
+		$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 
4519 4519
 		    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' ";
4520 4520
 		if ($olderthanmonths > 0) {
4521 4521
 			if ($globalDBdriver == 'mysql') {
@@ -4540,7 +4540,7 @@  discard block
 block discarded – undo
4540 4540
 
4541 4541
 		$aircraft_array = array();
4542 4542
 		$temp_array = array();
4543
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4543
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4544 4544
 		{
4545 4545
 			$temp_array['airline_icao'] = $row['airline_icao'];
4546 4546
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
@@ -4558,11 +4558,11 @@  discard block
 block discarded – undo
4558 4558
 	* @return Array the aircraft list
4559 4559
 	*
4560 4560
 	*/
4561
-	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4561
+	public function countAllAircraftTypesByMonths($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4562 4562
 	{
4563 4563
 		global $globalDBdriver;
4564
-		$filter_query = $this->getFilter($filters,true,true);
4565
-		$query  = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4564
+		$filter_query = $this->getFilter($filters, true, true);
4565
+		$query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
4566 4566
 		    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' ";
4567 4567
 		if ($olderthanmonths > 0) {
4568 4568
 			if ($globalDBdriver == 'mysql') {
@@ -4587,7 +4587,7 @@  discard block
 block discarded – undo
4587 4587
 
4588 4588
 		$aircraft_array = array();
4589 4589
 		$temp_array = array();
4590
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4590
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4591 4591
 		{
4592 4592
 			//$temp_array['airline_icao'] = $row['airline_icao'];
4593 4593
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
@@ -4606,13 +4606,13 @@  discard block
 block discarded – undo
4606 4606
 	* @return Array the aircraft list
4607 4607
 	*
4608 4608
 	*/
4609
-	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
4609
+	public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array())
4610 4610
 	{
4611 4611
 		$Image = new Image($this->db);
4612
-		$filter_query = $this->getFilter($filters,true,true);
4613
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
4612
+		$filter_query = $this->getFilter($filters, true, true);
4613
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
4614 4614
 
4615
-		$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  
4615
+		$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  
4616 4616
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao  
4617 4617
 				GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
4618 4618
 				ORDER BY registration_count DESC";
@@ -4623,14 +4623,14 @@  discard block
 block discarded – undo
4623 4623
 		$aircraft_array = array();
4624 4624
 		$temp_array = array();
4625 4625
         
4626
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4626
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4627 4627
 		{
4628 4628
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4629 4629
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4630 4630
 			$temp_array['registration'] = $row['registration'];
4631 4631
 			$temp_array['airline_name'] = $row['airline_name'];
4632 4632
 			$temp_array['image_thumbnail'] = "";
4633
-			if($row['registration'] != "")
4633
+			if ($row['registration'] != "")
4634 4634
 			{
4635 4635
 				$image_array = $Image->getSpotterImage($row['registration']);
4636 4636
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4649,11 +4649,11 @@  discard block
 block discarded – undo
4649 4649
 	* @return Array the aircraft list
4650 4650
 	*
4651 4651
 	*/
4652
-	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
4652
+	public function countAllAircraftTypesByAirline($airline_icao, $filters = array())
4653 4653
 	{
4654
-		$filter_query = $this->getFilter($filters,true,true);
4655
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4656
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4654
+		$filter_query = $this->getFilter($filters, true, true);
4655
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4656
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4657 4657
 			    FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao 
4658 4658
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4659 4659
 			    ORDER BY aircraft_icao_count DESC";
@@ -4664,7 +4664,7 @@  discard block
 block discarded – undo
4664 4664
 		$aircraft_array = array();
4665 4665
 		$temp_array = array();
4666 4666
 
4667
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4667
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4668 4668
 		{
4669 4669
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4670 4670
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4682,13 +4682,13 @@  discard block
 block discarded – undo
4682 4682
 	* @return Array the aircraft list
4683 4683
 	*
4684 4684
 	*/
4685
-	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
4685
+	public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array())
4686 4686
 	{
4687
-		$filter_query = $this->getFilter($filters,true,true);
4687
+		$filter_query = $this->getFilter($filters, true, true);
4688 4688
 		$Image = new Image($this->db);
4689
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4689
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4690 4690
 
4691
-		$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 
4691
+		$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 
4692 4692
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao 
4693 4693
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4694 4694
 			    ORDER BY registration_count DESC";
@@ -4698,14 +4698,14 @@  discard block
 block discarded – undo
4698 4698
 
4699 4699
 		$aircraft_array = array();
4700 4700
 		$temp_array = array();
4701
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4701
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4702 4702
 		{
4703 4703
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4704 4704
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4705 4705
 			$temp_array['registration'] = $row['registration'];
4706 4706
 			$temp_array['airline_name'] = $row['airline_name'];
4707 4707
 			$temp_array['image_thumbnail'] = "";
4708
-			if($row['registration'] != "")
4708
+			if ($row['registration'] != "")
4709 4709
 			{
4710 4710
 				$image_array = $Image->getSpotterImage($row['registration']);
4711 4711
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4724,11 +4724,11 @@  discard block
 block discarded – undo
4724 4724
 	* @return Array the aircraft list
4725 4725
 	*
4726 4726
 	*/
4727
-	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
4727
+	public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array())
4728 4728
 	{
4729
-		$filter_query = $this->getFilter($filters,true,true);
4730
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4731
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4729
+		$filter_query = $this->getFilter($filters, true, true);
4730
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4731
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4732 4732
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao 
4733 4733
 				GROUP BY spotter_output.aircraft_manufacturer 
4734 4734
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -4739,7 +4739,7 @@  discard block
 block discarded – undo
4739 4739
 		$aircraft_array = array();
4740 4740
 		$temp_array = array();
4741 4741
 
4742
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4742
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4743 4743
 		{
4744 4744
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4745 4745
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -4756,12 +4756,12 @@  discard block
 block discarded – undo
4756 4756
 	* @return Array the aircraft list
4757 4757
 	*
4758 4758
 	*/
4759
-	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
4759
+	public function countAllAircraftTypesByAirport($airport_icao, $filters = array())
4760 4760
 	{
4761
-		$filter_query = $this->getFilter($filters,true,true);
4762
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4761
+		$filter_query = $this->getFilter($filters, true, true);
4762
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4763 4763
 
4764
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4764
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4765 4765
 				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) 
4766 4766
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4767 4767
 				ORDER BY aircraft_icao_count DESC";
@@ -4771,7 +4771,7 @@  discard block
 block discarded – undo
4771 4771
 
4772 4772
 		$aircraft_array = array();
4773 4773
 		$temp_array = array();
4774
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4774
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4775 4775
 		{
4776 4776
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4777 4777
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4789,13 +4789,13 @@  discard block
 block discarded – undo
4789 4789
 	* @return Array the aircraft list
4790 4790
 	*
4791 4791
 	*/
4792
-	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
4792
+	public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array())
4793 4793
 	{
4794
-		$filter_query = $this->getFilter($filters,true,true);
4794
+		$filter_query = $this->getFilter($filters, true, true);
4795 4795
 		$Image = new Image($this->db);
4796
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4796
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4797 4797
 
4798
-		$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  
4798
+		$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  
4799 4799
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)   
4800 4800
                     GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
4801 4801
 		    ORDER BY registration_count DESC";
@@ -4805,14 +4805,14 @@  discard block
 block discarded – undo
4805 4805
 
4806 4806
 		$aircraft_array = array();
4807 4807
 		$temp_array = array();
4808
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4808
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4809 4809
 		{
4810 4810
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4811 4811
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4812 4812
 			$temp_array['registration'] = $row['registration'];
4813 4813
 			$temp_array['airline_name'] = $row['airline_name'];
4814 4814
 			$temp_array['image_thumbnail'] = "";
4815
-			if($row['registration'] != "")
4815
+			if ($row['registration'] != "")
4816 4816
 			{
4817 4817
 				$image_array = $Image->getSpotterImage($row['registration']);
4818 4818
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4830,11 +4830,11 @@  discard block
 block discarded – undo
4830 4830
 	* @return Array the aircraft list
4831 4831
 	*
4832 4832
 	*/
4833
-	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
4833
+	public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array())
4834 4834
 	{
4835
-		$filter_query = $this->getFilter($filters,true,true);
4836
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4837
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4835
+		$filter_query = $this->getFilter($filters, true, true);
4836
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4837
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
4838 4838
                     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)  
4839 4839
                     GROUP BY spotter_output.aircraft_manufacturer 
4840 4840
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -4845,7 +4845,7 @@  discard block
 block discarded – undo
4845 4845
 
4846 4846
 		$aircraft_array = array();
4847 4847
 		$temp_array = array();
4848
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4848
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4849 4849
 		{
4850 4850
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4851 4851
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -4860,12 +4860,12 @@  discard block
 block discarded – undo
4860 4860
 	* @return Array the aircraft list
4861 4861
 	*
4862 4862
 	*/
4863
-	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
4863
+	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array())
4864 4864
 	{
4865
-		$filter_query = $this->getFilter($filters,true,true);
4866
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4865
+		$filter_query = $this->getFilter($filters, true, true);
4866
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4867 4867
 
4868
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4868
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4869 4869
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4870 4870
                     GROUP BY spotter_output.aircraft_name 
4871 4871
 					ORDER BY aircraft_icao_count DESC";
@@ -4874,7 +4874,7 @@  discard block
 block discarded – undo
4874 4874
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4875 4875
 		$aircraft_array = array();
4876 4876
 		$temp_array = array();
4877
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4877
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4878 4878
 		{
4879 4879
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4880 4880
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4893,11 +4893,11 @@  discard block
 block discarded – undo
4893 4893
 	*/
4894 4894
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
4895 4895
 	{
4896
-		$filter_query = $this->getFilter($filters,true,true);
4896
+		$filter_query = $this->getFilter($filters, true, true);
4897 4897
 		$Image = new Image($this->db);
4898
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4898
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4899 4899
 
4900
-		$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   
4900
+		$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   
4901 4901
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
4902 4902
                     GROUP BY spotter_output.registration 
4903 4903
 					ORDER BY registration_count DESC";
@@ -4907,14 +4907,14 @@  discard block
 block discarded – undo
4907 4907
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4908 4908
 		$aircraft_array = array();
4909 4909
 		$temp_array = array();
4910
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4910
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4911 4911
 		{
4912 4912
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4913 4913
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4914 4914
 			$temp_array['registration'] = $row['registration'];
4915 4915
 			$temp_array['airline_name'] = $row['airline_name'];
4916 4916
 			$temp_array['image_thumbnail'] = "";
4917
-			if($row['registration'] != "")
4917
+			if ($row['registration'] != "")
4918 4918
 			{
4919 4919
 				$image_array = $Image->getSpotterImage($row['registration']);
4920 4920
 				$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -4931,11 +4931,11 @@  discard block
 block discarded – undo
4931 4931
 	* @return Array the aircraft list
4932 4932
 	*
4933 4933
 	*/
4934
-	public function countAllAircraftTypesByDate($date,$filters = array())
4934
+	public function countAllAircraftTypesByDate($date, $filters = array())
4935 4935
 	{
4936 4936
 		global $globalTimezone, $globalDBdriver;
4937
-		$filter_query = $this->getFilter($filters,true,true);
4938
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4937
+		$filter_query = $this->getFilter($filters, true, true);
4938
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4939 4939
 		if ($globalTimezone != '') {
4940 4940
 			date_default_timezone_set($globalTimezone);
4941 4941
 			$datetime = new DateTime($date);
@@ -4943,12 +4943,12 @@  discard block
 block discarded – undo
4943 4943
 		} else $offset = '+00:00';
4944 4944
 
4945 4945
 		if ($globalDBdriver == 'mysql') {
4946
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4946
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4947 4947
 					FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4948 4948
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4949 4949
 					ORDER BY aircraft_icao_count DESC";
4950 4950
 		} else {
4951
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4951
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
4952 4952
 					FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4953 4953
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
4954 4954
 					ORDER BY aircraft_icao_count DESC";
@@ -4959,7 +4959,7 @@  discard block
 block discarded – undo
4959 4959
 
4960 4960
 		$aircraft_array = array();
4961 4961
 		$temp_array = array();
4962
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4962
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4963 4963
 		{
4964 4964
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4965 4965
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -4977,12 +4977,12 @@  discard block
 block discarded – undo
4977 4977
 	* @return Array the aircraft list
4978 4978
 	*
4979 4979
 	*/
4980
-	public function countAllAircraftRegistrationByDate($date,$filters = array())
4980
+	public function countAllAircraftRegistrationByDate($date, $filters = array())
4981 4981
 	{
4982 4982
 		global $globalTimezone, $globalDBdriver;
4983
-		$filter_query = $this->getFilter($filters,true,true);
4983
+		$filter_query = $this->getFilter($filters, true, true);
4984 4984
 		$Image = new Image($this->db);
4985
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4985
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4986 4986
 		if ($globalTimezone != '') {
4987 4987
 			date_default_timezone_set($globalTimezone);
4988 4988
 			$datetime = new DateTime($date);
@@ -4990,12 +4990,12 @@  discard block
 block discarded – undo
4990 4990
 		} else $offset = '+00:00';
4991 4991
 
4992 4992
 		if ($globalDBdriver == 'mysql') {
4993
-			$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
+			$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 
4994 4994
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
4995 4995
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
4996 4996
 					ORDER BY registration_count DESC";
4997 4997
 		} else {
4998
-			$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    
4998
+			$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    
4999 4999
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
5000 5000
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
5001 5001
 					ORDER BY registration_count DESC";
@@ -5006,14 +5006,14 @@  discard block
 block discarded – undo
5006 5006
 
5007 5007
 		$aircraft_array = array();
5008 5008
 		$temp_array = array();
5009
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5009
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5010 5010
 		{
5011 5011
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5012 5012
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5013 5013
 			$temp_array['registration'] = $row['registration'];
5014 5014
 			$temp_array['airline_name'] = $row['airline_name'];
5015 5015
 			$temp_array['image_thumbnail'] = "";
5016
-			if($row['registration'] != "")
5016
+			if ($row['registration'] != "")
5017 5017
 			{
5018 5018
 				$image_array = $Image->getSpotterImage($row['registration']);
5019 5019
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5032,11 +5032,11 @@  discard block
 block discarded – undo
5032 5032
 	* @return Array the aircraft manufacturer list
5033 5033
 	*
5034 5034
 	*/
5035
-	public function countAllAircraftManufacturerByDate($date,$filters = array())
5035
+	public function countAllAircraftManufacturerByDate($date, $filters = array())
5036 5036
 	{
5037 5037
 		global $globalTimezone, $globalDBdriver;
5038
-		$filter_query = $this->getFilter($filters,true,true);
5039
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
5038
+		$filter_query = $this->getFilter($filters, true, true);
5039
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
5040 5040
 		if ($globalTimezone != '') {
5041 5041
 			date_default_timezone_set($globalTimezone);
5042 5042
 			$datetime = new DateTime($date);
@@ -5044,12 +5044,12 @@  discard block
 block discarded – undo
5044 5044
 		} else $offset = '+00:00';
5045 5045
 
5046 5046
 		if ($globalDBdriver == 'mysql') {
5047
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5047
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5048 5048
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
5049 5049
 				GROUP BY spotter_output.aircraft_manufacturer 
5050 5050
 				ORDER BY aircraft_manufacturer_count DESC";
5051 5051
 		} else {
5052
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5052
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5053 5053
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
5054 5054
 				GROUP BY spotter_output.aircraft_manufacturer 
5055 5055
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -5061,7 +5061,7 @@  discard block
 block discarded – undo
5061 5061
 		$aircraft_array = array();
5062 5062
 		$temp_array = array();
5063 5063
 
5064
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5064
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5065 5065
 		{
5066 5066
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5067 5067
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5078,11 +5078,11 @@  discard block
 block discarded – undo
5078 5078
 	* @return Array the aircraft list
5079 5079
 	*
5080 5080
 	*/
5081
-	public function countAllAircraftTypesByIdent($ident,$filters = array())
5081
+	public function countAllAircraftTypesByIdent($ident, $filters = array())
5082 5082
 	{
5083
-		$filter_query = $this->getFilter($filters,true,true);
5084
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5085
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5083
+		$filter_query = $this->getFilter($filters, true, true);
5084
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5085
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5086 5086
 				FROM spotter_output".$filter_query." spotter_output.ident = :ident 
5087 5087
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
5088 5088
 				ORDER BY aircraft_icao_count DESC";
@@ -5093,7 +5093,7 @@  discard block
 block discarded – undo
5093 5093
 		$aircraft_array = array();
5094 5094
 		$temp_array = array();
5095 5095
 
5096
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5096
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5097 5097
 		{
5098 5098
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5099 5099
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -5111,13 +5111,13 @@  discard block
 block discarded – undo
5111 5111
 	* @return Array the aircraft list
5112 5112
 	*
5113 5113
 	*/
5114
-	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
5114
+	public function countAllAircraftRegistrationByIdent($ident, $filters = array())
5115 5115
 	{
5116
-		$filter_query = $this->getFilter($filters,true,true);
5116
+		$filter_query = $this->getFilter($filters, true, true);
5117 5117
 		$Image = new Image($this->db);
5118
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5118
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5119 5119
 
5120
-		$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  
5120
+		$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  
5121 5121
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident   
5122 5122
                     GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5123 5123
 		    ORDER BY registration_count DESC";
@@ -5129,14 +5129,14 @@  discard block
 block discarded – undo
5129 5129
 		$aircraft_array = array();
5130 5130
 		$temp_array = array();
5131 5131
         
5132
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5132
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5133 5133
 		{
5134 5134
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5135 5135
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5136 5136
 			$temp_array['registration'] = $row['registration'];
5137 5137
 			$temp_array['airline_name'] = $row['airline_name'];
5138 5138
 			$temp_array['image_thumbnail'] = "";
5139
-			if($row['registration'] != "")
5139
+			if ($row['registration'] != "")
5140 5140
 			{
5141 5141
 				$image_array = $Image->getSpotterImage($row['registration']);
5142 5142
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5155,11 +5155,11 @@  discard block
 block discarded – undo
5155 5155
 	* @return Array the aircraft manufacturer list
5156 5156
 	*
5157 5157
 	*/
5158
-	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
5158
+	public function countAllAircraftManufacturerByIdent($ident, $filters = array())
5159 5159
 	{
5160
-		$filter_query = $this->getFilter($filters,true,true);
5161
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5162
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5160
+		$filter_query = $this->getFilter($filters, true, true);
5161
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5162
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5163 5163
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident  
5164 5164
                     GROUP BY spotter_output.aircraft_manufacturer 
5165 5165
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -5169,7 +5169,7 @@  discard block
 block discarded – undo
5169 5169
 		$sth->execute(array(':ident' => $ident));
5170 5170
 		$aircraft_array = array();
5171 5171
 		$temp_array = array();
5172
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5172
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5173 5173
 		{
5174 5174
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5175 5175
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5185,24 +5185,24 @@  discard block
 block discarded – undo
5185 5185
 	* @return Array the aircraft list
5186 5186
 	*
5187 5187
 	*/
5188
-	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5188
+	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5189 5189
 	{
5190
-		$filter_query = $this->getFilter($filters,true,true);
5191
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5192
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5190
+		$filter_query = $this->getFilter($filters, true, true);
5191
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5192
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5193 5193
 		
5194 5194
 
5195
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5195
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5196 5196
                     FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5197 5197
                     GROUP BY spotter_output.aircraft_name 
5198 5198
 					ORDER BY aircraft_icao_count DESC";
5199 5199
  
5200 5200
 		
5201 5201
 		$sth = $this->db->prepare($query);
5202
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5202
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5203 5203
 		$aircraft_array = array();
5204 5204
 		$temp_array = array();
5205
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5205
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5206 5206
 		{
5207 5207
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5208 5208
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -5218,33 +5218,33 @@  discard block
 block discarded – undo
5218 5218
 	* @return Array the aircraft list
5219 5219
 	*
5220 5220
 	*/
5221
-	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5221
+	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5222 5222
 	{
5223
-		$filter_query = $this->getFilter($filters,true,true);
5223
+		$filter_query = $this->getFilter($filters, true, true);
5224 5224
 		$Image = new Image($this->db);
5225
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5226
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5225
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5226
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5227 5227
 
5228
-		$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   
5228
+		$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   
5229 5229
                     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)   
5230 5230
                     GROUP BY spotter_output.registration 
5231 5231
 					ORDER BY registration_count DESC";
5232 5232
 
5233 5233
 		
5234 5234
 		$sth = $this->db->prepare($query);
5235
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5235
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5236 5236
       
5237 5237
 		$aircraft_array = array();
5238 5238
 		$temp_array = array();
5239 5239
         
5240
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5240
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5241 5241
 		{
5242 5242
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5243 5243
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5244 5244
 			$temp_array['registration'] = $row['registration'];
5245 5245
 			$temp_array['airline_name'] = $row['airline_name'];
5246 5246
 			$temp_array['image_thumbnail'] = "";
5247
-			if($row['registration'] != "")
5247
+			if ($row['registration'] != "")
5248 5248
 			{
5249 5249
 				$image_array = $Image->getSpotterImage($row['registration']);
5250 5250
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5264,25 +5264,25 @@  discard block
 block discarded – undo
5264 5264
 	* @return Array the aircraft manufacturer list
5265 5265
 	*
5266 5266
 	*/
5267
-	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5267
+	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5268 5268
 	{
5269
-		$filter_query = $this->getFilter($filters,true,true);
5270
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5271
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5269
+		$filter_query = $this->getFilter($filters, true, true);
5270
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5271
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5272 5272
 
5273
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5273
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5274 5274
                     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) 
5275 5275
                     GROUP BY spotter_output.aircraft_manufacturer 
5276 5276
 					ORDER BY aircraft_manufacturer_count DESC";
5277 5277
 
5278 5278
 		
5279 5279
 		$sth = $this->db->prepare($query);
5280
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5280
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5281 5281
       
5282 5282
 		$aircraft_array = array();
5283 5283
 		$temp_array = array();
5284 5284
         
5285
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5285
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5286 5286
 		{
5287 5287
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5288 5288
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5302,11 +5302,11 @@  discard block
 block discarded – undo
5302 5302
 	* @return Array the aircraft list
5303 5303
 	*
5304 5304
 	*/
5305
-	public function countAllAircraftTypesByCountry($country,$filters = array())
5305
+	public function countAllAircraftTypesByCountry($country, $filters = array())
5306 5306
 	{
5307
-		$filter_query = $this->getFilter($filters,true,true);
5308
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5309
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5307
+		$filter_query = $this->getFilter($filters, true, true);
5308
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5309
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
5310 5310
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
5311 5311
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
5312 5312
 			    ORDER BY aircraft_icao_count DESC";
@@ -5318,7 +5318,7 @@  discard block
 block discarded – undo
5318 5318
 		$aircraft_array = array();
5319 5319
 		$temp_array = array();
5320 5320
         
5321
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5321
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5322 5322
 		{
5323 5323
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5324 5324
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -5337,12 +5337,12 @@  discard block
 block discarded – undo
5337 5337
 	* @return Array the aircraft list
5338 5338
 	*
5339 5339
 	*/
5340
-	public function countAllAircraftRegistrationByCountry($country,$filters = array())
5340
+	public function countAllAircraftRegistrationByCountry($country, $filters = array())
5341 5341
 	{
5342
-		$filter_query = $this->getFilter($filters,true,true);
5342
+		$filter_query = $this->getFilter($filters, true, true);
5343 5343
 		$Image = new Image($this->db);
5344
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5345
-		$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 
5344
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5345
+		$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 
5346 5346
 			    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)    
5347 5347
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
5348 5348
 			    ORDER BY registration_count DESC";
@@ -5354,14 +5354,14 @@  discard block
 block discarded – undo
5354 5354
 		$aircraft_array = array();
5355 5355
 		$temp_array = array();
5356 5356
         
5357
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5357
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5358 5358
 		{
5359 5359
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5360 5360
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5361 5361
 			$temp_array['registration'] = $row['registration'];
5362 5362
 			$temp_array['airline_name'] = $row['airline_name'];
5363 5363
 			$temp_array['image_thumbnail'] = "";
5364
-			if($row['registration'] != "")
5364
+			if ($row['registration'] != "")
5365 5365
 			{
5366 5366
 				$image_array = $Image->getSpotterImage($row['registration']);
5367 5367
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5381,11 +5381,11 @@  discard block
 block discarded – undo
5381 5381
 	* @return Array the aircraft manufacturer list
5382 5382
 	*
5383 5383
 	*/
5384
-	public function countAllAircraftManufacturerByCountry($country,$filters = array())
5384
+	public function countAllAircraftManufacturerByCountry($country, $filters = array())
5385 5385
 	{
5386
-		$filter_query = $this->getFilter($filters,true,true);
5387
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5388
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5386
+		$filter_query = $this->getFilter($filters, true, true);
5387
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5388
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5389 5389
                     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) 
5390 5390
                     GROUP BY spotter_output.aircraft_manufacturer 
5391 5391
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -5397,7 +5397,7 @@  discard block
 block discarded – undo
5397 5397
 		$aircraft_array = array();
5398 5398
 		$temp_array = array();
5399 5399
         
5400
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5400
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5401 5401
 		{
5402 5402
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5403 5403
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5418,8 +5418,8 @@  discard block
 block discarded – undo
5418 5418
 	*/
5419 5419
 	public function countAllAircraftManufacturers($filters = array())
5420 5420
 	{
5421
-		$filter_query = $this->getFilter($filters,true,true);
5422
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5421
+		$filter_query = $this->getFilter($filters, true, true);
5422
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
5423 5423
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
5424 5424
                 $query .= " GROUP BY spotter_output.aircraft_manufacturer
5425 5425
 					ORDER BY aircraft_manufacturer_count DESC
@@ -5432,7 +5432,7 @@  discard block
 block discarded – undo
5432 5432
 		$manufacturer_array = array();
5433 5433
 		$temp_array = array();
5434 5434
         
5435
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5435
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5436 5436
 		{
5437 5437
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5438 5438
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5451,12 +5451,12 @@  discard block
 block discarded – undo
5451 5451
 	* @return Array the aircraft list
5452 5452
 	*
5453 5453
 	*/
5454
-	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5454
+	public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5455 5455
 	{
5456 5456
 		global $globalDBdriver;
5457 5457
 		$Image = new Image($this->db);
5458
-		$filter_query = $this->getFilter($filters,true,true);
5459
-		$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    
5458
+		$filter_query = $this->getFilter($filters, true, true);
5459
+		$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    
5460 5460
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
5461 5461
                 if ($olderthanmonths > 0) {
5462 5462
             		if ($globalDBdriver == 'mysql') {
@@ -5484,7 +5484,7 @@  discard block
 block discarded – undo
5484 5484
 		$aircraft_array = array();
5485 5485
 		$temp_array = array();
5486 5486
         
5487
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5487
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5488 5488
 		{
5489 5489
 			$temp_array['registration'] = $row['registration'];
5490 5490
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -5492,7 +5492,7 @@  discard block
 block discarded – undo
5492 5492
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5493 5493
 			$temp_array['airline_name'] = $row['airline_name'];
5494 5494
 			$temp_array['image_thumbnail'] = "";
5495
-			if($row['registration'] != "")
5495
+			if ($row['registration'] != "")
5496 5496
 			{
5497 5497
 				$image_array = $Image->getSpotterImage($row['registration']);
5498 5498
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5511,12 +5511,12 @@  discard block
 block discarded – undo
5511 5511
 	* @return Array the aircraft list
5512 5512
 	*
5513 5513
 	*/
5514
-	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5514
+	public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5515 5515
 	{
5516 5516
 		global $globalDBdriver;
5517
-		$filter_query = $this->getFilter($filters,true,true);
5517
+		$filter_query = $this->getFilter($filters, true, true);
5518 5518
 		$Image = new Image($this->db);
5519
-		$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    
5519
+		$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    
5520 5520
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
5521 5521
                 if ($olderthanmonths > 0) {
5522 5522
             		if ($globalDBdriver == 'mysql') {
@@ -5544,7 +5544,7 @@  discard block
 block discarded – undo
5544 5544
 		$aircraft_array = array();
5545 5545
 		$temp_array = array();
5546 5546
         
5547
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5547
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5548 5548
 		{
5549 5549
 			$temp_array['registration'] = $row['registration'];
5550 5550
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -5553,7 +5553,7 @@  discard block
 block discarded – undo
5553 5553
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5554 5554
 			$temp_array['airline_name'] = $row['airline_name'];
5555 5555
 			$temp_array['image_thumbnail'] = "";
5556
-			if($row['registration'] != "")
5556
+			if ($row['registration'] != "")
5557 5557
 			{
5558 5558
 				$image_array = $Image->getSpotterImage($row['registration']);
5559 5559
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5572,11 +5572,11 @@  discard block
 block discarded – undo
5572 5572
 	* @return Array the airport list
5573 5573
 	*
5574 5574
 	*/
5575
-	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5575
+	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5576 5576
 	{
5577 5577
 		global $globalDBdriver;
5578
-		$filter_query = $this->getFilter($filters,true,true);
5579
-		$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 
5578
+		$filter_query = $this->getFilter($filters, true, true);
5579
+		$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 
5580 5580
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA'";
5581 5581
                 if ($olderthanmonths > 0) {
5582 5582
             		if ($globalDBdriver == 'mysql') {
@@ -5605,7 +5605,7 @@  discard block
 block discarded – undo
5605 5605
 		$airport_array = array();
5606 5606
 		$temp_array = array();
5607 5607
         
5608
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5608
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5609 5609
 		{
5610 5610
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5611 5611
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5624,11 +5624,11 @@  discard block
 block discarded – undo
5624 5624
 	* @return Array the airport list
5625 5625
 	*
5626 5626
 	*/
5627
-	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5627
+	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5628 5628
 	{
5629 5629
 		global $globalDBdriver;
5630
-		$filter_query = $this->getFilter($filters,true,true);
5631
-		$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 
5630
+		$filter_query = $this->getFilter($filters, true, true);
5631
+		$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 
5632 5632
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' ";
5633 5633
                 if ($olderthanmonths > 0) {
5634 5634
             		if ($globalDBdriver == 'mysql') {
@@ -5657,7 +5657,7 @@  discard block
 block discarded – undo
5657 5657
 		$airport_array = array();
5658 5658
 		$temp_array = array();
5659 5659
         
5660
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5660
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5661 5661
 		{
5662 5662
 			$temp_array['airline_icao'] = $row['airline_icao'];
5663 5663
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -5677,11 +5677,11 @@  discard block
 block discarded – undo
5677 5677
 	* @return Array the airport list
5678 5678
 	*
5679 5679
 	*/
5680
-	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5680
+	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5681 5681
 	{
5682 5682
 		global $globalDBdriver;
5683
-		$filter_query = $this->getFilter($filters,true,true);
5684
-		$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
5683
+		$filter_query = $this->getFilter($filters, true, true);
5684
+		$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
5685 5685
 				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";
5686 5686
                 if ($olderthanmonths > 0) {
5687 5687
             		if ($globalDBdriver == 'mysql') {
@@ -5709,7 +5709,7 @@  discard block
 block discarded – undo
5709 5709
 		$airport_array = array();
5710 5710
 		$temp_array = array();
5711 5711
         
5712
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5712
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5713 5713
 		{
5714 5714
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5715 5715
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5728,11 +5728,11 @@  discard block
 block discarded – undo
5728 5728
 	* @return Array the airport list
5729 5729
 	*
5730 5730
 	*/
5731
-	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5731
+	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5732 5732
 	{
5733 5733
 		global $globalDBdriver;
5734
-		$filter_query = $this->getFilter($filters,true,true);
5735
-		$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
5734
+		$filter_query = $this->getFilter($filters, true, true);
5735
+		$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
5736 5736
 				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 ";
5737 5737
                 if ($olderthanmonths > 0) {
5738 5738
             		if ($globalDBdriver == 'mysql') {
@@ -5761,7 +5761,7 @@  discard block
 block discarded – undo
5761 5761
 		$airport_array = array();
5762 5762
 		$temp_array = array();
5763 5763
         
5764
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5764
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5765 5765
 		{
5766 5766
 			$temp_array['airline_icao'] = $row['airline_icao'];
5767 5767
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -5781,11 +5781,11 @@  discard block
 block discarded – undo
5781 5781
 	* @return Array the airport list
5782 5782
 	*
5783 5783
 	*/
5784
-	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
5784
+	public function countAllDepartureAirportsByAirline($airline_icao, $filters = array())
5785 5785
 	{
5786
-		$filter_query = $this->getFilter($filters,true,true);
5787
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5788
-		$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 
5786
+		$filter_query = $this->getFilter($filters, true, true);
5787
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5788
+		$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 
5789 5789
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao 
5790 5790
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
5791 5791
 			    ORDER BY airport_departure_icao_count DESC";
@@ -5797,7 +5797,7 @@  discard block
 block discarded – undo
5797 5797
 		$airport_array = array();
5798 5798
 		$temp_array = array();
5799 5799
         
5800
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5800
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5801 5801
 		{
5802 5802
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5803 5803
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5819,11 +5819,11 @@  discard block
 block discarded – undo
5819 5819
 	* @return Array the airport list
5820 5820
 	*
5821 5821
 	*/
5822
-	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
5822
+	public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array())
5823 5823
 	{
5824
-		$filter_query = $this->getFilter($filters,true,true);
5825
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5826
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5824
+		$filter_query = $this->getFilter($filters, true, true);
5825
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5826
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5827 5827
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
5828 5828
                     GROUP BY spotter_output.departure_airport_country
5829 5829
 					ORDER BY airport_departure_country_count DESC";
@@ -5835,7 +5835,7 @@  discard block
 block discarded – undo
5835 5835
 		$airport_array = array();
5836 5836
 		$temp_array = array();
5837 5837
         
5838
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5838
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5839 5839
 		{
5840 5840
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5841 5841
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5854,11 +5854,11 @@  discard block
 block discarded – undo
5854 5854
 	* @return Array the airport list
5855 5855
 	*
5856 5856
 	*/
5857
-	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
5857
+	public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array())
5858 5858
 	{
5859
-		$filter_query = $this->getFilter($filters,true,true);
5860
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5861
-		$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 
5859
+		$filter_query = $this->getFilter($filters, true, true);
5860
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5861
+		$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 
5862 5862
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao 
5863 5863
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5864 5864
 			    ORDER BY airport_departure_icao_count DESC";
@@ -5870,7 +5870,7 @@  discard block
 block discarded – undo
5870 5870
 		$airport_array = array();
5871 5871
 		$temp_array = array();
5872 5872
         
5873
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5873
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5874 5874
 		{
5875 5875
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5876 5876
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5891,11 +5891,11 @@  discard block
 block discarded – undo
5891 5891
 	* @return Array the airport list
5892 5892
 	*
5893 5893
 	*/
5894
-	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
5894
+	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array())
5895 5895
 	{
5896
-		$filter_query = $this->getFilter($filters,true,true);
5897
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5898
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5896
+		$filter_query = $this->getFilter($filters, true, true);
5897
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5898
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5899 5899
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
5900 5900
                     GROUP BY spotter_output.departure_airport_country
5901 5901
 					ORDER BY airport_departure_country_count DESC";
@@ -5907,7 +5907,7 @@  discard block
 block discarded – undo
5907 5907
 		$airport_array = array();
5908 5908
 		$temp_array = array();
5909 5909
         
5910
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5910
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5911 5911
 		{
5912 5912
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5913 5913
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5925,11 +5925,11 @@  discard block
 block discarded – undo
5925 5925
 	* @return Array the airport list
5926 5926
 	*
5927 5927
 	*/
5928
-	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
5928
+	public function countAllDepartureAirportsByRegistration($registration, $filters = array())
5929 5929
 	{
5930
-		$filter_query = $this->getFilter($filters,true,true);
5931
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5932
-		$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 
5930
+		$filter_query = $this->getFilter($filters, true, true);
5931
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5932
+		$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 
5933 5933
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration 
5934 5934
                     GROUP BY spotter_output.departure_airport_icao
5935 5935
 					ORDER BY airport_departure_icao_count DESC";
@@ -5941,7 +5941,7 @@  discard block
 block discarded – undo
5941 5941
 		$airport_array = array();
5942 5942
 		$temp_array = array();
5943 5943
         
5944
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5944
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5945 5945
 		{
5946 5946
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5947 5947
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -5962,11 +5962,11 @@  discard block
 block discarded – undo
5962 5962
 	* @return Array the airport list
5963 5963
 	*
5964 5964
 	*/
5965
-	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
5965
+	public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array())
5966 5966
 	{
5967
-		$filter_query = $this->getFilter($filters,true,true);
5968
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5969
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5967
+		$filter_query = $this->getFilter($filters, true, true);
5968
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5969
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
5970 5970
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration 
5971 5971
                     GROUP BY spotter_output.departure_airport_country
5972 5972
 					ORDER BY airport_departure_country_count DESC";
@@ -5978,7 +5978,7 @@  discard block
 block discarded – undo
5978 5978
 		$airport_array = array();
5979 5979
 		$temp_array = array();
5980 5980
         
5981
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5981
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5982 5982
 		{
5983 5983
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5984 5984
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -5996,11 +5996,11 @@  discard block
 block discarded – undo
5996 5996
 	* @return Array the airport list
5997 5997
 	*
5998 5998
 	*/
5999
-	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
5999
+	public function countAllDepartureAirportsByAirport($airport_icao, $filters = array())
6000 6000
 	{
6001
-		$filter_query = $this->getFilter($filters,true,true);
6002
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6003
-		$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 
6001
+		$filter_query = $this->getFilter($filters, true, true);
6002
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6003
+		$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 
6004 6004
 			    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 
6005 6005
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6006 6006
 			    ORDER BY airport_departure_icao_count DESC";
@@ -6012,7 +6012,7 @@  discard block
 block discarded – undo
6012 6012
 		$airport_array = array();
6013 6013
 		$temp_array = array();
6014 6014
         
6015
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6015
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6016 6016
 		{
6017 6017
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6018 6018
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6033,11 +6033,11 @@  discard block
 block discarded – undo
6033 6033
 	* @return Array the airport list
6034 6034
 	*
6035 6035
 	*/
6036
-	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
6036
+	public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array())
6037 6037
 	{
6038
-		$filter_query = $this->getFilter($filters,true,true);
6039
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6040
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6038
+		$filter_query = $this->getFilter($filters, true, true);
6039
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6040
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6041 6041
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao 
6042 6042
                     GROUP BY spotter_output.departure_airport_country
6043 6043
 					ORDER BY airport_departure_country_count DESC";
@@ -6049,7 +6049,7 @@  discard block
 block discarded – undo
6049 6049
 		$airport_array = array();
6050 6050
 		$temp_array = array();
6051 6051
         
6052
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6052
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6053 6053
 		{
6054 6054
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6055 6055
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6068,11 +6068,11 @@  discard block
 block discarded – undo
6068 6068
 	* @return Array the airport list
6069 6069
 	*
6070 6070
 	*/
6071
-	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6071
+	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6072 6072
 	{
6073
-		$filter_query = $this->getFilter($filters,true,true);
6074
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6075
-		$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 
6073
+		$filter_query = $this->getFilter($filters, true, true);
6074
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6075
+		$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 
6076 6076
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6077 6077
                     GROUP BY spotter_output.departure_airport_icao
6078 6078
 					ORDER BY airport_departure_icao_count DESC";
@@ -6084,7 +6084,7 @@  discard block
 block discarded – undo
6084 6084
 		$airport_array = array();
6085 6085
 		$temp_array = array();
6086 6086
         
6087
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6087
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6088 6088
 		{
6089 6089
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6090 6090
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6105,11 +6105,11 @@  discard block
 block discarded – undo
6105 6105
 	* @return Array the airport list
6106 6106
 	*
6107 6107
 	*/
6108
-	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6108
+	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6109 6109
 	{
6110
-		$filter_query = $this->getFilter($filters,true,true);
6111
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6112
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6110
+		$filter_query = $this->getFilter($filters, true, true);
6111
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6112
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6113 6113
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6114 6114
                     GROUP BY spotter_output.departure_airport_country
6115 6115
 					ORDER BY airport_departure_country_count DESC";
@@ -6121,7 +6121,7 @@  discard block
 block discarded – undo
6121 6121
 		$airport_array = array();
6122 6122
 		$temp_array = array();
6123 6123
         
6124
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6124
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6125 6125
 		{
6126 6126
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6127 6127
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6139,11 +6139,11 @@  discard block
 block discarded – undo
6139 6139
 	* @return Array the airport list
6140 6140
 	*
6141 6141
 	*/
6142
-	public function countAllDepartureAirportsByDate($date,$filters = array())
6142
+	public function countAllDepartureAirportsByDate($date, $filters = array())
6143 6143
 	{
6144 6144
 		global $globalTimezone, $globalDBdriver;
6145
-		$filter_query = $this->getFilter($filters,true,true);
6146
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6145
+		$filter_query = $this->getFilter($filters, true, true);
6146
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6147 6147
 		if ($globalTimezone != '') {
6148 6148
 			date_default_timezone_set($globalTimezone);
6149 6149
 			$datetime = new DateTime($date);
@@ -6151,12 +6151,12 @@  discard block
 block discarded – undo
6151 6151
 		} else $offset = '+00:00';
6152 6152
 
6153 6153
 		if ($globalDBdriver == 'mysql') {
6154
-			$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 
6154
+			$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 
6155 6155
 					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
6156 6156
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6157 6157
 					ORDER BY airport_departure_icao_count DESC";
6158 6158
 		} else {
6159
-			$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 
6159
+			$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 
6160 6160
 					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
6161 6161
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6162 6162
 					ORDER BY airport_departure_icao_count DESC";
@@ -6168,7 +6168,7 @@  discard block
 block discarded – undo
6168 6168
 		$airport_array = array();
6169 6169
 		$temp_array = array();
6170 6170
         
6171
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6171
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6172 6172
 		{
6173 6173
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6174 6174
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6189,11 +6189,11 @@  discard block
 block discarded – undo
6189 6189
 	* @return Array the airport list
6190 6190
 	*
6191 6191
 	*/
6192
-	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
6192
+	public function countAllDepartureAirportCountriesByDate($date, $filters = array())
6193 6193
 	{
6194 6194
 		global $globalTimezone, $globalDBdriver;
6195
-		$filter_query = $this->getFilter($filters,true,true);
6196
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6195
+		$filter_query = $this->getFilter($filters, true, true);
6196
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6197 6197
 		if ($globalTimezone != '') {
6198 6198
 			date_default_timezone_set($globalTimezone);
6199 6199
 			$datetime = new DateTime($date);
@@ -6201,12 +6201,12 @@  discard block
 block discarded – undo
6201 6201
 		} else $offset = '+00:00';
6202 6202
 
6203 6203
 		if ($globalDBdriver == 'mysql') {
6204
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6204
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6205 6205
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
6206 6206
 					GROUP BY spotter_output.departure_airport_country
6207 6207
 					ORDER BY airport_departure_country_count DESC";
6208 6208
 		} else {
6209
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6209
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6210 6210
 					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 
6211 6211
 					GROUP BY spotter_output.departure_airport_country
6212 6212
 					ORDER BY airport_departure_country_count DESC";
@@ -6218,7 +6218,7 @@  discard block
 block discarded – undo
6218 6218
 		$airport_array = array();
6219 6219
 		$temp_array = array();
6220 6220
         
6221
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6221
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6222 6222
 		{
6223 6223
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6224 6224
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6236,11 +6236,11 @@  discard block
 block discarded – undo
6236 6236
 	* @return Array the airport list
6237 6237
 	*
6238 6238
 	*/
6239
-	public function countAllDepartureAirportsByIdent($ident,$filters = array())
6239
+	public function countAllDepartureAirportsByIdent($ident, $filters = array())
6240 6240
 	{
6241
-		$filter_query = $this->getFilter($filters,true,true);
6242
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6243
-		$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 
6241
+		$filter_query = $this->getFilter($filters, true, true);
6242
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6243
+		$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 
6244 6244
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.ident = :ident 
6245 6245
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6246 6246
 		    ORDER BY airport_departure_icao_count DESC";
@@ -6252,7 +6252,7 @@  discard block
 block discarded – undo
6252 6252
 		$airport_array = array();
6253 6253
 		$temp_array = array();
6254 6254
         
6255
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6255
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6256 6256
 		{
6257 6257
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6258 6258
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6274,11 +6274,11 @@  discard block
 block discarded – undo
6274 6274
 	* @return Array the airport list
6275 6275
 	*
6276 6276
 	*/
6277
-	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
6277
+	public function countAllDepartureAirportCountriesByIdent($ident, $filters = array())
6278 6278
 	{
6279
-		$filter_query = $this->getFilter($filters,true,true);
6280
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6281
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6279
+		$filter_query = $this->getFilter($filters, true, true);
6280
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6281
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6282 6282
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident 
6283 6283
                     GROUP BY spotter_output.departure_airport_country
6284 6284
 					ORDER BY airport_departure_country_count DESC";
@@ -6290,7 +6290,7 @@  discard block
 block discarded – undo
6290 6290
 		$airport_array = array();
6291 6291
 		$temp_array = array();
6292 6292
         
6293
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6293
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6294 6294
 		{
6295 6295
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6296 6296
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6309,12 +6309,12 @@  discard block
 block discarded – undo
6309 6309
 	* @return Array the airport list
6310 6310
 	*
6311 6311
 	*/
6312
-	public function countAllDepartureAirportsByCountry($country,$filters = array())
6312
+	public function countAllDepartureAirportsByCountry($country, $filters = array())
6313 6313
 	{
6314
-		$filter_query = $this->getFilter($filters,true,true);
6315
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6314
+		$filter_query = $this->getFilter($filters, true, true);
6315
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6316 6316
 
6317
-		$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 
6317
+		$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 
6318 6318
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6319 6319
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
6320 6320
 			    ORDER BY airport_departure_icao_count DESC";
@@ -6326,7 +6326,7 @@  discard block
 block discarded – undo
6326 6326
 		$airport_array = array();
6327 6327
 		$temp_array = array();
6328 6328
         
6329
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6329
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6330 6330
 		{
6331 6331
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6332 6332
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -6347,11 +6347,11 @@  discard block
 block discarded – undo
6347 6347
 	* @return Array the airport list
6348 6348
 	*
6349 6349
 	*/
6350
-	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
6350
+	public function countAllDepartureAirportCountriesByCountry($country, $filters = array())
6351 6351
 	{
6352
-		$filter_query = $this->getFilter($filters,true,true);
6353
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6354
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6352
+		$filter_query = $this->getFilter($filters, true, true);
6353
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6354
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
6355 6355
 			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 
6356 6356
                     GROUP BY spotter_output.departure_airport_country
6357 6357
 					ORDER BY airport_departure_country_count DESC";
@@ -6363,7 +6363,7 @@  discard block
 block discarded – undo
6363 6363
 		$airport_array = array();
6364 6364
 		$temp_array = array();
6365 6365
         
6366
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6366
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6367 6367
 		{
6368 6368
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6369 6369
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6381,11 +6381,11 @@  discard block
 block discarded – undo
6381 6381
 	* @return Array the airport list
6382 6382
 	*
6383 6383
 	*/
6384
-	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6384
+	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6385 6385
 	{
6386 6386
 		global $globalDBdriver;
6387
-		$filter_query = $this->getFilter($filters,true,true);
6388
-		$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 
6387
+		$filter_query = $this->getFilter($filters, true, true);
6388
+		$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 
6389 6389
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
6390 6390
                 if ($olderthanmonths > 0) {
6391 6391
             		if ($globalDBdriver == 'mysql') {
@@ -6420,7 +6420,7 @@  discard block
 block discarded – undo
6420 6420
 		$airport_array = array();
6421 6421
 		$temp_array = array();
6422 6422
         
6423
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6423
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6424 6424
 		{
6425 6425
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6426 6426
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6443,11 +6443,11 @@  discard block
 block discarded – undo
6443 6443
 	* @return Array the airport list
6444 6444
 	*
6445 6445
 	*/
6446
-	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6446
+	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6447 6447
 	{
6448 6448
 		global $globalDBdriver;
6449
-		$filter_query = $this->getFilter($filters,true,true);
6450
-		$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 
6449
+		$filter_query = $this->getFilter($filters, true, true);
6450
+		$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 
6451 6451
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' ";
6452 6452
                 if ($olderthanmonths > 0) {
6453 6453
             		if ($globalDBdriver == 'mysql') {
@@ -6482,7 +6482,7 @@  discard block
 block discarded – undo
6482 6482
 		$airport_array = array();
6483 6483
 		$temp_array = array();
6484 6484
         
6485
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6485
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6486 6486
 		{
6487 6487
 			$temp_array['airline_icao'] = $row['airline_icao'];
6488 6488
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
@@ -6507,11 +6507,11 @@  discard block
 block discarded – undo
6507 6507
 	* @return Array the airport list
6508 6508
 	*
6509 6509
 	*/
6510
-	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6510
+	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6511 6511
 	{
6512 6512
 		global $globalDBdriver;
6513
-		$filter_query = $this->getFilter($filters,true,true);
6514
-		$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 
6513
+		$filter_query = $this->getFilter($filters, true, true);
6514
+		$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 
6515 6515
 			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";
6516 6516
                 if ($olderthanmonths > 0) {
6517 6517
             		if ($globalDBdriver == 'mysql') {
@@ -6545,7 +6545,7 @@  discard block
 block discarded – undo
6545 6545
 		$airport_array = array();
6546 6546
 		$temp_array = array();
6547 6547
         
6548
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6548
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6549 6549
 		{
6550 6550
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6551 6551
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6568,11 +6568,11 @@  discard block
 block discarded – undo
6568 6568
 	* @return Array the airport list
6569 6569
 	*
6570 6570
 	*/
6571
-	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6571
+	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6572 6572
 	{
6573 6573
 		global $globalDBdriver;
6574
-		$filter_query = $this->getFilter($filters,true,true);
6575
-		$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 
6574
+		$filter_query = $this->getFilter($filters, true, true);
6575
+		$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 
6576 6576
 			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 ";
6577 6577
                 if ($olderthanmonths > 0) {
6578 6578
             		if ($globalDBdriver == 'mysql') {
@@ -6607,7 +6607,7 @@  discard block
 block discarded – undo
6607 6607
 		$airport_array = array();
6608 6608
 		$temp_array = array();
6609 6609
         
6610
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6610
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6611 6611
 		{
6612 6612
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6613 6613
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6633,9 +6633,9 @@  discard block
 block discarded – undo
6633 6633
 	*/
6634 6634
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
6635 6635
 	{
6636
-		$filter_query = $this->getFilter($filters,true,true);
6637
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6638
-		$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 
6636
+		$filter_query = $this->getFilter($filters, true, true);
6637
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6638
+		$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 
6639 6639
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao 
6640 6640
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6641 6641
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6646,7 +6646,7 @@  discard block
 block discarded – undo
6646 6646
 		$airport_array = array();
6647 6647
 		$temp_array = array();
6648 6648
         
6649
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6649
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6650 6650
 		{
6651 6651
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6652 6652
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6667,12 +6667,12 @@  discard block
 block discarded – undo
6667 6667
 	* @return Array the airport list
6668 6668
 	*
6669 6669
 	*/
6670
-	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
6670
+	public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array())
6671 6671
 	{
6672
-		$filter_query = $this->getFilter($filters,true,true);
6673
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6672
+		$filter_query = $this->getFilter($filters, true, true);
6673
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6674 6674
 					
6675
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6675
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6676 6676
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
6677 6677
                     GROUP BY spotter_output.arrival_airport_country
6678 6678
 					ORDER BY airport_arrival_country_count DESC";
@@ -6684,7 +6684,7 @@  discard block
 block discarded – undo
6684 6684
 		$airport_array = array();
6685 6685
 		$temp_array = array();
6686 6686
         
6687
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6687
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6688 6688
 		{
6689 6689
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6690 6690
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6702,11 +6702,11 @@  discard block
 block discarded – undo
6702 6702
 	* @return Array the airport list
6703 6703
 	*
6704 6704
 	*/
6705
-	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
6705
+	public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array())
6706 6706
 	{
6707
-		$filter_query = $this->getFilter($filters,true,true);
6708
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6709
-		$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 
6707
+		$filter_query = $this->getFilter($filters, true, true);
6708
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6709
+		$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 
6710 6710
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao 
6711 6711
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6712 6712
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6718,7 +6718,7 @@  discard block
 block discarded – undo
6718 6718
 		$airport_array = array();
6719 6719
 		$temp_array = array();
6720 6720
         
6721
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6721
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6722 6722
 		{
6723 6723
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6724 6724
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6740,11 +6740,11 @@  discard block
 block discarded – undo
6740 6740
 	* @return Array the airport list
6741 6741
 	*
6742 6742
 	*/
6743
-	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
6743
+	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array())
6744 6744
 	{
6745
-		$filter_query = $this->getFilter($filters,true,true);
6746
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6747
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6745
+		$filter_query = $this->getFilter($filters, true, true);
6746
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6747
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6748 6748
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
6749 6749
                     GROUP BY spotter_output.arrival_airport_country
6750 6750
 					ORDER BY airport_arrival_country_count DESC";
@@ -6756,7 +6756,7 @@  discard block
 block discarded – undo
6756 6756
 		$airport_array = array();
6757 6757
 		$temp_array = array();
6758 6758
         
6759
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6759
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6760 6760
 		{
6761 6761
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6762 6762
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6774,12 +6774,12 @@  discard block
 block discarded – undo
6774 6774
 	* @return Array the airport list
6775 6775
 	*
6776 6776
 	*/
6777
-	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
6777
+	public function countAllArrivalAirportsByRegistration($registration, $filters = array())
6778 6778
 	{
6779
-		$filter_query = $this->getFilter($filters,true,true);
6780
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6779
+		$filter_query = $this->getFilter($filters, true, true);
6780
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6781 6781
 
6782
-		$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 
6782
+		$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 
6783 6783
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.registration = :registration 
6784 6784
                     GROUP BY spotter_output.arrival_airport_icao
6785 6785
 					ORDER BY airport_arrival_icao_count DESC";
@@ -6791,7 +6791,7 @@  discard block
 block discarded – undo
6791 6791
 		$airport_array = array();
6792 6792
 		$temp_array = array();
6793 6793
         
6794
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6794
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6795 6795
 		{
6796 6796
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6797 6797
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6812,11 +6812,11 @@  discard block
 block discarded – undo
6812 6812
 	* @return Array the airport list
6813 6813
 	*
6814 6814
 	*/
6815
-	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
6815
+	public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array())
6816 6816
 	{
6817
-		$filter_query = $this->getFilter($filters,true,true);
6818
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6819
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6817
+		$filter_query = $this->getFilter($filters, true, true);
6818
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6819
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6820 6820
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration 
6821 6821
                     GROUP BY spotter_output.arrival_airport_country
6822 6822
 					ORDER BY airport_arrival_country_count DESC";
@@ -6828,7 +6828,7 @@  discard block
 block discarded – undo
6828 6828
 		$airport_array = array();
6829 6829
 		$temp_array = array();
6830 6830
         
6831
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6831
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6832 6832
 		{
6833 6833
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6834 6834
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6847,11 +6847,11 @@  discard block
 block discarded – undo
6847 6847
 	* @return Array the airport list
6848 6848
 	*
6849 6849
 	*/
6850
-	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
6850
+	public function countAllArrivalAirportsByAirport($airport_icao, $filters = array())
6851 6851
 	{
6852
-		$filter_query = $this->getFilter($filters,true,true);
6853
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6854
-		$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 
6852
+		$filter_query = $this->getFilter($filters, true, true);
6853
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6854
+		$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 
6855 6855
 			    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 
6856 6856
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
6857 6857
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -6863,7 +6863,7 @@  discard block
 block discarded – undo
6863 6863
 		$airport_array = array();
6864 6864
 		$temp_array = array();
6865 6865
         
6866
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6866
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6867 6867
 		{
6868 6868
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6869 6869
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6884,11 +6884,11 @@  discard block
 block discarded – undo
6884 6884
 	* @return Array the airport list
6885 6885
 	*
6886 6886
 	*/
6887
-	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
6887
+	public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array())
6888 6888
 	{
6889
-		$filter_query = $this->getFilter($filters,true,true);
6890
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6891
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6889
+		$filter_query = $this->getFilter($filters, true, true);
6890
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6891
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6892 6892
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao 
6893 6893
                     GROUP BY spotter_output.arrival_airport_country
6894 6894
 					ORDER BY airport_arrival_country_count DESC";
@@ -6900,7 +6900,7 @@  discard block
 block discarded – undo
6900 6900
 		$airport_array = array();
6901 6901
 		$temp_array = array();
6902 6902
         
6903
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6903
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6904 6904
 		{
6905 6905
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6906 6906
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6918,11 +6918,11 @@  discard block
 block discarded – undo
6918 6918
 	* @return Array the airport list
6919 6919
 	*
6920 6920
 	*/
6921
-	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6921
+	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6922 6922
 	{
6923
-		$filter_query = $this->getFilter($filters,true,true);
6924
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6925
-		$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 
6923
+		$filter_query = $this->getFilter($filters, true, true);
6924
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6925
+		$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 
6926 6926
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6927 6927
                     GROUP BY spotter_output.arrival_airport_icao
6928 6928
 					ORDER BY airport_arrival_icao_count DESC";
@@ -6934,7 +6934,7 @@  discard block
 block discarded – undo
6934 6934
 		$airport_array = array();
6935 6935
 		$temp_array = array();
6936 6936
         
6937
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6937
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6938 6938
 		{
6939 6939
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6940 6940
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -6956,11 +6956,11 @@  discard block
 block discarded – undo
6956 6956
 	* @return Array the airport list
6957 6957
 	*
6958 6958
 	*/
6959
-	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6959
+	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6960 6960
 	{
6961
-		$filter_query = $this->getFilter($filters,true,true);
6962
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6963
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6961
+		$filter_query = $this->getFilter($filters, true, true);
6962
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6963
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
6964 6964
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
6965 6965
                     GROUP BY spotter_output.arrival_airport_country
6966 6966
 					ORDER BY airport_arrival_country_count DESC";
@@ -6972,7 +6972,7 @@  discard block
 block discarded – undo
6972 6972
 		$airport_array = array();
6973 6973
 		$temp_array = array();
6974 6974
         
6975
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6975
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6976 6976
 		{
6977 6977
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6978 6978
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -6991,11 +6991,11 @@  discard block
 block discarded – undo
6991 6991
 	* @return Array the airport list
6992 6992
 	*
6993 6993
 	*/
6994
-	public function countAllArrivalAirportsByDate($date,$filters = array())
6994
+	public function countAllArrivalAirportsByDate($date, $filters = array())
6995 6995
 	{
6996 6996
 		global $globalTimezone, $globalDBdriver;
6997
-		$filter_query = $this->getFilter($filters,true,true);
6998
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6997
+		$filter_query = $this->getFilter($filters, true, true);
6998
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6999 6999
 		if ($globalTimezone != '') {
7000 7000
 			date_default_timezone_set($globalTimezone);
7001 7001
 			$datetime = new DateTime($date);
@@ -7003,12 +7003,12 @@  discard block
 block discarded – undo
7003 7003
 		} else $offset = '+00:00';
7004 7004
 
7005 7005
 		if ($globalDBdriver == 'mysql') {
7006
-			$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 
7006
+			$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 
7007 7007
 					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  
7008 7008
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7009 7009
 					ORDER BY airport_arrival_icao_count DESC";
7010 7010
 		} else {
7011
-			$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 
7011
+			$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 
7012 7012
 					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  
7013 7013
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7014 7014
 					ORDER BY airport_arrival_icao_count DESC";
@@ -7020,7 +7020,7 @@  discard block
 block discarded – undo
7020 7020
 		$airport_array = array();
7021 7021
 		$temp_array = array();
7022 7022
         
7023
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7023
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7024 7024
 		{
7025 7025
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7026 7026
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -7044,8 +7044,8 @@  discard block
 block discarded – undo
7044 7044
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
7045 7045
 	{
7046 7046
 		global $globalTimezone, $globalDBdriver;
7047
-		$filter_query = $this->getFilter($filters,true,true);
7048
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7047
+		$filter_query = $this->getFilter($filters, true, true);
7048
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7049 7049
 		if ($globalTimezone != '') {
7050 7050
 			date_default_timezone_set($globalTimezone);
7051 7051
 			$datetime = new DateTime($date);
@@ -7053,12 +7053,12 @@  discard block
 block discarded – undo
7053 7053
 		} else $offset = '+00:00';
7054 7054
 
7055 7055
 		if ($globalDBdriver == 'mysql') {
7056
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7056
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7057 7057
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
7058 7058
 					GROUP BY spotter_output.arrival_airport_country
7059 7059
 					ORDER BY airport_arrival_country_count DESC";
7060 7060
 		} else {
7061
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7061
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7062 7062
 					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 
7063 7063
 					GROUP BY spotter_output.arrival_airport_country
7064 7064
 					ORDER BY airport_arrival_country_count DESC";
@@ -7070,7 +7070,7 @@  discard block
 block discarded – undo
7070 7070
 		$airport_array = array();
7071 7071
 		$temp_array = array();
7072 7072
         
7073
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7073
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7074 7074
 		{
7075 7075
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7076 7076
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7088,11 +7088,11 @@  discard block
 block discarded – undo
7088 7088
 	* @return Array the airport list
7089 7089
 	*
7090 7090
 	*/
7091
-	public function countAllArrivalAirportsByIdent($ident,$filters = array())
7091
+	public function countAllArrivalAirportsByIdent($ident, $filters = array())
7092 7092
 	{
7093
-		$filter_query = $this->getFilter($filters,true,true);
7094
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7095
-		$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 
7093
+		$filter_query = $this->getFilter($filters, true, true);
7094
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7095
+		$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 
7096 7096
 		    FROM spotter_output".$filter_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.ident = :ident  
7097 7097
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7098 7098
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -7104,7 +7104,7 @@  discard block
 block discarded – undo
7104 7104
 		$airport_array = array();
7105 7105
 		$temp_array = array();
7106 7106
         
7107
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7107
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7108 7108
 		{
7109 7109
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7110 7110
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -7127,9 +7127,9 @@  discard block
 block discarded – undo
7127 7127
 	*/
7128 7128
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
7129 7129
 	{
7130
-		$filter_query = $this->getFilter($filters,true,true);
7131
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7132
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7130
+		$filter_query = $this->getFilter($filters, true, true);
7131
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7132
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7133 7133
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident 
7134 7134
                     GROUP BY spotter_output.arrival_airport_country
7135 7135
 					ORDER BY airport_arrival_country_count DESC";
@@ -7141,7 +7141,7 @@  discard block
 block discarded – undo
7141 7141
 		$airport_array = array();
7142 7142
 		$temp_array = array();
7143 7143
         
7144
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7144
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7145 7145
 		{
7146 7146
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7147 7147
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7160,11 +7160,11 @@  discard block
 block discarded – undo
7160 7160
 	* @return Array the airport list
7161 7161
 	*
7162 7162
 	*/
7163
-	public function countAllArrivalAirportsByCountry($country,$filters = array())
7163
+	public function countAllArrivalAirportsByCountry($country, $filters = array())
7164 7164
 	{
7165
-		$filter_query = $this->getFilter($filters,true,true);
7166
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7167
-		$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 
7165
+		$filter_query = $this->getFilter($filters, true, true);
7166
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7167
+		$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 
7168 7168
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
7169 7169
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
7170 7170
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -7176,7 +7176,7 @@  discard block
 block discarded – undo
7176 7176
 		$airport_array = array();
7177 7177
 		$temp_array = array();
7178 7178
         
7179
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7179
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7180 7180
 		{
7181 7181
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7182 7182
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -7197,11 +7197,11 @@  discard block
 block discarded – undo
7197 7197
 	* @return Array the airport list
7198 7198
 	*
7199 7199
 	*/
7200
-	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
7200
+	public function countAllArrivalAirportCountriesByCountry($country, $filters = array())
7201 7201
 	{
7202
-		$filter_query = $this->getFilter($filters,true,true);
7203
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7204
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7202
+		$filter_query = $this->getFilter($filters, true, true);
7203
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7204
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7205 7205
 			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 
7206 7206
                     GROUP BY spotter_output.arrival_airport_country
7207 7207
 					ORDER BY airport_arrival_country_count DESC";
@@ -7213,7 +7213,7 @@  discard block
 block discarded – undo
7213 7213
 		$airport_array = array();
7214 7214
 		$temp_array = array();
7215 7215
         
7216
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7216
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7217 7217
 		{
7218 7218
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7219 7219
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7234,7 +7234,7 @@  discard block
 block discarded – undo
7234 7234
 	*/
7235 7235
 	public function countAllDepartureCountries($filters = array())
7236 7236
 	{
7237
-		$filter_query = $this->getFilter($filters,true,true);
7237
+		$filter_query = $this->getFilter($filters, true, true);
7238 7238
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
7239 7239
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA'";
7240 7240
 		$query .= " GROUP BY spotter_output.departure_airport_country
@@ -7248,7 +7248,7 @@  discard block
 block discarded – undo
7248 7248
 		$airport_array = array();
7249 7249
 		$temp_array = array();
7250 7250
         
7251
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7251
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7252 7252
 		{
7253 7253
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
7254 7254
 			$temp_array['airport_departure_country'] = $row['departure_airport_country'];
@@ -7266,9 +7266,9 @@  discard block
 block discarded – undo
7266 7266
 	* @return Array the airport arrival list
7267 7267
 	*
7268 7268
 	*/
7269
-	public function countAllArrivalCountries($limit = true,$filters = array())
7269
+	public function countAllArrivalCountries($limit = true, $filters = array())
7270 7270
 	{
7271
-		$filter_query = $this->getFilter($filters,true,true);
7271
+		$filter_query = $this->getFilter($filters, true, true);
7272 7272
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
7273 7273
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
7274 7274
 		$query .= " GROUP BY spotter_output.arrival_airport_country
@@ -7282,7 +7282,7 @@  discard block
 block discarded – undo
7282 7282
 		$airport_array = array();
7283 7283
 		$temp_array = array();
7284 7284
         
7285
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7285
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7286 7286
 		{
7287 7287
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
7288 7288
 			$temp_array['airport_arrival_country'] = $row['arrival_airport_country'];
@@ -7305,8 +7305,8 @@  discard block
 block discarded – undo
7305 7305
 	*/
7306 7306
 	public function countAllRoutes($filters = array())
7307 7307
 	{
7308
-		$filter_query = $this->getFilter($filters,true,true);
7309
-		$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
+		$filter_query = $this->getFilter($filters, true, true);
7309
+		$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
7310 7310
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> 'NA'
7311 7311
                     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
7312 7312
                     ORDER BY route_count DESC
@@ -7319,7 +7319,7 @@  discard block
 block discarded – undo
7319 7319
 		$routes_array = array();
7320 7320
 		$temp_array = array();
7321 7321
         
7322
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7322
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7323 7323
 		{
7324 7324
 			$temp_array['route_count'] = $row['route_count'];
7325 7325
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7346,11 +7346,11 @@  discard block
 block discarded – undo
7346 7346
 	* @return Array the route list
7347 7347
 	*
7348 7348
 	*/
7349
-	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
7349
+	public function countAllRoutesByAircraft($aircraft_icao, $filters = array())
7350 7350
 	{
7351
-		$filter_query = $this->getFilter($filters,true,true);
7352
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
7353
-		$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
7351
+		$filter_query = $this->getFilter($filters, true, true);
7352
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
7353
+		$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
7354 7354
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
7355 7355
 			    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 
7356 7356
 			    ORDER BY route_count DESC";
@@ -7361,7 +7361,7 @@  discard block
 block discarded – undo
7361 7361
 		$routes_array = array();
7362 7362
 		$temp_array = array();
7363 7363
         
7364
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7364
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7365 7365
 		{
7366 7366
 			$temp_array['route_count'] = $row['route_count'];
7367 7367
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7388,9 +7388,9 @@  discard block
 block discarded – undo
7388 7388
 	*/
7389 7389
 	public function countAllRoutesByRegistration($registration, $filters = array())
7390 7390
 	{
7391
-		$filter_query = $this->getFilter($filters,true,true);
7391
+		$filter_query = $this->getFilter($filters, true, true);
7392 7392
 		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
7393
-		$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
7393
+		$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
7394 7394
 			FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration 
7395 7395
                     GROUP BY route
7396 7396
                     ORDER BY route_count DESC";
@@ -7402,7 +7402,7 @@  discard block
 block discarded – undo
7402 7402
 		$routes_array = array();
7403 7403
 		$temp_array = array();
7404 7404
         
7405
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7405
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7406 7406
 		{
7407 7407
 			$temp_array['route_count'] = $row['route_count'];
7408 7408
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7430,9 +7430,9 @@  discard block
 block discarded – undo
7430 7430
 	*/
7431 7431
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
7432 7432
 	{
7433
-		$filter_query = $this->getFilter($filters,true,true);
7434
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
7435
-		$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
7433
+		$filter_query = $this->getFilter($filters, true, true);
7434
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
7435
+		$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
7436 7436
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao 
7437 7437
 			    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 
7438 7438
 			    ORDER BY route_count DESC";
@@ -7444,7 +7444,7 @@  discard block
 block discarded – undo
7444 7444
 		$routes_array = array();
7445 7445
 		$temp_array = array();
7446 7446
         
7447
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7447
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7448 7448
 		{
7449 7449
 			$temp_array['route_count'] = $row['route_count'];
7450 7450
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7472,9 +7472,9 @@  discard block
 block discarded – undo
7472 7472
 	*/
7473 7473
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
7474 7474
 	{
7475
-		$filter_query = $this->getFilter($filters,true,true);
7476
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
7477
-		$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
7475
+		$filter_query = $this->getFilter($filters, true, true);
7476
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
7477
+		$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
7478 7478
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
7479 7479
 			    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 
7480 7480
 			    ORDER BY route_count DESC";
@@ -7485,7 +7485,7 @@  discard block
 block discarded – undo
7485 7485
 		$routes_array = array();
7486 7486
 		$temp_array = array();
7487 7487
         
7488
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7488
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7489 7489
 		{
7490 7490
 			$temp_array['route_count'] = $row['route_count'];
7491 7491
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7513,9 +7513,9 @@  discard block
 block discarded – undo
7513 7513
 	*/
7514 7514
 	public function countAllRoutesByCountry($country, $filters = array())
7515 7515
 	{
7516
-		$filter_query = $this->getFilter($filters,true,true);
7517
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7518
-		$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
7516
+		$filter_query = $this->getFilter($filters, true, true);
7517
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7518
+		$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
7519 7519
 			    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 
7520 7520
 			    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 
7521 7521
 			    ORDER BY route_count DESC";
@@ -7526,7 +7526,7 @@  discard block
 block discarded – undo
7526 7526
 		$routes_array = array();
7527 7527
 		$temp_array = array();
7528 7528
         
7529
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7529
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7530 7530
 		{
7531 7531
 			$temp_array['route_count'] = $row['route_count'];
7532 7532
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7554,8 +7554,8 @@  discard block
 block discarded – undo
7554 7554
 	public function countAllRoutesByDate($date, $filters = array())
7555 7555
 	{
7556 7556
 		global $globalTimezone, $globalDBdriver;
7557
-		$filter_query = $this->getFilter($filters,true,true);
7558
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7557
+		$filter_query = $this->getFilter($filters, true, true);
7558
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7559 7559
 		if ($globalTimezone != '') {
7560 7560
 			date_default_timezone_set($globalTimezone);
7561 7561
 			$datetime = new DateTime($date);
@@ -7563,12 +7563,12 @@  discard block
 block discarded – undo
7563 7563
 		} else $offset = '+00:00';
7564 7564
 		
7565 7565
 		if ($globalDBdriver == 'mysql') {
7566
-			$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
7566
+			$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
7567 7567
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date  
7568 7568
 				    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
7569 7569
 				    ORDER BY route_count DESC";
7570 7570
 		} else {
7571
-			$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
7571
+			$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
7572 7572
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date  
7573 7573
 				    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
7574 7574
 				    ORDER BY route_count DESC";
@@ -7580,7 +7580,7 @@  discard block
 block discarded – undo
7580 7580
 		$routes_array = array();
7581 7581
 		$temp_array = array();
7582 7582
         
7583
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7583
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7584 7584
 		{
7585 7585
 			$temp_array['route_count'] = $row['route_count'];
7586 7586
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7607,9 +7607,9 @@  discard block
 block discarded – undo
7607 7607
 	*/
7608 7608
 	public function countAllRoutesByIdent($ident, $filters = array())
7609 7609
 	{
7610
-		$filter_query = $this->getFilter($filters,true,true);
7611
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7612
-		$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
7610
+		$filter_query = $this->getFilter($filters, true, true);
7611
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7612
+		$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
7613 7613
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident   
7614 7614
                     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
7615 7615
                     ORDER BY route_count DESC";
@@ -7621,7 +7621,7 @@  discard block
 block discarded – undo
7621 7621
 		$routes_array = array();
7622 7622
 		$temp_array = array();
7623 7623
         
7624
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7624
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7625 7625
 		{
7626 7626
 			$temp_array['route_count'] = $row['route_count'];
7627 7627
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7648,9 +7648,9 @@  discard block
 block discarded – undo
7648 7648
 	*/
7649 7649
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
7650 7650
 	{
7651
-		$filter_query = $this->getFilter($filters,true,true);
7652
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
7653
-		$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
7651
+		$filter_query = $this->getFilter($filters, true, true);
7652
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
7653
+		$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
7654 7654
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
7655 7655
                     GROUP BY route
7656 7656
                     ORDER BY route_count DESC";
@@ -7662,7 +7662,7 @@  discard block
 block discarded – undo
7662 7662
 		$routes_array = array();
7663 7663
 		$temp_array = array();
7664 7664
         
7665
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7665
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7666 7666
 		{
7667 7667
 			$temp_array['route_count'] = $row['route_count'];
7668 7668
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -7690,8 +7690,8 @@  discard block
 block discarded – undo
7690 7690
 	*/
7691 7691
 	public function countAllRoutesWithWaypoints($filters = array())
7692 7692
 	{
7693
-		$filter_query = $this->getFilter($filters,true,true);
7694
-		$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
7693
+		$filter_query = $this->getFilter($filters, true, true);
7694
+		$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
7695 7695
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> '' 
7696 7696
                     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
7697 7697
                     ORDER BY route_count DESC
@@ -7704,7 +7704,7 @@  discard block
 block discarded – undo
7704 7704
 		$routes_array = array();
7705 7705
 		$temp_array = array();
7706 7706
         
7707
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7707
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7708 7708
 		{
7709 7709
 			$temp_array['spotter_id'] = $row['spotter_id'];
7710 7710
 			$temp_array['route_count'] = $row['route_count'];
@@ -7729,11 +7729,11 @@  discard block
 block discarded – undo
7729 7729
 	* @return Array the callsign list
7730 7730
 	*
7731 7731
 	*/
7732
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
7732
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7733 7733
 	{
7734 7734
 		global $globalDBdriver;
7735
-		$filter_query = $this->getFilter($filters,true,true);
7736
-		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7735
+		$filter_query = $this->getFilter($filters, true, true);
7736
+		$query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7737 7737
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7738 7738
 		 if ($olderthanmonths > 0) {
7739 7739
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -7752,7 +7752,7 @@  discard block
 block discarded – undo
7752 7752
 		$callsign_array = array();
7753 7753
 		$temp_array = array();
7754 7754
         
7755
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7755
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7756 7756
 		{
7757 7757
 			$temp_array['callsign_icao'] = $row['ident'];
7758 7758
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -7774,8 +7774,8 @@  discard block
 block discarded – undo
7774 7774
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7775 7775
 	{
7776 7776
 		global $globalDBdriver;
7777
-		$filter_query = $this->getFilter($filters,true,true);
7778
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7777
+		$filter_query = $this->getFilter($filters, true, true);
7778
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7779 7779
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7780 7780
 		 if ($olderthanmonths > 0) {
7781 7781
 			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
@@ -7794,7 +7794,7 @@  discard block
 block discarded – undo
7794 7794
 		$callsign_array = array();
7795 7795
 		$temp_array = array();
7796 7796
         
7797
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7797
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7798 7798
 		{
7799 7799
 			$temp_array['callsign_icao'] = $row['ident'];
7800 7800
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -7848,7 +7848,7 @@  discard block
 block discarded – undo
7848 7848
 		$date_array = array();
7849 7849
 		$temp_array = array();
7850 7850
         
7851
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7851
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7852 7852
 		{
7853 7853
 			$temp_array['date_name'] = $row['date_name'];
7854 7854
 			$temp_array['date_count'] = $row['date_count'];
@@ -7873,15 +7873,15 @@  discard block
 block discarded – undo
7873 7873
 			$datetime = new DateTime();
7874 7874
 			$offset = $datetime->format('P');
7875 7875
 		} else $offset = '+00:00';
7876
-		$filter_query = $this->getFilter($filters,true,true);
7876
+		$filter_query = $this->getFilter($filters, true, true);
7877 7877
 		if ($globalDBdriver == 'mysql') {
7878
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7878
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7879 7879
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
7880 7880
 								GROUP BY spotter_output.airline_icao, date_name 
7881 7881
 								ORDER BY date_count DESC
7882 7882
 								LIMIT 10 OFFSET 0";
7883 7883
 		} else {
7884
-			$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
7884
+			$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
7885 7885
 								FROM spotter_output 
7886 7886
 								WHERE spotter_output.airline_icao <> '' 
7887 7887
 								GROUP BY spotter_output.airline_icao, date_name 
@@ -7896,7 +7896,7 @@  discard block
 block discarded – undo
7896 7896
 		$date_array = array();
7897 7897
 		$temp_array = array();
7898 7898
         
7899
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7899
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7900 7900
 		{
7901 7901
 			$temp_array['date_name'] = $row['date_name'];
7902 7902
 			$temp_array['date_count'] = $row['date_count'];
@@ -7922,7 +7922,7 @@  discard block
 block discarded – undo
7922 7922
 			$datetime = new DateTime();
7923 7923
 			$offset = $datetime->format('P');
7924 7924
 		} else $offset = '+00:00';
7925
-		$filter_query = $this->getFilter($filters,true,true);
7925
+		$filter_query = $this->getFilter($filters, true, true);
7926 7926
 		if ($globalDBdriver == 'mysql') {
7927 7927
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7928 7928
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -7943,7 +7943,7 @@  discard block
 block discarded – undo
7943 7943
 		$date_array = array();
7944 7944
 		$temp_array = array();
7945 7945
         
7946
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7946
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7947 7947
 		{
7948 7948
 			$temp_array['date_name'] = $row['date_name'];
7949 7949
 			$temp_array['date_count'] = $row['date_count'];
@@ -7968,7 +7968,7 @@  discard block
 block discarded – undo
7968 7968
 			$datetime = new DateTime();
7969 7969
 			$offset = $datetime->format('P');
7970 7970
 		} else $offset = '+00:00';
7971
-		$filter_query = $this->getFilter($filters,true,true);
7971
+		$filter_query = $this->getFilter($filters, true, true);
7972 7972
 		if ($globalDBdriver == 'mysql') {
7973 7973
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7974 7974
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -7989,7 +7989,7 @@  discard block
 block discarded – undo
7989 7989
 		$date_array = array();
7990 7990
 		$temp_array = array();
7991 7991
         
7992
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7992
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7993 7993
 		{
7994 7994
 			$temp_array['date_name'] = $row['date_name'];
7995 7995
 			$temp_array['date_count'] = $row['date_count'];
@@ -8010,7 +8010,7 @@  discard block
 block discarded – undo
8010 8010
 	public function countAllDatesLastMonthByAirlines($filters = array())
8011 8011
 	{
8012 8012
 		global $globalTimezone, $globalDBdriver;
8013
-		$filter_query = $this->getFilter($filters,true,true);
8013
+		$filter_query = $this->getFilter($filters, true, true);
8014 8014
 		if ($globalTimezone != '') {
8015 8015
 			date_default_timezone_set($globalTimezone);
8016 8016
 			$datetime = new DateTime();
@@ -8018,13 +8018,13 @@  discard block
 block discarded – undo
8018 8018
 		} else $offset = '+00:00';
8019 8019
 		
8020 8020
 		if ($globalDBdriver == 'mysql') {
8021
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
8021
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
8022 8022
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)
8023 8023
 								GROUP BY spotter_output.airline_icao, date_name 
8024 8024
 								ORDER BY spotter_output.date ASC";
8025 8025
 			$query_data = array(':offset' => $offset);
8026 8026
 		} else {
8027
-			$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
8027
+			$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
8028 8028
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS'
8029 8029
 								GROUP BY spotter_output.airline_icao, date_name 
8030 8030
 								ORDER BY date_name ASC";
@@ -8037,7 +8037,7 @@  discard block
 block discarded – undo
8037 8037
 		$date_array = array();
8038 8038
 		$temp_array = array();
8039 8039
         
8040
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8040
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8041 8041
 		{
8042 8042
 			$temp_array['date_name'] = $row['date_name'];
8043 8043
 			$temp_array['date_count'] = $row['date_count'];
@@ -8084,7 +8084,7 @@  discard block
 block discarded – undo
8084 8084
 		$date_array = array();
8085 8085
 		$temp_array = array();
8086 8086
         
8087
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8087
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8088 8088
 		{
8089 8089
 			$temp_array['month_name'] = $row['month_name'];
8090 8090
 			$temp_array['year_name'] = $row['year_name'];
@@ -8105,7 +8105,7 @@  discard block
 block discarded – undo
8105 8105
 	public function countAllMonthsByAirlines($filters = array())
8106 8106
 	{
8107 8107
 		global $globalTimezone, $globalDBdriver;
8108
-		$filter_query = $this->getFilter($filters,true,true);
8108
+		$filter_query = $this->getFilter($filters, true, true);
8109 8109
 		if ($globalTimezone != '') {
8110 8110
 			date_default_timezone_set($globalTimezone);
8111 8111
 			$datetime = new DateTime();
@@ -8113,12 +8113,12 @@  discard block
 block discarded – undo
8113 8113
 		} else $offset = '+00:00';
8114 8114
 
8115 8115
 		if ($globalDBdriver == 'mysql') {
8116
-			$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
8116
+			$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
8117 8117
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
8118 8118
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
8119 8119
 								ORDER BY date_count DESC";
8120 8120
 		} else {
8121
-			$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
8121
+			$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
8122 8122
 								FROM spotter_output 
8123 8123
 								WHERE spotter_output.airline_icao <> '' 
8124 8124
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
@@ -8132,7 +8132,7 @@  discard block
 block discarded – undo
8132 8132
 		$date_array = array();
8133 8133
 		$temp_array = array();
8134 8134
         
8135
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8135
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8136 8136
 		{
8137 8137
 			$temp_array['month_name'] = $row['month_name'];
8138 8138
 			$temp_array['year_name'] = $row['year_name'];
@@ -8159,14 +8159,14 @@  discard block
 block discarded – undo
8159 8159
 			$datetime = new DateTime();
8160 8160
 			$offset = $datetime->format('P');
8161 8161
 		} else $offset = '+00:00';
8162
-		$filter_query = $this->getFilter($filters,true,true);
8162
+		$filter_query = $this->getFilter($filters, true, true);
8163 8163
 		if ($globalDBdriver == 'mysql') {
8164
-			$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
8164
+			$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
8165 8165
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8166 8166
 								GROUP BY year_name, month_name 
8167 8167
 								ORDER BY date_count DESC";
8168 8168
 		} else {
8169
-			$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
8169
+			$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
8170 8170
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8171 8171
 								GROUP BY year_name, month_name 
8172 8172
 								ORDER BY date_count DESC";
@@ -8178,7 +8178,7 @@  discard block
 block discarded – undo
8178 8178
 		$date_array = array();
8179 8179
 		$temp_array = array();
8180 8180
         
8181
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8181
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8182 8182
 		{
8183 8183
 			$temp_array['month_name'] = $row['month_name'];
8184 8184
 			$temp_array['year_name'] = $row['year_name'];
@@ -8204,15 +8204,15 @@  discard block
 block discarded – undo
8204 8204
 			$datetime = new DateTime();
8205 8205
 			$offset = $datetime->format('P');
8206 8206
 		} else $offset = '+00:00';
8207
-		$filter_query = $this->getFilter($filters,true,true);
8207
+		$filter_query = $this->getFilter($filters, true, true);
8208 8208
 
8209 8209
 		if ($globalDBdriver == 'mysql') {
8210
-			$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
8210
+			$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
8211 8211
 								FROM spotter_output".$filter_query." owner_name <> ''
8212 8212
 								GROUP BY year_name, month_name
8213 8213
 								ORDER BY date_count DESC";
8214 8214
 		} else {
8215
-			$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
8215
+			$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
8216 8216
 								FROM spotter_output".$filter_query." owner_name <> ''
8217 8217
 								GROUP BY year_name, month_name
8218 8218
 								ORDER BY date_count DESC";
@@ -8224,7 +8224,7 @@  discard block
 block discarded – undo
8224 8224
 		$date_array = array();
8225 8225
 		$temp_array = array();
8226 8226
         
8227
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8227
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8228 8228
 		{
8229 8229
 			$temp_array['month_name'] = $row['month_name'];
8230 8230
 			$temp_array['year_name'] = $row['year_name'];
@@ -8245,7 +8245,7 @@  discard block
 block discarded – undo
8245 8245
 	public function countAllMonthsOwnersByAirlines($filters = array())
8246 8246
 	{
8247 8247
 		global $globalTimezone, $globalDBdriver;
8248
-		$filter_query = $this->getFilter($filters,true,true);
8248
+		$filter_query = $this->getFilter($filters, true, true);
8249 8249
 		if ($globalTimezone != '') {
8250 8250
 			date_default_timezone_set($globalTimezone);
8251 8251
 			$datetime = new DateTime();
@@ -8253,12 +8253,12 @@  discard block
 block discarded – undo
8253 8253
 		} else $offset = '+00:00';
8254 8254
 
8255 8255
 		if ($globalDBdriver == 'mysql') {
8256
-			$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
8256
+			$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
8257 8257
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
8258 8258
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8259 8259
 								ORDER BY date_count DESC";
8260 8260
 		} else {
8261
-			$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
8261
+			$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
8262 8262
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
8263 8263
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8264 8264
 								ORDER BY date_count DESC";
@@ -8270,7 +8270,7 @@  discard block
 block discarded – undo
8270 8270
 		$date_array = array();
8271 8271
 		$temp_array = array();
8272 8272
         
8273
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8273
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8274 8274
 		{
8275 8275
 			$temp_array['month_name'] = $row['month_name'];
8276 8276
 			$temp_array['year_name'] = $row['year_name'];
@@ -8297,15 +8297,15 @@  discard block
 block discarded – undo
8297 8297
 			$datetime = new DateTime();
8298 8298
 			$offset = $datetime->format('P');
8299 8299
 		} else $offset = '+00:00';
8300
-		$filter_query = $this->getFilter($filters,true,true);
8300
+		$filter_query = $this->getFilter($filters, true, true);
8301 8301
 
8302 8302
 		if ($globalDBdriver == 'mysql') {
8303
-			$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
8303
+			$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
8304 8304
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8305 8305
 								GROUP BY year_name, month_name
8306 8306
 								ORDER BY date_count DESC";
8307 8307
 		} else {
8308
-			$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
8308
+			$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
8309 8309
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8310 8310
 								GROUP BY year_name, month_name
8311 8311
 								ORDER BY date_count DESC";
@@ -8317,7 +8317,7 @@  discard block
 block discarded – undo
8317 8317
 		$date_array = array();
8318 8318
 		$temp_array = array();
8319 8319
         
8320
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8320
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8321 8321
 		{
8322 8322
 			$temp_array['month_name'] = $row['month_name'];
8323 8323
 			$temp_array['year_name'] = $row['year_name'];
@@ -8338,7 +8338,7 @@  discard block
 block discarded – undo
8338 8338
 	public function countAllMonthsPilotsByAirlines($filters = array())
8339 8339
 	{
8340 8340
 		global $globalTimezone, $globalDBdriver;
8341
-		$filter_query = $this->getFilter($filters,true,true);
8341
+		$filter_query = $this->getFilter($filters, true, true);
8342 8342
 		if ($globalTimezone != '') {
8343 8343
 			date_default_timezone_set($globalTimezone);
8344 8344
 			$datetime = new DateTime();
@@ -8346,12 +8346,12 @@  discard block
 block discarded – undo
8346 8346
 		} else $offset = '+00:00';
8347 8347
 
8348 8348
 		if ($globalDBdriver == 'mysql') {
8349
-			$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
8349
+			$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
8350 8350
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8351 8351
 								GROUP BY spotter_output.airline_icao,year_name, month_name
8352 8352
 								ORDER BY date_count DESC";
8353 8353
 		} else {
8354
-			$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
8354
+			$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
8355 8355
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8356 8356
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8357 8357
 								ORDER BY date_count DESC";
@@ -8363,7 +8363,7 @@  discard block
 block discarded – undo
8363 8363
 		$date_array = array();
8364 8364
 		$temp_array = array();
8365 8365
         
8366
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8366
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8367 8367
 		{
8368 8368
 			$temp_array['month_name'] = $row['month_name'];
8369 8369
 			$temp_array['year_name'] = $row['year_name'];
@@ -8385,7 +8385,7 @@  discard block
 block discarded – undo
8385 8385
 	public function countAllMonthsAirlines($filters = array())
8386 8386
 	{
8387 8387
 		global $globalTimezone, $globalDBdriver;
8388
-		$filter_query = $this->getFilter($filters,true,true);
8388
+		$filter_query = $this->getFilter($filters, true, true);
8389 8389
 		if ($globalTimezone != '') {
8390 8390
 			date_default_timezone_set($globalTimezone);
8391 8391
 			$datetime = new DateTime();
@@ -8393,12 +8393,12 @@  discard block
 block discarded – undo
8393 8393
 		} else $offset = '+00:00';
8394 8394
 
8395 8395
 		if ($globalDBdriver == 'mysql') {
8396
-			$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
8396
+			$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
8397 8397
 								FROM spotter_output".$filter_query." airline_icao <> '' 
8398 8398
 								GROUP BY year_name, month_name
8399 8399
 								ORDER BY date_count DESC";
8400 8400
 		} else {
8401
-			$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
8401
+			$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
8402 8402
 								FROM spotter_output".$filter_query." airline_icao <> '' 
8403 8403
 								GROUP BY year_name, month_name
8404 8404
 								ORDER BY date_count DESC";
@@ -8410,7 +8410,7 @@  discard block
 block discarded – undo
8410 8410
 		$date_array = array();
8411 8411
 		$temp_array = array();
8412 8412
         
8413
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8413
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8414 8414
 		{
8415 8415
 			$temp_array['month_name'] = $row['month_name'];
8416 8416
 			$temp_array['year_name'] = $row['year_name'];
@@ -8436,15 +8436,15 @@  discard block
 block discarded – undo
8436 8436
 			$datetime = new DateTime();
8437 8437
 			$offset = $datetime->format('P');
8438 8438
 		} else $offset = '+00:00';
8439
-		$filter_query = $this->getFilter($filters,true,true);
8439
+		$filter_query = $this->getFilter($filters, true, true);
8440 8440
 
8441 8441
 		if ($globalDBdriver == 'mysql') {
8442
-			$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
8442
+			$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
8443 8443
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
8444 8444
 								GROUP BY year_name, month_name
8445 8445
 								ORDER BY date_count DESC";
8446 8446
 		} else {
8447
-			$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
8447
+			$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
8448 8448
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
8449 8449
 								GROUP BY year_name, month_name
8450 8450
 								ORDER BY date_count DESC";
@@ -8456,7 +8456,7 @@  discard block
 block discarded – undo
8456 8456
 		$date_array = array();
8457 8457
 		$temp_array = array();
8458 8458
         
8459
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8459
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8460 8460
 		{
8461 8461
 			$temp_array['month_name'] = $row['month_name'];
8462 8462
 			$temp_array['year_name'] = $row['year_name'];
@@ -8478,7 +8478,7 @@  discard block
 block discarded – undo
8478 8478
 	public function countAllMonthsAircraftsByAirlines($filters = array())
8479 8479
 	{
8480 8480
 		global $globalTimezone, $globalDBdriver;
8481
-		$filter_query = $this->getFilter($filters,true,true);
8481
+		$filter_query = $this->getFilter($filters, true, true);
8482 8482
 		if ($globalTimezone != '') {
8483 8483
 			date_default_timezone_set($globalTimezone);
8484 8484
 			$datetime = new DateTime();
@@ -8486,12 +8486,12 @@  discard block
 block discarded – undo
8486 8486
 		} else $offset = '+00:00';
8487 8487
 
8488 8488
 		if ($globalDBdriver == 'mysql') {
8489
-			$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
8489
+			$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
8490 8490
 								FROM spotter_output".$filter_query." aircraft_icao <> ''  AND spotter_output.airline_icao <> '' 
8491 8491
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8492 8492
 								ORDER BY date_count DESC";
8493 8493
 		} else {
8494
-			$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
8494
+			$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
8495 8495
 								FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> '' 
8496 8496
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8497 8497
 								ORDER BY date_count DESC";
@@ -8503,7 +8503,7 @@  discard block
 block discarded – undo
8503 8503
 		$date_array = array();
8504 8504
 		$temp_array = array();
8505 8505
         
8506
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8506
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8507 8507
 		{
8508 8508
 			$temp_array['month_name'] = $row['month_name'];
8509 8509
 			$temp_array['year_name'] = $row['year_name'];
@@ -8530,15 +8530,15 @@  discard block
 block discarded – undo
8530 8530
 			$datetime = new DateTime();
8531 8531
 			$offset = $datetime->format('P');
8532 8532
 		} else $offset = '+00:00';
8533
-		$filter_query = $this->getFilter($filters,true,true);
8533
+		$filter_query = $this->getFilter($filters, true, true);
8534 8534
 
8535 8535
 		if ($globalDBdriver == 'mysql') {
8536
-			$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
8536
+			$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
8537 8537
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
8538 8538
 								GROUP BY year_name, month_name
8539 8539
 								ORDER BY date_count DESC";
8540 8540
 		} else {
8541
-			$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
8541
+			$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
8542 8542
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
8543 8543
 								GROUP BY year_name, month_name
8544 8544
 								ORDER BY date_count DESC";
@@ -8550,7 +8550,7 @@  discard block
 block discarded – undo
8550 8550
 		$date_array = array();
8551 8551
 		$temp_array = array();
8552 8552
         
8553
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8553
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8554 8554
 		{
8555 8555
 			$temp_array['month_name'] = $row['month_name'];
8556 8556
 			$temp_array['year_name'] = $row['year_name'];
@@ -8572,7 +8572,7 @@  discard block
 block discarded – undo
8572 8572
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
8573 8573
 	{
8574 8574
 		global $globalTimezone, $globalDBdriver;
8575
-		$filter_query = $this->getFilter($filters,true,true);
8575
+		$filter_query = $this->getFilter($filters, true, true);
8576 8576
 		if ($globalTimezone != '') {
8577 8577
 			date_default_timezone_set($globalTimezone);
8578 8578
 			$datetime = new DateTime();
@@ -8580,12 +8580,12 @@  discard block
 block discarded – undo
8580 8580
 		} else $offset = '+00:00';
8581 8581
 
8582 8582
 		if ($globalDBdriver == 'mysql') {
8583
-			$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
8583
+			$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
8584 8584
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
8585 8585
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8586 8586
 								ORDER BY date_count DESC";
8587 8587
 		} else {
8588
-			$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
8588
+			$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
8589 8589
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
8590 8590
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8591 8591
 								ORDER BY date_count DESC";
@@ -8597,7 +8597,7 @@  discard block
 block discarded – undo
8597 8597
 		$date_array = array();
8598 8598
 		$temp_array = array();
8599 8599
         
8600
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8600
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8601 8601
 		{
8602 8602
 			$temp_array['month_name'] = $row['month_name'];
8603 8603
 			$temp_array['year_name'] = $row['year_name'];
@@ -8625,7 +8625,7 @@  discard block
 block discarded – undo
8625 8625
 			$datetime = new DateTime();
8626 8626
 			$offset = $datetime->format('P');
8627 8627
 		} else $offset = '+00:00';
8628
-		$filter_query = $this->getFilter($filters,true,true);
8628
+		$filter_query = $this->getFilter($filters, true, true);
8629 8629
 		if ($globalDBdriver == 'mysql') {
8630 8630
 			$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
8631 8631
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -8646,7 +8646,7 @@  discard block
 block discarded – undo
8646 8646
 		$date_array = array();
8647 8647
 		$temp_array = array();
8648 8648
         
8649
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8649
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8650 8650
 		{
8651 8651
 			$temp_array['year_name'] = $row['year_name'];
8652 8652
 			$temp_array['month_name'] = $row['month_name'];
@@ -8666,7 +8666,7 @@  discard block
 block discarded – undo
8666 8666
 	* @return Array the hour list
8667 8667
 	*
8668 8668
 	*/
8669
-	public function countAllHours($orderby,$filters = array())
8669
+	public function countAllHours($orderby, $filters = array())
8670 8670
 	{
8671 8671
 		global $globalTimezone, $globalDBdriver;
8672 8672
 		if ($globalTimezone != '') {
@@ -8714,7 +8714,7 @@  discard block
 block discarded – undo
8714 8714
 		$hour_array = array();
8715 8715
 		$temp_array = array();
8716 8716
         
8717
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8717
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8718 8718
 		{
8719 8719
 			$temp_array['hour_name'] = $row['hour_name'];
8720 8720
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8734,7 +8734,7 @@  discard block
 block discarded – undo
8734 8734
 	public function countAllHoursByAirlines($orderby, $filters = array())
8735 8735
 	{
8736 8736
 		global $globalTimezone, $globalDBdriver;
8737
-		$filter_query = $this->getFilter($filters,true,true);
8737
+		$filter_query = $this->getFilter($filters, true, true);
8738 8738
 		if ($globalTimezone != '') {
8739 8739
 			date_default_timezone_set($globalTimezone);
8740 8740
 			$datetime = new DateTime();
@@ -8752,7 +8752,7 @@  discard block
 block discarded – undo
8752 8752
 		}
8753 8753
 		
8754 8754
 		if ($globalDBdriver == 'mysql') {
8755
-			$query  = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8755
+			$query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8756 8756
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
8757 8757
 								GROUP BY spotter_output.airline_icao, hour_name 
8758 8758
 								".$orderby_sql;
@@ -8765,7 +8765,7 @@  discard block
 block discarded – undo
8765 8765
   */    
8766 8766
 		$query_data = array(':offset' => $offset);
8767 8767
 		} else {
8768
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8768
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8769 8769
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
8770 8770
 								GROUP BY spotter_output.airline_icao, hour_name 
8771 8771
 								".$orderby_sql;
@@ -8778,7 +8778,7 @@  discard block
 block discarded – undo
8778 8778
 		$hour_array = array();
8779 8779
 		$temp_array = array();
8780 8780
         
8781
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8781
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8782 8782
 		{
8783 8783
 			$temp_array['hour_name'] = $row['hour_name'];
8784 8784
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8801,34 +8801,34 @@  discard block
 block discarded – undo
8801 8801
 	public function countAllHoursByAirline($airline_icao, $filters = array())
8802 8802
 	{
8803 8803
 		global $globalTimezone, $globalDBdriver;
8804
-		$filter_query = $this->getFilter($filters,true,true);
8804
+		$filter_query = $this->getFilter($filters, true, true);
8805 8805
 		if ($globalTimezone != '') {
8806 8806
 			date_default_timezone_set($globalTimezone);
8807 8807
 			$datetime = new DateTime();
8808 8808
 			$offset = $datetime->format('P');
8809 8809
 		} else $offset = '+00:00';
8810 8810
 
8811
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8811
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
8812 8812
 
8813 8813
 		if ($globalDBdriver == 'mysql') {
8814
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8814
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8815 8815
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8816 8816
 								GROUP BY hour_name 
8817 8817
 								ORDER BY hour_name ASC";
8818 8818
 		} else {
8819
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8819
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8820 8820
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8821 8821
 								GROUP BY hour_name 
8822 8822
 								ORDER BY hour_name ASC";
8823 8823
 		}
8824 8824
 		
8825 8825
 		$sth = $this->db->prepare($query);
8826
-		$sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset));
8826
+		$sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset));
8827 8827
       
8828 8828
 		$hour_array = array();
8829 8829
 		$temp_array = array();
8830 8830
         
8831
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8831
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8832 8832
 		{
8833 8833
 			$temp_array['hour_name'] = $row['hour_name'];
8834 8834
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8851,8 +8851,8 @@  discard block
 block discarded – undo
8851 8851
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
8852 8852
 	{
8853 8853
 		global $globalTimezone, $globalDBdriver;
8854
-		$filter_query = $this->getFilter($filters,true,true);
8855
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
8854
+		$filter_query = $this->getFilter($filters, true, true);
8855
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
8856 8856
 		if ($globalTimezone != '') {
8857 8857
 			date_default_timezone_set($globalTimezone);
8858 8858
 			$datetime = new DateTime();
@@ -8860,24 +8860,24 @@  discard block
 block discarded – undo
8860 8860
 		} else $offset = '+00:00';
8861 8861
 
8862 8862
 		if ($globalDBdriver == 'mysql') {
8863
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8863
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8864 8864
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8865 8865
 								GROUP BY hour_name 
8866 8866
 								ORDER BY hour_name ASC";
8867 8867
 		} else {
8868
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8868
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8869 8869
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8870 8870
 								GROUP BY hour_name 
8871 8871
 								ORDER BY hour_name ASC";
8872 8872
 		}
8873 8873
 		
8874 8874
 		$sth = $this->db->prepare($query);
8875
-		$sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset));
8875
+		$sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset));
8876 8876
       
8877 8877
 		$hour_array = array();
8878 8878
 		$temp_array = array();
8879 8879
         
8880
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8880
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8881 8881
 		{
8882 8882
 			$temp_array['hour_name'] = $row['hour_name'];
8883 8883
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8898,8 +8898,8 @@  discard block
 block discarded – undo
8898 8898
 	public function countAllHoursByRegistration($registration, $filters = array())
8899 8899
 	{
8900 8900
 		global $globalTimezone, $globalDBdriver;
8901
-		$filter_query = $this->getFilter($filters,true,true);
8902
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
8901
+		$filter_query = $this->getFilter($filters, true, true);
8902
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
8903 8903
 		if ($globalTimezone != '') {
8904 8904
 			date_default_timezone_set($globalTimezone);
8905 8905
 			$datetime = new DateTime();
@@ -8907,24 +8907,24 @@  discard block
 block discarded – undo
8907 8907
 		} else $offset = '+00:00';
8908 8908
 
8909 8909
 		if ($globalDBdriver == 'mysql') {
8910
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8910
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8911 8911
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8912 8912
 								GROUP BY hour_name 
8913 8913
 								ORDER BY hour_name ASC";
8914 8914
 		} else {
8915
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8915
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8916 8916
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8917 8917
 								GROUP BY hour_name 
8918 8918
 								ORDER BY hour_name ASC";
8919 8919
 		}
8920 8920
 		
8921 8921
 		$sth = $this->db->prepare($query);
8922
-		$sth->execute(array(':registration' => $registration,':offset' => $offset));
8922
+		$sth->execute(array(':registration' => $registration, ':offset' => $offset));
8923 8923
       
8924 8924
 		$hour_array = array();
8925 8925
 		$temp_array = array();
8926 8926
         
8927
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8927
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8928 8928
 		{
8929 8929
 			$temp_array['hour_name'] = $row['hour_name'];
8930 8930
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8945,8 +8945,8 @@  discard block
 block discarded – undo
8945 8945
 	public function countAllHoursByAirport($airport_icao, $filters = array())
8946 8946
 	{
8947 8947
 		global $globalTimezone, $globalDBdriver;
8948
-		$filter_query = $this->getFilter($filters,true,true);
8949
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
8948
+		$filter_query = $this->getFilter($filters, true, true);
8949
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
8950 8950
 		if ($globalTimezone != '') {
8951 8951
 			date_default_timezone_set($globalTimezone);
8952 8952
 			$datetime = new DateTime();
@@ -8954,24 +8954,24 @@  discard block
 block discarded – undo
8954 8954
 		} else $offset = '+00:00';
8955 8955
 
8956 8956
 		if ($globalDBdriver == 'mysql') {
8957
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8957
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8958 8958
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8959 8959
 								GROUP BY hour_name 
8960 8960
 								ORDER BY hour_name ASC";
8961 8961
 		} else {
8962
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8962
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8963 8963
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8964 8964
 								GROUP BY hour_name 
8965 8965
 								ORDER BY hour_name ASC";
8966 8966
 		}
8967 8967
 		
8968 8968
 		$sth = $this->db->prepare($query);
8969
-		$sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset));
8969
+		$sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset));
8970 8970
       
8971 8971
 		$hour_array = array();
8972 8972
 		$temp_array = array();
8973 8973
         
8974
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8974
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8975 8975
 		{
8976 8976
 			$temp_array['hour_name'] = $row['hour_name'];
8977 8977
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -8990,11 +8990,11 @@  discard block
 block discarded – undo
8990 8990
 	* @return Array the hour list
8991 8991
 	*
8992 8992
 	*/
8993
-	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
8993
+	public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array())
8994 8994
 	{
8995 8995
 		global $globalTimezone, $globalDBdriver;
8996
-		$filter_query = $this->getFilter($filters,true,true);
8997
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
8996
+		$filter_query = $this->getFilter($filters, true, true);
8997
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
8998 8998
 		if ($globalTimezone != '') {
8999 8999
 			date_default_timezone_set($globalTimezone);
9000 9000
 			$datetime = new DateTime();
@@ -9002,24 +9002,24 @@  discard block
 block discarded – undo
9002 9002
 		} else $offset = '+00:00';
9003 9003
 
9004 9004
 		if ($globalDBdriver == 'mysql') {
9005
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9005
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9006 9006
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
9007 9007
 								GROUP BY hour_name 
9008 9008
 								ORDER BY hour_name ASC";
9009 9009
 		} else {
9010
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9010
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9011 9011
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
9012 9012
 								GROUP BY hour_name 
9013 9013
 								ORDER BY hour_name ASC";
9014 9014
 		}
9015 9015
 		
9016 9016
 		$sth = $this->db->prepare($query);
9017
-		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset));
9017
+		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset));
9018 9018
       
9019 9019
 		$hour_array = array();
9020 9020
 		$temp_array = array();
9021 9021
         
9022
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9022
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9023 9023
 		{
9024 9024
 			$temp_array['hour_name'] = $row['hour_name'];
9025 9025
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9041,8 +9041,8 @@  discard block
 block discarded – undo
9041 9041
 	public function countAllHoursByDate($date, $filters = array())
9042 9042
 	{
9043 9043
 		global $globalTimezone, $globalDBdriver;
9044
-		$filter_query = $this->getFilter($filters,true,true);
9045
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
9044
+		$filter_query = $this->getFilter($filters, true, true);
9045
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
9046 9046
 		if ($globalTimezone != '') {
9047 9047
 			date_default_timezone_set($globalTimezone);
9048 9048
 			$datetime = new DateTime($date);
@@ -9050,12 +9050,12 @@  discard block
 block discarded – undo
9050 9050
 		} else $offset = '+00:00';
9051 9051
 
9052 9052
 		if ($globalDBdriver == 'mysql') {
9053
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9053
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9054 9054
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
9055 9055
 								GROUP BY hour_name 
9056 9056
 								ORDER BY hour_name ASC";
9057 9057
 		} else {
9058
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9058
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9059 9059
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
9060 9060
 								GROUP BY hour_name 
9061 9061
 								ORDER BY hour_name ASC";
@@ -9067,7 +9067,7 @@  discard block
 block discarded – undo
9067 9067
 		$hour_array = array();
9068 9068
 		$temp_array = array();
9069 9069
         
9070
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9070
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9071 9071
 		{
9072 9072
 			$temp_array['hour_name'] = $row['hour_name'];
9073 9073
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9089,8 +9089,8 @@  discard block
 block discarded – undo
9089 9089
 	public function countAllHoursByIdent($ident, $filters = array())
9090 9090
 	{
9091 9091
 		global $globalTimezone, $globalDBdriver;
9092
-		$filter_query = $this->getFilter($filters,true,true);
9093
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
9092
+		$filter_query = $this->getFilter($filters, true, true);
9093
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
9094 9094
 		if ($globalTimezone != '') {
9095 9095
 			date_default_timezone_set($globalTimezone);
9096 9096
 			$datetime = new DateTime();
@@ -9098,12 +9098,12 @@  discard block
 block discarded – undo
9098 9098
 		} else $offset = '+00:00';
9099 9099
 
9100 9100
 		if ($globalDBdriver == 'mysql') {
9101
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9101
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9102 9102
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
9103 9103
 								GROUP BY hour_name 
9104 9104
 								ORDER BY hour_name ASC";
9105 9105
 		} else {
9106
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9106
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9107 9107
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
9108 9108
 								GROUP BY hour_name 
9109 9109
 								ORDER BY hour_name ASC";
@@ -9111,12 +9111,12 @@  discard block
 block discarded – undo
9111 9111
       
9112 9112
 		
9113 9113
 		$sth = $this->db->prepare($query);
9114
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
9114
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
9115 9115
       
9116 9116
 		$hour_array = array();
9117 9117
 		$temp_array = array();
9118 9118
         
9119
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9119
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9120 9120
 		{
9121 9121
 			$temp_array['hour_name'] = $row['hour_name'];
9122 9122
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9135,12 +9135,12 @@  discard block
 block discarded – undo
9135 9135
 	* @return Array the hour list
9136 9136
 	*
9137 9137
 	*/
9138
-	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
9138
+	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
9139 9139
 	{
9140 9140
 		global $globalTimezone, $globalDBdriver;
9141
-		$filter_query = $this->getFilter($filters,true,true);
9142
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
9143
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
9141
+		$filter_query = $this->getFilter($filters, true, true);
9142
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
9143
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
9144 9144
 		if ($globalTimezone != '') {
9145 9145
 			date_default_timezone_set($globalTimezone);
9146 9146
 			$datetime = new DateTime();
@@ -9148,24 +9148,24 @@  discard block
 block discarded – undo
9148 9148
 		} else $offset = '+00:00';
9149 9149
 
9150 9150
 		if ($globalDBdriver == 'mysql') {
9151
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9151
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9152 9152
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9153 9153
 								GROUP BY hour_name 
9154 9154
 								ORDER BY hour_name ASC";
9155 9155
 		} else {
9156
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9156
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9157 9157
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9158 9158
 								GROUP BY hour_name 
9159 9159
 								ORDER BY hour_name ASC";
9160 9160
 		}
9161 9161
 		
9162 9162
 		$sth = $this->db->prepare($query);
9163
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset));
9163
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset));
9164 9164
       
9165 9165
 		$hour_array = array();
9166 9166
 		$temp_array = array();
9167 9167
         
9168
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9168
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9169 9169
 		{
9170 9170
 			$temp_array['hour_name'] = $row['hour_name'];
9171 9171
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9186,8 +9186,8 @@  discard block
 block discarded – undo
9186 9186
 	public function countAllHoursByCountry($country, $filters = array())
9187 9187
 	{
9188 9188
 		global $globalTimezone, $globalDBdriver;
9189
-		$filter_query = $this->getFilter($filters,true,true);
9190
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
9189
+		$filter_query = $this->getFilter($filters, true, true);
9190
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
9191 9191
 		if ($globalTimezone != '') {
9192 9192
 			date_default_timezone_set($globalTimezone);
9193 9193
 			$datetime = new DateTime();
@@ -9195,24 +9195,24 @@  discard block
 block discarded – undo
9195 9195
 		} else $offset = '+00:00';
9196 9196
 
9197 9197
 		if ($globalDBdriver == 'mysql') {
9198
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9198
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9199 9199
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9200 9200
 								GROUP BY hour_name 
9201 9201
 								ORDER BY hour_name ASC";
9202 9202
 		} else {
9203
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9203
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9204 9204
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9205 9205
 								GROUP BY hour_name 
9206 9206
 								ORDER BY hour_name ASC";
9207 9207
 		}
9208 9208
 		
9209 9209
 		$sth = $this->db->prepare($query);
9210
-		$sth->execute(array(':country' => $country,':offset' => $offset));
9210
+		$sth->execute(array(':country' => $country, ':offset' => $offset));
9211 9211
       
9212 9212
 		$hour_array = array();
9213 9213
 		$temp_array = array();
9214 9214
         
9215
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9215
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9216 9216
 		{
9217 9217
 			$temp_array['hour_name'] = $row['hour_name'];
9218 9218
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9234,8 +9234,8 @@  discard block
 block discarded – undo
9234 9234
 	*/
9235 9235
 	public function countOverallAircrafts($filters = array())
9236 9236
 	{
9237
-		$filter_query = $this->getFilter($filters,true,true);
9238
-		$query  = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
9237
+		$filter_query = $this->getFilter($filters, true, true);
9238
+		$query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
9239 9239
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
9240 9240
 		$sth = $this->db->prepare($query);
9241 9241
 		$sth->execute();
@@ -9250,8 +9250,8 @@  discard block
 block discarded – undo
9250 9250
 	*/
9251 9251
 	public function countOverallArrival($filters = array())
9252 9252
 	{
9253
-		$filter_query = $this->getFilter($filters,true,true);
9254
-		$query  = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
9253
+		$filter_query = $this->getFilter($filters, true, true);
9254
+		$query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
9255 9255
                     FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''";
9256 9256
 		
9257 9257
 		$sth = $this->db->prepare($query);
@@ -9267,8 +9267,8 @@  discard block
 block discarded – undo
9267 9267
 	*/
9268 9268
 	public function countOverallPilots($filters = array())
9269 9269
 	{
9270
-		$filter_query = $this->getFilter($filters,true,true);
9271
-		$query  = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
9270
+		$filter_query = $this->getFilter($filters, true, true);
9271
+		$query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
9272 9272
                     FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''";
9273 9273
 		$sth = $this->db->prepare($query);
9274 9274
 		$sth->execute();
@@ -9283,8 +9283,8 @@  discard block
 block discarded – undo
9283 9283
 	*/
9284 9284
 	public function countOverallOwners($filters = array())
9285 9285
 	{
9286
-		$filter_query = $this->getFilter($filters,true,true);
9287
-		$query  = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
9286
+		$filter_query = $this->getFilter($filters, true, true);
9287
+		$query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
9288 9288
                     FROM spotter_output".$filter_query." spotter_output.owner_name <> ''";
9289 9289
 		$sth = $this->db->prepare($query);
9290 9290
 		$sth->execute();
@@ -9317,8 +9317,8 @@  discard block
 block discarded – undo
9317 9317
 	*/
9318 9318
 	public function countOverallMilitaryFlights($filters = array())
9319 9319
 	{
9320
-		$filter_query = $this->getFilter($filters,true,true);
9321
-		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
9320
+		$filter_query = $this->getFilter($filters, true, true);
9321
+		$query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
9322 9322
                     FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'";
9323 9323
       
9324 9324
 		$sth = $this->db->prepare($query);
@@ -9355,7 +9355,7 @@  discard block
 block discarded – undo
9355 9355
 	public function countAllHoursFromToday($filters = array())
9356 9356
 	{
9357 9357
 		global $globalTimezone, $globalDBdriver;
9358
-		$filter_query = $this->getFilter($filters,true,true);
9358
+		$filter_query = $this->getFilter($filters, true, true);
9359 9359
 		if ($globalTimezone != '') {
9360 9360
 			date_default_timezone_set($globalTimezone);
9361 9361
 			$datetime = new DateTime();
@@ -9363,12 +9363,12 @@  discard block
 block discarded – undo
9363 9363
 		} else $offset = '+00:00';
9364 9364
 
9365 9365
 		if ($globalDBdriver == 'mysql') {
9366
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9366
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9367 9367
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE()
9368 9368
 								GROUP BY hour_name 
9369 9369
 								ORDER BY hour_name ASC";
9370 9370
 		} else {
9371
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9371
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9372 9372
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
9373 9373
 								GROUP BY hour_name 
9374 9374
 								ORDER BY hour_name ASC";
@@ -9380,7 +9380,7 @@  discard block
 block discarded – undo
9380 9380
 		$hour_array = array();
9381 9381
 		$temp_array = array();
9382 9382
         
9383
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9383
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9384 9384
 		{
9385 9385
 			$temp_array['hour_name'] = $row['hour_name'];
9386 9386
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -9399,14 +9399,14 @@  discard block
 block discarded – undo
9399 9399
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
9400 9400
 	{
9401 9401
 		global $global_query, $globalDBdriver, $globalTimezone;
9402
-		$filter_query = $this->getFilter($filters,true,true);
9402
+		$filter_query = $this->getFilter($filters, true, true);
9403 9403
 		date_default_timezone_set('UTC');
9404 9404
 		$limit_query = '';
9405 9405
 		if ($limit != "")
9406 9406
 		{
9407 9407
 			$limit_array = explode(",", $limit);
9408
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
9409
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
9408
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
9409
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
9410 9410
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
9411 9411
 			{
9412 9412
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -9459,7 +9459,7 @@  discard block
 block discarded – undo
9459 9459
 			    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')
9460 9460
 			    HAVING count(spotter_output.ident) > 5$orderby_query";
9461 9461
 			//echo $query;
9462
-			$spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone));
9462
+			$spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone));
9463 9463
 			/*
9464 9464
 			$sth = $this->db->prepare($query);
9465 9465
 			$sth->execute(array(':timezone' => $globalTimezone));
@@ -9478,9 +9478,9 @@  discard block
 block discarded – undo
9478 9478
 	*/
9479 9479
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
9480 9480
 	{
9481
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
9481
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
9482 9482
 
9483
-		$query  = "SELECT spotter_output.spotter_id
9483
+		$query = "SELECT spotter_output.spotter_id
9484 9484
 								FROM spotter_output 
9485 9485
 								WHERE spotter_output.flightaware_id = '".$flightaware_id."'";
9486 9486
         
@@ -9488,7 +9488,7 @@  discard block
 block discarded – undo
9488 9488
 		$sth = $this->db->prepare($query);
9489 9489
 		$sth->execute();
9490 9490
 
9491
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9491
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9492 9492
 		{
9493 9493
 			return $row['spotter_id'];
9494 9494
 		}
@@ -9513,23 +9513,23 @@  discard block
 block discarded – undo
9513 9513
 		}
9514 9514
 		
9515 9515
 		$current_date = date("Y-m-d H:i:s");
9516
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
9516
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
9517 9517
 		
9518 9518
 		$diff = abs(strtotime($current_date) - strtotime($date));
9519 9519
 
9520
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
9520
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
9521 9521
 		$years = $time_array['years'];
9522 9522
 		
9523
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
9523
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
9524 9524
 		$months = $time_array['months'];
9525 9525
 		
9526
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
9526
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
9527 9527
 		$days = $time_array['days'];
9528
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
9528
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
9529 9529
 		$hours = $time_array['hours'];
9530
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
9530
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
9531 9531
 		$minutes = $time_array['minutes'];
9532
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
9532
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
9533 9533
 		
9534 9534
 		return $time_array;	
9535 9535
 	}	
@@ -9555,63 +9555,63 @@  discard block
 block discarded – undo
9555 9555
 			$temp_array['direction_degree'] = $direction;
9556 9556
 			$temp_array['direction_shortname'] = "N";
9557 9557
 			$temp_array['direction_fullname'] = "North";
9558
-		} elseif ($direction >= 22.5 && $direction < 45){
9558
+		} elseif ($direction >= 22.5 && $direction < 45) {
9559 9559
 			$temp_array['direction_degree'] = $direction;
9560 9560
 			$temp_array['direction_shortname'] = "NNE";
9561 9561
 			$temp_array['direction_fullname'] = "North-Northeast";
9562
-		} elseif ($direction >= 45 && $direction < 67.5){
9562
+		} elseif ($direction >= 45 && $direction < 67.5) {
9563 9563
 			$temp_array['direction_degree'] = $direction;
9564 9564
 			$temp_array['direction_shortname'] = "NE";
9565 9565
 			$temp_array['direction_fullname'] = "Northeast";
9566
-		} elseif ($direction >= 67.5 && $direction < 90){
9566
+		} elseif ($direction >= 67.5 && $direction < 90) {
9567 9567
 			$temp_array['direction_degree'] = $direction;
9568 9568
 			$temp_array['direction_shortname'] = "ENE";
9569 9569
 			$temp_array['direction_fullname'] = "East-Northeast";
9570
-		} elseif ($direction >= 90 && $direction < 112.5){
9570
+		} elseif ($direction >= 90 && $direction < 112.5) {
9571 9571
 			$temp_array['direction_degree'] = $direction;
9572 9572
 			$temp_array['direction_shortname'] = "E";
9573 9573
 			$temp_array['direction_fullname'] = "East";
9574
-		} elseif ($direction >= 112.5 && $direction < 135){
9574
+		} elseif ($direction >= 112.5 && $direction < 135) {
9575 9575
 			$temp_array['direction_degree'] = $direction;
9576 9576
 			$temp_array['direction_shortname'] = "ESE";
9577 9577
 			$temp_array['direction_fullname'] = "East-Southeast";
9578
-		} elseif ($direction >= 135 && $direction < 157.5){
9578
+		} elseif ($direction >= 135 && $direction < 157.5) {
9579 9579
 			$temp_array['direction_degree'] = $direction;
9580 9580
 			$temp_array['direction_shortname'] = "SE";
9581 9581
 			$temp_array['direction_fullname'] = "Southeast";
9582
-		} elseif ($direction >= 157.5 && $direction < 180){
9582
+		} elseif ($direction >= 157.5 && $direction < 180) {
9583 9583
 			$temp_array['direction_degree'] = $direction;
9584 9584
 			$temp_array['direction_shortname'] = "SSE";
9585 9585
 			$temp_array['direction_fullname'] = "South-Southeast";
9586
-		} elseif ($direction >= 180 && $direction < 202.5){
9586
+		} elseif ($direction >= 180 && $direction < 202.5) {
9587 9587
 			$temp_array['direction_degree'] = $direction;
9588 9588
 			$temp_array['direction_shortname'] = "S";
9589 9589
 			$temp_array['direction_fullname'] = "South";
9590
-		} elseif ($direction >= 202.5 && $direction < 225){
9590
+		} elseif ($direction >= 202.5 && $direction < 225) {
9591 9591
 			$temp_array['direction_degree'] = $direction;
9592 9592
 			$temp_array['direction_shortname'] = "SSW";
9593 9593
 			$temp_array['direction_fullname'] = "South-Southwest";
9594
-		} elseif ($direction >= 225 && $direction < 247.5){
9594
+		} elseif ($direction >= 225 && $direction < 247.5) {
9595 9595
 			$temp_array['direction_degree'] = $direction;
9596 9596
 			$temp_array['direction_shortname'] = "SW";
9597 9597
 			$temp_array['direction_fullname'] = "Southwest";
9598
-		} elseif ($direction >= 247.5 && $direction < 270){
9598
+		} elseif ($direction >= 247.5 && $direction < 270) {
9599 9599
 			$temp_array['direction_degree'] = $direction;
9600 9600
 			$temp_array['direction_shortname'] = "WSW";
9601 9601
 			$temp_array['direction_fullname'] = "West-Southwest";
9602
-		} elseif ($direction >= 270 && $direction < 292.5){
9602
+		} elseif ($direction >= 270 && $direction < 292.5) {
9603 9603
 			$temp_array['direction_degree'] = $direction;
9604 9604
 			$temp_array['direction_shortname'] = "W";
9605 9605
 			$temp_array['direction_fullname'] = "West";
9606
-		} elseif ($direction >= 292.5 && $direction < 315){
9606
+		} elseif ($direction >= 292.5 && $direction < 315) {
9607 9607
 			$temp_array['direction_degree'] = $direction;
9608 9608
 			$temp_array['direction_shortname'] = "WNW";
9609 9609
 			$temp_array['direction_fullname'] = "West-Northwest";
9610
-		} elseif ($direction >= 315 && $direction < 337.5){
9610
+		} elseif ($direction >= 315 && $direction < 337.5) {
9611 9611
 			$temp_array['direction_degree'] = $direction;
9612 9612
 			$temp_array['direction_shortname'] = "NW";
9613 9613
 			$temp_array['direction_fullname'] = "Northwest";
9614
-		} elseif ($direction >= 337.5 && $direction < 360){
9614
+		} elseif ($direction >= 337.5 && $direction < 360) {
9615 9615
 			$temp_array['direction_degree'] = $direction;
9616 9616
 			$temp_array['direction_shortname'] = "NNW";
9617 9617
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -9664,9 +9664,9 @@  discard block
 block discarded – undo
9664 9664
 	*/
9665 9665
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
9666 9666
 	{
9667
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9667
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9668 9668
 	
9669
-		$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9669
+		$query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9670 9670
 		
9671 9671
 		$sth = $this->db->prepare($query);
9672 9672
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -9689,9 +9689,9 @@  discard block
 block discarded – undo
9689 9689
 	*/
9690 9690
 	public function getAircraftTypeBymodeS($aircraft_modes)
9691 9691
 	{
9692
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9692
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9693 9693
 	
9694
-		$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9694
+		$query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9695 9695
 		
9696 9696
 		$sth = $this->db->prepare($query);
9697 9697
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -9712,11 +9712,11 @@  discard block
 block discarded – undo
9712 9712
 	* @param Float $longitude longitute of the flight
9713 9713
 	* @return String the countrie
9714 9714
 	*/
9715
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
9715
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
9716 9716
 	{
9717 9717
 		global $globalDBdriver, $globalDebug;
9718
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9719
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9718
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9719
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9720 9720
 	
9721 9721
 		$Connection = new Connection($this->db);
9722 9722
 		if (!$Connection->tableExists('countries')) return '';
@@ -9756,7 +9756,7 @@  discard block
 block discarded – undo
9756 9756
 	public function getCountryFromISO2($iso2)
9757 9757
 	{
9758 9758
 		global $globalDBdriver, $globalDebug;
9759
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
9759
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
9760 9760
 	
9761 9761
 		$Connection = new Connection($this->db);
9762 9762
 		if (!$Connection->tableExists('countries')) return '';
@@ -9788,19 +9788,19 @@  discard block
 block discarded – undo
9788 9788
 	*/
9789 9789
 	public function convertAircraftRegistration($registration)
9790 9790
 	{
9791
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9791
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9792 9792
 		$registration_prefix = '';
9793 9793
 		$registration_1 = substr($registration, 0, 1);
9794 9794
 		$registration_2 = substr($registration, 0, 2);
9795 9795
 
9796 9796
 		//first get the prefix based on two characters
9797
-		$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9797
+		$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9798 9798
       
9799 9799
 		
9800 9800
 		$sth = $this->db->prepare($query);
9801 9801
 		$sth->execute(array(':registration_2' => $registration_2));
9802 9802
         
9803
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9803
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9804 9804
 		{
9805 9805
 			$registration_prefix = $row['registration_prefix'];
9806 9806
 		}
@@ -9808,11 +9808,11 @@  discard block
 block discarded – undo
9808 9808
 		//if we didn't find a two chracter prefix lets just search the one with one character
9809 9809
 		if ($registration_prefix == '')
9810 9810
 		{
9811
-			$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9811
+			$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9812 9812
 			$sth = $this->db->prepare($query);
9813 9813
 			$sth->execute(array(':registration_1' => $registration_1));
9814 9814
 	        
9815
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9815
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9816 9816
 			{
9817 9817
 				$registration_prefix = $row['registration_prefix'];
9818 9818
 			}
@@ -9826,7 +9826,7 @@  discard block
 block discarded – undo
9826 9826
 			} else {
9827 9827
 				$registration = preg_replace("/^(.{1})/", "$1-", $registration);
9828 9828
 			}
9829
-		} else if(strlen($registration_prefix) == 2){
9829
+		} else if (strlen($registration_prefix) == 2) {
9830 9830
 			if (0 === strpos($registration, 'N')) {
9831 9831
 				$registration = preg_replace("/^(.{2})/", "$1", $registration);
9832 9832
 			} else {
@@ -9845,17 +9845,17 @@  discard block
 block discarded – undo
9845 9845
 	*/
9846 9846
 	public function countryFromAircraftRegistration($registration)
9847 9847
 	{
9848
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9848
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9849 9849
 		
9850 9850
 		$registration_prefix = '';
9851
-		$registration_test = explode('-',$registration);
9851
+		$registration_test = explode('-', $registration);
9852 9852
 		$country = '';
9853 9853
 		if ($registration_test[0] != $registration) {
9854 9854
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9855 9855
 	      
9856 9856
 			$sth = $this->db->prepare($query);
9857 9857
 			$sth->execute(array(':registration_1' => $registration_test[0]));
9858
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9858
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9859 9859
 			{
9860 9860
 				//$registration_prefix = $row['registration_prefix'];
9861 9861
 				$country = $row['country'];
@@ -9866,13 +9866,13 @@  discard block
 block discarded – undo
9866 9866
 
9867 9867
 			$country = '';
9868 9868
 			//first get the prefix based on two characters
9869
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9869
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9870 9870
       
9871 9871
 			
9872 9872
 			$sth = $this->db->prepare($query);
9873 9873
 			$sth->execute(array(':registration_2' => $registration_2));
9874 9874
         
9875
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9875
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9876 9876
 			{
9877 9877
 				$registration_prefix = $row['registration_prefix'];
9878 9878
 				$country = $row['country'];
@@ -9881,12 +9881,12 @@  discard block
 block discarded – undo
9881 9881
 			//if we didn't find a two chracter prefix lets just search the one with one character
9882 9882
 			if ($registration_prefix == "")
9883 9883
 			{
9884
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9884
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9885 9885
 	      
9886 9886
 				$sth = $this->db->prepare($query);
9887 9887
 				$sth->execute(array(':registration_1' => $registration_1));
9888 9888
 	        
9889
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
9889
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9890 9890
 				{
9891 9891
 					//$registration_prefix = $row['registration_prefix'];
9892 9892
 					$country = $row['country'];
@@ -9906,13 +9906,13 @@  discard block
 block discarded – undo
9906 9906
 	*/
9907 9907
 	public function countryFromAircraftRegistrationCode($registration)
9908 9908
 	{
9909
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9909
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9910 9910
 		
9911 9911
 		$country = '';
9912
-		$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
9912
+		$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
9913 9913
 		$sth = $this->db->prepare($query);
9914 9914
 		$sth->execute(array(':registration' => $registration));
9915
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9915
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9916 9916
 		{
9917 9917
 			$country = $row['country'];
9918 9918
 		}
@@ -9925,9 +9925,9 @@  discard block
 block discarded – undo
9925 9925
 	* @param String $flightaware_id flightaware_id from spotter_output table
9926 9926
 	* @param String $highlight New highlight value
9927 9927
 	*/
9928
-	public function setHighlightFlight($flightaware_id,$highlight) {
9928
+	public function setHighlightFlight($flightaware_id, $highlight) {
9929 9929
 		
9930
-		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9930
+		$query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9931 9931
 		$sth = $this->db->prepare($query);
9932 9932
 		$sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight));
9933 9933
 	}
@@ -9956,7 +9956,7 @@  discard block
 block discarded – undo
9956 9956
 		
9957 9957
 		$bitly_data = json_decode($bitly_data);
9958 9958
 		$bitly_url = '';
9959
-		if ($bitly_data->status_txt = "OK"){
9959
+		if ($bitly_data->status_txt = "OK") {
9960 9960
 			$bitly_url = $bitly_data->data->url;
9961 9961
 		}
9962 9962
 
@@ -9966,7 +9966,7 @@  discard block
 block discarded – undo
9966 9966
 
9967 9967
 	public function getOrderBy()
9968 9968
 	{
9969
-		$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"));
9969
+		$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"));
9970 9970
 		
9971 9971
 		return $orderby;
9972 9972
 		
@@ -10100,14 +10100,14 @@  discard block
 block discarded – undo
10100 10100
 		}
10101 10101
 		$sth = $this->db->prepare($query);
10102 10102
 		$sth->execute();
10103
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10103
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10104 10104
 		{
10105 10105
 			$departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']);
10106 10106
 			$arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']);
10107 10107
 			if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) {
10108
-				$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";
10108
+				$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";
10109 10109
 				$sthu = $this->db->prepare($update_query);
10110
-				$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']));
10110
+				$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']));
10111 10111
 			}
10112 10112
 		}
10113 10113
 		
@@ -10120,7 +10120,7 @@  discard block
 block discarded – undo
10120 10120
 		}
10121 10121
 		$sth = $this->db->prepare($query);
10122 10122
 		$sth->execute();
10123
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10123
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10124 10124
 		{
10125 10125
 			if (is_numeric(substr($row['ident'], -1, 1)))
10126 10126
 			{
@@ -10129,11 +10129,11 @@  discard block
 block discarded – undo
10129 10129
 				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
10130 10130
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
10131 10131
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
10132
-				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
10132
+				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
10133 10133
 				if (isset($airline_array[0]['name'])) {
10134
-					$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";
10134
+					$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";
10135 10135
 					$sthu = $this->db->prepare($update_query);
10136
-					$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']));
10136
+					$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']));
10137 10137
 				}
10138 10138
 			}
10139 10139
 		}
@@ -10153,18 +10153,18 @@  discard block
 block discarded – undo
10153 10153
 		}
10154 10154
 		$sth = $this->db->prepare($query);
10155 10155
 		$sth->execute();
10156
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10156
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10157 10157
 		{
10158 10158
 			if ($row['aircraft_icao'] != '') {
10159 10159
 				$aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']);
10160
-				if ($row['registration'] != ""){
10160
+				if ($row['registration'] != "") {
10161 10161
 					$image_array = $Image->getSpotterImage($row['registration']);
10162 10162
 					if (!isset($image_array[0]['registration'])) {
10163 10163
 						$Image->addSpotterImage($row['registration']);
10164 10164
 					}
10165 10165
 				}
10166 10166
 				if (count($aircraft_name) > 0) {
10167
-					$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";
10167
+					$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";
10168 10168
 					$sthu = $this->db->prepare($update_query);
10169 10169
 					$sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id']));
10170 10170
 				}
@@ -10179,10 +10179,10 @@  discard block
 block discarded – undo
10179 10179
 		$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";
10180 10180
 		$sth = $this->db->prepare($query);
10181 10181
 		$sth->execute();
10182
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10182
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10183 10183
 		{
10184 10184
 			if ($row['last_latitude'] != '' && $row['last_longitude'] != '') {
10185
-				$closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist);
10185
+				$closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist);
10186 10186
 				$airport_icao = '';
10187 10187
 				 if (isset($closestAirports[0])) {
10188 10188
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
@@ -10196,7 +10196,7 @@  discard block
 block discarded – undo
10196 10196
 								break;
10197 10197
 							}
10198 10198
 						}
10199
-					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10199
+					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) {
10200 10200
 						$airport_icao = $closestAirports[0]['icao'];
10201 10201
 						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";
10202 10202
 					} else {
@@ -10207,28 +10207,28 @@  discard block
 block discarded – undo
10207 10207
 				}
10208 10208
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10209 10209
 					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10210
-					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10210
+					$update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10211 10211
 					$sthu = $this->db->prepare($update_query);
10212
-					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
10212
+					$sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id']));
10213 10213
 				}
10214 10214
 			}
10215 10215
 		}
10216 10216
 	}
10217 10217
 	
10218
-	public function closestAirports($origLat,$origLon,$dist = 10) {
10218
+	public function closestAirports($origLat, $origLon, $dist = 10) {
10219 10219
 		global $globalDBdriver;
10220
-		$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
10220
+		$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
10221 10221
 /*
10222 10222
 		$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 
10223 10223
                       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)) 
10224 10224
                       having distance < $dist ORDER BY distance limit 100;";
10225 10225
 */
10226 10226
 		if ($globalDBdriver == 'mysql') {
10227
-			$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 
10227
+			$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 
10228 10228
 	                      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)) 
10229 10229
 	                      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;";
10230 10230
                 } else {
10231
-			$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 
10231
+			$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 
10232 10232
 	                      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)) 
10233 10233
 	                      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;";
10234 10234
     		}
Please login to merge, or discard this patch.
Braces   +679 added lines, -235 removed lines patch added patch discarded remove patch
@@ -27,7 +27,9 @@  discard block
 block discarded – undo
27 27
 				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
28 28
 			}
29 29
 		}
30
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30
+		if (is_array($globalFilter)) {
31
+			$filter = array_merge($filter,$globalFilter);
32
+		}
31 33
 		$filter_query_join = '';
32 34
 		$filter_query_where = '';
33 35
 		foreach($filters as $flt) {
@@ -77,8 +79,11 @@  discard block
 block discarded – undo
77 79
 				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
78 80
 			}
79 81
 		}
80
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
81
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
82
+		if ($filter_query_where == '' && $where) {
83
+			$filter_query_where = ' WHERE';
84
+		} elseif ($filter_query_where != '' && $and) {
85
+			$filter_query_where .= ' AND';
86
+		}
82 87
 		$filter_query = $filter_query_join.$filter_query_where;
83 88
 		return $filter_query;
84 89
 	}
@@ -98,10 +103,18 @@  discard block
 block discarded – undo
98 103
 		$Image = new Image($this->db);
99 104
 		$Schedule = new Schedule($this->db);
100 105
 		$ACARS = new ACARS($this->db);
101
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
102
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
103
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
104
-		if (!isset($globalVAM)) $globalVAM = FALSE;
106
+		if (!isset($globalIVAO)) {
107
+			$globalIVAO = FALSE;
108
+		}
109
+		if (!isset($globalVATSIM)) {
110
+			$globalVATSIM = FALSE;
111
+		}
112
+		if (!isset($globalphpVMS)) {
113
+			$globalphpVMS = FALSE;
114
+		}
115
+		if (!isset($globalVAM)) {
116
+			$globalVAM = FALSE;
117
+		}
105 118
 		date_default_timezone_set('UTC');
106 119
 		
107 120
 		if (!is_string($query))
@@ -148,21 +161,35 @@  discard block
 block discarded – undo
148 161
 			} else {
149 162
 				$temp_array['spotter_id'] = '';
150 163
 			}
151
-			if (isset($row['flightaware_id'])) $temp_array['flightaware_id'] = $row['flightaware_id'];
152
-			if (isset($row['modes'])) $temp_array['modes'] = $row['modes'];
164
+			if (isset($row['flightaware_id'])) {
165
+				$temp_array['flightaware_id'] = $row['flightaware_id'];
166
+			}
167
+			if (isset($row['modes'])) {
168
+				$temp_array['modes'] = $row['modes'];
169
+			}
153 170
 			$temp_array['ident'] = $row['ident'];
154 171
 			if (isset($row['registration']) && $row['registration'] != '') {
155 172
 				$temp_array['registration'] = $row['registration'];
156 173
 			} elseif (isset($temp_array['modes'])) {
157 174
 				$temp_array['registration'] = $this->getAircraftRegistrationBymodeS($temp_array['modes']);
158
-			} else $temp_array['registration'] = '';
159
-			if (isset($row['aircraft_icao'])) $temp_array['aircraft_type'] = $row['aircraft_icao'];
175
+			} else {
176
+				$temp_array['registration'] = '';
177
+			}
178
+			if (isset($row['aircraft_icao'])) {
179
+				$temp_array['aircraft_type'] = $row['aircraft_icao'];
180
+			}
160 181
 			
161 182
 			$temp_array['departure_airport'] = $row['departure_airport_icao'];
162 183
 			$temp_array['arrival_airport'] = $row['arrival_airport_icao'];
163
-			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) $temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
164
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
165
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
184
+			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) {
185
+				$temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
186
+			}
187
+			if (isset($row['latitude'])) {
188
+				$temp_array['latitude'] = $row['latitude'];
189
+			}
190
+			if (isset($row['longitude'])) {
191
+				$temp_array['longitude'] = $row['longitude'];
192
+			}
166 193
 			/*
167 194
 			if (Connection->tableExists('countries')) {
168 195
 				$country_info = $this->getCountryFromLatitudeLongitude($temp_array['latitude'],$temp_array['longitude']);
@@ -172,8 +199,12 @@  discard block
 block discarded – undo
172 199
 				}
173 200
 			}
174 201
 			*/
175
-			if (isset($row['waypoints'])) $temp_array['waypoints'] = $row['waypoints'];
176
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
202
+			if (isset($row['waypoints'])) {
203
+				$temp_array['waypoints'] = $row['waypoints'];
204
+			}
205
+			if (isset($row['format_source'])) {
206
+				$temp_array['format_source'] = $row['format_source'];
207
+			}
177 208
 			if (isset($row['route_stop'])) {
178 209
 				$temp_array['route_stop'] = $row['route_stop'];
179 210
 				if ($row['route_stop'] != '') {
@@ -192,13 +223,19 @@  discard block
 block discarded – undo
192 223
 					}
193 224
 				}
194 225
 			}
195
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
226
+			if (isset($row['altitude'])) {
227
+				$temp_array['altitude'] = $row['altitude'];
228
+			}
196 229
 			if (isset($row['heading'])) {
197 230
 				$temp_array['heading'] = $row['heading'];
198 231
 				$heading_direction = $this->parseDirection($row['heading']);
199
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
232
+				if (isset($heading_direction[0]['direction_fullname'])) {
233
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
234
+				}
235
+			}
236
+			if (isset($row['ground_speed'])) {
237
+				$temp_array['ground_speed'] = $row['ground_speed'];
200 238
 			}
201
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
202 239
 			$temp_array['image'] = "";
203 240
 			$temp_array['image_thumbnail'] = "";
204 241
 			$temp_array['image_source'] = "";
@@ -206,7 +243,9 @@  discard block
 block discarded – undo
206 243
  
207 244
 			if (isset($row['highlight'])) {
208 245
 				$temp_array['highlight'] = $row['highlight'];
209
-			} else $temp_array['highlight'] = '';
246
+			} else {
247
+				$temp_array['highlight'] = '';
248
+			}
210 249
 			
211 250
 			if (isset($row['date'])) {
212 251
 				$dateArray = $this->parseDateString($row['date']);
@@ -254,7 +293,9 @@  discard block
 block discarded – undo
254 293
 				
255 294
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
256 295
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
257
-					} else $temp_array['aircraft_shadow'] = 'default.png';
296
+					} else {
297
+						$temp_array['aircraft_shadow'] = 'default.png';
298
+					}
258 299
                                 } else {
259 300
                             		$temp_array['aircraft_shadow'] = 'default.png';
260 301
 					$temp_array['aircraft_name'] = 'N/A';
@@ -262,11 +303,17 @@  discard block
 block discarded – undo
262 303
                             	}
263 304
 			}
264 305
 			$fromsource = NULL;
265
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
266
-			elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
267
-			elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
268
-			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
269
-			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
306
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
307
+				$fromsource = $globalAirlinesSource;
308
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
309
+				$fromsource = 'vatsim';
310
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') {
311
+				$fromsource = 'ivao';
312
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
313
+				$fromsource = 'vatsim';
314
+			} elseif (isset($globalIVAO) && $globalIVAO) {
315
+				$fromsource = 'ivao';
316
+			}
270 317
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
271 318
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
272 319
 					if (is_numeric(substr($row['ident'], 2, 1))) {
@@ -289,12 +336,18 @@  discard block
 block discarded – undo
289 336
 				}
290 337
 			} else {
291 338
 				$temp_array['airline_icao'] = $row['airline_icao'];
292
-				if (isset($row['airline_iata'])) $temp_array['airline_iata'] = $row['airline_iata'];
293
-				else $temp_array['airline_iata'] = 'N/A';
339
+				if (isset($row['airline_iata'])) {
340
+					$temp_array['airline_iata'] = $row['airline_iata'];
341
+				} else {
342
+					$temp_array['airline_iata'] = 'N/A';
343
+				}
294 344
 				$temp_array['airline_name'] = $row['airline_name'];
295 345
 				$temp_array['airline_country'] = $row['airline_country'];
296
-				if (isset($row['airline_callsign'])) $temp_array['airline_callsign'] = $row['airline_callsign'];
297
-				else $temp_array['airline_callsign'] = 'N/A';
346
+				if (isset($row['airline_callsign'])) {
347
+					$temp_array['airline_callsign'] = $row['airline_callsign'];
348
+				} else {
349
+					$temp_array['airline_callsign'] = 'N/A';
350
+				}
298 351
 				$temp_array['airline_type'] = $row['airline_type'];
299 352
 				if ($temp_array['airline_icao'] != '' && $temp_array['airline_iata'] == 'N/A') {
300 353
 					$airline_array = $this->getAllAirlineInfo($temp_array['airline_icao']);
@@ -321,7 +374,9 @@  discard block
 block discarded – undo
321 374
 			}
322 375
 			if ($temp_array['registration'] != "" && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && !isset($temp_array['aircraft_owner'])) {
323 376
 				$owner_info = $this->getAircraftOwnerByRegistration($temp_array['registration']);
324
-				if ($owner_info['owner'] != '') $temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
377
+				if ($owner_info['owner'] != '') {
378
+					$temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
379
+				}
325 380
 				$temp_array['aircraft_base'] = $owner_info['base'];
326 381
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
327 382
 			}
@@ -329,9 +384,14 @@  discard block
 block discarded – undo
329 384
 			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
330 385
 			{
331 386
 				if ($globalIVAO) {
332
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
333
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
334
-				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
387
+					if (isset($temp_array['airline_icao'])) {
388
+						$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
389
+					} else {
390
+						$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
391
+					}
392
+				} else {
393
+					$image_array = $Image->getSpotterImage($temp_array['registration']);
394
+				}
335 395
 				if (count($image_array) > 0) {
336 396
 					$temp_array['image'] = $image_array[0]['image'];
337 397
 					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -383,7 +443,9 @@  discard block
 block discarded – undo
383 443
 			//if ($row['departure_airport_icao'] != '' && $row['departure_airport_name'] == '') {
384 444
 			if ($row['departure_airport_icao'] != '') {
385 445
 				$departure_airport_array = $this->getAllAirportInfo($row['departure_airport_icao']);
386
-				if (!isset($departure_airport_array[0]['name'])) $departure_airport_array = $this->getAllAirportInfo('NA');
446
+				if (!isset($departure_airport_array[0]['name'])) {
447
+					$departure_airport_array = $this->getAllAirportInfo('NA');
448
+				}
387 449
 			/*
388 450
 			} elseif ($row['departure_airport_name'] != '') {
389 451
 				$temp_array['departure_airport_name'] = $row['departure_airport_name'];
@@ -391,7 +453,9 @@  discard block
 block discarded – undo
391 453
 				$temp_array['departure_airport_country'] = $row['departure_airport_country'];
392 454
 				$temp_array['departure_airport_icao'] = $row['departure_airport_icao'];
393 455
 			*/
394
-			} else $departure_airport_array = $this->getAllAirportInfo('NA');
456
+			} else {
457
+				$departure_airport_array = $this->getAllAirportInfo('NA');
458
+			}
395 459
 			if (isset($departure_airport_array[0]['name'])) {
396 460
 				$temp_array['departure_airport_name'] = $departure_airport_array[0]['name'];
397 461
 				$temp_array['departure_airport_city'] = $departure_airport_array[0]['city'];
@@ -411,8 +475,12 @@  discard block
 block discarded – undo
411 475
 			
412 476
 			if ($row['arrival_airport_icao'] != '') {
413 477
 				$arrival_airport_array = $this->getAllAirportInfo($row['arrival_airport_icao']);
414
-				if (count($arrival_airport_array) == 0) $arrival_airport_array = $this->getAllAirportInfo('NA');
415
-			} else $arrival_airport_array = $this->getAllAirportInfo('NA');
478
+				if (count($arrival_airport_array) == 0) {
479
+					$arrival_airport_array = $this->getAllAirportInfo('NA');
480
+				}
481
+			} else {
482
+				$arrival_airport_array = $this->getAllAirportInfo('NA');
483
+			}
416 484
 			if (isset($arrival_airport_array[0]['name'])) {
417 485
 				$temp_array['arrival_airport_name'] = $arrival_airport_array[0]['name'];
418 486
 				$temp_array['arrival_airport_city'] = $arrival_airport_array[0]['city'];
@@ -428,27 +496,45 @@  discard block
 block discarded – undo
428 496
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
429 497
 			}
430 498
 			*/
431
-			if (isset($row['pilot_id']) && $row['pilot_id'] != '') $temp_array['pilot_id'] = $row['pilot_id'];
432
-			if (isset($row['pilot_name']) && $row['pilot_name'] != '') $temp_array['pilot_name'] = $row['pilot_name'];
433
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
434
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
435
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
499
+			if (isset($row['pilot_id']) && $row['pilot_id'] != '') {
500
+				$temp_array['pilot_id'] = $row['pilot_id'];
501
+			}
502
+			if (isset($row['pilot_name']) && $row['pilot_name'] != '') {
503
+				$temp_array['pilot_name'] = $row['pilot_name'];
504
+			}
505
+			if (isset($row['source_name']) && $row['source_name'] != '') {
506
+				$temp_array['source_name'] = $row['source_name'];
507
+			}
508
+			if (isset($row['over_country']) && $row['over_country'] != '') {
509
+				$temp_array['over_country'] = $row['over_country'];
510
+			}
511
+			if (isset($row['distance']) && $row['distance'] != '') {
512
+				$temp_array['distance'] = $row['distance'];
513
+			}
436 514
 			if (isset($row['squawk'])) {
437 515
 				$temp_array['squawk'] = $row['squawk'];
438 516
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
439 517
 					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
440
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
518
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) {
519
+						$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
520
+					}
441 521
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
442 522
 					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
443
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
444
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
523
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) {
524
+						$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
525
+					}
526
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) {
527
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
528
+				}
445 529
 			}
446 530
     			
447 531
 			$temp_array['query_number_rows'] = $num_rows;
448 532
 			
449 533
 			$spotter_array[] = $temp_array;
450 534
 		}
451
-		if ($num_rows == 0) return array();
535
+		if ($num_rows == 0) {
536
+			return array();
537
+		}
452 538
 		$spotter_array[0]['query_number_rows'] = $num_rows;
453 539
 		return $spotter_array;
454 540
 	}	
@@ -481,7 +567,9 @@  discard block
 block discarded – undo
481 567
 				foreach ($q_array as $q_item){
482 568
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
483 569
 					$additional_query .= " AND (";
484
-					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
570
+					if (is_int($q_item)) {
571
+						$additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
572
+					}
485 573
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
486 574
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
487 575
 					$additional_query .= "(spotter_output.aircraft_manufacturer like '%".$q_item."%') OR ";
@@ -502,7 +590,9 @@  discard block
 block discarded – undo
502 590
 					$additional_query .= "(spotter_output.pilot_name like '%".$q_item."%') OR ";
503 591
 					$additional_query .= "(spotter_output.ident like '%".$q_item."%') OR ";
504 592
 					$translate = $Translation->ident2icao($q_item);
505
-					if ($translate != $q_item) $additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
593
+					if ($translate != $q_item) {
594
+						$additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
595
+					}
506 596
 					$additional_query .= "(spotter_output.highlight like '%".$q_item."%')";
507 597
 					$additional_query .= ")";
508 598
 				}
@@ -729,7 +819,9 @@  discard block
 block discarded – undo
729 819
 				date_default_timezone_set($globalTimezone);
730 820
 				$datetime = new DateTime();
731 821
 				$offset = $datetime->format('P');
732
-			} else $offset = '+00:00';
822
+			} else {
823
+				$offset = '+00:00';
824
+			}
733 825
 
734 826
 			if ($date_array[1] != "")
735 827
 			{
@@ -761,8 +853,12 @@  discard block
 block discarded – undo
761 853
 			{
762 854
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
763 855
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
764
-			} else $limit_query = "";
765
-		} else $limit_query = "";
856
+			} else {
857
+				$limit_query = "";
858
+			}
859
+		} else {
860
+			$limit_query = "";
861
+		}
766 862
 
767 863
 
768 864
 		if ($sort != "")
@@ -830,8 +926,12 @@  discard block
 block discarded – undo
830 926
 			{
831 927
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
832 928
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
833
-			} else $limit_query = "";
834
-		} else $limit_query = "";
929
+			} else {
930
+				$limit_query = "";
931
+			}
932
+		} else {
933
+			$limit_query = "";
934
+		}
835 935
 		
836 936
 		if ($sort != "")
837 937
 		{
@@ -1155,7 +1255,9 @@  discard block
 block discarded – undo
1155 1255
 		global $global_query;
1156 1256
 		
1157 1257
 		date_default_timezone_set('UTC');
1158
-		if ($id == '') return array();
1258
+		if ($id == '') {
1259
+			return array();
1260
+		}
1159 1261
 		$additional_query = "spotter_output.spotter_id = :id";
1160 1262
 		$query_values = array(':id' => $id);
1161 1263
 
@@ -1784,7 +1886,9 @@  discard block
 block discarded – undo
1784 1886
 		{
1785 1887
 			$highlight = $row['highlight'];
1786 1888
 		}
1787
-		if (isset($highlight)) return $highlight;
1889
+		if (isset($highlight)) {
1890
+			return $highlight;
1891
+		}
1788 1892
 	}
1789 1893
 
1790 1894
 	
@@ -1812,7 +1916,9 @@  discard block
 block discarded – undo
1812 1916
 		$sth->closeCursor();
1813 1917
 		if (count($row) > 0) {
1814 1918
 			return $row['usage'];
1815
-		} else return '';
1919
+		} else {
1920
+			return '';
1921
+		}
1816 1922
 	}
1817 1923
 
1818 1924
 	/**
@@ -1837,7 +1943,9 @@  discard block
 block discarded – undo
1837 1943
 		$sth->closeCursor();
1838 1944
 		if (count($row) > 0) {
1839 1945
 			return $row['icao'];
1840
-		} else return '';
1946
+		} else {
1947
+			return '';
1948
+		}
1841 1949
 	}
1842 1950
 
1843 1951
 	/**
@@ -1865,7 +1973,9 @@  discard block
 block discarded – undo
1865 1973
 			$airport_longitude = $row['longitude'];
1866 1974
 			$Common = new Common();
1867 1975
 			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1868
-		} else return '';
1976
+		} else {
1977
+			return '';
1978
+		}
1869 1979
 	}
1870 1980
 	
1871 1981
 	/**
@@ -1977,7 +2087,9 @@  discard block
 block discarded – undo
1977 2087
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1978 2088
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1979 2089
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1980
-		} else return array();
2090
+		} else {
2091
+			return array();
2092
+		}
1981 2093
 		if ($globalDBdriver == 'mysql') {
1982 2094
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
1983 2095
 		} else {
@@ -2012,7 +2124,9 @@  discard block
 block discarded – undo
2012 2124
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2013 2125
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2014 2126
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2015
-		} else return array();
2127
+		} else {
2128
+			return array();
2129
+		}
2016 2130
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
2017 2131
 		$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.")";
2018 2132
 		//$query  = "SELECT waypoints.* FROM waypoints";
@@ -2047,7 +2161,9 @@  discard block
 block discarded – undo
2047 2161
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
2048 2162
 	{
2049 2163
 		global $globalUseRealAirlines;
2050
-		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2164
+		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) {
2165
+			$fromsource = NULL;
2166
+		}
2051 2167
 		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2052 2168
 		if ($airline_icao == 'NA') {
2053 2169
 			$airline_array = array();
@@ -2097,7 +2213,9 @@  discard block
 block discarded – undo
2097 2213
 				$sth->execute(array(':fromsource' => $fromsource));
2098 2214
 				$row = $sth->fetch(PDO::FETCH_ASSOC);
2099 2215
 				$sth->closeCursor();
2100
-				if ($row['nb'] == 0) $result = $this->getAllAirlineInfo($airline_icao);
2216
+				if ($row['nb'] == 0) {
2217
+					$result = $this->getAllAirlineInfo($airline_icao);
2218
+				}
2101 2219
 			}
2102 2220
 			return $result;
2103 2221
 		}
@@ -2161,15 +2279,20 @@  discard block
 block discarded – undo
2161 2279
 				'A320-211' => 'A320',
2162 2280
 				'747-8i' => 'B748',
2163 2281
 				'A380' => 'A388');
2164
-		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2282
+		if (isset($all_aircraft[$aircraft_type])) {
2283
+			return $all_aircraft[$aircraft_type];
2284
+		}
2165 2285
 
2166 2286
 		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2167 2287
 		$aircraft_type = strtoupper($aircraft_type);
2168 2288
 		$sth = $this->db->prepare($query);
2169 2289
 		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2170 2290
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2171
-		if (isset($result[0]['icao'])) return $result[0]['icao'];
2172
-		else return '';
2291
+		if (isset($result[0]['icao'])) {
2292
+			return $result[0]['icao'];
2293
+		} else {
2294
+			return '';
2295
+		}
2173 2296
 	}
2174 2297
 	
2175 2298
 	/**
@@ -2192,7 +2315,9 @@  discard block
 block discarded – undo
2192 2315
 		$sth->closeCursor();
2193 2316
 		if (isset($row['icaotypecode'])) {
2194 2317
 			return $row['icaotypecode'];
2195
-		} else return '';
2318
+		} else {
2319
+			return '';
2320
+		}
2196 2321
 	}
2197 2322
 
2198 2323
 	/**
@@ -2215,7 +2340,9 @@  discard block
 block discarded – undo
2215 2340
 		$sth->closeCursor();
2216 2341
 		if (isset($row['icaotypecode'])) {
2217 2342
 			return $row['icaotypecode'];
2218
-		} else return '';
2343
+		} else {
2344
+			return '';
2345
+		}
2219 2346
 	}
2220 2347
 
2221 2348
 	/**
@@ -2237,7 +2364,9 @@  discard block
 block discarded – undo
2237 2364
 		$sth->closeCursor();
2238 2365
 		if (isset($row['operator_correct'])) {
2239 2366
 			return $row['operator_correct'];
2240
-		} else return $operator;
2367
+		} else {
2368
+			return $operator;
2369
+		}
2241 2370
 	}
2242 2371
 
2243 2372
 	/**
@@ -2250,7 +2379,9 @@  discard block
 block discarded – undo
2250 2379
 	public function getRouteInfo($callsign)
2251 2380
 	{
2252 2381
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2253
-                if ($callsign == '') return array();
2382
+                if ($callsign == '') {
2383
+                	return array();
2384
+                }
2254 2385
 		$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";
2255 2386
 		
2256 2387
 		$sth = $this->db->prepare($query);
@@ -2260,7 +2391,9 @@  discard block
 block discarded – undo
2260 2391
 		$sth->closeCursor();
2261 2392
 		if (count($row) > 0) {
2262 2393
 			return $row;
2263
-		} else return array();
2394
+		} else {
2395
+			return array();
2396
+		}
2264 2397
 	}
2265 2398
 	
2266 2399
 	/**
@@ -2313,7 +2446,9 @@  discard block
 block discarded – undo
2313 2446
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
2314 2447
 			$sth->closeCursor();
2315 2448
 			return $result;
2316
-		} else return array();
2449
+		} else {
2450
+			return array();
2451
+		}
2317 2452
 	}
2318 2453
 	
2319 2454
   
@@ -2470,8 +2605,11 @@  discard block
 block discarded – undo
2470 2605
 		$query .= " ORDER BY spotter_output.source_name ASC";
2471 2606
 
2472 2607
 		$sth = $this->db->prepare($query);
2473
-		if (!empty($query_values)) $sth->execute($query_values);
2474
-		else $sth->execute();
2608
+		if (!empty($query_values)) {
2609
+			$sth->execute($query_values);
2610
+		} else {
2611
+			$sth->execute();
2612
+		}
2475 2613
 
2476 2614
 		$source_array = array();
2477 2615
 		$temp_array = array();
@@ -2504,9 +2642,13 @@  discard block
 block discarded – undo
2504 2642
 								WHERE spotter_output.airline_icao <> '' 
2505 2643
 								ORDER BY spotter_output.airline_name ASC";
2506 2644
 			*/
2507
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource;
2508
-			elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim';
2509
-			elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao';
2645
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
2646
+				$forsource = $globalAirlinesSource;
2647
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
2648
+				$forsource = 'vatsim';
2649
+			} elseif (isset($globalIVAO) && $globalIVAO) {
2650
+				$forsource = 'ivao';
2651
+			}
2510 2652
 			if ($forsource === NULL) {
2511 2653
 				$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";
2512 2654
 				$query_data = array();
@@ -2798,7 +2940,9 @@  discard block
 block discarded – undo
2798 2940
 			date_default_timezone_set($globalTimezone);
2799 2941
 			$datetime = new DateTime();
2800 2942
 			$offset = $datetime->format('P');
2801
-		} else $offset = '+00:00';
2943
+		} else {
2944
+			$offset = '+00:00';
2945
+		}
2802 2946
 		if ($airport_icao == '') {
2803 2947
 			if ($globalDBdriver == 'mysql') {
2804 2948
 				$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";
@@ -2830,7 +2974,9 @@  discard block
 block discarded – undo
2830 2974
 			date_default_timezone_set($globalTimezone);
2831 2975
 			$datetime = new DateTime();
2832 2976
 			$offset = $datetime->format('P');
2833
-		} else $offset = '+00:00';
2977
+		} else {
2978
+			$offset = '+00:00';
2979
+		}
2834 2980
 		if ($airport_icao == '') {
2835 2981
 			if ($globalDBdriver == 'mysql') {
2836 2982
 				$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";
@@ -2863,7 +3009,9 @@  discard block
 block discarded – undo
2863 3009
 			date_default_timezone_set($globalTimezone);
2864 3010
 			$datetime = new DateTime();
2865 3011
 			$offset = $datetime->format('P');
2866
-		} else $offset = '+00:00';
3012
+		} else {
3013
+			$offset = '+00:00';
3014
+		}
2867 3015
 		if ($airport_icao == '') {
2868 3016
 			if ($globalDBdriver == 'mysql') {
2869 3017
 				$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 
@@ -2902,7 +3050,9 @@  discard block
 block discarded – undo
2902 3050
 			date_default_timezone_set($globalTimezone);
2903 3051
 			$datetime = new DateTime();
2904 3052
 			$offset = $datetime->format('P');
2905
-		} else $offset = '+00:00';
3053
+		} else {
3054
+			$offset = '+00:00';
3055
+		}
2906 3056
 		if ($airport_icao == '') {
2907 3057
 			if ($globalDBdriver == 'mysql') {
2908 3058
 				$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 
@@ -2947,7 +3097,9 @@  discard block
 block discarded – undo
2947 3097
 			date_default_timezone_set($globalTimezone);
2948 3098
 			$datetime = new DateTime();
2949 3099
 			$offset = $datetime->format('P');
2950
-		} else $offset = '+00:00';
3100
+		} else {
3101
+			$offset = '+00:00';
3102
+		}
2951 3103
 		if ($airport_icao == '') {
2952 3104
 			if ($globalDBdriver == 'mysql') {
2953 3105
 				$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";
@@ -2982,7 +3134,9 @@  discard block
 block discarded – undo
2982 3134
 			date_default_timezone_set($globalTimezone);
2983 3135
 			$datetime = new DateTime();
2984 3136
 			$offset = $datetime->format('P');
2985
-		} else $offset = '+00:00';
3137
+		} else {
3138
+			$offset = '+00:00';
3139
+		}
2986 3140
 		if ($airport_icao == '') {
2987 3141
 			if ($globalDBdriver == 'mysql') {
2988 3142
 				$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 
@@ -3024,7 +3178,9 @@  discard block
 block discarded – undo
3024 3178
 			date_default_timezone_set($globalTimezone);
3025 3179
 			$datetime = new DateTime();
3026 3180
 			$offset = $datetime->format('P');
3027
-		} else $offset = '+00:00';
3181
+		} else {
3182
+			$offset = '+00:00';
3183
+		}
3028 3184
 		if ($airport_icao == '') {
3029 3185
 			if ($globalDBdriver == 'mysql') {
3030 3186
 				$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";
@@ -3058,7 +3214,9 @@  discard block
 block discarded – undo
3058 3214
 			date_default_timezone_set($globalTimezone);
3059 3215
 			$datetime = new DateTime();
3060 3216
 			$offset = $datetime->format('P');
3061
-		} else $offset = '+00:00';
3217
+		} else {
3218
+			$offset = '+00:00';
3219
+		}
3062 3220
 		if ($airport_icao == '') {
3063 3221
 			if ($globalDBdriver == 'mysql') {
3064 3222
 				$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 
@@ -3106,7 +3264,9 @@  discard block
 block discarded – undo
3106 3264
 			date_default_timezone_set($globalTimezone);
3107 3265
 			$datetime = new DateTime();
3108 3266
 			$offset = $datetime->format('P');
3109
-		} else $offset = '+00:00';
3267
+		} else {
3268
+			$offset = '+00:00';
3269
+		}
3110 3270
 
3111 3271
 		if ($globalDBdriver == 'mysql') {
3112 3272
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
@@ -3226,7 +3386,9 @@  discard block
 block discarded – undo
3226 3386
 	*/	
3227 3387
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3228 3388
 	{
3229
-		if ($groundspeed == '') $groundspeed = NULL;
3389
+		if ($groundspeed == '') {
3390
+			$groundspeed = NULL;
3391
+		}
3230 3392
 		$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';
3231 3393
                 $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);
3232 3394
 
@@ -3276,10 +3438,18 @@  discard block
 block discarded – undo
3276 3438
 		$Image = new Image($this->db);
3277 3439
 		$Common = new Common();
3278 3440
 		
3279
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
3280
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
3281
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
3282
-		if (!isset($globalVAM)) $globalVAM = FALSE;
3441
+		if (!isset($globalIVAO)) {
3442
+			$globalIVAO = FALSE;
3443
+		}
3444
+		if (!isset($globalVATSIM)) {
3445
+			$globalVATSIM = FALSE;
3446
+		}
3447
+		if (!isset($globalphpVMS)) {
3448
+			$globalphpVMS = FALSE;
3449
+		}
3450
+		if (!isset($globalVAM)) {
3451
+			$globalVAM = FALSE;
3452
+		}
3283 3453
 		date_default_timezone_set('UTC');
3284 3454
 		
3285 3455
 		//getting the registration
@@ -3292,23 +3462,33 @@  discard block
 block discarded – undo
3292 3462
 				if ($ModeS != '') {
3293 3463
 					$timeelapsed = microtime(true);
3294 3464
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3295
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3465
+					if ($globalDebugTimeElapsed) {
3466
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3467
+					}
3296 3468
 				} else {
3297 3469
 					$myhex = explode('-',$flightaware_id);
3298 3470
 					if (count($myhex) > 0) {
3299 3471
 						$timeelapsed = microtime(true);
3300 3472
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3301
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3473
+						if ($globalDebugTimeElapsed) {
3474
+							echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3475
+						}
3302 3476
 					}
3303 3477
 				}
3304 3478
 			}
3305 3479
 		}
3306 3480
 		$fromsource = NULL;
3307
-		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
3308
-		elseif ($format_source == 'vatsimtxt') $fromsource = 'vatsim';
3309
-		elseif ($format_source == 'whazzup') $fromsource = 'ivao';
3310
-		elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
3311
-		elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
3481
+		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
3482
+			$fromsource = $globalAirlinesSource;
3483
+		} elseif ($format_source == 'vatsimtxt') {
3484
+			$fromsource = 'vatsim';
3485
+		} elseif ($format_source == 'whazzup') {
3486
+			$fromsource = 'ivao';
3487
+		} elseif (isset($globalVATSIM) && $globalVATSIM) {
3488
+			$fromsource = 'vatsim';
3489
+		} elseif (isset($globalIVAO) && $globalIVAO) {
3490
+			$fromsource = 'ivao';
3491
+		}
3312 3492
 		//getting the airline information
3313 3493
 		if ($ident != "")
3314 3494
 		{
@@ -3332,15 +3512,21 @@  discard block
 block discarded – undo
3332 3512
 					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3333 3513
 						$airline_array = $this->getAllAirlineInfo("NA");
3334 3514
 					}
3335
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3515
+					if ($globalDebugTimeElapsed) {
3516
+						echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3517
+					}
3336 3518
 
3337 3519
 				} else {
3338 3520
 					$timeelapsed = microtime(true);
3339 3521
 					$airline_array = $this->getAllAirlineInfo("NA");
3340
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3522
+					if ($globalDebugTimeElapsed) {
3523
+						echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3524
+					}
3341 3525
 				}
3342 3526
 			}
3343
-		} else $airline_array = array();
3527
+		} else {
3528
+			$airline_array = array();
3529
+		}
3344 3530
 		
3345 3531
 		//getting the aircraft information
3346 3532
 		$aircraft_array = array();
@@ -3354,27 +3540,37 @@  discard block
 block discarded – undo
3354 3540
 				{
3355 3541
 					$timeelapsed = microtime(true);
3356 3542
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3357
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3543
+					if ($globalDebugTimeElapsed) {
3544
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3545
+					}
3358 3546
 				} else {
3359 3547
 					$timeelapsed = microtime(true);
3360 3548
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3361
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3549
+					if ($globalDebugTimeElapsed) {
3550
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3551
+					}
3362 3552
 				}
3363 3553
 			}
3364 3554
 		} else {
3365 3555
 			if ($ModeS != '') {
3366 3556
 				$timeelapsed = microtime(true);
3367 3557
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3368
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3558
+				if ($globalDebugTimeElapsed) {
3559
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3560
+				}
3369 3561
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3370 3562
 				{
3371 3563
 					$timeelapsed = microtime(true);
3372 3564
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3373
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3565
+					if ($globalDebugTimeElapsed) {
3566
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3567
+					}
3374 3568
 				} else {
3375 3569
 					$timeelapsed = microtime(true);
3376 3570
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3377
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3571
+					if ($globalDebugTimeElapsed) {
3572
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3573
+					}
3378 3574
 				}
3379 3575
 			}
3380 3576
 		}
@@ -3389,7 +3585,9 @@  discard block
 block discarded – undo
3389 3585
 			} else {
3390 3586
 				$timeelapsed = microtime(true);
3391 3587
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3392
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3588
+				if ($globalDebugTimeElapsed) {
3589
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3590
+				}
3393 3591
 			}
3394 3592
 		}
3395 3593
 		
@@ -3403,7 +3601,9 @@  discard block
 block discarded – undo
3403 3601
 			} else {
3404 3602
 				$timeelapsed = microtime(true);
3405 3603
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3406
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3604
+				if ($globalDebugTimeElapsed) {
3605
+					echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3606
+				}
3407 3607
 			}
3408 3608
 		}
3409 3609
 
@@ -3438,7 +3638,9 @@  discard block
 block discarded – undo
3438 3638
 			{
3439 3639
 				return false;
3440 3640
 			}
3441
-		} else $altitude = 0;
3641
+		} else {
3642
+			$altitude = 0;
3643
+		}
3442 3644
 		
3443 3645
 		if ($heading != "")
3444 3646
 		{
@@ -3467,7 +3669,9 @@  discard block
 block discarded – undo
3467 3669
 		{
3468 3670
 			$timeelapsed = microtime(true);
3469 3671
 			$image_array = $Image->getSpotterImage($registration);
3470
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3672
+			if ($globalDebugTimeElapsed) {
3673
+				echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3674
+			}
3471 3675
 			if (!isset($image_array[0]['registration']))
3472 3676
 			{
3473 3677
 				//echo "Add image !!!! \n";
@@ -3475,14 +3679,21 @@  discard block
 block discarded – undo
3475 3679
 			}
3476 3680
 			$timeelapsed = microtime(true);
3477 3681
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3478
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3479
-			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3682
+			if ($globalDebugTimeElapsed) {
3683
+				echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3684
+			}
3685
+			if ($owner_info['owner'] != '') {
3686
+				$aircraft_owner = ucwords(strtolower($owner_info['owner']));
3687
+			}
3480 3688
 		}
3481 3689
     
3482 3690
 		if ($globalIVAO && $aircraft_icao != '')
3483 3691
 		{
3484
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3485
-            		else $airline_icao = '';
3692
+            		if (isset($airline_array[0]['icao'])) {
3693
+            			$airline_icao = $airline_array[0]['icao'];
3694
+            		} else {
3695
+            			$airline_icao = '';
3696
+            		}
3486 3697
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3487 3698
 			if (!isset($image_array[0]['registration']))
3488 3699
 			{
@@ -3527,16 +3738,28 @@  discard block
 block discarded – undo
3527 3738
                 {
3528 3739
                         $arrival_airport_array = $this->getAllAirportInfo('NA');
3529 3740
                 }
3530
-                if ($registration == '') $registration = 'NA';
3741
+                if ($registration == '') {
3742
+                	$registration = 'NA';
3743
+                }
3531 3744
                 if ($latitude == '' && $longitude == '') {
3532 3745
             		$latitude = 0;
3533 3746
             		$longitude = 0;
3534 3747
             	}
3535
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
3536
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
3537
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3538
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3539
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3748
+                if ($squawk == '' || $Common->isInteger($squawk) === false) {
3749
+                	$squawk = NULL;
3750
+                }
3751
+                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) {
3752
+                	$verticalrate = NULL;
3753
+                }
3754
+                if ($heading == '' || $Common->isInteger($heading) === false) {
3755
+                	$heading = 0;
3756
+                }
3757
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
3758
+                	$groundspeed = 0;
3759
+                }
3760
+                if (!isset($aircraft_owner)) {
3761
+                	$aircraft_owner = NULL;
3762
+                }
3540 3763
                 $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) 
3541 3764
                 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)";
3542 3765
 
@@ -3547,9 +3770,13 @@  discard block
 block discarded – undo
3547 3770
 		if ($airline_type == '') {
3548 3771
 			$timeelapsed = microtime(true);
3549 3772
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3550
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3773
+			if ($globalDebugTimeElapsed) {
3774
+				echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3775
+			}
3776
+		}
3777
+		if ($airline_type == null) {
3778
+			$airline_type = '';
3551 3779
 		}
3552
-		if ($airline_type == null) $airline_type = '';
3553 3780
                 $aircraft_type = $aircraft_array[0]['type'];
3554 3781
                 $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
3555 3782
                 $departure_airport_name = $departure_airport_array[0]['name'];
@@ -3684,7 +3911,9 @@  discard block
 block discarded – undo
3684 3911
 			}
3685 3912
 		}
3686 3913
 		$query .= "GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC";
3687
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3914
+		if ($limit) {
3915
+			$query .= " LIMIT 10 OFFSET 0";
3916
+		}
3688 3917
 		
3689 3918
 		$sth = $this->db->prepare($query);
3690 3919
 		$sth->execute();
@@ -3729,7 +3958,9 @@  discard block
 block discarded – undo
3729 3958
 			}
3730 3959
 		}
3731 3960
 		$query .= "GROUP BY spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC";
3732
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
3961
+		if ($limit) {
3962
+			$query .= " LIMIT 10 OFFSET 0";
3963
+		}
3733 3964
       
3734 3965
 		
3735 3966
 		$sth = $this->db->prepare($query);
@@ -3775,7 +4006,9 @@  discard block
 block discarded – undo
3775 4006
 			}
3776 4007
 		}
3777 4008
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC";
3778
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4009
+		if ($limit) {
4010
+			$query .= " LIMIT 10 OFFSET 0";
4011
+		}
3779 4012
       
3780 4013
 		
3781 4014
 		$sth = $this->db->prepare($query);
@@ -3823,7 +4056,9 @@  discard block
 block discarded – undo
3823 4056
 			}
3824 4057
 		}
3825 4058
 		$query .= "GROUP BY spotter_output.owner_name ORDER BY owner_count DESC";
3826
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4059
+		if ($limit) {
4060
+			$query .= " LIMIT 10 OFFSET 0";
4061
+		}
3827 4062
       
3828 4063
 		
3829 4064
 		$sth = $this->db->prepare($query);
@@ -3868,7 +4103,9 @@  discard block
 block discarded – undo
3868 4103
 			}
3869 4104
 		}
3870 4105
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.owner_name ORDER BY owner_count DESC";
3871
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4106
+		if ($limit) {
4107
+			$query .= " LIMIT 10 OFFSET 0";
4108
+		}
3872 4109
       
3873 4110
 		
3874 4111
 		$sth = $this->db->prepare($query);
@@ -4111,7 +4348,9 @@  discard block
 block discarded – undo
4111 4348
 			date_default_timezone_set($globalTimezone);
4112 4349
 			$datetime = new DateTime($date);
4113 4350
 			$offset = $datetime->format('P');
4114
-		} else $offset = '+00:00';
4351
+		} else {
4352
+			$offset = '+00:00';
4353
+		}
4115 4354
 
4116 4355
 		if ($globalDBdriver == 'mysql') {
4117 4356
 			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
@@ -4159,7 +4398,9 @@  discard block
 block discarded – undo
4159 4398
 			date_default_timezone_set($globalTimezone);
4160 4399
 			$datetime = new DateTime($date);
4161 4400
 			$offset = $datetime->format('P');
4162
-		} else $offset = '+00:00';
4401
+		} else {
4402
+			$offset = '+00:00';
4403
+		}
4163 4404
 		
4164 4405
 		if ($globalDBdriver == 'mysql') {
4165 4406
 			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
@@ -4377,7 +4618,9 @@  discard block
 block discarded – undo
4377 4618
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA' 
4378 4619
 					GROUP BY spotter_output.airline_country
4379 4620
 					ORDER BY airline_country_count DESC";
4380
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4621
+		if ($limit) {
4622
+			$query .= " LIMIT 10 OFFSET 0";
4623
+		}
4381 4624
       
4382 4625
 		$sth = $this->db->prepare($query);
4383 4626
 		$sth->execute();
@@ -4405,7 +4648,9 @@  discard block
 block discarded – undo
4405 4648
 		global $globalDBdriver;
4406 4649
 		//$filter_query = $this->getFilter($filters,true,true);
4407 4650
 		$Connection= new Connection($this->db);
4408
-		if (!$Connection->tableExists('countries')) return array();
4651
+		if (!$Connection->tableExists('countries')) {
4652
+			return array();
4653
+		}
4409 4654
 		/*
4410 4655
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
4411 4656
 					FROM countries c, spotter_output s
@@ -4437,7 +4682,9 @@  discard block
 block discarded – undo
4437 4682
 		}
4438 4683
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT flightaware_id,over_country FROM spotter_live".$filter_query.") l ON c.iso2 = l.over_country ";
4439 4684
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
4440
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4685
+		if ($limit) {
4686
+			$query .= " LIMIT 10 OFFSET 0";
4687
+		}
4441 4688
       
4442 4689
 		
4443 4690
 		$sth = $this->db->prepare($query);
@@ -4487,7 +4734,9 @@  discard block
 block discarded – undo
4487 4734
 		}
4488 4735
 
4489 4736
 		$query .= " GROUP BY spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
4490
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4737
+		if ($limit) {
4738
+			$query .= " LIMIT 10 OFFSET 0";
4739
+		}
4491 4740
  
4492 4741
 		$sth = $this->db->prepare($query);
4493 4742
 		$sth->execute();
@@ -4533,7 +4782,9 @@  discard block
 block discarded – undo
4533 4782
 		}
4534 4783
 
4535 4784
 		$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";
4536
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4785
+		if ($limit) {
4786
+			$query .= " LIMIT 10 OFFSET 0";
4787
+		}
4537 4788
  
4538 4789
 		$sth = $this->db->prepare($query);
4539 4790
 		$sth->execute();
@@ -4580,7 +4831,9 @@  discard block
 block discarded – undo
4580 4831
 		}
4581 4832
 
4582 4833
 		$query .= "GROUP BY EXTRACT(month from spotter_output.date), EXTRACT(year from spotter_output.date), spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
4583
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
4834
+		if ($limit) {
4835
+			$query .= " LIMIT 10 OFFSET 0";
4836
+		}
4584 4837
  
4585 4838
 		$sth = $this->db->prepare($query);
4586 4839
 		$sth->execute();
@@ -4633,7 +4886,9 @@  discard block
 block discarded – undo
4633 4886
 			if($row['registration'] != "")
4634 4887
 			{
4635 4888
 				$image_array = $Image->getSpotterImage($row['registration']);
4636
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4889
+				if (isset($image_array[0]['image_thumbnail'])) {
4890
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4891
+				}
4637 4892
 			}
4638 4893
 			$temp_array['registration_count'] = $row['registration_count'];
4639 4894
 
@@ -4708,7 +4963,9 @@  discard block
 block discarded – undo
4708 4963
 			if($row['registration'] != "")
4709 4964
 			{
4710 4965
 				$image_array = $Image->getSpotterImage($row['registration']);
4711
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4966
+				if (isset($image_array[0]['image_thumbnail'])) {
4967
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
4968
+				}
4712 4969
 			}
4713 4970
 			$temp_array['registration_count'] = $row['registration_count'];
4714 4971
 
@@ -4815,7 +5072,9 @@  discard block
 block discarded – undo
4815 5072
 			if($row['registration'] != "")
4816 5073
 			{
4817 5074
 				$image_array = $Image->getSpotterImage($row['registration']);
4818
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5075
+				if (isset($image_array[0]['image_thumbnail'])) {
5076
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5077
+				}
4819 5078
 			}
4820 5079
 			$temp_array['registration_count'] = $row['registration_count'];
4821 5080
 			$aircraft_array[] = $temp_array;
@@ -4940,7 +5199,9 @@  discard block
 block discarded – undo
4940 5199
 			date_default_timezone_set($globalTimezone);
4941 5200
 			$datetime = new DateTime($date);
4942 5201
 			$offset = $datetime->format('P');
4943
-		} else $offset = '+00:00';
5202
+		} else {
5203
+			$offset = '+00:00';
5204
+		}
4944 5205
 
4945 5206
 		if ($globalDBdriver == 'mysql') {
4946 5207
 			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
@@ -4987,7 +5248,9 @@  discard block
 block discarded – undo
4987 5248
 			date_default_timezone_set($globalTimezone);
4988 5249
 			$datetime = new DateTime($date);
4989 5250
 			$offset = $datetime->format('P');
4990
-		} else $offset = '+00:00';
5251
+		} else {
5252
+			$offset = '+00:00';
5253
+		}
4991 5254
 
4992 5255
 		if ($globalDBdriver == 'mysql') {
4993 5256
 			$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 
@@ -5016,7 +5279,9 @@  discard block
 block discarded – undo
5016 5279
 			if($row['registration'] != "")
5017 5280
 			{
5018 5281
 				$image_array = $Image->getSpotterImage($row['registration']);
5019
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5282
+				if (isset($image_array[0]['image_thumbnail'])) {
5283
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5284
+				}
5020 5285
 			}
5021 5286
 			$temp_array['registration_count'] = $row['registration_count'];
5022 5287
  
@@ -5041,7 +5306,9 @@  discard block
 block discarded – undo
5041 5306
 			date_default_timezone_set($globalTimezone);
5042 5307
 			$datetime = new DateTime($date);
5043 5308
 			$offset = $datetime->format('P');
5044
-		} else $offset = '+00:00';
5309
+		} else {
5310
+			$offset = '+00:00';
5311
+		}
5045 5312
 
5046 5313
 		if ($globalDBdriver == 'mysql') {
5047 5314
 			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
@@ -5139,8 +5406,11 @@  discard block
 block discarded – undo
5139 5406
 			if($row['registration'] != "")
5140 5407
 			{
5141 5408
 				$image_array = $Image->getSpotterImage($row['registration']);
5142
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5143
-				else $temp_array['image_thumbnail'] = '';
5409
+				if (isset($image_array[0]['image_thumbnail'])) {
5410
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5411
+				} else {
5412
+					$temp_array['image_thumbnail'] = '';
5413
+				}
5144 5414
 			}
5145 5415
 			$temp_array['registration_count'] = $row['registration_count'];
5146 5416
 			$aircraft_array[] = $temp_array;
@@ -5247,7 +5517,9 @@  discard block
 block discarded – undo
5247 5517
 			if($row['registration'] != "")
5248 5518
 			{
5249 5519
 				$image_array = $Image->getSpotterImage($row['registration']);
5250
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5520
+				if (isset($image_array[0]['image_thumbnail'])) {
5521
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5522
+				}
5251 5523
 			}
5252 5524
 			$temp_array['registration_count'] = $row['registration_count'];
5253 5525
           
@@ -5364,7 +5636,9 @@  discard block
 block discarded – undo
5364 5636
 			if($row['registration'] != "")
5365 5637
 			{
5366 5638
 				$image_array = $Image->getSpotterImage($row['registration']);
5367
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5639
+				if (isset($image_array[0]['image_thumbnail'])) {
5640
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5641
+				}
5368 5642
 			}
5369 5643
 			$temp_array['registration_count'] = $row['registration_count'];
5370 5644
           
@@ -5476,7 +5750,9 @@  discard block
 block discarded – undo
5476 5750
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5477 5751
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5478 5752
                 $query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
5479
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5753
+		if ($limit) {
5754
+			$query .= " LIMIT 10 OFFSET 0";
5755
+		}
5480 5756
 		
5481 5757
 		$sth = $this->db->prepare($query);
5482 5758
 		$sth->execute();
@@ -5495,7 +5771,9 @@  discard block
 block discarded – undo
5495 5771
 			if($row['registration'] != "")
5496 5772
 			{
5497 5773
 				$image_array = $Image->getSpotterImage($row['registration']);
5498
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5774
+				if (isset($image_array[0]['image_thumbnail'])) {
5775
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5776
+				}
5499 5777
 			}
5500 5778
           
5501 5779
 			$aircraft_array[] = $temp_array;
@@ -5536,7 +5814,9 @@  discard block
 block discarded – undo
5536 5814
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
5537 5815
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5538 5816
                 $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";
5539
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5817
+		if ($limit) {
5818
+			$query .= " LIMIT 10 OFFSET 0";
5819
+		}
5540 5820
 		
5541 5821
 		$sth = $this->db->prepare($query);
5542 5822
 		$sth->execute();
@@ -5556,7 +5836,9 @@  discard block
 block discarded – undo
5556 5836
 			if($row['registration'] != "")
5557 5837
 			{
5558 5838
 				$image_array = $Image->getSpotterImage($row['registration']);
5559
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5839
+				if (isset($image_array[0]['image_thumbnail'])) {
5840
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
5841
+				}
5560 5842
 			}
5561 5843
           
5562 5844
 			$aircraft_array[] = $temp_array;
@@ -5597,7 +5879,9 @@  discard block
 block discarded – undo
5597 5879
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5598 5880
                 $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5599 5881
 				ORDER BY airport_departure_icao_count DESC";
5600
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5882
+		if ($limit) {
5883
+			$query .= " LIMIT 10 OFFSET 0";
5884
+		}
5601 5885
       
5602 5886
 		$sth = $this->db->prepare($query);
5603 5887
 		$sth->execute();
@@ -5649,7 +5933,9 @@  discard block
 block discarded – undo
5649 5933
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5650 5934
                 $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
5651 5935
 				ORDER BY airport_departure_icao_count DESC";
5652
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5936
+		if ($limit) {
5937
+			$query .= " LIMIT 10 OFFSET 0";
5938
+		}
5653 5939
       
5654 5940
 		$sth = $this->db->prepare($query);
5655 5941
 		$sth->execute();
@@ -5701,7 +5987,9 @@  discard block
 block discarded – undo
5701 5987
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5702 5988
                 $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5703 5989
 				ORDER BY airport_departure_icao_count DESC";
5704
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
5990
+		if ($limit) {
5991
+			$query .= " LIMIT 10 OFFSET 0";
5992
+		}
5705 5993
     		//echo $query;
5706 5994
 		$sth = $this->db->prepare($query);
5707 5995
 		$sth->execute();
@@ -5753,7 +6041,9 @@  discard block
 block discarded – undo
5753 6041
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
5754 6042
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
5755 6043
 				ORDER BY airport_departure_icao_count DESC";
5756
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
6044
+		if ($limit) {
6045
+			$query .= " LIMIT 10 OFFSET 0";
6046
+		}
5757 6047
       
5758 6048
 		$sth = $this->db->prepare($query);
5759 6049
 		$sth->execute();
@@ -6148,7 +6438,9 @@  discard block
 block discarded – undo
6148 6438
 			date_default_timezone_set($globalTimezone);
6149 6439
 			$datetime = new DateTime($date);
6150 6440
 			$offset = $datetime->format('P');
6151
-		} else $offset = '+00:00';
6441
+		} else {
6442
+			$offset = '+00:00';
6443
+		}
6152 6444
 
6153 6445
 		if ($globalDBdriver == 'mysql') {
6154 6446
 			$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 
@@ -6198,7 +6490,9 @@  discard block
 block discarded – undo
6198 6490
 			date_default_timezone_set($globalTimezone);
6199 6491
 			$datetime = new DateTime($date);
6200 6492
 			$offset = $datetime->format('P');
6201
-		} else $offset = '+00:00';
6493
+		} else {
6494
+			$offset = '+00:00';
6495
+		}
6202 6496
 
6203 6497
 		if ($globalDBdriver == 'mysql') {
6204 6498
 			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
@@ -6411,7 +6705,9 @@  discard block
 block discarded – undo
6411 6705
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6412 6706
                 $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6413 6707
 					ORDER BY airport_arrival_icao_count DESC";
6414
-		if ($limit) $query .= " LIMIT 10";
6708
+		if ($limit) {
6709
+			$query .= " LIMIT 10";
6710
+		}
6415 6711
       
6416 6712
 		
6417 6713
 		$sth = $this->db->prepare($query);
@@ -6431,7 +6727,9 @@  discard block
 block discarded – undo
6431 6727
 			if ($icaoaskey) {
6432 6728
 				$icao = $row['arrival_airport_icao'];
6433 6729
 				$airport_array[$icao] = $temp_array;
6434
-			} else $airport_array[] = $temp_array;
6730
+			} else {
6731
+				$airport_array[] = $temp_array;
6732
+			}
6435 6733
 		}
6436 6734
 
6437 6735
 		return $airport_array;
@@ -6473,7 +6771,9 @@  discard block
 block discarded – undo
6473 6771
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6474 6772
                 $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
6475 6773
 					ORDER BY airport_arrival_icao_count DESC";
6476
-		if ($limit) $query .= " LIMIT 10";
6774
+		if ($limit) {
6775
+			$query .= " LIMIT 10";
6776
+		}
6477 6777
       
6478 6778
 		
6479 6779
 		$sth = $this->db->prepare($query);
@@ -6494,7 +6794,9 @@  discard block
 block discarded – undo
6494 6794
 			if ($icaoaskey) {
6495 6795
 				$icao = $row['arrival_airport_icao'];
6496 6796
 				$airport_array[$icao] = $temp_array;
6497
-			} else $airport_array[] = $temp_array;
6797
+			} else {
6798
+				$airport_array[] = $temp_array;
6799
+			}
6498 6800
 		}
6499 6801
 
6500 6802
 		return $airport_array;
@@ -6536,7 +6838,9 @@  discard block
 block discarded – undo
6536 6838
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6537 6839
                 $query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6538 6840
 					ORDER BY airport_arrival_icao_count DESC";
6539
-		if ($limit) $query .= " LIMIT 10";
6841
+		if ($limit) {
6842
+			$query .= " LIMIT 10";
6843
+		}
6540 6844
       
6541 6845
 		
6542 6846
 		$sth = $this->db->prepare($query);
@@ -6556,7 +6860,9 @@  discard block
 block discarded – undo
6556 6860
 			if ($icaoaskey) {
6557 6861
 				$icao = $row['arrival_airport_icao'];
6558 6862
 				$airport_array[$icao] = $temp_array;
6559
-			} else $airport_array[] = $temp_array;
6863
+			} else {
6864
+				$airport_array[] = $temp_array;
6865
+			}
6560 6866
 		}
6561 6867
 
6562 6868
 		return $airport_array;
@@ -6598,7 +6904,9 @@  discard block
 block discarded – undo
6598 6904
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
6599 6905
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
6600 6906
 					ORDER BY airport_arrival_icao_count DESC";
6601
-		if ($limit) $query .= " LIMIT 10";
6907
+		if ($limit) {
6908
+			$query .= " LIMIT 10";
6909
+		}
6602 6910
       
6603 6911
 		
6604 6912
 		$sth = $this->db->prepare($query);
@@ -6619,7 +6927,9 @@  discard block
 block discarded – undo
6619 6927
 			if ($icaoaskey) {
6620 6928
 				$icao = $row['arrival_airport_icao'];
6621 6929
 				$airport_array[$icao] = $temp_array;
6622
-			} else $airport_array[] = $temp_array;
6930
+			} else {
6931
+				$airport_array[] = $temp_array;
6932
+			}
6623 6933
 		}
6624 6934
 
6625 6935
 		return $airport_array;
@@ -7000,7 +7310,9 @@  discard block
 block discarded – undo
7000 7310
 			date_default_timezone_set($globalTimezone);
7001 7311
 			$datetime = new DateTime($date);
7002 7312
 			$offset = $datetime->format('P');
7003
-		} else $offset = '+00:00';
7313
+		} else {
7314
+			$offset = '+00:00';
7315
+		}
7004 7316
 
7005 7317
 		if ($globalDBdriver == 'mysql') {
7006 7318
 			$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 
@@ -7050,7 +7362,9 @@  discard block
 block discarded – undo
7050 7362
 			date_default_timezone_set($globalTimezone);
7051 7363
 			$datetime = new DateTime($date);
7052 7364
 			$offset = $datetime->format('P');
7053
-		} else $offset = '+00:00';
7365
+		} else {
7366
+			$offset = '+00:00';
7367
+		}
7054 7368
 
7055 7369
 		if ($globalDBdriver == 'mysql') {
7056 7370
 			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
@@ -7273,7 +7587,9 @@  discard block
 block discarded – undo
7273 7587
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA'";
7274 7588
 		$query .= " GROUP BY spotter_output.arrival_airport_country
7275 7589
 					ORDER BY airport_arrival_country_count DESC";
7276
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
7590
+		if ($limit) {
7591
+			$query .= " LIMIT 10 OFFSET 0";
7592
+		}
7277 7593
       
7278 7594
 		
7279 7595
 		$sth = $this->db->prepare($query);
@@ -7560,7 +7876,9 @@  discard block
 block discarded – undo
7560 7876
 			date_default_timezone_set($globalTimezone);
7561 7877
 			$datetime = new DateTime($date);
7562 7878
 			$offset = $datetime->format('P');
7563
-		} else $offset = '+00:00';
7879
+		} else {
7880
+			$offset = '+00:00';
7881
+		}
7564 7882
 		
7565 7883
 		if ($globalDBdriver == 'mysql') {
7566 7884
 			$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
@@ -7736,15 +8054,23 @@  discard block
 block discarded – undo
7736 8054
 		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
7737 8055
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7738 8056
 		 if ($olderthanmonths > 0) {
7739
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
7740
-			else $query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
8057
+			if ($globalDBdriver == 'mysql') {
8058
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
8059
+			} else {
8060
+				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
8061
+			}
7741 8062
 		}
7742 8063
 		if ($sincedate != '') {
7743
-			if ($globalDBdriver == 'mysql') $query .= " AND spotter_output.date > '".$sincedate."'";
7744
-			else $query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
8064
+			if ($globalDBdriver == 'mysql') {
8065
+				$query .= " AND spotter_output.date > '".$sincedate."'";
8066
+			} else {
8067
+				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
8068
+			}
7745 8069
 		}
7746 8070
 		$query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
7747
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
8071
+		if ($limit) {
8072
+			$query .= " LIMIT 10 OFFSET 0";
8073
+		}
7748 8074
       		
7749 8075
 		$sth = $this->db->prepare($query);
7750 8076
 		$sth->execute();
@@ -7778,15 +8104,23 @@  discard block
 block discarded – undo
7778 8104
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
7779 8105
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7780 8106
 		 if ($olderthanmonths > 0) {
7781
-			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
7782
-			else $query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
8107
+			if ($globalDBdriver == 'mysql') {
8108
+				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
8109
+			} else {
8110
+				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
8111
+			}
7783 8112
 		}
7784 8113
 		if ($sincedate != '') {
7785
-			if ($globalDBdriver == 'mysql') $query .= "AND spotter_output.date > '".$sincedate."' ";
7786
-			else $query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
8114
+			if ($globalDBdriver == 'mysql') {
8115
+				$query .= "AND spotter_output.date > '".$sincedate."' ";
8116
+			} else {
8117
+				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
8118
+			}
7787 8119
 		}
7788 8120
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
7789
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
8121
+		if ($limit) {
8122
+			$query .= " LIMIT 10 OFFSET 0";
8123
+		}
7790 8124
       		
7791 8125
 		$sth = $this->db->prepare($query);
7792 8126
 		$sth->execute();
@@ -7823,7 +8157,9 @@  discard block
 block discarded – undo
7823 8157
 			date_default_timezone_set($globalTimezone);
7824 8158
 			$datetime = new DateTime();
7825 8159
 			$offset = $datetime->format('P');
7826
-		} else $offset = '+00:00';
8160
+		} else {
8161
+			$offset = '+00:00';
8162
+		}
7827 8163
 
7828 8164
 		if ($globalDBdriver == 'mysql') {
7829 8165
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7872,7 +8208,9 @@  discard block
 block discarded – undo
7872 8208
 			date_default_timezone_set($globalTimezone);
7873 8209
 			$datetime = new DateTime();
7874 8210
 			$offset = $datetime->format('P');
7875
-		} else $offset = '+00:00';
8211
+		} else {
8212
+			$offset = '+00:00';
8213
+		}
7876 8214
 		$filter_query = $this->getFilter($filters,true,true);
7877 8215
 		if ($globalDBdriver == 'mysql') {
7878 8216
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7921,7 +8259,9 @@  discard block
 block discarded – undo
7921 8259
 			date_default_timezone_set($globalTimezone);
7922 8260
 			$datetime = new DateTime();
7923 8261
 			$offset = $datetime->format('P');
7924
-		} else $offset = '+00:00';
8262
+		} else {
8263
+			$offset = '+00:00';
8264
+		}
7925 8265
 		$filter_query = $this->getFilter($filters,true,true);
7926 8266
 		if ($globalDBdriver == 'mysql') {
7927 8267
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -7967,7 +8307,9 @@  discard block
 block discarded – undo
7967 8307
 			date_default_timezone_set($globalTimezone);
7968 8308
 			$datetime = new DateTime();
7969 8309
 			$offset = $datetime->format('P');
7970
-		} else $offset = '+00:00';
8310
+		} else {
8311
+			$offset = '+00:00';
8312
+		}
7971 8313
 		$filter_query = $this->getFilter($filters,true,true);
7972 8314
 		if ($globalDBdriver == 'mysql') {
7973 8315
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -8015,7 +8357,9 @@  discard block
 block discarded – undo
8015 8357
 			date_default_timezone_set($globalTimezone);
8016 8358
 			$datetime = new DateTime();
8017 8359
 			$offset = $datetime->format('P');
8018
-		} else $offset = '+00:00';
8360
+		} else {
8361
+			$offset = '+00:00';
8362
+		}
8019 8363
 		
8020 8364
 		if ($globalDBdriver == 'mysql') {
8021 8365
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -8063,7 +8407,9 @@  discard block
 block discarded – undo
8063 8407
 			date_default_timezone_set($globalTimezone);
8064 8408
 			$datetime = new DateTime();
8065 8409
 			$offset = $datetime->format('P');
8066
-		} else $offset = '+00:00';
8410
+		} else {
8411
+			$offset = '+00:00';
8412
+		}
8067 8413
 
8068 8414
 		if ($globalDBdriver == 'mysql') {
8069 8415
 			$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
@@ -8110,7 +8456,9 @@  discard block
 block discarded – undo
8110 8456
 			date_default_timezone_set($globalTimezone);
8111 8457
 			$datetime = new DateTime();
8112 8458
 			$offset = $datetime->format('P');
8113
-		} else $offset = '+00:00';
8459
+		} else {
8460
+			$offset = '+00:00';
8461
+		}
8114 8462
 
8115 8463
 		if ($globalDBdriver == 'mysql') {
8116 8464
 			$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
@@ -8158,7 +8506,9 @@  discard block
 block discarded – undo
8158 8506
 			date_default_timezone_set($globalTimezone);
8159 8507
 			$datetime = new DateTime();
8160 8508
 			$offset = $datetime->format('P');
8161
-		} else $offset = '+00:00';
8509
+		} else {
8510
+			$offset = '+00:00';
8511
+		}
8162 8512
 		$filter_query = $this->getFilter($filters,true,true);
8163 8513
 		if ($globalDBdriver == 'mysql') {
8164 8514
 			$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
@@ -8203,7 +8553,9 @@  discard block
 block discarded – undo
8203 8553
 			date_default_timezone_set($globalTimezone);
8204 8554
 			$datetime = new DateTime();
8205 8555
 			$offset = $datetime->format('P');
8206
-		} else $offset = '+00:00';
8556
+		} else {
8557
+			$offset = '+00:00';
8558
+		}
8207 8559
 		$filter_query = $this->getFilter($filters,true,true);
8208 8560
 
8209 8561
 		if ($globalDBdriver == 'mysql') {
@@ -8250,7 +8602,9 @@  discard block
 block discarded – undo
8250 8602
 			date_default_timezone_set($globalTimezone);
8251 8603
 			$datetime = new DateTime();
8252 8604
 			$offset = $datetime->format('P');
8253
-		} else $offset = '+00:00';
8605
+		} else {
8606
+			$offset = '+00:00';
8607
+		}
8254 8608
 
8255 8609
 		if ($globalDBdriver == 'mysql') {
8256 8610
 			$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
@@ -8296,7 +8650,9 @@  discard block
 block discarded – undo
8296 8650
 			date_default_timezone_set($globalTimezone);
8297 8651
 			$datetime = new DateTime();
8298 8652
 			$offset = $datetime->format('P');
8299
-		} else $offset = '+00:00';
8653
+		} else {
8654
+			$offset = '+00:00';
8655
+		}
8300 8656
 		$filter_query = $this->getFilter($filters,true,true);
8301 8657
 
8302 8658
 		if ($globalDBdriver == 'mysql') {
@@ -8343,7 +8699,9 @@  discard block
 block discarded – undo
8343 8699
 			date_default_timezone_set($globalTimezone);
8344 8700
 			$datetime = new DateTime();
8345 8701
 			$offset = $datetime->format('P');
8346
-		} else $offset = '+00:00';
8702
+		} else {
8703
+			$offset = '+00:00';
8704
+		}
8347 8705
 
8348 8706
 		if ($globalDBdriver == 'mysql') {
8349 8707
 			$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
@@ -8390,7 +8748,9 @@  discard block
 block discarded – undo
8390 8748
 			date_default_timezone_set($globalTimezone);
8391 8749
 			$datetime = new DateTime();
8392 8750
 			$offset = $datetime->format('P');
8393
-		} else $offset = '+00:00';
8751
+		} else {
8752
+			$offset = '+00:00';
8753
+		}
8394 8754
 
8395 8755
 		if ($globalDBdriver == 'mysql') {
8396 8756
 			$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
@@ -8435,7 +8795,9 @@  discard block
 block discarded – undo
8435 8795
 			date_default_timezone_set($globalTimezone);
8436 8796
 			$datetime = new DateTime();
8437 8797
 			$offset = $datetime->format('P');
8438
-		} else $offset = '+00:00';
8798
+		} else {
8799
+			$offset = '+00:00';
8800
+		}
8439 8801
 		$filter_query = $this->getFilter($filters,true,true);
8440 8802
 
8441 8803
 		if ($globalDBdriver == 'mysql') {
@@ -8483,7 +8845,9 @@  discard block
 block discarded – undo
8483 8845
 			date_default_timezone_set($globalTimezone);
8484 8846
 			$datetime = new DateTime();
8485 8847
 			$offset = $datetime->format('P');
8486
-		} else $offset = '+00:00';
8848
+		} else {
8849
+			$offset = '+00:00';
8850
+		}
8487 8851
 
8488 8852
 		if ($globalDBdriver == 'mysql') {
8489 8853
 			$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
@@ -8529,7 +8893,9 @@  discard block
 block discarded – undo
8529 8893
 			date_default_timezone_set($globalTimezone);
8530 8894
 			$datetime = new DateTime();
8531 8895
 			$offset = $datetime->format('P');
8532
-		} else $offset = '+00:00';
8896
+		} else {
8897
+			$offset = '+00:00';
8898
+		}
8533 8899
 		$filter_query = $this->getFilter($filters,true,true);
8534 8900
 
8535 8901
 		if ($globalDBdriver == 'mysql') {
@@ -8577,7 +8943,9 @@  discard block
 block discarded – undo
8577 8943
 			date_default_timezone_set($globalTimezone);
8578 8944
 			$datetime = new DateTime();
8579 8945
 			$offset = $datetime->format('P');
8580
-		} else $offset = '+00:00';
8946
+		} else {
8947
+			$offset = '+00:00';
8948
+		}
8581 8949
 
8582 8950
 		if ($globalDBdriver == 'mysql') {
8583 8951
 			$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
@@ -8624,7 +8992,9 @@  discard block
 block discarded – undo
8624 8992
 			date_default_timezone_set($globalTimezone);
8625 8993
 			$datetime = new DateTime();
8626 8994
 			$offset = $datetime->format('P');
8627
-		} else $offset = '+00:00';
8995
+		} else {
8996
+			$offset = '+00:00';
8997
+		}
8628 8998
 		$filter_query = $this->getFilter($filters,true,true);
8629 8999
 		if ($globalDBdriver == 'mysql') {
8630 9000
 			$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
@@ -8673,7 +9043,9 @@  discard block
 block discarded – undo
8673 9043
 			date_default_timezone_set($globalTimezone);
8674 9044
 			$datetime = new DateTime();
8675 9045
 			$offset = $datetime->format('P');
8676
-		} else $offset = '+00:00';
9046
+		} else {
9047
+			$offset = '+00:00';
9048
+		}
8677 9049
 
8678 9050
 		$orderby_sql = '';
8679 9051
 		if ($orderby == "hour")
@@ -8739,7 +9111,9 @@  discard block
 block discarded – undo
8739 9111
 			date_default_timezone_set($globalTimezone);
8740 9112
 			$datetime = new DateTime();
8741 9113
 			$offset = $datetime->format('P');
8742
-		} else $offset = '+00:00';
9114
+		} else {
9115
+			$offset = '+00:00';
9116
+		}
8743 9117
 
8744 9118
 		$orderby_sql = '';
8745 9119
 		if ($orderby == "hour")
@@ -8806,7 +9180,9 @@  discard block
 block discarded – undo
8806 9180
 			date_default_timezone_set($globalTimezone);
8807 9181
 			$datetime = new DateTime();
8808 9182
 			$offset = $datetime->format('P');
8809
-		} else $offset = '+00:00';
9183
+		} else {
9184
+			$offset = '+00:00';
9185
+		}
8810 9186
 
8811 9187
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8812 9188
 
@@ -8857,7 +9233,9 @@  discard block
 block discarded – undo
8857 9233
 			date_default_timezone_set($globalTimezone);
8858 9234
 			$datetime = new DateTime();
8859 9235
 			$offset = $datetime->format('P');
8860
-		} else $offset = '+00:00';
9236
+		} else {
9237
+			$offset = '+00:00';
9238
+		}
8861 9239
 
8862 9240
 		if ($globalDBdriver == 'mysql') {
8863 9241
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8904,7 +9282,9 @@  discard block
 block discarded – undo
8904 9282
 			date_default_timezone_set($globalTimezone);
8905 9283
 			$datetime = new DateTime();
8906 9284
 			$offset = $datetime->format('P');
8907
-		} else $offset = '+00:00';
9285
+		} else {
9286
+			$offset = '+00:00';
9287
+		}
8908 9288
 
8909 9289
 		if ($globalDBdriver == 'mysql') {
8910 9290
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8951,7 +9331,9 @@  discard block
 block discarded – undo
8951 9331
 			date_default_timezone_set($globalTimezone);
8952 9332
 			$datetime = new DateTime();
8953 9333
 			$offset = $datetime->format('P');
8954
-		} else $offset = '+00:00';
9334
+		} else {
9335
+			$offset = '+00:00';
9336
+		}
8955 9337
 
8956 9338
 		if ($globalDBdriver == 'mysql') {
8957 9339
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -8999,7 +9381,9 @@  discard block
 block discarded – undo
8999 9381
 			date_default_timezone_set($globalTimezone);
9000 9382
 			$datetime = new DateTime();
9001 9383
 			$offset = $datetime->format('P');
9002
-		} else $offset = '+00:00';
9384
+		} else {
9385
+			$offset = '+00:00';
9386
+		}
9003 9387
 
9004 9388
 		if ($globalDBdriver == 'mysql') {
9005 9389
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9047,7 +9431,9 @@  discard block
 block discarded – undo
9047 9431
 			date_default_timezone_set($globalTimezone);
9048 9432
 			$datetime = new DateTime($date);
9049 9433
 			$offset = $datetime->format('P');
9050
-		} else $offset = '+00:00';
9434
+		} else {
9435
+			$offset = '+00:00';
9436
+		}
9051 9437
 
9052 9438
 		if ($globalDBdriver == 'mysql') {
9053 9439
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9095,7 +9481,9 @@  discard block
 block discarded – undo
9095 9481
 			date_default_timezone_set($globalTimezone);
9096 9482
 			$datetime = new DateTime();
9097 9483
 			$offset = $datetime->format('P');
9098
-		} else $offset = '+00:00';
9484
+		} else {
9485
+			$offset = '+00:00';
9486
+		}
9099 9487
 
9100 9488
 		if ($globalDBdriver == 'mysql') {
9101 9489
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9145,7 +9533,9 @@  discard block
 block discarded – undo
9145 9533
 			date_default_timezone_set($globalTimezone);
9146 9534
 			$datetime = new DateTime();
9147 9535
 			$offset = $datetime->format('P');
9148
-		} else $offset = '+00:00';
9536
+		} else {
9537
+			$offset = '+00:00';
9538
+		}
9149 9539
 
9150 9540
 		if ($globalDBdriver == 'mysql') {
9151 9541
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9192,7 +9582,9 @@  discard block
 block discarded – undo
9192 9582
 			date_default_timezone_set($globalTimezone);
9193 9583
 			$datetime = new DateTime();
9194 9584
 			$offset = $datetime->format('P');
9195
-		} else $offset = '+00:00';
9585
+		} else {
9586
+			$offset = '+00:00';
9587
+		}
9196 9588
 
9197 9589
 		if ($globalDBdriver == 'mysql') {
9198 9590
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9360,7 +9752,9 @@  discard block
 block discarded – undo
9360 9752
 			date_default_timezone_set($globalTimezone);
9361 9753
 			$datetime = new DateTime();
9362 9754
 			$offset = $datetime->format('P');
9363
-		} else $offset = '+00:00';
9755
+		} else {
9756
+			$offset = '+00:00';
9757
+		}
9364 9758
 
9365 9759
 		if ($globalDBdriver == 'mysql') {
9366 9760
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -9546,7 +9940,9 @@  discard block
 block discarded – undo
9546 9940
 	*/
9547 9941
 	public function parseDirection($direction = 0)
9548 9942
 	{
9549
-		if ($direction == '') $direction = 0;
9943
+		if ($direction == '') {
9944
+			$direction = 0;
9945
+		}
9550 9946
 		$direction_array = array();
9551 9947
 		$temp_array = array();
9552 9948
 
@@ -9647,7 +10043,9 @@  discard block
 block discarded – undo
9647 10043
 		if (isset($result->AirlineFlightInfoResult))
9648 10044
 		{
9649 10045
 			$registration = $result->AirlineFlightInfoResult->tailnumber;
9650
-		} else return '';
10046
+		} else {
10047
+			return '';
10048
+		}
9651 10049
 		
9652 10050
 		$registration = $this->convertAircraftRegistration($registration);
9653 10051
 		
@@ -9676,7 +10074,9 @@  discard block
 block discarded – undo
9676 10074
 		if (count($row) > 0) {
9677 10075
 		    //return $row['Registration'];
9678 10076
 		    return $row['registration'];
9679
-		} else return '';
10077
+		} else {
10078
+			return '';
10079
+		}
9680 10080
 	
9681 10081
 	}
9682 10082
 
@@ -9699,9 +10099,14 @@  discard block
 block discarded – undo
9699 10099
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
9700 10100
 		$sth->closeCursor();
9701 10101
 		if (count($row) > 0) {
9702
-		    if ($row['type_flight'] == null) return '';
9703
-		    else return $row['type_flight'];
9704
-		} else return '';
10102
+		    if ($row['type_flight'] == null) {
10103
+		    	return '';
10104
+		    } else {
10105
+		    	return $row['type_flight'];
10106
+		    }
10107
+		} else {
10108
+			return '';
10109
+		}
9705 10110
 	
9706 10111
 	}
9707 10112
 
@@ -9719,7 +10124,9 @@  discard block
 block discarded – undo
9719 10124
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9720 10125
 	
9721 10126
 		$Connection = new Connection($this->db);
9722
-		if (!$Connection->tableExists('countries')) return '';
10127
+		if (!$Connection->tableExists('countries')) {
10128
+			return '';
10129
+		}
9723 10130
 	
9724 10131
 		try {
9725 10132
 			/*
@@ -9739,9 +10146,13 @@  discard block
 block discarded – undo
9739 10146
 			$sth->closeCursor();
9740 10147
 			if (count($row) > 0) {
9741 10148
 				return $row;
9742
-			} else return '';
10149
+			} else {
10150
+				return '';
10151
+			}
9743 10152
 		} catch (PDOException $e) {
9744
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
10153
+			if (isset($globalDebug) && $globalDebug) {
10154
+				echo 'Error : '.$e->getMessage()."\n";
10155
+			}
9745 10156
 			return '';
9746 10157
 		}
9747 10158
 	
@@ -9759,7 +10170,9 @@  discard block
 block discarded – undo
9759 10170
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
9760 10171
 	
9761 10172
 		$Connection = new Connection($this->db);
9762
-		if (!$Connection->tableExists('countries')) return '';
10173
+		if (!$Connection->tableExists('countries')) {
10174
+			return '';
10175
+		}
9763 10176
 	
9764 10177
 		try {
9765 10178
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -9771,9 +10184,13 @@  discard block
 block discarded – undo
9771 10184
 			$sth->closeCursor();
9772 10185
 			if (count($row) > 0) {
9773 10186
 				return $row;
9774
-			} else return '';
10187
+			} else {
10188
+				return '';
10189
+			}
9775 10190
 		} catch (PDOException $e) {
9776
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
10191
+			if (isset($globalDebug) && $globalDebug) {
10192
+				echo 'Error : '.$e->getMessage()."\n";
10193
+			}
9777 10194
 			return '';
9778 10195
 		}
9779 10196
 	
@@ -9943,7 +10360,9 @@  discard block
 block discarded – undo
9943 10360
 	{
9944 10361
 		global $globalBitlyAccessToken;
9945 10362
 		
9946
-		if ($globalBitlyAccessToken == '') return $url;
10363
+		if ($globalBitlyAccessToken == '') {
10364
+			return $url;
10365
+		}
9947 10366
         
9948 10367
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
9949 10368
 		
@@ -10092,7 +10511,9 @@  discard block
 block discarded – undo
10092 10511
 		
10093 10512
 
10094 10513
 		// routes
10095
-		if ($globalDebug) print "Routes...\n";
10514
+		if ($globalDebug) {
10515
+			print "Routes...\n";
10516
+		}
10096 10517
 		if ($globalDBdriver == 'mysql') {
10097 10518
 			$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)";
10098 10519
 		} else {
@@ -10111,7 +10532,9 @@  discard block
 block discarded – undo
10111 10532
 			}
10112 10533
 		}
10113 10534
 		
10114
-		if ($globalDebug) print "Airlines...\n";
10535
+		if ($globalDebug) {
10536
+			print "Airlines...\n";
10537
+		}
10115 10538
 		//airlines
10116 10539
 		if ($globalDBdriver == 'mysql') {
10117 10540
 			$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)";
@@ -10125,10 +10548,15 @@  discard block
 block discarded – undo
10125 10548
 			if (is_numeric(substr($row['ident'], -1, 1)))
10126 10549
 			{
10127 10550
 				$fromsource = NULL;
10128
-				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
10129
-				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
10130
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
10131
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
10551
+				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
10552
+					$fromsource = 'vatsim';
10553
+				} elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') {
10554
+					$fromsource = 'ivao';
10555
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
10556
+					$fromsource = 'vatsim';
10557
+				} elseif (isset($globalIVAO) && $globalIVAO) {
10558
+					$fromsource = 'ivao';
10559
+				}
10132 10560
 				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
10133 10561
 				if (isset($airline_array[0]['name'])) {
10134 10562
 					$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";
@@ -10138,13 +10566,17 @@  discard block
 block discarded – undo
10138 10566
 			}
10139 10567
 		}
10140 10568
 
10141
-		if ($globalDebug) print "Remove Duplicate in aircraft_modes...\n";
10569
+		if ($globalDebug) {
10570
+			print "Remove Duplicate in aircraft_modes...\n";
10571
+		}
10142 10572
 		//duplicate modes
10143 10573
 		$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";
10144 10574
 		$sth = $this->db->prepare($query);
10145 10575
 		$sth->execute();
10146 10576
 		
10147
-		if ($globalDebug) print "Aircraft...\n";
10577
+		if ($globalDebug) {
10578
+			print "Aircraft...\n";
10579
+		}
10148 10580
 		//aircraft
10149 10581
 		if ($globalDBdriver == 'mysql') {
10150 10582
 			$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)";
@@ -10187,26 +10619,38 @@  discard block
 block discarded – undo
10187 10619
 				 if (isset($closestAirports[0])) {
10188 10620
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
10189 10621
 						$airport_icao = $closestAirports[0]['icao'];
10190
-						if ($globalDebug) echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10622
+						if ($globalDebug) {
10623
+							echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10624
+						}
10191 10625
 					} elseif (count($closestAirports > 1) && $row['arrival_airport_icao'] != '' && $row['arrival_airport_icao'] != 'NA') {
10192 10626
 						foreach ($closestAirports as $airport) {
10193 10627
 							if ($row['arrival_airport_icao'] == $airport['icao']) {
10194 10628
 								$airport_icao = $airport['icao'];
10195
-								if ($globalDebug) echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10629
+								if ($globalDebug) {
10630
+									echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
10631
+								}
10196 10632
 								break;
10197 10633
 							}
10198 10634
 						}
10199 10635
 					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10200 10636
 						$airport_icao = $closestAirports[0]['icao'];
10201
-						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";
10637
+						if ($globalDebug) {
10638
+							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";
10639
+						}
10202 10640
 					} else {
10203
-						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";
10641
+						if ($globalDebug) {
10642
+							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";
10643
+						}
10204 10644
 					}
10205 10645
 				} else {
10206
-					if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
10646
+					if ($globalDebug) {
10647
+						echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
10648
+					}
10207 10649
 				}
10208 10650
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10209
-					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10651
+					if ($globalDebug) {
10652
+						echo "Updating airport to ".$airport_icao."...\n";
10653
+					}
10210 10654
 					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10211 10655
 					$sthu = $this->db->prepare($update_query);
10212 10656
 					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
Please login to merge, or discard this patch.
require/class.Accident.php 3 patches
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -23,10 +23,10 @@  discard block
 block discarded – undo
23 23
 	}
24 24
 	
25 25
 	/**
26
-	* Get Latest ACARS data from DB
27
-	*
28
-	* @return Array Return ACARS data in array
29
-	*/
26
+	 * Get Latest ACARS data from DB
27
+	 *
28
+	 * @return Array Return ACARS data in array
29
+	 */
30 30
 	public function getLatestAccidentData($limit = '',$type = '') {
31 31
 	global $globalURL, $globalDBdriver;
32 32
 	$Image = new Image($this->db);
@@ -37,36 +37,36 @@  discard block
 block discarded – undo
37 37
 	$limit_query = '';
38 38
 	if ($limit != "")
39 39
 	{
40
-	    $limit_array = explode(",", $limit);
40
+		$limit_array = explode(",", $limit);
41 41
 
42
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
43
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
42
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
43
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
44 44
 
45
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
46
-	    {
45
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
46
+		{
47 47
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
48
-	    }
48
+		}
49 49
 	}
50 50
 
51 51
 	if ($type != '') {
52
-	    $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY date DESC".$limit_query;
53
-	    $query_values = array(':type' => $type);
52
+		$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type GROUP BY registration) ORDER BY date DESC".$limit_query;
53
+		$query_values = array(':type' => $type);
54 54
 	} else {
55
-	    //$query = "SELECT * FROM accidents GROUP BY registration ORDER BY date DESC".$limit_query;
56
-	    $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents GROUP BY registration) ORDER BY date DESC".$limit_query;
57
-	    $query_values = array();
55
+		//$query = "SELECT * FROM accidents GROUP BY registration ORDER BY date DESC".$limit_query;
56
+		$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents GROUP BY registration) ORDER BY date DESC".$limit_query;
57
+		$query_values = array();
58 58
 	}
59 59
 	try {
60 60
 
61
-	    $sth = $this->db->prepare($query);
62
-	    $sth->execute($query_values);
61
+		$sth = $this->db->prepare($query);
62
+		$sth->execute($query_values);
63 63
 	} catch(PDOException $e) {
64
-	    return "error : ".$e->getMessage();
64
+		return "error : ".$e->getMessage();
65 65
 	}
66 66
 	$i = 0;
67 67
 	while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
68
-	    $data = array();
69
-	    if ($row['registration'] != '') {
68
+		$data = array();
69
+		if ($row['registration'] != '') {
70 70
 //		$row['registration'] = str_replace('.','',$row['registration']);
71 71
 		$image_array = $Image->getSpotterImage($row['registration']);
72 72
 		if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
@@ -89,33 +89,33 @@  discard block
 block discarded – undo
89 89
 			$data['aircraft_base'] = $owner_data['base'];
90 90
 			$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
91 91
 		}
92
-	    } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
93
-	    if ($row['registration'] == '') $row['registration'] = 'NA';
94
-	    if ($row['ident'] == '') $row['ident'] = 'NA';
95
-	    $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
96
-	    if (isset($identicao[0])) {
92
+		} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
93
+		if ($row['registration'] == '') $row['registration'] = 'NA';
94
+		if ($row['ident'] == '') $row['ident'] = 'NA';
95
+		$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
96
+		if (isset($identicao[0])) {
97 97
 		if (substr($row['ident'],0,2) == 'AF') {
98
-		    if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
99
-		    else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
98
+			if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
99
+			else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
100 100
 		} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
101 101
 
102 102
 		$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
103
-	    } else $icao = $row['ident'];
104
-	    $icao = $Translation->checkTranslation($icao,false);
105
-	    //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
106
-	    $data = array_merge($row,$data);
107
-	    if ($data['ident'] == null) $data['ident'] = $icao;
108
-	    if ($data['title'] == null) {
103
+		} else $icao = $row['ident'];
104
+		$icao = $Translation->checkTranslation($icao,false);
105
+		//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
106
+		$data = array_merge($row,$data);
107
+		if ($data['ident'] == null) $data['ident'] = $icao;
108
+		if ($data['title'] == null) {
109 109
 		$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
110
-	    } else $data['message'] = strtolower($data['title']);
111
-	    $result[] = $data;
112
-	    $i++;
110
+		} else $data['message'] = strtolower($data['title']);
111
+		$result[] = $data;
112
+		$i++;
113 113
 	}
114 114
 	if (isset($result)) {
115
-	    $result[0]['query_number_rows'] = $i;
116
-	    return $result;
115
+		$result[0]['query_number_rows'] = $i;
116
+		return $result;
117 117
 	}
118 118
 	else return array();
119
-    }
119
+	}
120 120
 }
121 121
 ?>
122 122
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	*
28 28
 	* @return Array Return ACARS data in array
29 29
 	*/
30
-	public function getLatestAccidentData($limit = '',$type = '') {
30
+	public function getLatestAccidentData($limit = '', $type = '') {
31 31
 	global $globalURL, $globalDBdriver;
32 32
 	$Image = new Image($this->db);
33 33
 	$Spotter = new Spotter($this->db);
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	{
40 40
 	    $limit_array = explode(",", $limit);
41 41
 
42
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
43
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
42
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
43
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
44 44
 
45 45
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
46 46
 	    {
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 	    $sth = $this->db->prepare($query);
62 62
 	    $sth->execute($query_values);
63
-	} catch(PDOException $e) {
63
+	} catch (PDOException $e) {
64 64
 	    return "error : ".$e->getMessage();
65 65
 	}
66 66
 	$i = 0;
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 	    if ($row['registration'] != '') {
70 70
 //		$row['registration'] = str_replace('.','',$row['registration']);
71 71
 		$image_array = $Image->getSpotterImage($row['registration']);
72
-		if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
73
-		else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
72
+		if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
73
+		else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
74 74
 		$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
75 75
 		$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
76 76
 		//echo $row['registration'];
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 			$data['aircraft_name'] = $aircraft_info[0]['type'];
82 82
 			$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
83 83
 		} else {
84
-			$data = array_merge($data,array('aircraft_type' => 'NA'));
84
+			$data = array_merge($data, array('aircraft_type' => 'NA'));
85 85
 		}
86 86
 		$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
87 87
 		if (!empty($owner_data)) {
@@ -89,21 +89,21 @@  discard block
 block discarded – undo
89 89
 			$data['aircraft_base'] = $owner_data['base'];
90 90
 			$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
91 91
 		}
92
-	    } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
92
+	    } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
93 93
 	    if ($row['registration'] == '') $row['registration'] = 'NA';
94 94
 	    if ($row['ident'] == '') $row['ident'] = 'NA';
95
-	    $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
95
+	    $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
96 96
 	    if (isset($identicao[0])) {
97
-		if (substr($row['ident'],0,2) == 'AF') {
98
-		    if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
99
-		    else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
100
-		} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
97
+		if (substr($row['ident'], 0, 2) == 'AF') {
98
+		    if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
99
+		    else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
100
+		} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
101 101
 
102
-		$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
102
+		$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
103 103
 	    } else $icao = $row['ident'];
104
-	    $icao = $Translation->checkTranslation($icao,false);
104
+	    $icao = $Translation->checkTranslation($icao, false);
105 105
 	    //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
106
-	    $data = array_merge($row,$data);
106
+	    $data = array_merge($row, $data);
107 107
 	    if ($data['ident'] == null) $data['ident'] = $icao;
108 108
 	    if ($data['title'] == null) {
109 109
 		$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
Please login to merge, or discard this patch.
Braces   +33 added lines, -12 removed lines patch added patch discarded remove patch
@@ -69,8 +69,11 @@  discard block
 block discarded – undo
69 69
 	    if ($row['registration'] != '') {
70 70
 //		$row['registration'] = str_replace('.','',$row['registration']);
71 71
 		$image_array = $Image->getSpotterImage($row['registration']);
72
-		if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
73
-		else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
72
+		if (count($image_array) > 0) {
73
+			$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
74
+		} else {
75
+			$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
76
+		}
74 77
 		$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
75 78
 		$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
76 79
 		//echo $row['registration'];
@@ -89,33 +92,51 @@  discard block
 block discarded – undo
89 92
 			$data['aircraft_base'] = $owner_data['base'];
90 93
 			$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
91 94
 		}
92
-	    } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
93
-	    if ($row['registration'] == '') $row['registration'] = 'NA';
94
-	    if ($row['ident'] == '') $row['ident'] = 'NA';
95
+	    } else {
96
+	    	$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
97
+	    }
98
+	    if ($row['registration'] == '') {
99
+	    	$row['registration'] = 'NA';
100
+	    }
101
+	    if ($row['ident'] == '') {
102
+	    	$row['ident'] = 'NA';
103
+	    }
95 104
 	    $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
96 105
 	    if (isset($identicao[0])) {
97 106
 		if (substr($row['ident'],0,2) == 'AF') {
98
-		    if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
99
-		    else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
100
-		} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
107
+		    if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
108
+		    	$icao = $row['ident'];
109
+		    } else {
110
+		    	$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
111
+		    }
112
+		} else {
113
+			$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
114
+		}
101 115
 
102 116
 		$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
103
-	    } else $icao = $row['ident'];
117
+	    } else {
118
+	    	$icao = $row['ident'];
119
+	    }
104 120
 	    $icao = $Translation->checkTranslation($icao,false);
105 121
 	    //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
106 122
 	    $data = array_merge($row,$data);
107
-	    if ($data['ident'] == null) $data['ident'] = $icao;
123
+	    if ($data['ident'] == null) {
124
+	    	$data['ident'] = $icao;
125
+	    }
108 126
 	    if ($data['title'] == null) {
109 127
 		$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
110
-	    } else $data['message'] = strtolower($data['title']);
128
+	    } else {
129
+	    	$data['message'] = strtolower($data['title']);
130
+	    }
111 131
 	    $result[] = $data;
112 132
 	    $i++;
113 133
 	}
114 134
 	if (isset($result)) {
115 135
 	    $result[0]['query_number_rows'] = $i;
116 136
 	    return $result;
137
+	} else {
138
+		return array();
117 139
 	}
118
-	else return array();
119 140
     }
120 141
 }
121 142
 ?>
122 143
\ No newline at end of file
Please login to merge, or discard this patch.
accident-latest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 $page_url = $globalURL.'/accident-latest';
10 10
 
11
-if(!isset($_GET['limit']))
11
+if (!isset($_GET['limit']))
12 12
 {
13 13
 	$limit_start = 0;
14 14
 	$limit_end = 25;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 print '<div class="table column">';
36 36
 print '<p>'._("The table below shows the latest Accidents.").'</p>';
37
-$spotter_array = $Accident->getLatestAccidentData($limit_start.",".$absolute_difference,'accident');
37
+$spotter_array = $Accident->getLatestAccidentData($limit_start.",".$absolute_difference, 'accident');
38 38
 //print_r($spotter_array);
39 39
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
40 40
 	include('table-output.php');
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,12 @@
 block discarded – undo
38 38
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
39 39
 	include('table-output.php');
40 40
 	print '<div class="pagination">';
41
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
42
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
41
+	if ($limit_previous_1 >= 0) {
42
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
43
+	}
44
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
45
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
46
+	}
43 47
 	print '</div>';
44 48
 }
45 49
 print '</div>';
Please login to merge, or discard this patch.
table-output.php 3 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -388,17 +388,17 @@  discard block
 block discarded – undo
388 388
 				else {
389 389
 					$planespotter_url_array = explode("_", $spotter_item['image']);
390 390
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
391
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
391
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
392 392
 				}
393 393
 				if (isset($spotter_item['airline_name'])) {
394 394
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
395 395
 				} else {
396 396
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
397 397
 				}
398
-                        } else {
399
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
400
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
401
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
398
+						} else {
399
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
400
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
401
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
402 402
 				if (isset($spotter_item['airline_name'])) {
403 403
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
404 404
 				} else {
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 		}
414 414
 	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest"){
415 415
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
416
-		    $spotter_item['squawk'] = '-';
416
+			$spotter_item['squawk'] = '-';
417 417
 		}
418 418
 		if ($spotter_item['image_thumbnail'] != "")
419 419
 		{
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 				else {
425 425
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
426 426
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
427
-                                        $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
427
+										$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
428 428
 				}
429 429
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
430 430
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -436,9 +436,9 @@  discard block
 block discarded – undo
436 436
 					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
437 437
 				}
438 438
 			} else {
439
-                    		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
440
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
441
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
439
+							if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
440
+							$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
441
+							} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
442 442
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
443 443
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
444 444
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
 			print '</td>'."\n";
453 453
 		} else {
454 454
 			print '<td class="aircraft_thumbnail">'."\n";
455
-       //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
455
+	   //   	 	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
456 456
 	//}
457 457
 			if (!isset($spotter_item['airline_name']) && !isset($spotter_item['aircraft_name'])) {
458 458
 				print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '._("Not available").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n";
@@ -557,13 +557,13 @@  discard block
 block discarded – undo
557 557
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
558 558
 			} else $distance = '';
559 559
 			if ($distance != '') {
560
-			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
561
-				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
562
-			    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
563
-				    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
564
-			    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
565
-				    echo '<br/><i>'.$distance.' km</i>';
566
-			    }
560
+				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
561
+					echo '<br/><i>'.round($distance*0.539957).' nm</i>';
562
+				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
563
+					echo '<br/><i>'.round($distance*0.621371).' mi</i>';
564
+				} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
565
+					echo '<br/><i>'.$distance.' km</i>';
566
+				}
567 567
 			}
568 568
 		}
569 569
 		print '</td>'."\n";
@@ -624,13 +624,13 @@  discard block
 block discarded – undo
624 624
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
625 625
 			} else $distance = '';
626 626
 				if ($distance != '') {
627
-				    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
628
-					    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
629
-				    } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
630
-					    echo '<br/><i>'.round($distance*0.621371).' mi</i>';
631
-				    } elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
632
-					    echo '<br/><i>'.$distance.' km</i>';
633
-				    }
627
+					if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
628
+						echo '<br/><i>'.round($distance*0.539957).' nm</i>';
629
+					} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
630
+						echo '<br/><i>'.round($distance*0.621371).' mi</i>';
631
+					} elseif ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
632
+						echo '<br/><i>'.$distance.' km</i>';
633
+					}
634 634
 				}
635 635
 			}
636 636
 			print '</td>'."\n";
Please login to merge, or discard this patch.
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 	print '<th class="more"></th>';
94 94
 	print '</thead>';
95
-} else if (strtolower($current_page) == "upcoming"){
95
+} else if (strtolower($current_page) == "upcoming") {
96 96
 	print '<thead>';
97 97
 	if ($_GET['sort'] == "airline_name_asc")
98 98
 	{
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 	}
143 143
 	*/
144 144
 	print '</thead>';
145
-} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){
145
+} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
146 146
 	print '<thead>';
147 147
 	print '<th class="aircraft_thumbnail"></th>';
148 148
 	print '<th class="logo">'._("Airline").'</th>';
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 	print '</thead>';
180 180
 } else {
181 181
 
182
-	if ($hide_th_links === true){
182
+	if ($hide_th_links === true) {
183 183
 		print '<thead>';
184 184
 		print '<th class="aircraft_thumbnail"></th>';
185 185
 		if ($_GET['sort'] == "airline_name_asc")
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 }
361 361
 
362 362
 print '<tbody>'."\n";
363
-foreach($spotter_array as $spotter_item)
363
+foreach ($spotter_array as $spotter_item)
364 364
 {
365 365
 	if (isset($globalTimezone))
366 366
 	{
@@ -391,13 +391,13 @@  discard block
 block discarded – undo
391 391
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
392 392
 				}
393 393
 				if (isset($spotter_item['airline_name'])) {
394
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
394
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
395 395
 				} else {
396
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
396
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
397 397
 				}
398 398
                         } else {
399 399
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
400
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
400
+                    		$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
401 401
                     		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
402 402
 				if (isset($spotter_item['airline_name'])) {
403 403
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
 			print '<img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" />'."\n";
412 412
 			print '</td>'."\n";
413 413
 		}
414
-	} elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest"){
414
+	} elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest") {
415 415
 		if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) {
416 416
 		    $spotter_item['squawk'] = '-';
417 417
 		}
@@ -427,17 +427,17 @@  discard block
 block discarded – undo
427 427
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
428 428
 				}
429 429
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
430
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
430
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
431 431
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
432
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
432
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
433 433
 				} elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) {
434
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
434
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
435 435
 				} else {
436
-					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
436
+					print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
437 437
 				}
438 438
 			} else {
439 439
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
440
-                    		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
440
+                    		$image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
441 441
                     		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
442 442
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
443 443
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
@@ -500,7 +500,7 @@  discard block
 block discarded – undo
500 500
 	}
501 501
 	print '</td>'."\n";
502 502
 	// Aircraft type
503
-	if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){
503
+	if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") {
504 504
 		print '<td class="type">'."\n";
505 505
 		if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) {
506 506
 			print '<span class="nomobile">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</span>'."\n";
@@ -524,22 +524,22 @@  discard block
 block discarded – undo
524 524
 		}
525 525
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
526 526
 			if ($spotter_item['departure_airport_time'] > 2460) {
527
-				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
528
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
527
+				$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
528
+			} else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
529 529
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
530
-				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
530
+				$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
531 531
 			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
532 532
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
533 533
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
534 534
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
535
-				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
535
+				$real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']);
536 536
 			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
537 537
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
538 538
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
539 539
 			if ($spotter_item['departure_airport_time'] > 2460) {
540
-				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
540
+				$departure_airport_time = date('H:m', $spotter_item['departure_airport_time']);
541 541
 			} else {
542
-				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
542
+				$departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2);
543 543
 			}
544 544
 			print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n";
545 545
 		}
@@ -554,7 +554,7 @@  discard block
 block discarded – undo
554 554
 					$latitude = $spotter_item['latitude'];
555 555
 					$longitude = $spotter_item['longitude'];
556 556
 				}
557
-				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
557
+				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude);
558 558
 			} else $distance = '';
559 559
 			if ($distance != '') {
560 560
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -595,20 +595,20 @@  discard block
 block discarded – undo
595 595
 		}
596 596
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
597 597
 			if ($spotter_item['arrival_airport_time'] > 2460) {
598
-				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
598
+				$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
599 599
 			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
600 600
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
601
-				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
601
+				$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
602 602
 			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
603 603
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
604 604
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
605 605
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
606
-				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
606
+				$real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']);
607 607
 			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
608 608
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
609 609
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
610 610
 			if ($spotter_item['arrival_airport_time'] > 2460) {
611
-				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
611
+				$arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']);
612 612
 			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
613 613
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
614 614
 		}
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 					$latitude = $spotter_item['latitude'];
622 622
 					$longitude = $spotter_item['longitude'];
623 623
 				}
624
-				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
624
+				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude);
625 625
 			} else $distance = '';
626 626
 				if ($distance != '') {
627 627
 				    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
 			}
636 636
 			print '</td>'."\n";
637 637
 			// Route stop
638
-			if(strtolower($current_page) != "upcoming"){
638
+			if (strtolower($current_page) != "upcoming") {
639 639
 			print '<td class="route_stop">'."\n";
640 640
 			if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') {
641 641
 				print '<span class="nomobile">-</span>'."\n";
@@ -659,21 +659,21 @@  discard block
 block discarded – undo
659 659
 			} else {
660 660
 				//if (!isset($globalUnitDistance) || $globalUnitDistance == 'km') {
661 661
 				if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
662
-					print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n";
663
-					print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n";
662
+					print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n";
663
+					print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n";
664 664
 				//} elseif ($globalUnitDistance == 'mi') {
665 665
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
666
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n";
667
-					print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n";
666
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n";
667
+					print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n";
668 668
 				//} elseif ($globalUnitDistance == 'nm') {
669 669
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
670
-					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n";
671
-					print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n";
670
+					print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n";
671
+					print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n";
672 672
 				}
673 673
 			}
674 674
 			print '</td>'."\n";
675 675
 		}
676
-		if(strtolower($current_page) != "upcoming"){
676
+		if (strtolower($current_page) != "upcoming") {
677 677
 			if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
678 678
 				print '<td class="pilot">'."\n";
679 679
 				if ((!isset($spotter_item['pilot_id']) || $spotter_item['pilot_id'] == '') && (!isset($spotter_item['pilot_name']) || $spotter_item['pilot_name'] == '')) {
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
 	if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") {
709 709
 		if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') {
710 710
 			print '<td class="message"><p>'."\n";
711
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
711
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
712 712
 			print '</p><p class="decode">';
713 713
 			$decode_array = json_decode($spotter_item['decode']);
714 714
 			foreach ($decode_array as $key => $value) {
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 			print '</td>'."\n";
719 719
 		} else {
720 720
 			print '<td class="message">'."\n";
721
-			print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
721
+			print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
722 722
 			print '</td>'."\n";
723 723
 		}
724 724
 	}
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 		}
744 744
 		print '</td>'."\n";
745 745
 		print '<td class="message">'."\n";
746
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
746
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
747 747
 		print '</td>'."\n";
748 748
 	}
749 749
 	if (strtolower($current_page) == "incident-latest") {
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 		print '</td>'."\n";
770 770
 		*/
771 771
 		print '<td class="message">'."\n";
772
-		print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']);
772
+		print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']);
773 773
 		print '</td>'."\n";
774 774
 	}
775 775
 	// Date
Please login to merge, or discard this patch.
Braces   +45 added lines, -17 removed lines patch added patch discarded remove patch
@@ -365,7 +365,9 @@  discard block
 block discarded – undo
365 365
 	if (isset($globalTimezone))
366 366
 	{
367 367
 		date_default_timezone_set($globalTimezone);
368
-	} else date_default_timezone_set('UTC');
368
+	} else {
369
+		date_default_timezone_set('UTC');
370
+	}
369 371
 	if ($showSpecial === true)
370 372
 	{
371 373
 		print '<tr class="special">'."\n";
@@ -384,8 +386,9 @@  discard block
 block discarded – undo
384 386
 			print '<td class="aircraft_thumbnail">'."\n";
385 387
 			
386 388
 			if ($spotter_item['image_source'] == 'planespotters') {
387
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
388
-				else {
389
+				if ($spotter_item['image_source_website'] != '') {
390
+					$image_src = $spotter_item['image_source_website'];
391
+				} else {
389 392
 					$planespotter_url_array = explode("_", $spotter_item['image']);
390 393
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
391 394
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -398,7 +401,9 @@  discard block
 block discarded – undo
398 401
                         } else {
399 402
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
400 403
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
401
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
404
+                    		} else {
405
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
406
+                    		}
402 407
 				if (isset($spotter_item['airline_name'])) {
403 408
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
404 409
 				} else {
@@ -420,8 +425,9 @@  discard block
 block discarded – undo
420 425
 			print '<td class="aircraft_thumbnail">'."\n";
421 426
 			//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
422 427
 			if ($spotter_item['image_source'] == 'planespotters') {
423
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
424
-				else {
428
+				if ($spotter_item['image_source_website'] != '') {
429
+					$image_src = $spotter_item['image_source_website'];
430
+				} else {
425 431
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
426 432
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
427 433
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -438,7 +444,9 @@  discard block
 block discarded – undo
438 444
 			} else {
439 445
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
440 446
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
441
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
447
+                    		} else {
448
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
449
+                    		}
442 450
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
443 451
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
444 452
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -525,15 +533,21 @@  discard block
 block discarded – undo
525 533
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
526 534
 			if ($spotter_item['departure_airport_time'] > 2460) {
527 535
 				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
528
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
536
+			} else {
537
+				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
538
+			}
529 539
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
530 540
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
531
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
541
+			} else {
542
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
543
+			}
532 544
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
533 545
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
534 546
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
535 547
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
536
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
548
+			} else {
549
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
550
+			}
537 551
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
538 552
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
539 553
 			if ($spotter_item['departure_airport_time'] > 2460) {
@@ -555,7 +569,9 @@  discard block
 block discarded – undo
555 569
 					$longitude = $spotter_item['longitude'];
556 570
 				}
557 571
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
558
-			} else $distance = '';
572
+			} else {
573
+				$distance = '';
574
+			}
559 575
 			if ($distance != '') {
560 576
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
561 577
 				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -580,7 +596,9 @@  discard block
 block discarded – undo
580 596
 		} else {
581 597
 			if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
582 598
 				print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
583
-				if (!isset($Spotter)) $Spotter = new Spotter();
599
+				if (!isset($Spotter)) {
600
+					$Spotter = new Spotter();
601
+				}
584 602
 				$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
585 603
 				print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
586 604
 				print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -596,20 +614,28 @@  discard block
 block discarded – undo
596 614
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
597 615
 			if ($spotter_item['arrival_airport_time'] > 2460) {
598 616
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
599
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
617
+			} else {
618
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
619
+			}
600 620
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
601 621
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
602
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
622
+			} else {
623
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
624
+			}
603 625
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
604 626
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
605 627
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
606 628
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
607
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
629
+			} else {
630
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
631
+			}
608 632
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
609 633
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
610 634
 			if ($spotter_item['arrival_airport_time'] > 2460) {
611 635
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
612
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
636
+			} else {
637
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
638
+			}
613 639
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
614 640
 		}
615 641
 		if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -622,7 +648,9 @@  discard block
 block discarded – undo
622 648
 					$longitude = $spotter_item['longitude'];
623 649
 				}
624 650
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
625
-			} else $distance = '';
651
+			} else {
652
+				$distance = '';
653
+			}
626 654
 				if ($distance != '') {
627 655
 				    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
628 656
 					    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
Please login to merge, or discard this patch.
install/class.update_db.php 2 patches
Spacing   +273 added lines, -273 removed lines patch added patch discarded remove patch
@@ -24,20 +24,20 @@  discard block
 block discarded – undo
24 24
 		fclose($fp);
25 25
 	}
26 26
 
27
-	public static function gunzip($in_file,$out_file_name = '') {
27
+	public static function gunzip($in_file, $out_file_name = '') {
28 28
 		//echo $in_file.' -> '.$out_file_name."\n";
29 29
 		$buffer_size = 4096; // read 4kb at a time
30 30
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
31 31
 		if ($in_file != '' && file_exists($in_file)) {
32 32
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
33
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
34
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
33
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
34
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
35 35
 			else {
36 36
 				echo 'gzopen not available';
37 37
 				die;
38 38
 			}
39 39
 			$out_file = fopen($out_file_name, 'wb'); 
40
-			while(!gzeof($file)) {
40
+			while (!gzeof($file)) {
41 41
 				fwrite($out_file, gzread($file, $buffer_size));
42 42
 			}  
43 43
 			fclose($out_file);
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		try {
62 62
 			self::$db_sqlite = new PDO('sqlite:'.$database);
63 63
 			self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
64
-		} catch(PDOException $e) {
64
+		} catch (PDOException $e) {
65 65
 			return "error : ".$e->getMessage();
66 66
 		}
67 67
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			//$Connection = new Connection();
77 77
 			$sth = $Connection->db->prepare($query);
78 78
                         $sth->execute(array(':source' => $database_file));
79
-                } catch(PDOException $e) {
79
+                } catch (PDOException $e) {
80 80
                         return "error : ".$e->getMessage();
81 81
                 }
82 82
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		try {
88 88
                         $sth = update_db::$db_sqlite->prepare($query);
89 89
                         $sth->execute();
90
-                } catch(PDOException $e) {
90
+                } catch (PDOException $e) {
91 91
                         return "error : ".$e->getMessage();
92 92
                 }
93 93
 		//$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)';
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 			if ($globalTransaction) $Connection->db->beginTransaction();
99 99
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
100 100
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
101
-				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
101
+				$query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file);
102 102
 				$sth_dest->execute($query_dest_values);
103 103
             		}
104 104
 			if ($globalTransaction) $Connection->db->commit();
105
-		} catch(PDOException $e) {
105
+		} catch (PDOException $e) {
106 106
 			if ($globalTransaction) $Connection->db->rollBack(); 
107 107
 			return "error : ".$e->getMessage();
108 108
 		}
@@ -118,26 +118,26 @@  discard block
 block discarded – undo
118 118
 			//$Connection = new Connection();
119 119
 			$sth = $Connection->db->prepare($query);
120 120
                         $sth->execute(array(':source' => 'oneworld'));
121
-                } catch(PDOException $e) {
121
+                } catch (PDOException $e) {
122 122
                         return "error : ".$e->getMessage();
123 123
                 }
124 124
 
125 125
     		if ($globalDebug) echo " - Add routes to DB -";
126 126
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
127 127
 		$Spotter = new Spotter();
128
-		if ($fh = fopen($database_file,"r")) {
128
+		if ($fh = fopen($database_file, "r")) {
129 129
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
130 130
 			$Connection = new Connection();
131 131
 			$sth_dest = $Connection->db->prepare($query_dest);
132 132
 			if ($globalTransaction) $Connection->db->beginTransaction();
133 133
 			while (!feof($fh)) {
134
-				$line = fgetcsv($fh,9999,',');
134
+				$line = fgetcsv($fh, 9999, ',');
135 135
 				if ($line[0] != '') {
136 136
 					if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) {
137 137
 						try {
138
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
138
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld');
139 139
 							$sth_dest->execute($query_dest_values);
140
-						} catch(PDOException $e) {
140
+						} catch (PDOException $e) {
141 141
 							if ($globalTransaction) $Connection->db->rollBack(); 
142 142
 							return "error : ".$e->getMessage();
143 143
 						}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 			//$Connection = new Connection();
160 160
 			$sth = $Connection->db->prepare($query);
161 161
                         $sth->execute(array(':source' => 'skyteam'));
162
-                } catch(PDOException $e) {
162
+                } catch (PDOException $e) {
163 163
                         return "error : ".$e->getMessage();
164 164
                 }
165 165
 
@@ -167,24 +167,24 @@  discard block
 block discarded – undo
167 167
 
168 168
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
169 169
 		$Spotter = new Spotter();
170
-		if ($fh = fopen($database_file,"r")) {
170
+		if ($fh = fopen($database_file, "r")) {
171 171
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
172 172
 			$Connection = new Connection();
173 173
 			$sth_dest = $Connection->db->prepare($query_dest);
174 174
 			try {
175 175
 				if ($globalTransaction) $Connection->db->beginTransaction();
176 176
 				while (!feof($fh)) {
177
-					$line = fgetcsv($fh,9999,',');
177
+					$line = fgetcsv($fh, 9999, ',');
178 178
 					if ($line[0] != '') {
179
-						$datebe = explode('  -  ',$line[2]);
179
+						$datebe = explode('  -  ', $line[2]);
180 180
 						if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) {
181
-							$query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam');
181
+							$query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam');
182 182
 							$sth_dest->execute($query_dest_values);
183 183
 						}
184 184
 					}
185 185
 				}
186 186
 				if ($globalTransaction) $Connection->db->commit();
187
-			} catch(PDOException $e) {
187
+			} catch (PDOException $e) {
188 188
 				if ($globalTransaction) $Connection->db->rollBack(); 
189 189
 				return "error : ".$e->getMessage();
190 190
 			}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 			$Connection = new Connection();
200 200
 			$sth = $Connection->db->prepare($query);
201 201
                         $sth->execute(array(':source' => $database_file));
202
-                } catch(PDOException $e) {
202
+                } catch (PDOException $e) {
203 203
                         return "error : ".$e->getMessage();
204 204
                 }
205 205
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 			$Connection = new Connection();
208 208
 			$sth = $Connection->db->prepare($query);
209 209
                         $sth->execute(array(':source' => $database_file));
210
-                } catch(PDOException $e) {
210
+                } catch (PDOException $e) {
211 211
                         return "error : ".$e->getMessage();
212 212
                 }
213 213
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 		try {
217 217
                         $sth = update_db::$db_sqlite->prepare($query);
218 218
                         $sth->execute();
219
-                } catch(PDOException $e) {
219
+                } catch (PDOException $e) {
220 220
                         return "error : ".$e->getMessage();
221 221
                 }
222 222
 		//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
@@ -233,15 +233,15 @@  discard block
 block discarded – undo
233 233
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
234 234
 				if ($values['UserString4'] == 'M') $type = 'military';
235 235
 				else $type = null;
236
-				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
236
+				$query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type);
237 237
 				$sth_dest->execute($query_dest_values);
238 238
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
239
-				    $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']);
239
+				    $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']);
240 240
 				    $sth_dest_owner->execute($query_dest_owner_values);
241 241
 				}
242 242
             		}
243 243
 			if ($globalTransaction) $Connection->db->commit();
244
-		} catch(PDOException $e) {
244
+		} catch (PDOException $e) {
245 245
 			return "error : ".$e->getMessage();
246 246
 		}
247 247
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 			$Connection = new Connection();
252 252
 			$sth = $Connection->db->prepare($query);
253 253
                         $sth->execute(array(':source' => $database_file));
254
-                } catch(PDOException $e) {
254
+                } catch (PDOException $e) {
255 255
                         return "error : ".$e->getMessage();
256 256
                 }
257 257
 		return '';
@@ -266,11 +266,11 @@  discard block
 block discarded – undo
266 266
 			$Connection = new Connection();
267 267
 			$sth = $Connection->db->prepare($query);
268 268
                         $sth->execute(array(':source' => $database_file));
269
-                } catch(PDOException $e) {
269
+                } catch (PDOException $e) {
270 270
                         return "error : ".$e->getMessage();
271 271
                 }
272 272
 		
273
-		if ($fh = fopen($database_file,"r")) {
273
+		if ($fh = fopen($database_file, "r")) {
274 274
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
275 275
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
276 276
 		
@@ -280,13 +280,13 @@  discard block
 block discarded – undo
280 280
 				if ($globalTransaction) $Connection->db->beginTransaction();
281 281
             			while (!feof($fh)) {
282 282
             				$values = array();
283
-            				$line = $Common->hex2str(fgets($fh,9999));
283
+            				$line = $Common->hex2str(fgets($fh, 9999));
284 284
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
285
-            				$values['ModeS'] = substr($line,0,6);
286
-            				$values['Registration'] = trim(substr($line,69,6));
287
-            				$aircraft_name = trim(substr($line,48,6));
285
+            				$values['ModeS'] = substr($line, 0, 6);
286
+            				$values['Registration'] = trim(substr($line, 69, 6));
287
+            				$aircraft_name = trim(substr($line, 48, 6));
288 288
             				// Check if we can find ICAO, else set it to GLID
289
-            				$aircraft_name_split = explode(' ',$aircraft_name);
289
+            				$aircraft_name_split = explode(' ', $aircraft_name);
290 290
             				$search_more = '';
291 291
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
292 292
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
@@ -298,20 +298,20 @@  discard block
 block discarded – undo
298 298
 	            				if (isset($result['icao']) && $result['icao'] != '') {
299 299
 	            				    $values['ICAOTypeCode'] = $result['icao'];
300 300
 	            				} 
301
-					} catch(PDOException $e) {
301
+					} catch (PDOException $e) {
302 302
 						return "error : ".$e->getMessage();
303 303
 					}
304 304
 					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
305 305
 					// Add data to db
306 306
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
307 307
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
308
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file);
308
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
309 309
 						//print_r($query_dest_values);
310 310
 						$sth_dest->execute($query_dest_values);
311 311
 					}
312 312
 				}
313 313
 				if ($globalTransaction) $Connection->db->commit();
314
-			} catch(PDOException $e) {
314
+			} catch (PDOException $e) {
315 315
 				return "error : ".$e->getMessage();
316 316
 			}
317 317
 		}
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 			$Connection = new Connection();
322 322
 			$sth = $Connection->db->prepare($query);
323 323
                         $sth->execute(array(':source' => $database_file));
324
-                } catch(PDOException $e) {
324
+                } catch (PDOException $e) {
325 325
                         return "error : ".$e->getMessage();
326 326
                 }
327 327
 		return '';
@@ -335,11 +335,11 @@  discard block
 block discarded – undo
335 335
 			$Connection = new Connection();
336 336
 			$sth = $Connection->db->prepare($query);
337 337
                         $sth->execute(array(':source' => $database_file));
338
-                } catch(PDOException $e) {
338
+                } catch (PDOException $e) {
339 339
                         return "error : ".$e->getMessage();
340 340
                 }
341 341
 		
342
-		if ($fh = fopen($database_file,"r")) {
342
+		if ($fh = fopen($database_file, "r")) {
343 343
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
344 344
 			$query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source)';
345 345
 		
@@ -347,9 +347,9 @@  discard block
 block discarded – undo
347 347
 			$sth_dest = $Connection->db->prepare($query_dest);
348 348
 			try {
349 349
 				if ($globalTransaction) $Connection->db->beginTransaction();
350
-				$tmp = fgetcsv($fh,9999,',',"'");
350
+				$tmp = fgetcsv($fh, 9999, ',', "'");
351 351
             			while (!feof($fh)) {
352
-            				$line = fgetcsv($fh,9999,',',"'");
352
+            				$line = fgetcsv($fh, 9999, ',', "'");
353 353
             				
354 354
 					//FFFFFF                     RIDEAU VALLEY SOARINGASW-20               C-FBKN MZ 123.400
355 355
 					//print_r($line);
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
             				$values['Registration'] = $line[3];
358 358
             				$aircraft_name = $line[2];
359 359
             				// Check if we can find ICAO, else set it to GLID
360
-            				$aircraft_name_split = explode(' ',$aircraft_name);
360
+            				$aircraft_name_split = explode(' ', $aircraft_name);
361 361
             				$search_more = '';
362 362
             				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
363 363
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
@@ -366,20 +366,20 @@  discard block
 block discarded – undo
366 366
                                     		$sth_search->execute();
367 367
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
368 368
 	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
369
-					} catch(PDOException $e) {
369
+					} catch (PDOException $e) {
370 370
 						return "error : ".$e->getMessage();
371 371
 					}
372 372
 					//if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
373 373
 					// Add data to db
374 374
 					if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') {
375 375
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
376
-						$query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file);
376
+						$query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file);
377 377
 						//print_r($query_dest_values);
378 378
 						$sth_dest->execute($query_dest_values);
379 379
 					}
380 380
 				}
381 381
 				if ($globalTransaction) $Connection->db->commit();
382
-			} catch(PDOException $e) {
382
+			} catch (PDOException $e) {
383 383
 				return "error : ".$e->getMessage();
384 384
 			}
385 385
 		}
@@ -389,13 +389,13 @@  discard block
 block discarded – undo
389 389
 			$Connection = new Connection();
390 390
 			$sth = $Connection->db->prepare($query);
391 391
                         $sth->execute(array(':source' => $database_file));
392
-                } catch(PDOException $e) {
392
+                } catch (PDOException $e) {
393 393
                         return "error : ".$e->getMessage();
394 394
                 }
395 395
 		return '';
396 396
 	}
397 397
 
398
-	public static function retrieve_owner($database_file,$country = 'F') {
398
+	public static function retrieve_owner($database_file, $country = 'F') {
399 399
 		global $globalTransaction;
400 400
 		//$query = 'TRUNCATE TABLE aircraft_modes';
401 401
 		$query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source";
@@ -403,11 +403,11 @@  discard block
 block discarded – undo
403 403
 			$Connection = new Connection();
404 404
 			$sth = $Connection->db->prepare($query);
405 405
                         $sth->execute(array(':source' => $database_file));
406
-                } catch(PDOException $e) {
406
+                } catch (PDOException $e) {
407 407
                         return "error : ".$e->getMessage();
408 408
                 }
409 409
 		
410
-		if ($fh = fopen($database_file,"r")) {
410
+		if ($fh = fopen($database_file, "r")) {
411 411
 			//$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)';
412 412
 			$query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
413 413
 		
@@ -415,9 +415,9 @@  discard block
 block discarded – undo
415 415
 			$sth_dest = $Connection->db->prepare($query_dest);
416 416
 			try {
417 417
 				if ($globalTransaction) $Connection->db->beginTransaction();
418
-				$tmp = fgetcsv($fh,9999,',','"');
418
+				$tmp = fgetcsv($fh, 9999, ',', '"');
419 419
             			while (!feof($fh)) {
420
-            				$line = fgetcsv($fh,9999,',','"');
420
+            				$line = fgetcsv($fh, 9999, ',', '"');
421 421
             				$values = array();
422 422
             				//print_r($line);
423 423
             				if ($country == 'F') {
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
             				    $values['base'] = $line[4];
426 426
             				    $values['owner'] = $line[5];
427 427
             				    if ($line[6] == '') $values['date_first_reg'] = null;
428
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
428
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
429 429
 					    $values['cancel'] = $line[7];
430 430
 					} elseif ($country == 'EI') {
431 431
 					    // TODO : add modeS & reg to aircraft_modes
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
             				    $values['base'] = $line[3];
434 434
             				    $values['owner'] = $line[2];
435 435
             				    if ($line[1] == '') $values['date_first_reg'] = null;
436
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
436
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1]));
437 437
 					    $values['cancel'] = '';
438 438
 					} elseif ($country == 'HB') {
439 439
 					    // TODO : add modeS & reg to aircraft_modes
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
             				    $values['base'] = null;
449 449
             				    $values['owner'] = $line[5];
450 450
             				    if ($line[18] == '') $values['date_first_reg'] = null;
451
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
451
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18]));
452 452
 					    $values['cancel'] = '';
453 453
 					} elseif ($country == 'VH') {
454 454
 					    // TODO : add modeS & reg to aircraft_modes
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
             				    $values['base'] = null;
457 457
             				    $values['owner'] = $line[12];
458 458
             				    if ($line[28] == '') $values['date_first_reg'] = null;
459
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
459
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28]));
460 460
 
461 461
 					    $values['cancel'] = $line[39];
462 462
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -476,28 +476,28 @@  discard block
 block discarded – undo
476 476
             				    $values['base'] = null;
477 477
             				    $values['owner'] = $line[8];
478 478
             				    if ($line[7] == '') $values['date_first_reg'] = null;
479
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
479
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
480 480
 					    $values['cancel'] = '';
481 481
 					} elseif ($country == 'PP') {
482 482
             				    $values['registration'] = $line[0];
483 483
             				    $values['base'] = null;
484 484
             				    $values['owner'] = $line[4];
485 485
             				    if ($line[6] == '') $values['date_first_reg'] = null;
486
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
486
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6]));
487 487
 					    $values['cancel'] = $line[7];
488 488
 					} elseif ($country == 'E7') {
489 489
             				    $values['registration'] = $line[0];
490 490
             				    $values['base'] = null;
491 491
             				    $values['owner'] = $line[4];
492 492
             				    if ($line[5] == '') $values['date_first_reg'] = null;
493
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
493
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5]));
494 494
 					    $values['cancel'] = '';
495 495
 					} elseif ($country == '8Q') {
496 496
             				    $values['registration'] = $line[0];
497 497
             				    $values['base'] = null;
498 498
             				    $values['owner'] = $line[3];
499 499
             				    if ($line[7] == '') $values['date_first_reg'] = null;
500
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
500
+					    else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7]));
501 501
 					    $values['cancel'] = '';
502 502
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
503 503
             				    $values['registration'] = $line[0];
@@ -507,12 +507,12 @@  discard block
 block discarded – undo
507 507
 					    $values['cancel'] = '';
508 508
 					}
509 509
 					if ($values['cancel'] == '' && $values['registration'] != null) {
510
-						$query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file);
510
+						$query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file);
511 511
 						$sth_dest->execute($query_dest_values);
512 512
 					}
513 513
 				}
514 514
 				if ($globalTransaction) $Connection->db->commit();
515
-			} catch(PDOException $e) {
515
+			} catch (PDOException $e) {
516 516
 				return "error : ".$e->getMessage();
517 517
 			}
518 518
 		}
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
 			$Connection = new Connection();
628 628
 			$sth = $Connection->db->prepare($query);
629 629
                         $sth->execute();
630
-                } catch(PDOException $e) {
630
+                } catch (PDOException $e) {
631 631
                         return "error : ".$e->getMessage();
632 632
                 }
633 633
 
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 			$Connection = new Connection();
638 638
 			$sth = $Connection->db->prepare($query);
639 639
                         $sth->execute();
640
-                } catch(PDOException $e) {
640
+                } catch (PDOException $e) {
641 641
                         return "error : ".$e->getMessage();
642 642
                 }
643 643
 
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
 		if ($globalTransaction) $Connection->db->beginTransaction();
649 649
   
650 650
 		$i = 0;
651
-		while($row = sparql_fetch_array($result))
651
+		while ($row = sparql_fetch_array($result))
652 652
 		{
653 653
 			if ($i >= 1) {
654 654
 			//print_r($row);
@@ -668,31 +668,31 @@  discard block
 block discarded – undo
668 668
 				$row['image'] = '';
669 669
 				$row['image_thumb'] = '';
670 670
 			} else {
671
-				$image = str_replace(' ','_',$row['image']);
671
+				$image = str_replace(' ', '_', $row['image']);
672 672
 				$digest = md5($image);
673
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image;
674
-				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder;
675
-				$folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image;
676
-				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder;
673
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image;
674
+				$row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder;
675
+				$folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image;
676
+				$row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder;
677 677
 			}
678 678
 			
679
-			$country = explode('-',$row['country']);
679
+			$country = explode('-', $row['country']);
680 680
 			$row['country'] = $country[0];
681 681
 			
682 682
 			$row['type'] = trim($row['type']);
683
-			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) {
683
+			if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) {
684 684
 				$row['type'] = 'Military';
685 685
 			} elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') {
686 686
 				$row['type'] = 'small_airport';
687 687
 			}
688 688
 			
689
-			$row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city'])));
690
-			$query_dest_values = array(':airport_id' => $i, ':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => $row['altitude'],':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']);
689
+			$row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city'])));
690
+			$query_dest_values = array(':airport_id' => $i, ':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => $row['altitude'], ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']);
691 691
 			//print_r($query_dest_values);
692 692
 			
693 693
 			try {
694 694
 				$sth_dest->execute($query_dest_values);
695
-			} catch(PDOException $e) {
695
+			} catch (PDOException $e) {
696 696
 				return "error : ".$e->getMessage();
697 697
 			}
698 698
 			}
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
 			$Connection = new Connection();
707 707
 			$sth = $Connection->db->prepare($query);
708 708
                         $sth->execute();
709
-                } catch(PDOException $e) {
709
+                } catch (PDOException $e) {
710 710
                         return "error : ".$e->getMessage();
711 711
                 }
712 712
 
@@ -714,12 +714,12 @@  discard block
 block discarded – undo
714 714
 		if ($globalDebug) echo "Insert Not available Airport...\n";
715 715
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
716 716
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
717
-		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
717
+		$query_values = array(':airport_id' => $i, ':name' => 'Not available', ':iata' => 'NA', ':icao' => 'NA', ':latitude' => '0', ':longitude' => '0', ':altitude' => '0', ':type' => 'NA', ':city' => 'N/A', ':country' => 'N/A', ':home_link' => '', ':wikipedia_link' => '', ':image' => '', ':image_thumb' => '');
718 718
 		try {
719 719
 			$Connection = new Connection();
720 720
 			$sth = $Connection->db->prepare($query);
721 721
                         $sth->execute($query_values);
722
-                } catch(PDOException $e) {
722
+                } catch (PDOException $e) {
723 723
                         return "error : ".$e->getMessage();
724 724
                 }
725 725
 		$i++;
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 		echo "Download data from ourairports.com...\n";
738 738
 		$delimiter = ',';
739 739
 		$out_file = $tmp_dir.'airports.csv';
740
-		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
740
+		update_db::download('http://ourairports.com/data/airports.csv', $out_file);
741 741
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
742 742
 		echo "Add data from ourairports.com...\n";
743 743
 
@@ -748,32 +748,32 @@  discard block
 block discarded – undo
748 748
 			//$Connection->db->beginTransaction();
749 749
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
750 750
 			{
751
-				if(!$header) $header = $row;
751
+				if (!$header) $header = $row;
752 752
 				else {
753 753
 					$data = array();
754 754
 					$data = array_combine($header, $row);
755 755
 					try {
756 756
 						$sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE `icao` = :icao');
757 757
 						$sth->execute(array(':icao' => $data['gps_code']));
758
-					} catch(PDOException $e) {
758
+					} catch (PDOException $e) {
759 759
 						return "error : ".$e->getMessage();
760 760
 					}
761 761
 					if ($sth->fetchColumn() > 0) {
762 762
 						$query = 'UPDATE airport SET `type` = :type WHERE icao = :icao';
763 763
 						try {
764 764
 							$sth = $Connection->db->prepare($query);
765
-							$sth->execute(array(':icao' => $data['gps_code'],':type' => $data['type']));
766
-						} catch(PDOException $e) {
765
+							$sth->execute(array(':icao' => $data['gps_code'], ':type' => $data['type']));
766
+						} catch (PDOException $e) {
767 767
 							return "error : ".$e->getMessage();
768 768
 						}
769 769
 					} else {
770 770
 						$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`)
771 771
 						    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)";
772
-						$query_values = array(':airport_id' => $i, ':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => $data['elevation_ft'],':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']);
772
+						$query_values = array(':airport_id' => $i, ':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => $data['elevation_ft'], ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']);
773 773
 						try {
774 774
 							$sth = $Connection->db->prepare($query);
775 775
 							$sth->execute($query_values);
776
-						} catch(PDOException $e) {
776
+						} catch (PDOException $e) {
777 777
 							return "error : ".$e->getMessage();
778 778
 						}
779 779
 						$i++;
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 
787 787
 		echo "Download data from another free database...\n";
788 788
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
789
-		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
789
+		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file);
790 790
 		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
791 791
 		update_db::unzip($out_file);
792 792
 		$header = NULL;
@@ -798,15 +798,15 @@  discard block
 block discarded – undo
798 798
 			//$Connection->db->beginTransaction();
799 799
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
800 800
 			{
801
-				if(!$header) $header = $row;
801
+				if (!$header) $header = $row;
802 802
 				else {
803 803
 					$data = $row;
804 804
 
805 805
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
806 806
 					try {
807 807
 						$sth = $Connection->db->prepare($query);
808
-						$sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4]))));
809
-					} catch(PDOException $e) {
808
+						$sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4]))));
809
+					} catch (PDOException $e) {
810 810
 						return "error : ".$e->getMessage();
811 811
 					}
812 812
 				}
@@ -820,15 +820,15 @@  discard block
 block discarded – undo
820 820
 		try {
821 821
 			$sth = $Connection->db->prepare("SELECT icao FROM airport WHERE `name` LIKE '%Air Base%'");
822 822
 			$sth->execute();
823
-		} catch(PDOException $e) {
823
+		} catch (PDOException $e) {
824 824
 			return "error : ".$e->getMessage();
825 825
 		}
826 826
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
827 827
 			$query2 = 'UPDATE airport SET `type` = :type WHERE icao = :icao';
828 828
 			try {
829 829
 				$sth2 = $Connection->db->prepare($query2);
830
-				$sth2->execute(array(':icao' => $row['icao'],':type' => 'military'));
831
-			} catch(PDOException $e) {
830
+				$sth2->execute(array(':icao' => $row['icao'], ':type' => 'military'));
831
+			} catch (PDOException $e) {
832 832
 				return "error : ".$e->getMessage();
833 833
 			}
834 834
 		}
@@ -852,7 +852,7 @@  discard block
 block discarded – undo
852 852
 			$Connection = new Connection();
853 853
 			$sth = $Connection->db->prepare($query);
854 854
                         $sth->execute(array(':source' => 'translation.csv'));
855
-                } catch(PDOException $e) {
855
+                } catch (PDOException $e) {
856 856
                         return "error : ".$e->getMessage();
857 857
                 }
858 858
 
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
870 870
 			{
871 871
 				$i++;
872
-				if($i > 12) {
872
+				if ($i > 12) {
873 873
 					$data = $row;
874 874
 					$operator = $data[2];
875 875
 					if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) {
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
877 877
                                                 //echo substr($operator, 0, 2)."\n";;
878 878
                                                 if (count($airline_array) > 0) {
879 879
 							//print_r($airline_array);
880
-							$operator = $airline_array[0]['icao'].substr($operator,2);
880
+							$operator = $airline_array[0]['icao'].substr($operator, 2);
881 881
                                                 }
882 882
                                         }
883 883
 					
@@ -885,14 +885,14 @@  discard block
 block discarded – undo
885 885
 					if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) {
886 886
                                                 $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2));
887 887
                                                 if (count($airline_array) > 0) {
888
-                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct,2);
888
+                                            		$operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2);
889 889
                                             	}
890 890
                                         }
891 891
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
892 892
 					try {
893 893
 						$sth = $Connection->db->prepare($query);
894
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
895
-					} catch(PDOException $e) {
894
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv'));
895
+					} catch (PDOException $e) {
896 896
 						return "error : ".$e->getMessage();
897 897
 					}
898 898
 				}
@@ -912,7 +912,7 @@  discard block
 block discarded – undo
912 912
 			$Connection = new Connection();
913 913
 			$sth = $Connection->db->prepare($query);
914 914
                         $sth->execute(array(':source' => 'website_fam'));
915
-                } catch(PDOException $e) {
915
+                } catch (PDOException $e) {
916 916
                         return "error : ".$e->getMessage();
917 917
                 }
918 918
 
@@ -932,8 +932,8 @@  discard block
 block discarded – undo
932 932
 					$query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)';
933 933
 					try {
934 934
 						$sth = $Connection->db->prepare($query);
935
-						$sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam'));
936
-					} catch(PDOException $e) {
935
+						$sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam'));
936
+					} catch (PDOException $e) {
937 937
 						return "error : ".$e->getMessage();
938 938
 					}
939 939
 				}
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
 			$Connection = new Connection();
957 957
 			$sth = $Connection->db->prepare($query);
958 958
                         $sth->execute(array(':source' => 'website_faa'));
959
-                } catch(PDOException $e) {
959
+                } catch (PDOException $e) {
960 960
                         return "error : ".$e->getMessage();
961 961
                 }
962 962
 
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
 			$Connection = new Connection();
966 966
 			$sth = $Connection->db->prepare($query);
967 967
                         $sth->execute(array(':source' => 'website_faa'));
968
-                } catch(PDOException $e) {
968
+                } catch (PDOException $e) {
969 969
                         return "error : ".$e->getMessage();
970 970
                 }
971 971
 
@@ -981,8 +981,8 @@  discard block
 block discarded – undo
981 981
 					$query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1';
982 982
 					try {
983 983
 						$sths = $Connection->db->prepare($query_search);
984
-						$sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa'));
985
-					} catch(PDOException $e) {
984
+						$sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa'));
985
+					} catch (PDOException $e) {
986 986
 						return "error s : ".$e->getMessage();
987 987
 					}
988 988
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
@@ -991,8 +991,8 @@  discard block
 block discarded – undo
991 991
 						$queryi = 'UPDATE aircraft SET mfr = :mfr WHERE icao = :icao';
992 992
 						try {
993 993
 							$sthi = $Connection->db->prepare($queryi);
994
-							$sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode']));
995
-						} catch(PDOException $e) {
994
+							$sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode']));
995
+						} catch (PDOException $e) {
996 996
 							return "error u : ".$e->getMessage();
997 997
 						}
998 998
 					} else {
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 						try {
1001 1001
 							$sthsm = $Connection->db->prepare($query_search_mfr);
1002 1002
 							$sthsm->execute(array(':mfr' => $data[2]));
1003
-						} catch(PDOException $e) {
1003
+						} catch (PDOException $e) {
1004 1004
 							return "error mfr : ".$e->getMessage();
1005 1005
 						}
1006 1006
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
@@ -1010,8 +1010,8 @@  discard block
 block discarded – undo
1010 1010
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1011 1011
 							try {
1012 1012
 								$sthf = $Connection->db->prepare($queryf);
1013
-								$sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa'));
1014
-							} catch(PDOException $e) {
1013
+								$sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa'));
1014
+							} catch (PDOException $e) {
1015 1015
 								return "error f : ".$e->getMessage();
1016 1016
 							}
1017 1017
 						}
@@ -1021,13 +1021,13 @@  discard block
 block discarded – undo
1021 1021
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1022 1022
 						try {
1023 1023
 							$sth = $Connection->db->prepare($query);
1024
-							$sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa'));
1025
-						} catch(PDOException $e) {
1024
+							$sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa'));
1025
+						} catch (PDOException $e) {
1026 1026
 							return "error i : ".$e->getMessage();
1027 1027
 						}
1028 1028
 					}
1029 1029
 				}
1030
-				if ($i % 90 == 0) {
1030
+				if ($i%90 == 0) {
1031 1031
 					if ($globalTransaction) $Connection->db->commit();
1032 1032
 					if ($globalTransaction) $Connection->db->beginTransaction();
1033 1033
 				}
@@ -1045,7 +1045,7 @@  discard block
 block discarded – undo
1045 1045
 			$Connection = new Connection();
1046 1046
 			$sth = $Connection->db->prepare($query);
1047 1047
                         $sth->execute(array(':source' => 'website_fam'));
1048
-                } catch(PDOException $e) {
1048
+                } catch (PDOException $e) {
1049 1049
                         return "error : ".$e->getMessage();
1050 1050
                 }
1051 1051
 
@@ -1065,8 +1065,8 @@  discard block
 block discarded – undo
1065 1065
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1066 1066
 					try {
1067 1067
 						$sth = $Connection->db->prepare($query);
1068
-						$sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam'));
1069
-					} catch(PDOException $e) {
1068
+						$sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam'));
1069
+					} catch (PDOException $e) {
1070 1070
 						return "error : ".$e->getMessage();
1071 1071
 					}
1072 1072
 				}
@@ -1085,7 +1085,7 @@  discard block
 block discarded – undo
1085 1085
 			$Connection = new Connection();
1086 1086
 			$sth = $Connection->db->prepare($query);
1087 1087
                         $sth->execute(array(':source' => 'website_fam'));
1088
-                } catch(PDOException $e) {
1088
+                } catch (PDOException $e) {
1089 1089
                         return "error : ".$e->getMessage();
1090 1090
                 }
1091 1091
 
@@ -1101,8 +1101,8 @@  discard block
 block discarded – undo
1101 1101
 					$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)';
1102 1102
 					try {
1103 1103
 						$sth = $Connection->db->prepare($query);
1104
-						$sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam'));
1105
-					} catch(PDOException $e) {
1104
+						$sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam'));
1105
+					} catch (PDOException $e) {
1106 1106
 						print_r($data);
1107 1107
 						return "error : ".$e->getMessage();
1108 1108
 					}
@@ -1122,7 +1122,7 @@  discard block
 block discarded – undo
1122 1122
 			$Connection = new Connection();
1123 1123
 			$sth = $Connection->db->prepare($query);
1124 1124
                         $sth->execute(array(':source' => 'website_fam'));
1125
-                } catch(PDOException $e) {
1125
+                } catch (PDOException $e) {
1126 1126
                         return "error : ".$e->getMessage();
1127 1127
                 }
1128 1128
 
@@ -1142,8 +1142,8 @@  discard block
 block discarded – undo
1142 1142
 					$query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)';
1143 1143
 					try {
1144 1144
 						$sth = $Connection->db->prepare($query);
1145
-						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1146
-					} catch(PDOException $e) {
1145
+						$sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam'));
1146
+					} catch (PDOException $e) {
1147 1147
 						return "error : ".$e->getMessage();
1148 1148
 					}
1149 1149
 				}
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 		return '';
1156 1156
         }
1157 1157
 
1158
-	public static function tle($filename,$tletype) {
1158
+	public static function tle($filename, $tletype) {
1159 1159
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
1160 1160
 		global $tmp_dir, $globalTransaction;
1161 1161
 		//$Spotter = new Spotter();
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 			$Connection = new Connection();
1166 1166
 			$sth = $Connection->db->prepare($query);
1167 1167
                         $sth->execute(array(':source' => $filename));
1168
-                } catch(PDOException $e) {
1168
+                } catch (PDOException $e) {
1169 1169
                         return "error : ".$e->getMessage();
1170 1170
                 }
1171 1171
 		
@@ -1190,8 +1190,8 @@  discard block
 block discarded – undo
1190 1190
 					$query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)';
1191 1191
 					try {
1192 1192
 						$sth = $Connection->db->prepare($query);
1193
-						$sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename));
1194
-					} catch(PDOException $e) {
1193
+						$sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename));
1194
+					} catch (PDOException $e) {
1195 1195
 						return "error : ".$e->getMessage();
1196 1196
 					}
1197 1197
 
@@ -1211,28 +1211,28 @@  discard block
 block discarded – undo
1211 1211
         */
1212 1212
         private static function table2array($data) {
1213 1213
                 $html = str_get_html($data);
1214
-                $tabledata=array();
1215
-                foreach($html->find('tr') as $element)
1214
+                $tabledata = array();
1215
+                foreach ($html->find('tr') as $element)
1216 1216
                 {
1217 1217
                         $td = array();
1218
-                        foreach( $element->find('th') as $row)
1218
+                        foreach ($element->find('th') as $row)
1219 1219
                         {
1220 1220
                                 $td [] = trim($row->plaintext);
1221 1221
                         }
1222
-                        $td=array_filter($td);
1222
+                        $td = array_filter($td);
1223 1223
                         $tabledata[] = $td;
1224 1224
 
1225 1225
                         $td = array();
1226 1226
                         $tdi = array();
1227
-                        foreach( $element->find('td') as $row)
1227
+                        foreach ($element->find('td') as $row)
1228 1228
                         {
1229 1229
                                 $td [] = trim($row->plaintext);
1230 1230
                                 $tdi [] = trim($row->innertext);
1231 1231
                         }
1232
-                        $td=array_filter($td);
1233
-                        $tdi=array_filter($tdi);
1232
+                        $td = array_filter($td);
1233
+                        $tdi = array_filter($tdi);
1234 1234
                     //    $tabledata[]=array_merge($td,$tdi);
1235
-                        $tabledata[]=$td;
1235
+                        $tabledata[] = $td;
1236 1236
                 }
1237 1237
                 return(array_filter($tabledata));
1238 1238
         }
@@ -1305,13 +1305,13 @@  discard block
 block discarded – undo
1305 1305
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1306 1306
 			{
1307 1307
 				$i++;
1308
-				if($i > 3 && count($row) > 2) {
1308
+				if ($i > 3 && count($row) > 2) {
1309 1309
 					$data = array_values(array_filter($row));
1310 1310
 					$cntdata = count($data);
1311 1311
 					if ($cntdata > 10) {
1312 1312
 						$value = $data[9];
1313 1313
 						
1314
-						for ($i =10;$i < $cntdata;$i++) {
1314
+						for ($i = 10; $i < $cntdata; $i++) {
1315 1315
 							$value .= ' '.$data[$i];
1316 1316
 						}
1317 1317
 						$data[9] = $value;
@@ -1321,8 +1321,8 @@  discard block
 block discarded – undo
1321 1321
 						$query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)';
1322 1322
 						try {
1323 1323
 							$sth = $Connection->db->prepare($query);
1324
-							$sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
1325
-						} catch(PDOException $e) {
1324
+							$sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9]));
1325
+						} catch (PDOException $e) {
1326 1326
 							return "error : ".$e->getMessage();
1327 1327
 						}
1328 1328
 					}
@@ -1343,7 +1343,7 @@  discard block
 block discarded – undo
1343 1343
 			$Connection = new Connection();
1344 1344
 			$sth = $Connection->db->prepare($query);
1345 1345
                         $sth->execute();
1346
-                } catch(PDOException $e) {
1346
+                } catch (PDOException $e) {
1347 1347
                         return "error : ".$e->getMessage();
1348 1348
                 }
1349 1349
 
@@ -1355,12 +1355,12 @@  discard block
 block discarded – undo
1355 1355
 			if ($globalTransaction) $Connection->db->beginTransaction();
1356 1356
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1357 1357
 			{
1358
-				if(count($row) > 1) {
1358
+				if (count($row) > 1) {
1359 1359
 					$query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')";
1360 1360
 					try {
1361 1361
 						$sth = $Connection->db->prepare($query);
1362
-						$sth->execute(array(':name' => $row[1],':icao' => $row[0]));
1363
-					} catch(PDOException $e) {
1362
+						$sth->execute(array(':name' => $row[1], ':icao' => $row[0]));
1363
+					} catch (PDOException $e) {
1364 1364
 						return "error : ".$e->getMessage();
1365 1365
 					}
1366 1366
 				}
@@ -1380,21 +1380,21 @@  discard block
 block discarded – undo
1380 1380
 			try {
1381 1381
 				$sth = $Connection->db->prepare($query);
1382 1382
                     		$sth->execute();
1383
-	                } catch(PDOException $e) {
1383
+	                } catch (PDOException $e) {
1384 1384
 				return "error : ".$e->getMessage();
1385 1385
 	                }
1386 1386
 	        }
1387 1387
 
1388 1388
 
1389
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1389
+		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql');
1390 1390
 		else {
1391
-			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1391
+			update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql');
1392 1392
 			$query = "CREATE EXTENSION postgis";
1393
-			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
1393
+			$Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']);
1394 1394
 			try {
1395 1395
 				$sth = $Connection->db->prepare($query);
1396 1396
 				$sth->execute();
1397
-			} catch(PDOException $e) {
1397
+			} catch (PDOException $e) {
1398 1398
 				return "error : ".$e->getMessage();
1399 1399
 			}
1400 1400
 		}
@@ -1407,7 +1407,7 @@  discard block
 block discarded – undo
1407 1407
 		include_once('class.create_db.php');
1408 1408
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1409 1409
 		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
1410
-		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1410
+		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz');
1411 1411
 		$error = '';
1412 1412
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
1413 1413
 			if ($globalDebug) echo "Gunzip...";
@@ -1439,14 +1439,14 @@  discard block
 block discarded – undo
1439 1439
 			try {
1440 1440
 				$sth = $Connection->db->prepare($query);
1441 1441
             	        	$sth->execute();
1442
-	                } catch(PDOException $e) {
1442
+	                } catch (PDOException $e) {
1443 1443
     	                	echo "error : ".$e->getMessage();
1444 1444
 	                }
1445 1445
 		}
1446 1446
 		if ($globalDBdriver == 'mysql') {
1447
-			update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql');
1447
+			update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql');
1448 1448
 		} else {
1449
-			update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql');
1449
+			update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql');
1450 1450
 		}
1451 1451
 		$error = create_db::import_file($tmp_dir.'countries.sql');
1452 1452
 		return $error;
@@ -1459,7 +1459,7 @@  discard block
 block discarded – undo
1459 1459
 //		update_db::unzip($tmp_dir.'AptNav.zip');
1460 1460
 //		update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz');
1461 1461
 //		update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
1462
-		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net');
1462
+		update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net');
1463 1463
 		update_db::gunzip($tmp_dir.'awy.dat.gz');
1464 1464
 		$error = update_db::waypoints($tmp_dir.'awy.dat');
1465 1465
 		return $error;
@@ -1479,7 +1479,7 @@  discard block
 block discarded – undo
1479 1479
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
1480 1480
 			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
1481 1481
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
1482
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
1482
+				if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
1483 1483
 			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1484 1484
 		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1485 1485
 		if ($error != '') {
@@ -1492,7 +1492,7 @@  discard block
 block discarded – undo
1492 1492
 		global $tmp_dir, $globalDebug;
1493 1493
 		$error = '';
1494 1494
 		if ($globalDebug) echo "Routes : Download...";
1495
-		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
1495
+		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz');
1496 1496
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
1497 1497
 			if ($globalDebug) echo "Gunzip...";
1498 1498
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
@@ -1508,7 +1508,7 @@  discard block
 block discarded – undo
1508 1508
 		global $tmp_dir, $globalDebug;
1509 1509
 		$error = '';
1510 1510
 		if ($globalDebug) echo "Schedules Oneworld : Download...";
1511
-		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
1511
+		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz');
1512 1512
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
1513 1513
 			if ($globalDebug) echo "Gunzip...";
1514 1514
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
@@ -1524,7 +1524,7 @@  discard block
 block discarded – undo
1524 1524
 		global $tmp_dir, $globalDebug;
1525 1525
 		$error = '';
1526 1526
 		if ($globalDebug) echo "Schedules Skyteam : Download...";
1527
-		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
1527
+		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz');
1528 1528
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
1529 1529
 			if ($globalDebug) echo "Gunzip...";
1530 1530
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
@@ -1552,7 +1552,7 @@  discard block
 block discarded – undo
1552 1552
 */
1553 1553
 		if ($globalDebug) echo "Modes : Download...";
1554 1554
 //		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1555
-		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
1555
+		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz');
1556 1556
 
1557 1557
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
1558 1558
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
@@ -1572,7 +1572,7 @@  discard block
 block discarded – undo
1572 1572
 	public static function update_ModeS_faa() {
1573 1573
 		global $tmp_dir, $globalDebug;
1574 1574
 		if ($globalDebug) echo "Modes FAA: Download...";
1575
-		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
1575
+		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip');
1576 1576
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
1577 1577
 			if ($globalDebug) echo "Unzip...";
1578 1578
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
@@ -1588,7 +1588,7 @@  discard block
 block discarded – undo
1588 1588
 	public static function update_ModeS_flarm() {
1589 1589
 		global $tmp_dir, $globalDebug;
1590 1590
 		if ($globalDebug) echo "Modes Flarmnet: Download...";
1591
-		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
1591
+		update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln');
1592 1592
 		if (file_exists($tmp_dir.'data.fln')) {
1593 1593
 			if ($globalDebug) echo "Add to DB...";
1594 1594
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
@@ -1602,7 +1602,7 @@  discard block
 block discarded – undo
1602 1602
 	public static function update_ModeS_ogn() {
1603 1603
 		global $tmp_dir, $globalDebug;
1604 1604
 		if ($globalDebug) echo "Modes OGN: Download...";
1605
-		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
1605
+		update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv');
1606 1606
 		if (file_exists($tmp_dir.'ogn.csv')) {
1607 1607
 			if ($globalDebug) echo "Add to DB...";
1608 1608
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
@@ -1617,173 +1617,173 @@  discard block
 block discarded – undo
1617 1617
 		global $tmp_dir, $globalDebug;
1618 1618
 		
1619 1619
 		if ($globalDebug) echo "Owner France: Download...";
1620
-		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
1620
+		update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv');
1621 1621
 		if (file_exists($tmp_dir.'owner_f.csv')) {
1622 1622
 			if ($globalDebug) echo "Add to DB...";
1623
-			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
1623
+			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F');
1624 1624
 		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
1625 1625
 		if ($error != '') {
1626 1626
 			return $error;
1627 1627
 		} elseif ($globalDebug) echo "Done\n";
1628 1628
 		
1629 1629
 		if ($globalDebug) echo "Owner Ireland: Download...";
1630
-		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
1630
+		update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv');
1631 1631
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
1632 1632
 			if ($globalDebug) echo "Add to DB...";
1633
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
1633
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI');
1634 1634
 		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
1635 1635
 		if ($error != '') {
1636 1636
 			return $error;
1637 1637
 		} elseif ($globalDebug) echo "Done\n";
1638 1638
 		if ($globalDebug) echo "Owner Switzerland: Download...";
1639
-		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
1639
+		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv');
1640 1640
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
1641 1641
 			if ($globalDebug) echo "Add to DB...";
1642
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
1642
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB');
1643 1643
 		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
1644 1644
 		if ($error != '') {
1645 1645
 			return $error;
1646 1646
 		} elseif ($globalDebug) echo "Done\n";
1647 1647
 		if ($globalDebug) echo "Owner Czech Republic: Download...";
1648
-		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
1648
+		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv');
1649 1649
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
1650 1650
 			if ($globalDebug) echo "Add to DB...";
1651
-			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
1651
+			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK');
1652 1652
 		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
1653 1653
 		if ($error != '') {
1654 1654
 			return $error;
1655 1655
 		} elseif ($globalDebug) echo "Done\n";
1656 1656
 		if ($globalDebug) echo "Owner Australia: Download...";
1657
-		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
1657
+		update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv');
1658 1658
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
1659 1659
 			if ($globalDebug) echo "Add to DB...";
1660
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
1660
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH');
1661 1661
 		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
1662 1662
 		if ($error != '') {
1663 1663
 			return $error;
1664 1664
 		} elseif ($globalDebug) echo "Done\n";
1665 1665
 		if ($globalDebug) echo "Owner Austria: Download...";
1666
-		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
1666
+		update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv');
1667 1667
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
1668 1668
 			if ($globalDebug) echo "Add to DB...";
1669
-			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
1669
+			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE');
1670 1670
 		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
1671 1671
 		if ($error != '') {
1672 1672
 			return $error;
1673 1673
 		} elseif ($globalDebug) echo "Done\n";
1674 1674
 		if ($globalDebug) echo "Owner Chile: Download...";
1675
-		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
1675
+		update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv');
1676 1676
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
1677 1677
 			if ($globalDebug) echo "Add to DB...";
1678
-			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
1678
+			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC');
1679 1679
 		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
1680 1680
 		if ($error != '') {
1681 1681
 			return $error;
1682 1682
 		} elseif ($globalDebug) echo "Done\n";
1683 1683
 		if ($globalDebug) echo "Owner Colombia: Download...";
1684
-		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
1684
+		update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv');
1685 1685
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
1686 1686
 			if ($globalDebug) echo "Add to DB...";
1687
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
1687
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ');
1688 1688
 		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
1689 1689
 		if ($error != '') {
1690 1690
 			return $error;
1691 1691
 		} elseif ($globalDebug) echo "Done\n";
1692 1692
 		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
1693
-		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
1693
+		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv');
1694 1694
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
1695 1695
 			if ($globalDebug) echo "Add to DB...";
1696
-			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
1696
+			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7');
1697 1697
 		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
1698 1698
 		if ($error != '') {
1699 1699
 			return $error;
1700 1700
 		} elseif ($globalDebug) echo "Done\n";
1701 1701
 		if ($globalDebug) echo "Owner Brazil: Download...";
1702
-		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
1702
+		update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv');
1703 1703
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
1704 1704
 			if ($globalDebug) echo "Add to DB...";
1705
-			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
1705
+			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP');
1706 1706
 		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
1707 1707
 		if ($error != '') {
1708 1708
 			return $error;
1709 1709
 		} elseif ($globalDebug) echo "Done\n";
1710 1710
 		if ($globalDebug) echo "Owner Cayman Islands: Download...";
1711
-		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
1711
+		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv');
1712 1712
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
1713 1713
 			if ($globalDebug) echo "Add to DB...";
1714
-			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
1714
+			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP');
1715 1715
 		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
1716 1716
 		if ($error != '') {
1717 1717
 			return $error;
1718 1718
 		} elseif ($globalDebug) echo "Done\n";
1719 1719
 		if ($globalDebug) echo "Owner Croatia: Download...";
1720
-		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
1720
+		update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv');
1721 1721
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
1722 1722
 			if ($globalDebug) echo "Add to DB...";
1723
-			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
1723
+			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A');
1724 1724
 		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
1725 1725
 		if ($error != '') {
1726 1726
 			return $error;
1727 1727
 		} elseif ($globalDebug) echo "Done\n";
1728 1728
 		if ($globalDebug) echo "Owner Luxembourg: Download...";
1729
-		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
1729
+		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv');
1730 1730
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
1731 1731
 			if ($globalDebug) echo "Add to DB...";
1732
-			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
1732
+			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX');
1733 1733
 		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
1734 1734
 		if ($error != '') {
1735 1735
 			return $error;
1736 1736
 		} elseif ($globalDebug) echo "Done\n";
1737 1737
 		if ($globalDebug) echo "Owner Maldives: Download...";
1738
-		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
1738
+		update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv');
1739 1739
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
1740 1740
 			if ($globalDebug) echo "Add to DB...";
1741
-			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
1741
+			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q');
1742 1742
 		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
1743 1743
 		if ($error != '') {
1744 1744
 			return $error;
1745 1745
 		} elseif ($globalDebug) echo "Done\n";
1746 1746
 		if ($globalDebug) echo "Owner New Zealand: Download...";
1747
-		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
1747
+		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv');
1748 1748
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
1749 1749
 			if ($globalDebug) echo "Add to DB...";
1750
-			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
1750
+			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK');
1751 1751
 		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
1752 1752
 		if ($error != '') {
1753 1753
 			return $error;
1754 1754
 		} elseif ($globalDebug) echo "Done\n";
1755 1755
 		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
1756
-		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
1756
+		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv');
1757 1757
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
1758 1758
 			if ($globalDebug) echo "Add to DB...";
1759
-			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
1759
+			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2');
1760 1760
 		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
1761 1761
 		if ($error != '') {
1762 1762
 			return $error;
1763 1763
 		} elseif ($globalDebug) echo "Done\n";
1764 1764
 		if ($globalDebug) echo "Owner Slovakia: Download...";
1765
-		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
1765
+		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv');
1766 1766
 		if (file_exists($tmp_dir.'owner_om.csv')) {
1767 1767
 			if ($globalDebug) echo "Add to DB...";
1768
-			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
1768
+			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM');
1769 1769
 		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
1770 1770
 		if ($error != '') {
1771 1771
 			return $error;
1772 1772
 		} elseif ($globalDebug) echo "Done\n";
1773 1773
 		if ($globalDebug) echo "Owner Ecuador: Download...";
1774
-		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
1774
+		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv');
1775 1775
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
1776 1776
 			if ($globalDebug) echo "Add to DB...";
1777
-			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
1777
+			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC');
1778 1778
 		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
1779 1779
 		if ($error != '') {
1780 1780
 			return $error;
1781 1781
 		} elseif ($globalDebug) echo "Done\n";
1782 1782
 		if ($globalDebug) echo "Owner Iceland: Download...";
1783
-		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
1783
+		update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv');
1784 1784
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
1785 1785
 			if ($globalDebug) echo "Add to DB...";
1786
-			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
1786
+			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF');
1787 1787
 		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
1788 1788
 		if ($error != '') {
1789 1789
 			return $error;
@@ -1795,7 +1795,7 @@  discard block
 block discarded – undo
1795 1795
 		global $tmp_dir, $globalDebug;
1796 1796
 		$error = '';
1797 1797
 		if ($globalDebug) echo "Translation : Download...";
1798
-		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
1798
+		update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip');
1799 1799
 		if (file_exists($tmp_dir.'translation.zip')) {
1800 1800
 			if ($globalDebug) echo "Unzip...";
1801 1801
 			update_db::unzip($tmp_dir.'translation.zip');
@@ -1811,7 +1811,7 @@  discard block
 block discarded – undo
1811 1811
 	public static function update_translation_fam() {
1812 1812
 		global $tmp_dir, $globalDebug;
1813 1813
 		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
1814
-		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
1814
+		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz');
1815 1815
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
1816 1816
 			if ($globalDebug) echo "Gunzip...";
1817 1817
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
@@ -1826,7 +1826,7 @@  discard block
 block discarded – undo
1826 1826
 	public static function update_ModeS_fam() {
1827 1827
 		global $tmp_dir, $globalDebug;
1828 1828
 		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
1829
-		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
1829
+		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz');
1830 1830
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
1831 1831
 			if ($globalDebug) echo "Gunzip...";
1832 1832
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
@@ -1842,9 +1842,9 @@  discard block
 block discarded – undo
1842 1842
 		global $tmp_dir, $globalDebug, $globalOwner;
1843 1843
 		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
1844 1844
 		if ($globalOwner === TRUE) {
1845
-			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
1845
+			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz');
1846 1846
 		} else {
1847
-			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
1847
+			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz');
1848 1848
 		}
1849 1849
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
1850 1850
 			if ($globalDebug) echo "Gunzip...";
@@ -1860,7 +1860,7 @@  discard block
 block discarded – undo
1860 1860
 	public static function update_routes_fam() {
1861 1861
 		global $tmp_dir, $globalDebug;
1862 1862
 		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
1863
-		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
1863
+		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz');
1864 1864
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
1865 1865
 			if ($globalDebug) echo "Gunzip...";
1866 1866
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
@@ -1879,18 +1879,18 @@  discard block
 block discarded – undo
1879 1879
 		$error = '';
1880 1880
 		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
1881 1881
 		if ($globalDBdriver == 'mysql') {
1882
-			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
1882
+			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
1883 1883
 		} else {
1884
-			update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
1884
+			update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5');
1885 1885
 		}
1886 1886
 		if (file_exists($tmp_dir.'airspace.sql.gz.md5')) {
1887
-			$airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
1887
+			$airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5'));
1888 1888
 			$airspace_md5 = $airspace_md5_file[0];
1889 1889
 			if (!update_db::check_airspace_version($airspace_md5)) {
1890 1890
 				if ($globalDBdriver == 'mysql') {
1891
-					update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz');
1891
+					update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz');
1892 1892
 				} else {
1893
-					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
1893
+					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz');
1894 1894
 				}
1895 1895
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
1896 1896
 					if ($globalDebug) echo "Gunzip...";
@@ -1902,7 +1902,7 @@  discard block
 block discarded – undo
1902 1902
 						try {
1903 1903
 							$sth = $Connection->db->prepare($query);
1904 1904
     	    	    					$sth->execute();
1905
-			            		} catch(PDOException $e) {
1905
+			            		} catch (PDOException $e) {
1906 1906
 							return "error : ".$e->getMessage();
1907 1907
 		            			}
1908 1908
 		    			}
@@ -1920,15 +1920,15 @@  discard block
 block discarded – undo
1920 1920
 	public static function update_tle() {
1921 1921
 		global $tmp_dir, $globalDebug;
1922 1922
 		if ($globalDebug) echo "Download TLE : Download...";
1923
-		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
1924
-		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
1925
-		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
1923
+		$alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt',
1924
+		'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt',
1925
+		'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt');
1926 1926
 		foreach ($alltle as $filename) {
1927 1927
 			if ($globalDebug) echo "downloading ".$filename.'...';
1928
-			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
1928
+			update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename);
1929 1929
 			if (file_exists($tmp_dir.$filename)) {
1930 1930
 				if ($globalDebug) echo "Add to DB ".$filename."...";
1931
-				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
1931
+				$error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename));
1932 1932
 			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
1933 1933
 			if ($error != '') {
1934 1934
 				echo $error."\n";
@@ -1941,32 +1941,32 @@  discard block
 block discarded – undo
1941 1941
 		global $tmp_dir, $globalDebug;
1942 1942
 		$error = '';
1943 1943
 		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
1944
-		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
1944
+		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum');
1945 1945
 		if (file_exists($tmp_dir.'models.md5sum')) {
1946 1946
 			if ($globalDebug) echo "Check files...\n";
1947 1947
 			$newmodelsdb = array();
1948
-			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
1949
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
1948
+			if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) {
1949
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
1950 1950
 					$model = trim($row[2]);
1951 1951
 					$newmodelsdb[$model] = trim($row[0]);
1952 1952
 				}
1953 1953
 			}
1954 1954
 			$modelsdb = array();
1955 1955
 			if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) {
1956
-				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) {
1957
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
1956
+				if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) {
1957
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
1958 1958
 						$model = trim($row[2]);
1959 1959
 						$modelsdb[$model] = trim($row[0]);
1960 1960
 					}
1961 1961
 				}
1962 1962
 			}
1963
-			$diff = array_diff($newmodelsdb,$modelsdb);
1963
+			$diff = array_diff($newmodelsdb, $modelsdb);
1964 1964
 			foreach ($diff as $key => $value) {
1965 1965
 				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
1966
-				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
1966
+				update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key);
1967 1967
 				
1968 1968
 			}
1969
-			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
1969
+			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum');
1970 1970
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
1971 1971
 		if ($error != '') {
1972 1972
 			return $error;
@@ -1978,32 +1978,32 @@  discard block
 block discarded – undo
1978 1978
 		global $tmp_dir, $globalDebug;
1979 1979
 		$error = '';
1980 1980
 		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
1981
-		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
1981
+		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum');
1982 1982
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
1983 1983
 			if ($globalDebug) echo "Check files...\n";
1984 1984
 			$newmodelsdb = array();
1985
-			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
1986
-				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
1985
+			if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) {
1986
+				while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
1987 1987
 					$model = trim($row[2]);
1988 1988
 					$newmodelsdb[$model] = trim($row[0]);
1989 1989
 				}
1990 1990
 			}
1991 1991
 			$modelsdb = array();
1992 1992
 			if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) {
1993
-				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) {
1994
-					while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
1993
+				if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) {
1994
+					while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) {
1995 1995
 						$model = trim($row[2]);
1996 1996
 						$modelsdb[$model] = trim($row[0]);
1997 1997
 					}
1998 1998
 				}
1999 1999
 			}
2000
-			$diff = array_diff($newmodelsdb,$modelsdb);
2000
+			$diff = array_diff($newmodelsdb, $modelsdb);
2001 2001
 			foreach ($diff as $key => $value) {
2002 2002
 				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
2003
-				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2003
+				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key);
2004 2004
 				
2005 2005
 			}
2006
-			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2006
+			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum');
2007 2007
 		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2008 2008
 		if ($error != '') {
2009 2009
 			return $error;
@@ -2026,8 +2026,8 @@  discard block
 block discarded – undo
2026 2026
 		*/
2027 2027
 		if (file_exists($tmp_dir.'aircrafts.html')) {
2028 2028
 		    //var_dump(file_get_html($tmp_dir.'aircrafts.html'));
2029
-		    $fh = fopen($tmp_dir.'aircrafts.html',"r");
2030
-		    $result = fread($fh,100000000);
2029
+		    $fh = fopen($tmp_dir.'aircrafts.html', "r");
2030
+		    $result = fread($fh, 100000000);
2031 2031
 		    //echo $result;
2032 2032
 		    //var_dump(str_get_html($result));
2033 2033
 		    //print_r(self::table2array($result));
@@ -2045,23 +2045,23 @@  discard block
 block discarded – undo
2045 2045
 			$Connection = new Connection();
2046 2046
 			$sth = $Connection->db->prepare($query);
2047 2047
                         $sth->execute();
2048
-                } catch(PDOException $e) {
2048
+                } catch (PDOException $e) {
2049 2049
                         return "error : ".$e->getMessage();
2050 2050
                 }
2051 2051
 
2052 2052
 		$error = '';
2053 2053
 		if ($globalDebug) echo "Notam : Download...";
2054
-		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2054
+		update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss');
2055 2055
 		if (file_exists($tmp_dir.'notam.rss')) {
2056
-			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
2056
+			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true);
2057 2057
 			foreach ($notams['channel']['item'] as $notam) {
2058
-				$title = explode(':',$notam['title']);
2058
+				$title = explode(':', $notam['title']);
2059 2059
 				$data['ref'] = trim($title[0]);
2060 2060
 				unset($title[0]);
2061
-				$data['title'] = trim(implode(':',$title));
2062
-				$description = strip_tags($notam['description'],'<pre>');
2063
-				preg_match(':^(.*?)<pre>:',$description,$match);
2064
-				$q = explode('/',$match[1]);
2061
+				$data['title'] = trim(implode(':', $title));
2062
+				$description = strip_tags($notam['description'], '<pre>');
2063
+				preg_match(':^(.*?)<pre>:', $description, $match);
2064
+				$q = explode('/', $match[1]);
2065 2065
 				$data['fir'] = $q[0];
2066 2066
 				$data['code'] = $q[1];
2067 2067
 				$ifrvfr = $q[2];
@@ -2077,30 +2077,30 @@  discard block
 block discarded – undo
2077 2077
 				$data['lower_limit'] = $q[5];
2078 2078
 				$data['upper_limit'] = $q[6];
2079 2079
 				$latlonrad = $q[7];
2080
-				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2081
-				$latitude = $Common->convertDec($las,'latitude');
2082
-				$longitude = $Common->convertDec($lns,'longitude');
2080
+				sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius);
2081
+				$latitude = $Common->convertDec($las, 'latitude');
2082
+				$longitude = $Common->convertDec($lns, 'longitude');
2083 2083
 				if ($lac == 'S') $latitude = '-'.$latitude;
2084 2084
 				if ($lnc == 'W') $longitude = '-'.$longitude;
2085 2085
 				$data['center_latitude'] = $latitude;
2086 2086
 				$data['center_longitude'] = $longitude;
2087 2087
 				$data['radius'] = intval($radius);
2088 2088
 				
2089
-				preg_match(':<pre>(.*?)</pre>:',$description,$match);
2089
+				preg_match(':<pre>(.*?)</pre>:', $description, $match);
2090 2090
 				$data['text'] = $match[1];
2091
-				preg_match(':</pre>(.*?)$:',$description,$match);
2091
+				preg_match(':</pre>(.*?)$:', $description, $match);
2092 2092
 				$fromto = $match[1];
2093
-				preg_match('#FROM:(.*?)TO:#',$fromto,$match);
2093
+				preg_match('#FROM:(.*?)TO:#', $fromto, $match);
2094 2094
 				$fromall = trim($match[1]);
2095
-				preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match);
2095
+				preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match);
2096 2096
 				$from = trim($match[1]);
2097
-				$data['date_begin'] = date("Y-m-d H:i:s",strtotime($from));
2098
-				preg_match('#TO:(.*?)$#',$fromto,$match);
2097
+				$data['date_begin'] = date("Y-m-d H:i:s", strtotime($from));
2098
+				preg_match('#TO:(.*?)$#', $fromto, $match);
2099 2099
 				$toall = trim($match[1]);
2100
-				if (!preg_match(':Permanent:',$toall)) {
2101
-					preg_match('#^(.*?) \((.*?)\)#',$toall,$match);
2100
+				if (!preg_match(':Permanent:', $toall)) {
2101
+					preg_match('#^(.*?) \((.*?)\)#', $toall, $match);
2102 2102
 					$to = trim($match[1]);
2103
-					$data['date_end'] = date("Y-m-d H:i:s",strtotime($to));
2103
+					$data['date_end'] = date("Y-m-d H:i:s", strtotime($to));
2104 2104
 					$data['permanent'] = 0;
2105 2105
 				} else {
2106 2106
 				    $data['date_end'] = NULL;
@@ -2108,7 +2108,7 @@  discard block
 block discarded – undo
2108 2108
 				}
2109 2109
 				$data['full_notam'] = $notam['title'].'<br>'.$notam['description'];
2110 2110
 				$NOTAM = new NOTAM();
2111
-				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2111
+				$NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
2112 2112
 				unset($data);
2113 2113
 			} 
2114 2114
 		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
@@ -2131,16 +2131,16 @@  discard block
 block discarded – undo
2131 2131
 				$Connection = new Connection();
2132 2132
 				$sth = $Connection->db->prepare($query);
2133 2133
 				$sth->execute();
2134
-			} catch(PDOException $e) {
2134
+			} catch (PDOException $e) {
2135 2135
 				return "error : ".$e->getMessage();
2136 2136
 			}
2137 2137
 		}
2138 2138
 		$Common = new Common();
2139 2139
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2140
-		$airspace_json = json_decode($airspace_lst,true);
2140
+		$airspace_json = json_decode($airspace_lst, true);
2141 2141
 		foreach ($airspace_json['records'] as $airspace) {
2142 2142
 			if ($globalDebug) echo $airspace['name']."...\n";
2143
-			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2143
+			update_db::download($airspace['uri'], $tmp_dir.$airspace['name']);
2144 2144
 			if (file_exists($tmp_dir.$airspace['name'])) {
2145 2145
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
2146 2146
 				//system('recode l9..utf8 '.$tmp_dir.$airspace['name']);
@@ -2164,7 +2164,7 @@  discard block
 block discarded – undo
2164 2164
 			$Connection = new Connection();
2165 2165
 			$sth = $Connection->db->prepare($query);
2166 2166
                         $sth->execute();
2167
-                } catch(PDOException $e) {
2167
+                } catch (PDOException $e) {
2168 2168
                         return "error : ".$e->getMessage();
2169 2169
                 }
2170 2170
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2179,7 +2179,7 @@  discard block
 block discarded – undo
2179 2179
 			$Connection = new Connection();
2180 2180
 			$sth = $Connection->db->prepare($query);
2181 2181
                         $sth->execute();
2182
-                } catch(PDOException $e) {
2182
+                } catch (PDOException $e) {
2183 2183
                         return "error : ".$e->getMessage();
2184 2184
                 }
2185 2185
 	}
@@ -2190,7 +2190,7 @@  discard block
 block discarded – undo
2190 2190
 			$Connection = new Connection();
2191 2191
 			$sth = $Connection->db->prepare($query);
2192 2192
                         $sth->execute(array(':version' => $version));
2193
-                } catch(PDOException $e) {
2193
+                } catch (PDOException $e) {
2194 2194
                         return "error : ".$e->getMessage();
2195 2195
                 }
2196 2196
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2206,7 +2206,7 @@  discard block
 block discarded – undo
2206 2206
 			$Connection = new Connection();
2207 2207
 			$sth = $Connection->db->prepare($query);
2208 2208
                         $sth->execute(array(':version' => $version));
2209
-                } catch(PDOException $e) {
2209
+                } catch (PDOException $e) {
2210 2210
                         return "error : ".$e->getMessage();
2211 2211
                 }
2212 2212
 	}
@@ -2222,7 +2222,7 @@  discard block
 block discarded – undo
2222 2222
 			$Connection = new Connection();
2223 2223
 			$sth = $Connection->db->prepare($query);
2224 2224
                         $sth->execute();
2225
-                } catch(PDOException $e) {
2225
+                } catch (PDOException $e) {
2226 2226
                         return "error : ".$e->getMessage();
2227 2227
                 }
2228 2228
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2237,7 +2237,7 @@  discard block
 block discarded – undo
2237 2237
 			$Connection = new Connection();
2238 2238
 			$sth = $Connection->db->prepare($query);
2239 2239
                         $sth->execute();
2240
-                } catch(PDOException $e) {
2240
+                } catch (PDOException $e) {
2241 2241
                         return "error : ".$e->getMessage();
2242 2242
                 }
2243 2243
 	}
@@ -2252,7 +2252,7 @@  discard block
 block discarded – undo
2252 2252
 			$Connection = new Connection();
2253 2253
 			$sth = $Connection->db->prepare($query);
2254 2254
                         $sth->execute();
2255
-                } catch(PDOException $e) {
2255
+                } catch (PDOException $e) {
2256 2256
                         return "error : ".$e->getMessage();
2257 2257
                 }
2258 2258
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2267,7 +2267,7 @@  discard block
 block discarded – undo
2267 2267
 			$Connection = new Connection();
2268 2268
 			$sth = $Connection->db->prepare($query);
2269 2269
                         $sth->execute();
2270
-                } catch(PDOException $e) {
2270
+                } catch (PDOException $e) {
2271 2271
                         return "error : ".$e->getMessage();
2272 2272
                 }
2273 2273
 	}
@@ -2283,7 +2283,7 @@  discard block
 block discarded – undo
2283 2283
 			$Connection = new Connection();
2284 2284
 			$sth = $Connection->db->prepare($query);
2285 2285
                         $sth->execute();
2286
-                } catch(PDOException $e) {
2286
+                } catch (PDOException $e) {
2287 2287
                         return "error : ".$e->getMessage();
2288 2288
                 }
2289 2289
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2298,7 +2298,7 @@  discard block
 block discarded – undo
2298 2298
 			$Connection = new Connection();
2299 2299
 			$sth = $Connection->db->prepare($query);
2300 2300
                         $sth->execute();
2301
-                } catch(PDOException $e) {
2301
+                } catch (PDOException $e) {
2302 2302
                         return "error : ".$e->getMessage();
2303 2303
                 }
2304 2304
 	}
@@ -2313,7 +2313,7 @@  discard block
 block discarded – undo
2313 2313
 			$Connection = new Connection();
2314 2314
 			$sth = $Connection->db->prepare($query);
2315 2315
                         $sth->execute();
2316
-                } catch(PDOException $e) {
2316
+                } catch (PDOException $e) {
2317 2317
                         return "error : ".$e->getMessage();
2318 2318
                 }
2319 2319
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2328,7 +2328,7 @@  discard block
 block discarded – undo
2328 2328
 			$Connection = new Connection();
2329 2329
 			$sth = $Connection->db->prepare($query);
2330 2330
                         $sth->execute();
2331
-                } catch(PDOException $e) {
2331
+                } catch (PDOException $e) {
2332 2332
                         return "error : ".$e->getMessage();
2333 2333
                 }
2334 2334
 	}
@@ -2343,7 +2343,7 @@  discard block
 block discarded – undo
2343 2343
 			$Connection = new Connection();
2344 2344
 			$sth = $Connection->db->prepare($query);
2345 2345
                         $sth->execute();
2346
-                } catch(PDOException $e) {
2346
+                } catch (PDOException $e) {
2347 2347
                         return "error : ".$e->getMessage();
2348 2348
                 }
2349 2349
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -2358,7 +2358,7 @@  discard block
 block discarded – undo
2358 2358
 			$Connection = new Connection();
2359 2359
 			$sth = $Connection->db->prepare($query);
2360 2360
                         $sth->execute();
2361
-                } catch(PDOException $e) {
2361
+                } catch (PDOException $e) {
2362 2362
                         return "error : ".$e->getMessage();
2363 2363
                 }
2364 2364
 	}
@@ -2373,7 +2373,7 @@  discard block
 block discarded – undo
2373 2373
 			$Connection = new Connection();
2374 2374
 			$sth = $Connection->db->prepare($query);
2375 2375
                         $sth->execute();
2376
-                } catch(PDOException $e) {
2376
+                } catch (PDOException $e) {
2377 2377
                         return "error : ".$e->getMessage();
2378 2378
                 }
2379 2379
 	}
@@ -2388,7 +2388,7 @@  discard block
 block discarded – undo
2388 2388
 			$Connection = new Connection();
2389 2389
 			$sth = $Connection->db->prepare($query);
2390 2390
                         $sth->execute();
2391
-                } catch(PDOException $e) {
2391
+                } catch (PDOException $e) {
2392 2392
                         return "error : ".$e->getMessage();
2393 2393
                 }
2394 2394
 	}
Please login to merge, or discard this patch.
Braces   +828 added lines, -287 removed lines patch added patch discarded remove patch
@@ -16,7 +16,9 @@  discard block
 block discarded – undo
16 16
 		curl_setopt($ch, CURLOPT_URL, $url);
17 17
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
18 18
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
19
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
19
+		if ($referer != '') {
20
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
21
+		}
20 22
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
21 23
 		curl_setopt($ch, CURLOPT_FILE, $fp);
22 24
 		curl_exec($ch);
@@ -27,12 +29,16 @@  discard block
 block discarded – undo
27 29
 	public static function gunzip($in_file,$out_file_name = '') {
28 30
 		//echo $in_file.' -> '.$out_file_name."\n";
29 31
 		$buffer_size = 4096; // read 4kb at a time
30
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
32
+		if ($out_file_name == '') {
33
+			$out_file_name = str_replace('.gz', '', $in_file);
34
+		}
31 35
 		if ($in_file != '' && file_exists($in_file)) {
32 36
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
33
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
34
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
35
-			else {
37
+			if (function_exists('gzopen')) {
38
+				$file = gzopen($in_file,'rb');
39
+			} elseif (function_exists('gzopen64')) {
40
+				$file = gzopen64($in_file,'rb');
41
+			} else {
36 42
 				echo 'gzopen not available';
37 43
 				die;
38 44
 			}
@@ -53,8 +59,12 @@  discard block
 block discarded – undo
53 59
 			if ($res === TRUE) {
54 60
 				$zip->extractTo($path);
55 61
 				$zip->close();
56
-			} else return false;
57
-		} else return false;
62
+			} else {
63
+				return false;
64
+			}
65
+		} else {
66
+			return false;
67
+		}
58 68
 	}
59 69
 	
60 70
 	public static function connect_sqlite($database) {
@@ -69,7 +79,9 @@  discard block
 block discarded – undo
69 79
 	public static function retrieve_route_sqlite_to_dest($database_file) {
70 80
 		global $globalDebug, $globalTransaction;
71 81
 		//$query = 'TRUNCATE TABLE routes';
72
-		if ($globalDebug) echo " - Delete previous routes from DB -";
82
+		if ($globalDebug) {
83
+			echo " - Delete previous routes from DB -";
84
+		}
73 85
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
74 86
 		$Connection = new Connection();
75 87
 		try {
@@ -80,7 +92,9 @@  discard block
 block discarded – undo
80 92
                         return "error : ".$e->getMessage();
81 93
                 }
82 94
 
83
-    		if ($globalDebug) echo " - Add routes to DB -";
95
+    		if ($globalDebug) {
96
+    			echo " - Add routes to DB -";
97
+    		}
84 98
     		update_db::connect_sqlite($database_file);
85 99
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
86 100
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
@@ -95,15 +109,21 @@  discard block
 block discarded – undo
95 109
 		$Connection = new Connection();
96 110
 		$sth_dest = $Connection->db->prepare($query_dest);
97 111
 		try {
98
-			if ($globalTransaction) $Connection->db->beginTransaction();
112
+			if ($globalTransaction) {
113
+				$Connection->db->beginTransaction();
114
+			}
99 115
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
100 116
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
101 117
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
102 118
 				$sth_dest->execute($query_dest_values);
103 119
             		}
104
-			if ($globalTransaction) $Connection->db->commit();
120
+			if ($globalTransaction) {
121
+				$Connection->db->commit();
122
+			}
105 123
 		} catch(PDOException $e) {
106
-			if ($globalTransaction) $Connection->db->rollBack(); 
124
+			if ($globalTransaction) {
125
+				$Connection->db->rollBack();
126
+			}
107 127
 			return "error : ".$e->getMessage();
108 128
 		}
109 129
                 return '';
@@ -111,7 +131,9 @@  discard block
 block discarded – undo
111 131
 	public static function retrieve_route_oneworld($database_file) {
112 132
 		global $globalDebug, $globalTransaction;
113 133
 		//$query = 'TRUNCATE TABLE routes';
114
-		if ($globalDebug) echo " - Delete previous routes from DB -";
134
+		if ($globalDebug) {
135
+			echo " - Delete previous routes from DB -";
136
+		}
115 137
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
116 138
 		$Connection = new Connection();
117 139
 		try {
@@ -122,14 +144,18 @@  discard block
 block discarded – undo
122 144
                         return "error : ".$e->getMessage();
123 145
                 }
124 146
 
125
-    		if ($globalDebug) echo " - Add routes to DB -";
147
+    		if ($globalDebug) {
148
+    			echo " - Add routes to DB -";
149
+    		}
126 150
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
127 151
 		$Spotter = new Spotter();
128 152
 		if ($fh = fopen($database_file,"r")) {
129 153
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
130 154
 			$Connection = new Connection();
131 155
 			$sth_dest = $Connection->db->prepare($query_dest);
132
-			if ($globalTransaction) $Connection->db->beginTransaction();
156
+			if ($globalTransaction) {
157
+				$Connection->db->beginTransaction();
158
+			}
133 159
 			while (!feof($fh)) {
134 160
 				$line = fgetcsv($fh,9999,',');
135 161
 				if ($line[0] != '') {
@@ -138,13 +164,17 @@  discard block
 block discarded – undo
138 164
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
139 165
 							$sth_dest->execute($query_dest_values);
140 166
 						} catch(PDOException $e) {
141
-							if ($globalTransaction) $Connection->db->rollBack(); 
167
+							if ($globalTransaction) {
168
+								$Connection->db->rollBack();
169
+							}
142 170
 							return "error : ".$e->getMessage();
143 171
 						}
144 172
 					}
145 173
 				}
146 174
 			}
147
-			if ($globalTransaction) $Connection->db->commit();
175
+			if ($globalTransaction) {
176
+				$Connection->db->commit();
177
+			}
148 178
 		}
149 179
                 return '';
150 180
 	}
@@ -152,7 +182,9 @@  discard block
 block discarded – undo
152 182
 	public static function retrieve_route_skyteam($database_file) {
153 183
 		global $globalDebug, $globalTransaction;
154 184
 		//$query = 'TRUNCATE TABLE routes';
155
-		if ($globalDebug) echo " - Delete previous routes from DB -";
185
+		if ($globalDebug) {
186
+			echo " - Delete previous routes from DB -";
187
+		}
156 188
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
157 189
 		$Connection = new Connection();
158 190
 		try {
@@ -163,7 +195,9 @@  discard block
 block discarded – undo
163 195
                         return "error : ".$e->getMessage();
164 196
                 }
165 197
 
166
-    		if ($globalDebug) echo " - Add routes to DB -";
198
+    		if ($globalDebug) {
199
+    			echo " - Add routes to DB -";
200
+    		}
167 201
 
168 202
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
169 203
 		$Spotter = new Spotter();
@@ -172,7 +206,9 @@  discard block
 block discarded – undo
172 206
 			$Connection = new Connection();
173 207
 			$sth_dest = $Connection->db->prepare($query_dest);
174 208
 			try {
175
-				if ($globalTransaction) $Connection->db->beginTransaction();
209
+				if ($globalTransaction) {
210
+					$Connection->db->beginTransaction();
211
+				}
176 212
 				while (!feof($fh)) {
177 213
 					$line = fgetcsv($fh,9999,',');
178 214
 					if ($line[0] != '') {
@@ -183,9 +219,13 @@  discard block
 block discarded – undo
183 219
 						}
184 220
 					}
185 221
 				}
186
-				if ($globalTransaction) $Connection->db->commit();
222
+				if ($globalTransaction) {
223
+					$Connection->db->commit();
224
+				}
187 225
 			} catch(PDOException $e) {
188
-				if ($globalTransaction) $Connection->db->rollBack(); 
226
+				if ($globalTransaction) {
227
+					$Connection->db->rollBack();
228
+				}
189 229
 				return "error : ".$e->getMessage();
190 230
 			}
191 231
 		}
@@ -228,11 +268,16 @@  discard block
 block discarded – undo
228 268
 		$sth_dest = $Connection->db->prepare($query_dest);
229 269
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
230 270
 		try {
231
-			if ($globalTransaction) $Connection->db->beginTransaction();
271
+			if ($globalTransaction) {
272
+				$Connection->db->beginTransaction();
273
+			}
232 274
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
233 275
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
234
-				if ($values['UserString4'] == 'M') $type = 'military';
235
-				else $type = null;
276
+				if ($values['UserString4'] == 'M') {
277
+					$type = 'military';
278
+				} else {
279
+					$type = null;
280
+				}
236 281
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
237 282
 				$sth_dest->execute($query_dest_values);
238 283
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -240,7 +285,9 @@  discard block
 block discarded – undo
240 285
 				    $sth_dest_owner->execute($query_dest_owner_values);
241 286
 				}
242 287
             		}
243
-			if ($globalTransaction) $Connection->db->commit();
288
+			if ($globalTransaction) {
289
+				$Connection->db->commit();
290
+			}
244 291
 		} catch(PDOException $e) {
245 292
 			return "error : ".$e->getMessage();
246 293
 		}
@@ -277,7 +324,9 @@  discard block
 block discarded – undo
277 324
 			$Connection = new Connection();
278 325
 			$sth_dest = $Connection->db->prepare($query_dest);
279 326
 			try {
280
-				if ($globalTransaction) $Connection->db->beginTransaction();
327
+				if ($globalTransaction) {
328
+					$Connection->db->beginTransaction();
329
+				}
281 330
             			while (!feof($fh)) {
282 331
             				$values = array();
283 332
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -288,7 +337,9 @@  discard block
 block discarded – undo
288 337
             				// Check if we can find ICAO, else set it to GLID
289 338
             				$aircraft_name_split = explode(' ',$aircraft_name);
290 339
             				$search_more = '';
291
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
340
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
341
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
342
+            				}
292 343
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
293 344
             				$sth_search = $Connection->db->prepare($query_search);
294 345
 					try {
@@ -301,7 +352,9 @@  discard block
 block discarded – undo
301 352
 					} catch(PDOException $e) {
302 353
 						return "error : ".$e->getMessage();
303 354
 					}
304
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
355
+					if (!isset($values['ICAOTypeCode'])) {
356
+						$values['ICAOTypeCode'] = 'GLID';
357
+					}
305 358
 					// Add data to db
306 359
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
307 360
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
@@ -310,7 +363,9 @@  discard block
 block discarded – undo
310 363
 						$sth_dest->execute($query_dest_values);
311 364
 					}
312 365
 				}
313
-				if ($globalTransaction) $Connection->db->commit();
366
+				if ($globalTransaction) {
367
+					$Connection->db->commit();
368
+				}
314 369
 			} catch(PDOException $e) {
315 370
 				return "error : ".$e->getMessage();
316 371
 			}
@@ -346,7 +401,9 @@  discard block
 block discarded – undo
346 401
 			$Connection = new Connection();
347 402
 			$sth_dest = $Connection->db->prepare($query_dest);
348 403
 			try {
349
-				if ($globalTransaction) $Connection->db->beginTransaction();
404
+				if ($globalTransaction) {
405
+					$Connection->db->beginTransaction();
406
+				}
350 407
 				$tmp = fgetcsv($fh,9999,',',"'");
351 408
             			while (!feof($fh)) {
352 409
             				$line = fgetcsv($fh,9999,',',"'");
@@ -359,13 +416,17 @@  discard block
 block discarded – undo
359 416
             				// Check if we can find ICAO, else set it to GLID
360 417
             				$aircraft_name_split = explode(' ',$aircraft_name);
361 418
             				$search_more = '';
362
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
419
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
420
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
421
+            				}
363 422
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
364 423
             				$sth_search = $Connection->db->prepare($query_search);
365 424
 					try {
366 425
                                     		$sth_search->execute();
367 426
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
368
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
427
+	            				if (isset($result['icao']) && $result['icao'] != '') {
428
+	            					$values['ICAOTypeCode'] = $result['icao'];
429
+	            				}
369 430
 					} catch(PDOException $e) {
370 431
 						return "error : ".$e->getMessage();
371 432
 					}
@@ -378,7 +439,9 @@  discard block
 block discarded – undo
378 439
 						$sth_dest->execute($query_dest_values);
379 440
 					}
380 441
 				}
381
-				if ($globalTransaction) $Connection->db->commit();
442
+				if ($globalTransaction) {
443
+					$Connection->db->commit();
444
+				}
382 445
 			} catch(PDOException $e) {
383 446
 				return "error : ".$e->getMessage();
384 447
 			}
@@ -414,7 +477,9 @@  discard block
 block discarded – undo
414 477
 			$Connection = new Connection();
415 478
 			$sth_dest = $Connection->db->prepare($query_dest);
416 479
 			try {
417
-				if ($globalTransaction) $Connection->db->beginTransaction();
480
+				if ($globalTransaction) {
481
+					$Connection->db->beginTransaction();
482
+				}
418 483
 				$tmp = fgetcsv($fh,9999,',','"');
419 484
             			while (!feof($fh)) {
420 485
             				$line = fgetcsv($fh,9999,',','"');
@@ -424,16 +489,22 @@  discard block
 block discarded – undo
424 489
             				    $values['registration'] = $line[0];
425 490
             				    $values['base'] = $line[4];
426 491
             				    $values['owner'] = $line[5];
427
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
428
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
492
+            				    if ($line[6] == '') {
493
+            				    	$values['date_first_reg'] = null;
494
+            				    } else {
495
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
496
+					    }
429 497
 					    $values['cancel'] = $line[7];
430 498
 					} elseif ($country == 'EI') {
431 499
 					    // TODO : add modeS & reg to aircraft_modes
432 500
             				    $values['registration'] = $line[0];
433 501
             				    $values['base'] = $line[3];
434 502
             				    $values['owner'] = $line[2];
435
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
436
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
503
+            				    if ($line[1] == '') {
504
+            				    	$values['date_first_reg'] = null;
505
+            				    } else {
506
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
507
+					    }
437 508
 					    $values['cancel'] = '';
438 509
 					} elseif ($country == 'HB') {
439 510
 					    // TODO : add modeS & reg to aircraft_modes
@@ -447,16 +518,22 @@  discard block
 block discarded – undo
447 518
             				    $values['registration'] = $line[3];
448 519
             				    $values['base'] = null;
449 520
             				    $values['owner'] = $line[5];
450
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
451
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
521
+            				    if ($line[18] == '') {
522
+            				    	$values['date_first_reg'] = null;
523
+            				    } else {
524
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
525
+					    }
452 526
 					    $values['cancel'] = '';
453 527
 					} elseif ($country == 'VH') {
454 528
 					    // TODO : add modeS & reg to aircraft_modes
455 529
             				    $values['registration'] = $line[0];
456 530
             				    $values['base'] = null;
457 531
             				    $values['owner'] = $line[12];
458
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
459
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
532
+            				    if ($line[28] == '') {
533
+            				    	$values['date_first_reg'] = null;
534
+            				    } else {
535
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
536
+					    }
460 537
 
461 538
 					    $values['cancel'] = $line[39];
462 539
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -475,29 +552,41 @@  discard block
 block discarded – undo
475 552
             				    $values['registration'] = $line[0];
476 553
             				    $values['base'] = null;
477 554
             				    $values['owner'] = $line[8];
478
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
479
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
555
+            				    if ($line[7] == '') {
556
+            				    	$values['date_first_reg'] = null;
557
+            				    } else {
558
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
559
+					    }
480 560
 					    $values['cancel'] = '';
481 561
 					} elseif ($country == 'PP') {
482 562
             				    $values['registration'] = $line[0];
483 563
             				    $values['base'] = null;
484 564
             				    $values['owner'] = $line[4];
485
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
486
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
565
+            				    if ($line[6] == '') {
566
+            				    	$values['date_first_reg'] = null;
567
+            				    } else {
568
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
569
+					    }
487 570
 					    $values['cancel'] = $line[7];
488 571
 					} elseif ($country == 'E7') {
489 572
             				    $values['registration'] = $line[0];
490 573
             				    $values['base'] = null;
491 574
             				    $values['owner'] = $line[4];
492
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
493
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
575
+            				    if ($line[5] == '') {
576
+            				    	$values['date_first_reg'] = null;
577
+            				    } else {
578
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
579
+					    }
494 580
 					    $values['cancel'] = '';
495 581
 					} elseif ($country == '8Q') {
496 582
             				    $values['registration'] = $line[0];
497 583
             				    $values['base'] = null;
498 584
             				    $values['owner'] = $line[3];
499
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
500
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
585
+            				    if ($line[7] == '') {
586
+            				    	$values['date_first_reg'] = null;
587
+            				    } else {
588
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
589
+					    }
501 590
 					    $values['cancel'] = '';
502 591
 					} elseif ($country == 'ZK' || $country == 'OM' || $country == 'TF') {
503 592
             				    $values['registration'] = $line[0];
@@ -511,7 +600,9 @@  discard block
 block discarded – undo
511 600
 						$sth_dest->execute($query_dest_values);
512 601
 					}
513 602
 				}
514
-				if ($globalTransaction) $Connection->db->commit();
603
+				if ($globalTransaction) {
604
+					$Connection->db->commit();
605
+				}
515 606
 			} catch(PDOException $e) {
516 607
 				return "error : ".$e->getMessage();
517 608
 			}
@@ -645,25 +736,45 @@  discard block
 block discarded – undo
645 736
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
646 737
 		$Connection = new Connection();
647 738
 		$sth_dest = $Connection->db->prepare($query_dest);
648
-		if ($globalTransaction) $Connection->db->beginTransaction();
739
+		if ($globalTransaction) {
740
+			$Connection->db->beginTransaction();
741
+		}
649 742
   
650 743
 		$i = 0;
651 744
 		while($row = sparql_fetch_array($result))
652 745
 		{
653 746
 			if ($i >= 1) {
654 747
 			//print_r($row);
655
-			if (!isset($row['iata'])) $row['iata'] = '';
656
-			if (!isset($row['icao'])) $row['icao'] = '';
657
-			if (!isset($row['type'])) $row['type'] = '';
658
-			if (!isset($row['altitude'])) $row['altitude'] = '';
748
+			if (!isset($row['iata'])) {
749
+				$row['iata'] = '';
750
+			}
751
+			if (!isset($row['icao'])) {
752
+				$row['icao'] = '';
753
+			}
754
+			if (!isset($row['type'])) {
755
+				$row['type'] = '';
756
+			}
757
+			if (!isset($row['altitude'])) {
758
+				$row['altitude'] = '';
759
+			}
659 760
 			if (isset($row['city_bis'])) {
660 761
 				$row['city'] = $row['city_bis'];
661 762
 			}
662
-			if (!isset($row['city'])) $row['city'] = '';
663
-			if (!isset($row['country'])) $row['country'] = '';
664
-			if (!isset($row['homepage'])) $row['homepage'] = '';
665
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
666
-			if (!isset($row['name'])) continue;
763
+			if (!isset($row['city'])) {
764
+				$row['city'] = '';
765
+			}
766
+			if (!isset($row['country'])) {
767
+				$row['country'] = '';
768
+			}
769
+			if (!isset($row['homepage'])) {
770
+				$row['homepage'] = '';
771
+			}
772
+			if (!isset($row['wikipedia_page'])) {
773
+				$row['wikipedia_page'] = '';
774
+			}
775
+			if (!isset($row['name'])) {
776
+				continue;
777
+			}
667 778
 			if (!isset($row['image'])) {
668 779
 				$row['image'] = '';
669 780
 				$row['image_thumb'] = '';
@@ -699,7 +810,9 @@  discard block
 block discarded – undo
699 810
 
700 811
 			$i++;
701 812
 		}
702
-		if ($globalTransaction) $Connection->db->commit();
813
+		if ($globalTransaction) {
814
+			$Connection->db->commit();
815
+		}
703 816
 		echo "Delete duplicate rows...\n";
704 817
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
705 818
 		try {
@@ -711,7 +824,9 @@  discard block
 block discarded – undo
711 824
                 }
712 825
 
713 826
 
714
-		if ($globalDebug) echo "Insert Not available Airport...\n";
827
+		if ($globalDebug) {
828
+			echo "Insert Not available Airport...\n";
829
+		}
715 830
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
716 831
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
717 832
 		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
@@ -738,7 +853,9 @@  discard block
 block discarded – undo
738 853
 		$delimiter = ',';
739 854
 		$out_file = $tmp_dir.'airports.csv';
740 855
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
741
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
856
+		if (!file_exists($out_file) || !is_readable($out_file)) {
857
+			return FALSE;
858
+		}
742 859
 		echo "Add data from ourairports.com...\n";
743 860
 
744 861
 		$header = NULL;
@@ -748,8 +865,9 @@  discard block
 block discarded – undo
748 865
 			//$Connection->db->beginTransaction();
749 866
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
750 867
 			{
751
-				if(!$header) $header = $row;
752
-				else {
868
+				if(!$header) {
869
+					$header = $row;
870
+				} else {
753 871
 					$data = array();
754 872
 					$data = array_combine($header, $row);
755 873
 					try {
@@ -787,7 +905,9 @@  discard block
 block discarded – undo
787 905
 		echo "Download data from another free database...\n";
788 906
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
789 907
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
790
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
908
+		if (!file_exists($out_file) || !is_readable($out_file)) {
909
+			return FALSE;
910
+		}
791 911
 		update_db::unzip($out_file);
792 912
 		$header = NULL;
793 913
 		echo "Add data from another free database...\n";
@@ -798,8 +918,9 @@  discard block
 block discarded – undo
798 918
 			//$Connection->db->beginTransaction();
799 919
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
800 920
 			{
801
-				if(!$header) $header = $row;
802
-				else {
921
+				if(!$header) {
922
+					$header = $row;
923
+				} else {
803 924
 					$data = $row;
804 925
 
805 926
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
@@ -974,7 +1095,9 @@  discard block
 block discarded – undo
974 1095
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
975 1096
 		{
976 1097
 			$i = 0;
977
-			if ($globalTransaction) $Connection->db->beginTransaction();
1098
+			if ($globalTransaction) {
1099
+				$Connection->db->beginTransaction();
1100
+			}
978 1101
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
979 1102
 			{
980 1103
 				if ($i > 0) {
@@ -987,7 +1110,9 @@  discard block
 block discarded – undo
987 1110
 					}
988 1111
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
989 1112
 					if (!empty($result_search)) {
990
-						if ($globalDebug) echo '.';
1113
+						if ($globalDebug) {
1114
+							echo '.';
1115
+						}
991 1116
 						$queryi = 'UPDATE aircraft SET mfr = :mfr WHERE icao = :icao';
992 1117
 						try {
993 1118
 							$sthi = $Connection->db->prepare($queryi);
@@ -1005,8 +1130,12 @@  discard block
 block discarded – undo
1005 1130
 						}
1006 1131
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1007 1132
 						if (!empty($result_search_mfr)) {
1008
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1009
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1133
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1134
+								$data[16] = $data[23];
1135
+							}
1136
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1137
+								$data[16] = $data[15];
1138
+							}
1010 1139
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1011 1140
 							try {
1012 1141
 								$sthf = $Connection->db->prepare($queryf);
@@ -1017,7 +1146,9 @@  discard block
 block discarded – undo
1017 1146
 						}
1018 1147
 					}
1019 1148
 					if (strtotime($data[29]) > time()) {
1020
-						if ($globalDebug) echo 'i';
1149
+						if ($globalDebug) {
1150
+							echo 'i';
1151
+						}
1021 1152
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1022 1153
 						try {
1023 1154
 							$sth = $Connection->db->prepare($query);
@@ -1028,13 +1159,19 @@  discard block
 block discarded – undo
1028 1159
 					}
1029 1160
 				}
1030 1161
 				if ($i % 90 == 0) {
1031
-					if ($globalTransaction) $Connection->db->commit();
1032
-					if ($globalTransaction) $Connection->db->beginTransaction();
1162
+					if ($globalTransaction) {
1163
+						$Connection->db->commit();
1164
+					}
1165
+					if ($globalTransaction) {
1166
+						$Connection->db->beginTransaction();
1167
+					}
1033 1168
 				}
1034 1169
 				$i++;
1035 1170
 			}
1036 1171
 			fclose($handle);
1037
-			if ($globalTransaction) $Connection->db->commit();
1172
+			if ($globalTransaction) {
1173
+				$Connection->db->commit();
1174
+			}
1038 1175
 		}
1039 1176
 		return '';
1040 1177
         }
@@ -1058,7 +1195,9 @@  discard block
 block discarded – undo
1058 1195
 			$i = 0;
1059 1196
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1060 1197
 			//$Connection->db->beginTransaction();
1061
-			if ($globalTransaction) $Connection->db->beginTransaction();
1198
+			if ($globalTransaction) {
1199
+				$Connection->db->beginTransaction();
1200
+			}
1062 1201
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1063 1202
 			{
1064 1203
 				if ($i > 0) {
@@ -1073,7 +1212,9 @@  discard block
 block discarded – undo
1073 1212
 				$i++;
1074 1213
 			}
1075 1214
 			fclose($handle);
1076
-			if ($globalTransaction) $Connection->db->commit();
1215
+			if ($globalTransaction) {
1216
+				$Connection->db->commit();
1217
+			}
1077 1218
 		}
1078 1219
 		return '';
1079 1220
         }
@@ -1094,7 +1235,9 @@  discard block
 block discarded – undo
1094 1235
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1095 1236
 		{
1096 1237
 			$i = 0;
1097
-			if ($globalTransaction) $Connection->db->beginTransaction();
1238
+			if ($globalTransaction) {
1239
+				$Connection->db->beginTransaction();
1240
+			}
1098 1241
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1099 1242
 			{
1100 1243
 				if ($i > 0) {
@@ -1110,7 +1253,9 @@  discard block
 block discarded – undo
1110 1253
 				$i++;
1111 1254
 			}
1112 1255
 			fclose($handle);
1113
-			if ($globalTransaction) $Connection->db->commit();
1256
+			if ($globalTransaction) {
1257
+				$Connection->db->commit();
1258
+			}
1114 1259
 		}
1115 1260
 		return '';
1116 1261
         }
@@ -1135,7 +1280,9 @@  discard block
 block discarded – undo
1135 1280
 			$i = 0;
1136 1281
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1137 1282
 			//$Connection->db->beginTransaction();
1138
-			if ($globalTransaction) $Connection->db->beginTransaction();
1283
+			if ($globalTransaction) {
1284
+				$Connection->db->beginTransaction();
1285
+			}
1139 1286
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1140 1287
 			{
1141 1288
 				if ($i > 0) {
@@ -1150,7 +1297,9 @@  discard block
 block discarded – undo
1150 1297
 				$i++;
1151 1298
 			}
1152 1299
 			fclose($handle);
1153
-			if ($globalTransaction) $Connection->db->commit();
1300
+			if ($globalTransaction) {
1301
+				$Connection->db->commit();
1302
+			}
1154 1303
 		}
1155 1304
 		return '';
1156 1305
         }
@@ -1301,7 +1450,9 @@  discard block
 block discarded – undo
1301 1450
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1302 1451
 		{
1303 1452
 			$i = 0;
1304
-			if ($globalTransaction) $Connection->db->beginTransaction();
1453
+			if ($globalTransaction) {
1454
+				$Connection->db->beginTransaction();
1455
+			}
1305 1456
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1306 1457
 			{
1307 1458
 				$i++;
@@ -1329,7 +1480,9 @@  discard block
 block discarded – undo
1329 1480
 				}
1330 1481
 			}
1331 1482
 			fclose($handle);
1332
-			if ($globalTransaction) $Connection->db->commit();
1483
+			if ($globalTransaction) {
1484
+				$Connection->db->commit();
1485
+			}
1333 1486
 		}
1334 1487
 		return '';
1335 1488
         }
@@ -1352,7 +1505,9 @@  discard block
 block discarded – undo
1352 1505
 		$Connection = new Connection();
1353 1506
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1354 1507
 		{
1355
-			if ($globalTransaction) $Connection->db->beginTransaction();
1508
+			if ($globalTransaction) {
1509
+				$Connection->db->beginTransaction();
1510
+			}
1356 1511
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1357 1512
 			{
1358 1513
 				if(count($row) > 1) {
@@ -1366,7 +1521,9 @@  discard block
 block discarded – undo
1366 1521
 				}
1367 1522
 			}
1368 1523
 			fclose($handle);
1369
-			if ($globalTransaction) $Connection->db->commit();
1524
+			if ($globalTransaction) {
1525
+				$Connection->db->commit();
1526
+			}
1370 1527
 		}
1371 1528
 		return '';
1372 1529
         }
@@ -1386,8 +1543,9 @@  discard block
 block discarded – undo
1386 1543
 	        }
1387 1544
 
1388 1545
 
1389
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1390
-		else {
1546
+		if ($globalDBdriver == 'mysql') {
1547
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1548
+		} else {
1391 1549
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1392 1550
 			$query = "CREATE EXTENSION postgis";
1393 1551
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1406,20 +1564,30 @@  discard block
 block discarded – undo
1406 1564
 		global $tmp_dir, $globalDebug;
1407 1565
 		include_once('class.create_db.php');
1408 1566
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1409
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
1567
+		if ($globalDebug) {
1568
+			echo "NOTAM from FlightAirMap website : Download...";
1569
+		}
1410 1570
 		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1411 1571
 		$error = '';
1412 1572
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
1413
-			if ($globalDebug) echo "Gunzip...";
1573
+			if ($globalDebug) {
1574
+				echo "Gunzip...";
1575
+			}
1414 1576
 			update_db::gunzip($tmp_dir.'notam.txt.gz');
1415
-			if ($globalDebug) echo "Add to DB...";
1577
+			if ($globalDebug) {
1578
+				echo "Add to DB...";
1579
+			}
1416 1580
 			//$error = create_db::import_file($tmp_dir.'notam.sql');
1417 1581
 			$NOTAM = new NOTAM();
1418 1582
 			$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1419
-		} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1583
+		} else {
1584
+			$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1585
+		}
1420 1586
 		if ($error != '') {
1421 1587
 			return $error;
1422
-		} elseif ($globalDebug) echo "Done\n";
1588
+		} elseif ($globalDebug) {
1589
+			echo "Done\n";
1590
+		}
1423 1591
 		return '';
1424 1592
 	}
1425 1593
 
@@ -1473,67 +1641,111 @@  discard block
 block discarded – undo
1473 1641
 		//if ($globalDebug) echo "IVAO : Download...";
1474 1642
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
1475 1643
 		if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
1476
-			if ($globalDebug) echo "Unzip...";
1644
+			if ($globalDebug) {
1645
+				echo "Unzip...";
1646
+			}
1477 1647
 			update_db::unzip($tmp_dir.'ivae_feb2013.zip');
1478
-			if ($globalDebug) echo "Add to DB...";
1648
+			if ($globalDebug) {
1649
+				echo "Add to DB...";
1650
+			}
1479 1651
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
1480
-			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
1652
+			if ($globalDebug) {
1653
+				echo "Copy airlines logos to airlines images directory...";
1654
+			}
1481 1655
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
1482
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
1483
-			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1484
-		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1656
+				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
1657
+					$error = "Failed to copy airlines logo.";
1658
+				}
1659
+			} else {
1660
+				$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1661
+			}
1662
+		} else {
1663
+			$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1664
+		}
1485 1665
 		if ($error != '') {
1486 1666
 			return $error;
1487
-		} elseif ($globalDebug) echo "Done\n";
1667
+		} elseif ($globalDebug) {
1668
+			echo "Done\n";
1669
+		}
1488 1670
 		return '';
1489 1671
 	}
1490 1672
 
1491 1673
 	public static function update_routes() {
1492 1674
 		global $tmp_dir, $globalDebug;
1493 1675
 		$error = '';
1494
-		if ($globalDebug) echo "Routes : Download...";
1676
+		if ($globalDebug) {
1677
+			echo "Routes : Download...";
1678
+		}
1495 1679
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
1496 1680
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
1497
-			if ($globalDebug) echo "Gunzip...";
1681
+			if ($globalDebug) {
1682
+				echo "Gunzip...";
1683
+			}
1498 1684
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
1499
-			if ($globalDebug) echo "Add to DB...";
1685
+			if ($globalDebug) {
1686
+				echo "Add to DB...";
1687
+			}
1500 1688
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
1501
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1689
+		} else {
1690
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1691
+		}
1502 1692
 		if ($error != '') {
1503 1693
 			return $error;
1504
-		} elseif ($globalDebug) echo "Done\n";
1694
+		} elseif ($globalDebug) {
1695
+			echo "Done\n";
1696
+		}
1505 1697
 		return '';
1506 1698
 	}
1507 1699
 	public static function update_oneworld() {
1508 1700
 		global $tmp_dir, $globalDebug;
1509 1701
 		$error = '';
1510
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
1702
+		if ($globalDebug) {
1703
+			echo "Schedules Oneworld : Download...";
1704
+		}
1511 1705
 		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
1512 1706
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
1513
-			if ($globalDebug) echo "Gunzip...";
1707
+			if ($globalDebug) {
1708
+				echo "Gunzip...";
1709
+			}
1514 1710
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
1515
-			if ($globalDebug) echo "Add to DB...";
1711
+			if ($globalDebug) {
1712
+				echo "Add to DB...";
1713
+			}
1516 1714
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
1517
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1715
+		} else {
1716
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1717
+		}
1518 1718
 		if ($error != '') {
1519 1719
 			return $error;
1520
-		} elseif ($globalDebug) echo "Done\n";
1720
+		} elseif ($globalDebug) {
1721
+			echo "Done\n";
1722
+		}
1521 1723
 		return '';
1522 1724
 	}
1523 1725
 	public static function update_skyteam() {
1524 1726
 		global $tmp_dir, $globalDebug;
1525 1727
 		$error = '';
1526
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
1728
+		if ($globalDebug) {
1729
+			echo "Schedules Skyteam : Download...";
1730
+		}
1527 1731
 		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
1528 1732
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
1529
-			if ($globalDebug) echo "Gunzip...";
1733
+			if ($globalDebug) {
1734
+				echo "Gunzip...";
1735
+			}
1530 1736
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
1531
-			if ($globalDebug) echo "Add to DB...";
1737
+			if ($globalDebug) {
1738
+				echo "Add to DB...";
1739
+			}
1532 1740
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
1533
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1741
+		} else {
1742
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1743
+		}
1534 1744
 		if ($error != '') {
1535 1745
 			return $error;
1536
-		} elseif ($globalDebug) echo "Done\n";
1746
+		} elseif ($globalDebug) {
1747
+			echo "Done\n";
1748
+		}
1537 1749
 		return '';
1538 1750
 	}
1539 1751
 	public static function update_ModeS() {
@@ -1550,326 +1762,564 @@  discard block
 block discarded – undo
1550 1762
 			exit;
1551 1763
 		} elseif ($globalDebug) echo "Done\n";
1552 1764
 */
1553
-		if ($globalDebug) echo "Modes : Download...";
1554
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1765
+		if ($globalDebug) {
1766
+			echo "Modes : Download...";
1767
+		}
1768
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1555 1769
 		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
1556 1770
 
1557 1771
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
1558 1772
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
1559
-			if ($globalDebug) echo "Unzip...";
1560
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1773
+			if ($globalDebug) {
1774
+				echo "Unzip...";
1775
+			}
1776
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1561 1777
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
1562
-			if ($globalDebug) echo "Add to DB...";
1778
+			if ($globalDebug) {
1779
+				echo "Add to DB...";
1780
+			}
1563 1781
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
1564 1782
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
1565
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1783
+		} else {
1784
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1785
+		}
1566 1786
 		if ($error != '') {
1567 1787
 			return $error;
1568
-		} elseif ($globalDebug) echo "Done\n";
1788
+		} elseif ($globalDebug) {
1789
+			echo "Done\n";
1790
+		}
1569 1791
 		return '';
1570 1792
 	}
1571 1793
 
1572 1794
 	public static function update_ModeS_faa() {
1573 1795
 		global $tmp_dir, $globalDebug;
1574
-		if ($globalDebug) echo "Modes FAA: Download...";
1796
+		if ($globalDebug) {
1797
+			echo "Modes FAA: Download...";
1798
+		}
1575 1799
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
1576 1800
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
1577
-			if ($globalDebug) echo "Unzip...";
1801
+			if ($globalDebug) {
1802
+				echo "Unzip...";
1803
+			}
1578 1804
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
1579
-			if ($globalDebug) echo "Add to DB...";
1805
+			if ($globalDebug) {
1806
+				echo "Add to DB...";
1807
+			}
1580 1808
 			$error = update_db::modes_faa();
1581
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1809
+		} else {
1810
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1811
+		}
1582 1812
 		if ($error != '') {
1583 1813
 			return $error;
1584
-		} elseif ($globalDebug) echo "Done\n";
1814
+		} elseif ($globalDebug) {
1815
+			echo "Done\n";
1816
+		}
1585 1817
 		return '';
1586 1818
 	}
1587 1819
 
1588 1820
 	public static function update_ModeS_flarm() {
1589 1821
 		global $tmp_dir, $globalDebug;
1590
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
1822
+		if ($globalDebug) {
1823
+			echo "Modes Flarmnet: Download...";
1824
+		}
1591 1825
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
1592 1826
 		if (file_exists($tmp_dir.'data.fln')) {
1593
-			if ($globalDebug) echo "Add to DB...";
1827
+			if ($globalDebug) {
1828
+				echo "Add to DB...";
1829
+			}
1594 1830
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
1595
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1831
+		} else {
1832
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1833
+		}
1596 1834
 		if ($error != '') {
1597 1835
 			return $error;
1598
-		} elseif ($globalDebug) echo "Done\n";
1836
+		} elseif ($globalDebug) {
1837
+			echo "Done\n";
1838
+		}
1599 1839
 		return '';
1600 1840
 	}
1601 1841
 
1602 1842
 	public static function update_ModeS_ogn() {
1603 1843
 		global $tmp_dir, $globalDebug;
1604
-		if ($globalDebug) echo "Modes OGN: Download...";
1844
+		if ($globalDebug) {
1845
+			echo "Modes OGN: Download...";
1846
+		}
1605 1847
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
1606 1848
 		if (file_exists($tmp_dir.'ogn.csv')) {
1607
-			if ($globalDebug) echo "Add to DB...";
1849
+			if ($globalDebug) {
1850
+				echo "Add to DB...";
1851
+			}
1608 1852
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
1609
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1853
+		} else {
1854
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1855
+		}
1610 1856
 		if ($error != '') {
1611 1857
 			return $error;
1612
-		} elseif ($globalDebug) echo "Done\n";
1858
+		} elseif ($globalDebug) {
1859
+			echo "Done\n";
1860
+		}
1613 1861
 		return '';
1614 1862
 	}
1615 1863
 
1616 1864
 	public static function update_owner() {
1617 1865
 		global $tmp_dir, $globalDebug;
1618 1866
 		
1619
-		if ($globalDebug) echo "Owner France: Download...";
1867
+		if ($globalDebug) {
1868
+			echo "Owner France: Download...";
1869
+		}
1620 1870
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
1621 1871
 		if (file_exists($tmp_dir.'owner_f.csv')) {
1622
-			if ($globalDebug) echo "Add to DB...";
1872
+			if ($globalDebug) {
1873
+				echo "Add to DB...";
1874
+			}
1623 1875
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
1624
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
1876
+		} else {
1877
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
1878
+		}
1625 1879
 		if ($error != '') {
1626 1880
 			return $error;
1627
-		} elseif ($globalDebug) echo "Done\n";
1881
+		} elseif ($globalDebug) {
1882
+			echo "Done\n";
1883
+		}
1628 1884
 		
1629
-		if ($globalDebug) echo "Owner Ireland: Download...";
1885
+		if ($globalDebug) {
1886
+			echo "Owner Ireland: Download...";
1887
+		}
1630 1888
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
1631 1889
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
1632
-			if ($globalDebug) echo "Add to DB...";
1890
+			if ($globalDebug) {
1891
+				echo "Add to DB...";
1892
+			}
1633 1893
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
1634
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
1894
+		} else {
1895
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
1896
+		}
1635 1897
 		if ($error != '') {
1636 1898
 			return $error;
1637
-		} elseif ($globalDebug) echo "Done\n";
1638
-		if ($globalDebug) echo "Owner Switzerland: Download...";
1899
+		} elseif ($globalDebug) {
1900
+			echo "Done\n";
1901
+		}
1902
+		if ($globalDebug) {
1903
+			echo "Owner Switzerland: Download...";
1904
+		}
1639 1905
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
1640 1906
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
1641
-			if ($globalDebug) echo "Add to DB...";
1907
+			if ($globalDebug) {
1908
+				echo "Add to DB...";
1909
+			}
1642 1910
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
1643
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
1911
+		} else {
1912
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
1913
+		}
1644 1914
 		if ($error != '') {
1645 1915
 			return $error;
1646
-		} elseif ($globalDebug) echo "Done\n";
1647
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
1916
+		} elseif ($globalDebug) {
1917
+			echo "Done\n";
1918
+		}
1919
+		if ($globalDebug) {
1920
+			echo "Owner Czech Republic: Download...";
1921
+		}
1648 1922
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
1649 1923
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
1650
-			if ($globalDebug) echo "Add to DB...";
1924
+			if ($globalDebug) {
1925
+				echo "Add to DB...";
1926
+			}
1651 1927
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
1652
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
1928
+		} else {
1929
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
1930
+		}
1653 1931
 		if ($error != '') {
1654 1932
 			return $error;
1655
-		} elseif ($globalDebug) echo "Done\n";
1656
-		if ($globalDebug) echo "Owner Australia: Download...";
1933
+		} elseif ($globalDebug) {
1934
+			echo "Done\n";
1935
+		}
1936
+		if ($globalDebug) {
1937
+			echo "Owner Australia: Download...";
1938
+		}
1657 1939
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
1658 1940
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
1659
-			if ($globalDebug) echo "Add to DB...";
1941
+			if ($globalDebug) {
1942
+				echo "Add to DB...";
1943
+			}
1660 1944
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
1661
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
1945
+		} else {
1946
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
1947
+		}
1662 1948
 		if ($error != '') {
1663 1949
 			return $error;
1664
-		} elseif ($globalDebug) echo "Done\n";
1665
-		if ($globalDebug) echo "Owner Austria: Download...";
1950
+		} elseif ($globalDebug) {
1951
+			echo "Done\n";
1952
+		}
1953
+		if ($globalDebug) {
1954
+			echo "Owner Austria: Download...";
1955
+		}
1666 1956
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
1667 1957
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
1668
-			if ($globalDebug) echo "Add to DB...";
1958
+			if ($globalDebug) {
1959
+				echo "Add to DB...";
1960
+			}
1669 1961
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
1670
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
1962
+		} else {
1963
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
1964
+		}
1671 1965
 		if ($error != '') {
1672 1966
 			return $error;
1673
-		} elseif ($globalDebug) echo "Done\n";
1674
-		if ($globalDebug) echo "Owner Chile: Download...";
1967
+		} elseif ($globalDebug) {
1968
+			echo "Done\n";
1969
+		}
1970
+		if ($globalDebug) {
1971
+			echo "Owner Chile: Download...";
1972
+		}
1675 1973
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
1676 1974
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
1677
-			if ($globalDebug) echo "Add to DB...";
1975
+			if ($globalDebug) {
1976
+				echo "Add to DB...";
1977
+			}
1678 1978
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
1679
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
1979
+		} else {
1980
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
1981
+		}
1680 1982
 		if ($error != '') {
1681 1983
 			return $error;
1682
-		} elseif ($globalDebug) echo "Done\n";
1683
-		if ($globalDebug) echo "Owner Colombia: Download...";
1984
+		} elseif ($globalDebug) {
1985
+			echo "Done\n";
1986
+		}
1987
+		if ($globalDebug) {
1988
+			echo "Owner Colombia: Download...";
1989
+		}
1684 1990
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
1685 1991
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
1686
-			if ($globalDebug) echo "Add to DB...";
1992
+			if ($globalDebug) {
1993
+				echo "Add to DB...";
1994
+			}
1687 1995
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
1688
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
1996
+		} else {
1997
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
1998
+		}
1689 1999
 		if ($error != '') {
1690 2000
 			return $error;
1691
-		} elseif ($globalDebug) echo "Done\n";
1692
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2001
+		} elseif ($globalDebug) {
2002
+			echo "Done\n";
2003
+		}
2004
+		if ($globalDebug) {
2005
+			echo "Owner Bosnia Herzegobina: Download...";
2006
+		}
1693 2007
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
1694 2008
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
1695
-			if ($globalDebug) echo "Add to DB...";
2009
+			if ($globalDebug) {
2010
+				echo "Add to DB...";
2011
+			}
1696 2012
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
1697
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2013
+		} else {
2014
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2015
+		}
1698 2016
 		if ($error != '') {
1699 2017
 			return $error;
1700
-		} elseif ($globalDebug) echo "Done\n";
1701
-		if ($globalDebug) echo "Owner Brazil: Download...";
2018
+		} elseif ($globalDebug) {
2019
+			echo "Done\n";
2020
+		}
2021
+		if ($globalDebug) {
2022
+			echo "Owner Brazil: Download...";
2023
+		}
1702 2024
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
1703 2025
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
1704
-			if ($globalDebug) echo "Add to DB...";
2026
+			if ($globalDebug) {
2027
+				echo "Add to DB...";
2028
+			}
1705 2029
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
1706
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2030
+		} else {
2031
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2032
+		}
1707 2033
 		if ($error != '') {
1708 2034
 			return $error;
1709
-		} elseif ($globalDebug) echo "Done\n";
1710
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2035
+		} elseif ($globalDebug) {
2036
+			echo "Done\n";
2037
+		}
2038
+		if ($globalDebug) {
2039
+			echo "Owner Cayman Islands: Download...";
2040
+		}
1711 2041
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
1712 2042
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
1713
-			if ($globalDebug) echo "Add to DB...";
2043
+			if ($globalDebug) {
2044
+				echo "Add to DB...";
2045
+			}
1714 2046
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
1715
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2047
+		} else {
2048
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2049
+		}
1716 2050
 		if ($error != '') {
1717 2051
 			return $error;
1718
-		} elseif ($globalDebug) echo "Done\n";
1719
-		if ($globalDebug) echo "Owner Croatia: Download...";
2052
+		} elseif ($globalDebug) {
2053
+			echo "Done\n";
2054
+		}
2055
+		if ($globalDebug) {
2056
+			echo "Owner Croatia: Download...";
2057
+		}
1720 2058
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
1721 2059
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
1722
-			if ($globalDebug) echo "Add to DB...";
2060
+			if ($globalDebug) {
2061
+				echo "Add to DB...";
2062
+			}
1723 2063
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
1724
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2064
+		} else {
2065
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2066
+		}
1725 2067
 		if ($error != '') {
1726 2068
 			return $error;
1727
-		} elseif ($globalDebug) echo "Done\n";
1728
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2069
+		} elseif ($globalDebug) {
2070
+			echo "Done\n";
2071
+		}
2072
+		if ($globalDebug) {
2073
+			echo "Owner Luxembourg: Download...";
2074
+		}
1729 2075
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
1730 2076
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
1731
-			if ($globalDebug) echo "Add to DB...";
2077
+			if ($globalDebug) {
2078
+				echo "Add to DB...";
2079
+			}
1732 2080
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
1733
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2081
+		} else {
2082
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2083
+		}
1734 2084
 		if ($error != '') {
1735 2085
 			return $error;
1736
-		} elseif ($globalDebug) echo "Done\n";
1737
-		if ($globalDebug) echo "Owner Maldives: Download...";
2086
+		} elseif ($globalDebug) {
2087
+			echo "Done\n";
2088
+		}
2089
+		if ($globalDebug) {
2090
+			echo "Owner Maldives: Download...";
2091
+		}
1738 2092
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
1739 2093
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
1740
-			if ($globalDebug) echo "Add to DB...";
2094
+			if ($globalDebug) {
2095
+				echo "Add to DB...";
2096
+			}
1741 2097
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
1742
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2098
+		} else {
2099
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2100
+		}
1743 2101
 		if ($error != '') {
1744 2102
 			return $error;
1745
-		} elseif ($globalDebug) echo "Done\n";
1746
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2103
+		} elseif ($globalDebug) {
2104
+			echo "Done\n";
2105
+		}
2106
+		if ($globalDebug) {
2107
+			echo "Owner New Zealand: Download...";
2108
+		}
1747 2109
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
1748 2110
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
1749
-			if ($globalDebug) echo "Add to DB...";
2111
+			if ($globalDebug) {
2112
+				echo "Add to DB...";
2113
+			}
1750 2114
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
1751
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2115
+		} else {
2116
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2117
+		}
1752 2118
 		if ($error != '') {
1753 2119
 			return $error;
1754
-		} elseif ($globalDebug) echo "Done\n";
1755
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2120
+		} elseif ($globalDebug) {
2121
+			echo "Done\n";
2122
+		}
2123
+		if ($globalDebug) {
2124
+			echo "Owner Papua New Guinea: Download...";
2125
+		}
1756 2126
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
1757 2127
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
1758
-			if ($globalDebug) echo "Add to DB...";
2128
+			if ($globalDebug) {
2129
+				echo "Add to DB...";
2130
+			}
1759 2131
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
1760
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2132
+		} else {
2133
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2134
+		}
1761 2135
 		if ($error != '') {
1762 2136
 			return $error;
1763
-		} elseif ($globalDebug) echo "Done\n";
1764
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2137
+		} elseif ($globalDebug) {
2138
+			echo "Done\n";
2139
+		}
2140
+		if ($globalDebug) {
2141
+			echo "Owner Slovakia: Download...";
2142
+		}
1765 2143
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
1766 2144
 		if (file_exists($tmp_dir.'owner_om.csv')) {
1767
-			if ($globalDebug) echo "Add to DB...";
2145
+			if ($globalDebug) {
2146
+				echo "Add to DB...";
2147
+			}
1768 2148
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
1769
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2149
+		} else {
2150
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2151
+		}
1770 2152
 		if ($error != '') {
1771 2153
 			return $error;
1772
-		} elseif ($globalDebug) echo "Done\n";
1773
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2154
+		} elseif ($globalDebug) {
2155
+			echo "Done\n";
2156
+		}
2157
+		if ($globalDebug) {
2158
+			echo "Owner Ecuador: Download...";
2159
+		}
1774 2160
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
1775 2161
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
1776
-			if ($globalDebug) echo "Add to DB...";
2162
+			if ($globalDebug) {
2163
+				echo "Add to DB...";
2164
+			}
1777 2165
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
1778
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2166
+		} else {
2167
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2168
+		}
1779 2169
 		if ($error != '') {
1780 2170
 			return $error;
1781
-		} elseif ($globalDebug) echo "Done\n";
1782
-		if ($globalDebug) echo "Owner Iceland: Download...";
2171
+		} elseif ($globalDebug) {
2172
+			echo "Done\n";
2173
+		}
2174
+		if ($globalDebug) {
2175
+			echo "Owner Iceland: Download...";
2176
+		}
1783 2177
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
1784 2178
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
1785
-			if ($globalDebug) echo "Add to DB...";
2179
+			if ($globalDebug) {
2180
+				echo "Add to DB...";
2181
+			}
1786 2182
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
1787
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2183
+		} else {
2184
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2185
+		}
1788 2186
 		if ($error != '') {
1789 2187
 			return $error;
1790
-		} elseif ($globalDebug) echo "Done\n";
2188
+		} elseif ($globalDebug) {
2189
+			echo "Done\n";
2190
+		}
1791 2191
 		return '';
1792 2192
 	}
1793 2193
 
1794 2194
 	public static function update_translation() {
1795 2195
 		global $tmp_dir, $globalDebug;
1796 2196
 		$error = '';
1797
-		if ($globalDebug) echo "Translation : Download...";
2197
+		if ($globalDebug) {
2198
+			echo "Translation : Download...";
2199
+		}
1798 2200
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
1799 2201
 		if (file_exists($tmp_dir.'translation.zip')) {
1800
-			if ($globalDebug) echo "Unzip...";
2202
+			if ($globalDebug) {
2203
+				echo "Unzip...";
2204
+			}
1801 2205
 			update_db::unzip($tmp_dir.'translation.zip');
1802
-			if ($globalDebug) echo "Add to DB...";
2206
+			if ($globalDebug) {
2207
+				echo "Add to DB...";
2208
+			}
1803 2209
 			$error = update_db::translation();
1804
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2210
+		} else {
2211
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2212
+		}
1805 2213
 		if ($error != '') {
1806 2214
 			return $error;
1807
-		} elseif ($globalDebug) echo "Done\n";
2215
+		} elseif ($globalDebug) {
2216
+			echo "Done\n";
2217
+		}
1808 2218
 		return '';
1809 2219
 	}
1810 2220
 
1811 2221
 	public static function update_translation_fam() {
1812 2222
 		global $tmp_dir, $globalDebug;
1813
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2223
+		if ($globalDebug) {
2224
+			echo "Translation from FlightAirMap website : Download...";
2225
+		}
1814 2226
 		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
1815 2227
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
1816
-			if ($globalDebug) echo "Gunzip...";
2228
+			if ($globalDebug) {
2229
+				echo "Gunzip...";
2230
+			}
1817 2231
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
1818
-			if ($globalDebug) echo "Add to DB...";
2232
+			if ($globalDebug) {
2233
+				echo "Add to DB...";
2234
+			}
1819 2235
 			$error = update_db::translation_fam();
1820
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2236
+		} else {
2237
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2238
+		}
1821 2239
 		if ($error != '') {
1822 2240
 			return $error;
1823
-		} elseif ($globalDebug) echo "Done\n";
2241
+		} elseif ($globalDebug) {
2242
+			echo "Done\n";
2243
+		}
1824 2244
 		return '';
1825 2245
 	}
1826 2246
 	public static function update_ModeS_fam() {
1827 2247
 		global $tmp_dir, $globalDebug;
1828
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2248
+		if ($globalDebug) {
2249
+			echo "ModeS from FlightAirMap website : Download...";
2250
+		}
1829 2251
 		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
1830 2252
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
1831
-			if ($globalDebug) echo "Gunzip...";
2253
+			if ($globalDebug) {
2254
+				echo "Gunzip...";
2255
+			}
1832 2256
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
1833
-			if ($globalDebug) echo "Add to DB...";
2257
+			if ($globalDebug) {
2258
+				echo "Add to DB...";
2259
+			}
1834 2260
 			$error = update_db::modes_fam();
1835
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2261
+		} else {
2262
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2263
+		}
1836 2264
 		if ($error != '') {
1837 2265
 			return $error;
1838
-		} elseif ($globalDebug) echo "Done\n";
2266
+		} elseif ($globalDebug) {
2267
+			echo "Done\n";
2268
+		}
1839 2269
 		return '';
1840 2270
 	}
1841 2271
 	public static function update_owner_fam() {
1842 2272
 		global $tmp_dir, $globalDebug, $globalOwner;
1843
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2273
+		if ($globalDebug) {
2274
+			echo "owner from FlightAirMap website : Download...";
2275
+		}
1844 2276
 		if ($globalOwner === TRUE) {
1845 2277
 			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
1846 2278
 		} else {
1847 2279
 			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
1848 2280
 		}
1849 2281
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
1850
-			if ($globalDebug) echo "Gunzip...";
2282
+			if ($globalDebug) {
2283
+				echo "Gunzip...";
2284
+			}
1851 2285
 			update_db::gunzip($tmp_dir.'owners.tsv.gz');
1852
-			if ($globalDebug) echo "Add to DB...";
2286
+			if ($globalDebug) {
2287
+				echo "Add to DB...";
2288
+			}
1853 2289
 			$error = update_db::owner_fam();
1854
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2290
+		} else {
2291
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2292
+		}
1855 2293
 		if ($error != '') {
1856 2294
 			return $error;
1857
-		} elseif ($globalDebug) echo "Done\n";
2295
+		} elseif ($globalDebug) {
2296
+			echo "Done\n";
2297
+		}
1858 2298
 		return '';
1859 2299
 	}
1860 2300
 	public static function update_routes_fam() {
1861 2301
 		global $tmp_dir, $globalDebug;
1862
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
2302
+		if ($globalDebug) {
2303
+			echo "Routes from FlightAirMap website : Download...";
2304
+		}
1863 2305
 		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
1864 2306
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
1865
-			if ($globalDebug) echo "Gunzip...";
2307
+			if ($globalDebug) {
2308
+				echo "Gunzip...";
2309
+			}
1866 2310
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
1867
-			if ($globalDebug) echo "Add to DB...";
2311
+			if ($globalDebug) {
2312
+				echo "Add to DB...";
2313
+			}
1868 2314
 			$error = update_db::routes_fam();
1869
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2315
+		} else {
2316
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2317
+		}
1870 2318
 		if ($error != '') {
1871 2319
 			return $error;
1872
-		} elseif ($globalDebug) echo "Done\n";
2320
+		} elseif ($globalDebug) {
2321
+			echo "Done\n";
2322
+		}
1873 2323
 		return '';
1874 2324
 	}
1875 2325
 
@@ -1877,7 +2327,9 @@  discard block
 block discarded – undo
1877 2327
 		global $tmp_dir, $globalDebug, $globalDBdriver;
1878 2328
 		include_once('class.create_db.php');
1879 2329
 		$error = '';
1880
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
2330
+		if ($globalDebug) {
2331
+			echo "Airspace from FlightAirMap website : Download...";
2332
+		}
1881 2333
 		if ($globalDBdriver == 'mysql') {
1882 2334
 			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
1883 2335
 		} else {
@@ -1893,9 +2345,13 @@  discard block
 block discarded – undo
1893 2345
 					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
1894 2346
 				}
1895 2347
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
1896
-					if ($globalDebug) echo "Gunzip...";
2348
+					if ($globalDebug) {
2349
+						echo "Gunzip...";
2350
+					}
1897 2351
 					update_db::gunzip($tmp_dir.'airspace.sql.gz');
1898
-					if ($globalDebug) echo "Add to DB...";
2352
+					if ($globalDebug) {
2353
+						echo "Add to DB...";
2354
+					}
1899 2355
 					$Connection = new Connection();
1900 2356
 					if ($Connection->tableExists('airspace')) {
1901 2357
 						$query = 'DROP TABLE airspace';
@@ -1908,31 +2364,47 @@  discard block
 block discarded – undo
1908 2364
 		    			}
1909 2365
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
1910 2366
 					update_db::insert_airspace_version($airspace_md5);
1911
-				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2367
+				} else {
2368
+					$error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2369
+				}
1912 2370
 			}
1913
-		} else $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2371
+		} else {
2372
+			$error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2373
+		}
1914 2374
 		if ($error != '') {
1915 2375
 			return $error;
1916
-		} elseif ($globalDebug) echo "Done\n";
2376
+		} elseif ($globalDebug) {
2377
+			echo "Done\n";
2378
+		}
1917 2379
 		return '';
1918 2380
 	}
1919 2381
 
1920 2382
 	public static function update_tle() {
1921 2383
 		global $tmp_dir, $globalDebug;
1922
-		if ($globalDebug) echo "Download TLE : Download...";
2384
+		if ($globalDebug) {
2385
+			echo "Download TLE : Download...";
2386
+		}
1923 2387
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
1924 2388
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
1925 2389
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
1926 2390
 		foreach ($alltle as $filename) {
1927
-			if ($globalDebug) echo "downloading ".$filename.'...';
2391
+			if ($globalDebug) {
2392
+				echo "downloading ".$filename.'...';
2393
+			}
1928 2394
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
1929 2395
 			if (file_exists($tmp_dir.$filename)) {
1930
-				if ($globalDebug) echo "Add to DB ".$filename."...";
2396
+				if ($globalDebug) {
2397
+					echo "Add to DB ".$filename."...";
2398
+				}
1931 2399
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
1932
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2400
+			} else {
2401
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2402
+			}
1933 2403
 			if ($error != '') {
1934 2404
 				echo $error."\n";
1935
-			} elseif ($globalDebug) echo "Done\n";
2405
+			} elseif ($globalDebug) {
2406
+				echo "Done\n";
2407
+			}
1936 2408
 		}
1937 2409
 		return '';
1938 2410
 	}
@@ -1940,10 +2412,14 @@  discard block
 block discarded – undo
1940 2412
 	public static function update_models() {
1941 2413
 		global $tmp_dir, $globalDebug;
1942 2414
 		$error = '';
1943
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
2415
+		if ($globalDebug) {
2416
+			echo "Models from FlightAirMap website : Download...";
2417
+		}
1944 2418
 		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
1945 2419
 		if (file_exists($tmp_dir.'models.md5sum')) {
1946
-			if ($globalDebug) echo "Check files...\n";
2420
+			if ($globalDebug) {
2421
+				echo "Check files...\n";
2422
+			}
1947 2423
 			$newmodelsdb = array();
1948 2424
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
1949 2425
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -1962,25 +2438,35 @@  discard block
 block discarded – undo
1962 2438
 			}
1963 2439
 			$diff = array_diff($newmodelsdb,$modelsdb);
1964 2440
 			foreach ($diff as $key => $value) {
1965
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
2441
+				if ($globalDebug) {
2442
+					echo 'Downloading model '.$key.' ...'."\n";
2443
+				}
1966 2444
 				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
1967 2445
 				
1968 2446
 			}
1969 2447
 			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
1970
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2448
+		} else {
2449
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2450
+		}
1971 2451
 		if ($error != '') {
1972 2452
 			return $error;
1973
-		} elseif ($globalDebug) echo "Done\n";
2453
+		} elseif ($globalDebug) {
2454
+			echo "Done\n";
2455
+		}
1974 2456
 		return '';
1975 2457
 	}
1976 2458
 
1977 2459
 	public static function update_space_models() {
1978 2460
 		global $tmp_dir, $globalDebug;
1979 2461
 		$error = '';
1980
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
2462
+		if ($globalDebug) {
2463
+			echo "Space models from FlightAirMap website : Download...";
2464
+		}
1981 2465
 		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
1982 2466
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
1983
-			if ($globalDebug) echo "Check files...\n";
2467
+			if ($globalDebug) {
2468
+				echo "Check files...\n";
2469
+			}
1984 2470
 			$newmodelsdb = array();
1985 2471
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
1986 2472
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -1999,15 +2485,21 @@  discard block
 block discarded – undo
1999 2485
 			}
2000 2486
 			$diff = array_diff($newmodelsdb,$modelsdb);
2001 2487
 			foreach ($diff as $key => $value) {
2002
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
2488
+				if ($globalDebug) {
2489
+					echo 'Downloading space model '.$key.' ...'."\n";
2490
+				}
2003 2491
 				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2004 2492
 				
2005 2493
 			}
2006 2494
 			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2007
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2495
+		} else {
2496
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2497
+		}
2008 2498
 		if ($error != '') {
2009 2499
 			return $error;
2010
-		} elseif ($globalDebug) echo "Done\n";
2500
+		} elseif ($globalDebug) {
2501
+			echo "Done\n";
2502
+		}
2011 2503
 		return '';
2012 2504
 	}
2013 2505
 
@@ -2050,7 +2542,9 @@  discard block
 block discarded – undo
2050 2542
                 }
2051 2543
 
2052 2544
 		$error = '';
2053
-		if ($globalDebug) echo "Notam : Download...";
2545
+		if ($globalDebug) {
2546
+			echo "Notam : Download...";
2547
+		}
2054 2548
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2055 2549
 		if (file_exists($tmp_dir.'notam.rss')) {
2056 2550
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2065,14 +2559,30 @@  discard block
 block discarded – undo
2065 2559
 				$data['fir'] = $q[0];
2066 2560
 				$data['code'] = $q[1];
2067 2561
 				$ifrvfr = $q[2];
2068
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2069
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2070
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2071
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2072
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2073
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2074
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2075
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
2562
+				if ($ifrvfr == 'IV') {
2563
+					$data['rules'] = 'IFR/VFR';
2564
+				}
2565
+				if ($ifrvfr == 'I') {
2566
+					$data['rules'] = 'IFR';
2567
+				}
2568
+				if ($ifrvfr == 'V') {
2569
+					$data['rules'] = 'VFR';
2570
+				}
2571
+				if ($q[4] == 'A') {
2572
+					$data['scope'] = 'Airport warning';
2573
+				}
2574
+				if ($q[4] == 'E') {
2575
+					$data['scope'] = 'Enroute warning';
2576
+				}
2577
+				if ($q[4] == 'W') {
2578
+					$data['scope'] = 'Navigation warning';
2579
+				}
2580
+				if ($q[4] == 'AE') {
2581
+					$data['scope'] = 'Airport/Enroute warning';
2582
+				}
2583
+				if ($q[4] == 'AW') {
2584
+					$data['scope'] = 'Airport/Navigation warning';
2585
+				}
2076 2586
 				//$data['scope'] = $q[4];
2077 2587
 				$data['lower_limit'] = $q[5];
2078 2588
 				$data['upper_limit'] = $q[6];
@@ -2080,8 +2590,12 @@  discard block
 block discarded – undo
2080 2590
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2081 2591
 				$latitude = $Common->convertDec($las,'latitude');
2082 2592
 				$longitude = $Common->convertDec($lns,'longitude');
2083
-				if ($lac == 'S') $latitude = '-'.$latitude;
2084
-				if ($lnc == 'W') $longitude = '-'.$longitude;
2593
+				if ($lac == 'S') {
2594
+					$latitude = '-'.$latitude;
2595
+				}
2596
+				if ($lnc == 'W') {
2597
+					$longitude = '-'.$longitude;
2598
+				}
2085 2599
 				$data['center_latitude'] = $latitude;
2086 2600
 				$data['center_longitude'] = $longitude;
2087 2601
 				$data['radius'] = intval($radius);
@@ -2111,10 +2625,14 @@  discard block
 block discarded – undo
2111 2625
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2112 2626
 				unset($data);
2113 2627
 			} 
2114
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2628
+		} else {
2629
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2630
+		}
2115 2631
 		if ($error != '') {
2116 2632
 			return $error;
2117
-		} elseif ($globalDebug) echo "Done\n";
2633
+		} elseif ($globalDebug) {
2634
+			echo "Done\n";
2635
+		}
2118 2636
 		return '';
2119 2637
 	}
2120 2638
 	
@@ -2139,7 +2657,9 @@  discard block
 block discarded – undo
2139 2657
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2140 2658
 		$airspace_json = json_decode($airspace_lst,true);
2141 2659
 		foreach ($airspace_json['records'] as $airspace) {
2142
-			if ($globalDebug) echo $airspace['name']."...\n";
2660
+			if ($globalDebug) {
2661
+				echo $airspace['name']."...\n";
2662
+			}
2143 2663
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2144 2664
 			if (file_exists($tmp_dir.$airspace['name'])) {
2145 2665
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -2168,8 +2688,11 @@  discard block
 block discarded – undo
2168 2688
                         return "error : ".$e->getMessage();
2169 2689
                 }
2170 2690
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2171
-                if ($row['nb'] > 0) return false;
2172
-                else return true;
2691
+                if ($row['nb'] > 0) {
2692
+                	return false;
2693
+                } else {
2694
+                	return true;
2695
+                }
2173 2696
 	}
2174 2697
 
2175 2698
 	public static function insert_last_update() {
@@ -2194,8 +2717,11 @@  discard block
 block discarded – undo
2194 2717
                         return "error : ".$e->getMessage();
2195 2718
                 }
2196 2719
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2197
-                if ($row['nb'] > 0) return true;
2198
-                else return false;
2720
+                if ($row['nb'] > 0) {
2721
+                	return true;
2722
+                } else {
2723
+                	return false;
2724
+                }
2199 2725
 	}
2200 2726
 
2201 2727
 
@@ -2226,8 +2752,11 @@  discard block
 block discarded – undo
2226 2752
                         return "error : ".$e->getMessage();
2227 2753
                 }
2228 2754
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2229
-                if ($row['nb'] > 0) return false;
2230
-                else return true;
2755
+                if ($row['nb'] > 0) {
2756
+                	return false;
2757
+                } else {
2758
+                	return true;
2759
+                }
2231 2760
 	}
2232 2761
 
2233 2762
 	public static function insert_last_notam_update() {
@@ -2256,8 +2785,11 @@  discard block
 block discarded – undo
2256 2785
                         return "error : ".$e->getMessage();
2257 2786
                 }
2258 2787
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2259
-                if ($row['nb'] > 0) return false;
2260
-                else return true;
2788
+                if ($row['nb'] > 0) {
2789
+                	return false;
2790
+                } else {
2791
+                	return true;
2792
+                }
2261 2793
 	}
2262 2794
 
2263 2795
 	public static function insert_last_airspace_update() {
@@ -2287,8 +2819,11 @@  discard block
 block discarded – undo
2287 2819
                         return "error : ".$e->getMessage();
2288 2820
                 }
2289 2821
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2290
-                if ($row['nb'] > 0) return false;
2291
-                else return true;
2822
+                if ($row['nb'] > 0) {
2823
+                	return false;
2824
+                } else {
2825
+                	return true;
2826
+                }
2292 2827
 	}
2293 2828
 
2294 2829
 	public static function insert_last_owner_update() {
@@ -2317,8 +2852,11 @@  discard block
 block discarded – undo
2317 2852
                         return "error : ".$e->getMessage();
2318 2853
                 }
2319 2854
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2320
-                if ($row['nb'] > 0) return false;
2321
-                else return true;
2855
+                if ($row['nb'] > 0) {
2856
+                	return false;
2857
+                } else {
2858
+                	return true;
2859
+                }
2322 2860
 	}
2323 2861
 
2324 2862
 	public static function insert_last_schedules_update() {
@@ -2347,8 +2885,11 @@  discard block
 block discarded – undo
2347 2885
                         return "error : ".$e->getMessage();
2348 2886
                 }
2349 2887
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2350
-                if ($row['nb'] > 0) return false;
2351
-                else return true;
2888
+                if ($row['nb'] > 0) {
2889
+                	return false;
2890
+                } else {
2891
+                	return true;
2892
+                }
2352 2893
 	}
2353 2894
 
2354 2895
 	public static function insert_last_tle_update() {
Please login to merge, or discard this patch.
install/class.update_schema.php 3 patches
Indentation   +571 added lines, -571 removed lines patch added patch discarded remove patch
@@ -8,18 +8,18 @@  discard block
 block discarded – undo
8 8
 class update_schema {
9 9
 
10 10
 	public static function update_schedule() {
11
-	    $Connection = new Connection();
12
-	    $Schedule = new Schedule();
13
-	    $query = "SELECT * FROM schedule";
14
-            try {
15
-            	$sth = $Connection->db->prepare($query);
11
+		$Connection = new Connection();
12
+		$Schedule = new Schedule();
13
+		$query = "SELECT * FROM schedule";
14
+			try {
15
+				$sth = $Connection->db->prepare($query);
16 16
 		$sth->execute();
17
-    	    } catch(PDOException $e) {
17
+			} catch(PDOException $e) {
18 18
 		return "error : ".$e->getMessage()."\n";
19
-    	    }
20
-    	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22
-    	    }
19
+			}
20
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21
+			$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
22
+			}
23 23
 	
24 24
 	}
25 25
 /*
@@ -43,198 +43,198 @@  discard block
 block discarded – undo
43 43
     	}
44 44
 */	
45 45
 	private static function update_from_1() {
46
-    		$Connection = new Connection();
47
-    		// Add new column to routes table
48
-    		//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
46
+			$Connection = new Connection();
47
+			// Add new column to routes table
48
+			//$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME";
49 49
 		$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL";
50
-        	try {
51
-            	    $sth = $Connection->db->prepare($query);
52
-		    $sth->execute();
53
-    		} catch(PDOException $e) {
54
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55
-    		}
56
-    		// Copy schedules data to routes table
57
-    		self::update_schedule();
58
-    		// Delete schedule table
50
+			try {
51
+					$sth = $Connection->db->prepare($query);
52
+			$sth->execute();
53
+			} catch(PDOException $e) {
54
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55
+			}
56
+			// Copy schedules data to routes table
57
+			self::update_schedule();
58
+			// Delete schedule table
59 59
 		$query = "DROP TABLE `schedule`";
60
-        	try {
61
-            	    $sth = $Connection->db->prepare($query);
62
-		    $sth->execute();
63
-    		} catch(PDOException $e) {
64
-		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65
-    		}
66
-    		// Add source column
67
-    		$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68
-    		try {
69
-            	    $sth = $Connection->db->prepare($query);
70
-		    $sth->execute();
71
-    		} catch(PDOException $e) {
72
-		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73
-    		}
60
+			try {
61
+					$sth = $Connection->db->prepare($query);
62
+			$sth->execute();
63
+			} catch(PDOException $e) {
64
+			return "error (delete schedule table) : ".$e->getMessage()."\n";
65
+			}
66
+			// Add source column
67
+			$query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL";
68
+			try {
69
+					$sth = $Connection->db->prepare($query);
70
+			$sth->execute();
71
+			} catch(PDOException $e) {
72
+			return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73
+			}
74 74
 		// Delete unused column
75 75
 		$query = "ALTER TABLE `aircraft_modes`  DROP `SerialNo`,  DROP `OperatorFlagCode`,  DROP `Manufacturer`,  DROP `Type`,  DROP `FirstRegDate`,  DROP `CurrentRegDate`,  DROP `Country`,  DROP `PreviousID`,  DROP `DeRegDate`,  DROP `Status`,  DROP `PopularName`,  DROP `GenericName`,  DROP `AircraftClass`,  DROP `Engines`,  DROP `OwnershipStatus`,  DROP `RegisteredOwners`,  DROP `MTOW`,  DROP `TotalHours`,  DROP `YearBuilt`,  DROP `CofACategory`,  DROP `CofAExpiry`,  DROP `UserNotes`,  DROP `Interested`,  DROP `UserTag`,  DROP `InfoUrl`,  DROP `PictureUrl1`,  DROP `PictureUrl2`,  DROP `PictureUrl3`,  DROP `UserBool1`,  DROP `UserBool2`,  DROP `UserBool3`,  DROP `UserBool4`,  DROP `UserBool5`,  DROP `UserString1`,  DROP `UserString2`,  DROP `UserString3`,  DROP `UserString4`,  DROP `UserString5`,  DROP `UserInt1`,  DROP `UserInt2`,  DROP `UserInt3`,  DROP `UserInt4`,  DROP `UserInt5`";
76
-    		try {
77
-            	    $sth = $Connection->db->prepare($query);
78
-		    $sth->execute();
79
-    		} catch(PDOException $e) {
80
-		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81
-    		}
76
+			try {
77
+					$sth = $Connection->db->prepare($query);
78
+			$sth->execute();
79
+			} catch(PDOException $e) {
80
+			return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81
+			}
82 82
 		// Add ModeS column
83 83
 		$query = "ALTER TABLE `spotter_output`  ADD `ModeS` VARCHAR(255) NULL";
84
-    		try {
85
-            	    $sth = $Connection->db->prepare($query);
86
-		    $sth->execute();
87
-    		} catch(PDOException $e) {
88
-		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89
-    		}
84
+			try {
85
+					$sth = $Connection->db->prepare($query);
86
+			$sth->execute();
87
+			} catch(PDOException $e) {
88
+			return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89
+			}
90 90
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91
-    		try {
92
-            	    $sth = $Connection->db->prepare($query);
93
-		    $sth->execute();
94
-    		} catch(PDOException $e) {
95
-		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96
-    		}
97
-    		// Add auto_increment for aircraft_modes
98
-    		$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99
-    		try {
100
-            	    $sth = $Connection->db->prepare($query);
101
-		    $sth->execute();
102
-    		} catch(PDOException $e) {
103
-		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104
-    		}
105
-    		$error = '';
91
+			try {
92
+					$sth = $Connection->db->prepare($query);
93
+			$sth->execute();
94
+			} catch(PDOException $e) {
95
+			return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96
+			}
97
+			// Add auto_increment for aircraft_modes
98
+			$query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT";
99
+			try {
100
+					$sth = $Connection->db->prepare($query);
101
+			$sth->execute();
102
+			} catch(PDOException $e) {
103
+			return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104
+			}
105
+			$error = '';
106 106
 		$error .= create_db::import_file('../db/acars_live.sql');
107 107
 		$error .= create_db::import_file('../db/config.sql');
108 108
 		// Update schema_version to 2
109 109
 		$query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'";
110
-        	try {
111
-            	    $sth = $Connection->db->prepare($query);
112
-		    $sth->execute();
113
-    		} catch(PDOException $e) {
114
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
115
-    		}
110
+			try {
111
+					$sth = $Connection->db->prepare($query);
112
+			$sth->execute();
113
+			} catch(PDOException $e) {
114
+			return "error (update schema_version) : ".$e->getMessage()."\n";
115
+			}
116 116
 		return $error;
117
-        }
117
+		}
118 118
 
119 119
 	private static function update_from_2() {
120
-    		$Connection = new Connection();
121
-    		// Add new column decode to acars_live table
120
+			$Connection = new Connection();
121
+			// Add new column decode to acars_live table
122 122
 		$query = "ALTER TABLE `acars_live` ADD `decode` TEXT";
123
-        	try {
124
-            	    $sth = $Connection->db->prepare($query);
125
-		    $sth->execute();
126
-    		} catch(PDOException $e) {
127
-		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128
-    		}
129
-    		$error = '';
130
-    		// Create table acars_archive
123
+			try {
124
+					$sth = $Connection->db->prepare($query);
125
+			$sth->execute();
126
+			} catch(PDOException $e) {
127
+			return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128
+			}
129
+			$error = '';
130
+			// Create table acars_archive
131 131
 		$error .= create_db::import_file('../db/acars_archive.sql');
132 132
 		// Update schema_version to 3
133 133
 		$query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'";
134
-        	try {
135
-            	    $sth = $Connection->db->prepare($query);
136
-		    $sth->execute();
137
-    		} catch(PDOException $e) {
138
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
139
-    		}
134
+			try {
135
+					$sth = $Connection->db->prepare($query);
136
+			$sth->execute();
137
+			} catch(PDOException $e) {
138
+			return "error (update schema_version) : ".$e->getMessage()."\n";
139
+			}
140 140
 		return $error;
141 141
 	}
142 142
 
143 143
 	private static function update_from_3() {
144
-    		$Connection = new Connection();
145
-    		// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
144
+			$Connection = new Connection();
145
+			// Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated
146 146
 		$query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP";
147
-        	try {
148
-            	    $sth = $Connection->db->prepare($query);
149
-		    $sth->execute();
150
-    		} catch(PDOException $e) {
151
-		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152
-    		}
153
-    		// Add image_source_website column to spotter_image
147
+			try {
148
+					$sth = $Connection->db->prepare($query);
149
+			$sth->execute();
150
+			} catch(PDOException $e) {
151
+			return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152
+			}
153
+			// Add image_source_website column to spotter_image
154 154
 		$query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL";
155
-        	try {
156
-            	    $sth = $Connection->db->prepare($query);
157
-		    $sth->execute();
158
-    		} catch(PDOException $e) {
159
-		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160
-    		}
161
-    		$error = '';
155
+			try {
156
+					$sth = $Connection->db->prepare($query);
157
+			$sth->execute();
158
+			} catch(PDOException $e) {
159
+			return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160
+			}
161
+			$error = '';
162 162
 		// Update schema_version to 4
163 163
 		$query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'";
164
-        	try {
165
-            	    $sth = $Connection->db->prepare($query);
166
-		    $sth->execute();
167
-    		} catch(PDOException $e) {
168
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
169
-    		}
164
+			try {
165
+					$sth = $Connection->db->prepare($query);
166
+			$sth->execute();
167
+			} catch(PDOException $e) {
168
+			return "error (update schema_version) : ".$e->getMessage()."\n";
169
+			}
170 170
 		return $error;
171 171
 	}
172 172
 	
173 173
 	private static function update_from_4() {
174
-    		$Connection = new Connection();
174
+			$Connection = new Connection();
175 175
 	
176
-    		$error = '';
177
-    		// Create table acars_label
176
+			$error = '';
177
+			// Create table acars_label
178 178
 		$error .= create_db::import_file('../db/acars_label.sql');
179 179
 		if ($error == '') {
180
-		    // Update schema_version to 5
181
-		    $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182
-        	    try {
183
-            		$sth = $Connection->db->prepare($query);
180
+			// Update schema_version to 5
181
+			$query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'";
182
+				try {
183
+					$sth = $Connection->db->prepare($query);
184 184
 			$sth->execute();
185
-    		    } catch(PDOException $e) {
185
+				} catch(PDOException $e) {
186 186
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187
-    		    }
188
-    		}
187
+				}
188
+			}
189 189
 		return $error;
190 190
 	}
191 191
 
192 192
 	private static function update_from_5() {
193
-    		$Connection = new Connection();
194
-    		// Add columns to translation
193
+			$Connection = new Connection();
194
+			// Add columns to translation
195 195
 		$query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;";
196
-        	try {
197
-            	    $sth = $Connection->db->prepare($query);
198
-		    $sth->execute();
199
-    		} catch(PDOException $e) {
200
-		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201
-    		}
202
-    		// Add aircraft_shadow column to aircraft
203
-    		$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204
-        	try {
205
-            	    $sth = $Connection->db->prepare($query);
206
-		    $sth->execute();
207
-    		} catch(PDOException $e) {
208
-		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209
-    		}
210
-    		// Add aircraft_shadow column to spotter_live
211
-    		$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212
-        	try {
213
-            	    $sth = $Connection->db->prepare($query);
214
-		    $sth->execute();
215
-    		} catch(PDOException $e) {
216
-		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217
-    		}
218
-    		$error = '';
219
-    		// Update table aircraft
196
+			try {
197
+					$sth = $Connection->db->prepare($query);
198
+			$sth->execute();
199
+			} catch(PDOException $e) {
200
+			return "error (add new columns to translation) : ".$e->getMessage()."\n";
201
+			}
202
+			// Add aircraft_shadow column to aircraft
203
+			$query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL";
204
+			try {
205
+					$sth = $Connection->db->prepare($query);
206
+			$sth->execute();
207
+			} catch(PDOException $e) {
208
+			return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209
+			}
210
+			// Add aircraft_shadow column to spotter_live
211
+			$query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL";
212
+			try {
213
+					$sth = $Connection->db->prepare($query);
214
+			$sth->execute();
215
+			} catch(PDOException $e) {
216
+			return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217
+			}
218
+			$error = '';
219
+			// Update table aircraft
220 220
 		$error .= create_db::import_file('../db/aircraft.sql');
221 221
 		$error .= create_db::import_file('../db/spotter_archive.sql');
222 222
 
223 223
 		// Update schema_version to 6
224 224
 		$query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'";
225
-        	try {
226
-            	    $sth = $Connection->db->prepare($query);
227
-		    $sth->execute();
228
-    		} catch(PDOException $e) {
229
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
230
-    		}
225
+			try {
226
+					$sth = $Connection->db->prepare($query);
227
+			$sth->execute();
228
+			} catch(PDOException $e) {
229
+			return "error (update schema_version) : ".$e->getMessage()."\n";
230
+			}
231 231
 		return $error;
232 232
 	}
233 233
 
234 234
 	private static function update_from_6() {
235
-    		$Connection = new Connection();
236
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237
-    		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
235
+			$Connection = new Connection();
236
+			if (!$Connection->indexExists('spotter_output','flightaware_id')) {
237
+				$query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239
 			ALTER TABLE spotter_output ADD INDEX(ident);
240 240
 			ALTER TABLE spotter_live ADD INDEX(flightaware_id);
@@ -247,147 +247,147 @@  discard block
 block discarded – undo
247 247
 			ALTER TABLE aircraft ADD INDEX(icao);
248 248
 			ALTER TABLE airport ADD INDEX(icao);
249 249
 			ALTER TABLE translation ADD INDEX(Operator);";
250
-        	    try {
251
-            		$sth = $Connection->db->prepare($query);
250
+				try {
251
+					$sth = $Connection->db->prepare($query);
252 252
 			$sth->execute();
253
-    		    } catch(PDOException $e) {
253
+				} catch(PDOException $e) {
254 254
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255
-    		    }
256
-    		}
257
-    		$error = '';
258
-    		// Update table countries
259
-    		if ($Connection->tableExists('airspace')) {
260
-    		    $error .= update_db::update_countries();
261
-		    if ($error != '') return $error;
255
+				}
256
+			}
257
+			$error = '';
258
+			// Update table countries
259
+			if ($Connection->tableExists('airspace')) {
260
+				$error .= update_db::update_countries();
261
+			if ($error != '') return $error;
262 262
 		}
263 263
 		// Update schema_version to 7
264 264
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
265
-        	try {
266
-            	    $sth = $Connection->db->prepare($query);
267
-		    $sth->execute();
268
-    		} catch(PDOException $e) {
269
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
270
-    		}
265
+			try {
266
+					$sth = $Connection->db->prepare($query);
267
+			$sth->execute();
268
+			} catch(PDOException $e) {
269
+			return "error (update schema_version) : ".$e->getMessage()."\n";
270
+			}
271 271
 		return $error;
272
-    	}
272
+		}
273 273
 
274 274
 	private static function update_from_7() {
275 275
 		global $globalDBname, $globalDBdriver;
276
-    		$Connection = new Connection();
277
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
276
+			$Connection = new Connection();
277
+			$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279
-        	try {
280
-            	    $sth = $Connection->db->prepare($query);
281
-		    $sth->execute();
282
-    		} catch(PDOException $e) {
283
-		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284
-    		}
285
-    		if ($globalDBdriver == 'mysql') {
286
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287
-		    try {
288
-            		$sth = $Connection->db->prepare($query);
279
+			try {
280
+					$sth = $Connection->db->prepare($query);
281
+			$sth->execute();
282
+			} catch(PDOException $e) {
283
+			return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284
+			}
285
+			if ($globalDBdriver == 'mysql') {
286
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
287
+			try {
288
+					$sth = $Connection->db->prepare($query);
289 289
 			$sth->execute();
290
-    		    } catch(PDOException $e) {
290
+				} catch(PDOException $e) {
291 291
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292
-    		    }
293
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
294
-    		    if ($row['engine'] == 'ARCHIVE') {
292
+				}
293
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
294
+				if ($row['engine'] == 'ARCHIVE') {
295 295
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
296 296
 				ALTER TABLE copy ENGINE=ARCHIVE;
297 297
 				ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
298 298
 				INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`;
299 299
 				DROP TABLE spotter_archive;
300 300
 				RENAME TABLE copy TO spotter_archive;";
301
-            	    } else {
302
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303
-            	    }
304
-                } else {
305
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306
-                }
307
-        	try {
308
-            	    $sth = $Connection->db->prepare($query);
309
-		    $sth->execute();
310
-    		} catch(PDOException $e) {
311
-		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312
-    		}
301
+					} else {
302
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303
+					}
304
+				} else {
305
+				$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306
+				}
307
+			try {
308
+					$sth = $Connection->db->prepare($query);
309
+			$sth->execute();
310
+			} catch(PDOException $e) {
311
+			return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312
+			}
313 313
 
314
-    		$error = '';
315
-    		// Update table aircraft
314
+			$error = '';
315
+			// Update table aircraft
316 316
 		$error .= create_db::import_file('../db/source_location.sql');
317 317
 		if ($error != '') return $error;
318 318
 		// Update schema_version to 6
319 319
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320
-        	try {
321
-            	    $sth = $Connection->db->prepare($query);
322
-		    $sth->execute();
323
-    		} catch(PDOException $e) {
324
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
325
-    		}
320
+			try {
321
+					$sth = $Connection->db->prepare($query);
322
+			$sth->execute();
323
+			} catch(PDOException $e) {
324
+			return "error (update schema_version) : ".$e->getMessage()."\n";
325
+			}
326 326
 		return $error;
327 327
 	}
328 328
 
329 329
 	private static function update_from_8() {
330
-    		$Connection = new Connection();
331
-    		$error = '';
332
-    		// Update table aircraft
330
+			$Connection = new Connection();
331
+			$error = '';
332
+			// Update table aircraft
333 333
 		$error .= create_db::import_file('../db/notam.sql');
334 334
 		if ($error != '') return $error;
335 335
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 336
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 337
                         DELETE FROM config WHERE name = 'last_update_notam_db';
338 338
                         INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());";
339
-        	try {
340
-            	    $sth = $Connection->db->prepare($query);
341
-		    $sth->execute();
342
-    		} catch(PDOException $e) {
343
-		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344
-    		}
339
+			try {
340
+					$sth = $Connection->db->prepare($query);
341
+			$sth->execute();
342
+			} catch(PDOException $e) {
343
+			return "error (insert last_update values) : ".$e->getMessage()."\n";
344
+			}
345 345
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346
-        	try {
347
-            	    $sth = $Connection->db->prepare($query);
348
-		    $sth->execute();
349
-    		} catch(PDOException $e) {
350
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
351
-    		}
346
+			try {
347
+					$sth = $Connection->db->prepare($query);
348
+			$sth->execute();
349
+			} catch(PDOException $e) {
350
+			return "error (update schema_version) : ".$e->getMessage()."\n";
351
+			}
352 352
 		return $error;
353 353
 	}
354 354
 
355 355
 	private static function update_from_9() {
356
-    		$Connection = new Connection();
357
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
356
+			$Connection = new Connection();
357
+			$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359
-        	try {
360
-            	    $sth = $Connection->db->prepare($query);
361
-		    $sth->execute();
362
-    		} catch(PDOException $e) {
363
-		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364
-    		}
359
+			try {
360
+					$sth = $Connection->db->prepare($query);
361
+			$sth->execute();
362
+			} catch(PDOException $e) {
363
+			return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364
+			}
365 365
 		$error = '';
366
-    		// Update table atc
366
+			// Update table atc
367 367
 		$error .= create_db::import_file('../db/atc.sql');
368 368
 		if ($error != '') return $error;
369 369
 		
370 370
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371
-        	try {
372
-            	    $sth = $Connection->db->prepare($query);
373
-		    $sth->execute();
374
-    		} catch(PDOException $e) {
375
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
376
-    		}
371
+			try {
372
+					$sth = $Connection->db->prepare($query);
373
+			$sth->execute();
374
+			} catch(PDOException $e) {
375
+			return "error (update schema_version) : ".$e->getMessage()."\n";
376
+			}
377 377
 		return $error;
378 378
 	}
379 379
 
380 380
 	private static function update_from_10() {
381
-    		$Connection = new Connection();
382
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383
-        	try {
384
-            	    $sth = $Connection->db->prepare($query);
385
-		    $sth->execute();
386
-    		} catch(PDOException $e) {
387
-		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388
-    		}
381
+			$Connection = new Connection();
382
+			$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383
+			try {
384
+					$sth = $Connection->db->prepare($query);
385
+			$sth->execute();
386
+			} catch(PDOException $e) {
387
+			return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388
+			}
389 389
 		$error = '';
390
-    		// Add tables
390
+			// Add tables
391 391
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 392
 		if ($error != '') return $error;
393 393
 		$error .= create_db::import_file('../db/metar.sql');
@@ -398,76 +398,76 @@  discard block
 block discarded – undo
398 398
 		if ($error != '') return $error;
399 399
 		
400 400
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401
-        	try {
402
-            	    $sth = $Connection->db->prepare($query);
403
-		    $sth->execute();
404
-    		} catch(PDOException $e) {
405
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
406
-    		}
401
+			try {
402
+					$sth = $Connection->db->prepare($query);
403
+			$sth->execute();
404
+			} catch(PDOException $e) {
405
+			return "error (update schema_version) : ".$e->getMessage()."\n";
406
+			}
407 407
 		return $error;
408 408
 	}
409 409
 
410 410
 	private static function update_from_11() {
411 411
 		global $globalDBdriver, $globalDBname;
412
-    		$Connection = new Connection();
413
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414
-        	try {
415
-            	    $sth = $Connection->db->prepare($query);
416
-		    $sth->execute();
417
-    		} catch(PDOException $e) {
418
-		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419
-    		}
420
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421
-        	try {
422
-            	    $sth = $Connection->db->prepare($query);
423
-		    $sth->execute();
424
-    		} catch(PDOException $e) {
425
-		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426
-    		}
427
-    		if ($globalDBdriver == 'mysql') {
428
-    		    $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429
-		    try {
430
-            		$sth = $Connection->db->prepare($query);
412
+			$Connection = new Connection();
413
+			$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414
+			try {
415
+					$sth = $Connection->db->prepare($query);
416
+			$sth->execute();
417
+			} catch(PDOException $e) {
418
+			return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419
+			}
420
+			$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421
+			try {
422
+					$sth = $Connection->db->prepare($query);
423
+			$sth->execute();
424
+			} catch(PDOException $e) {
425
+			return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426
+			}
427
+			if ($globalDBdriver == 'mysql') {
428
+				$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
429
+			try {
430
+					$sth = $Connection->db->prepare($query);
431 431
 			$sth->execute();
432
-    		    } catch(PDOException $e) {
432
+				} catch(PDOException $e) {
433 433
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434
-    		    }
435
-    		    $row = $sth->fetch(PDO::FETCH_ASSOC);
436
-    		    if ($row['engine'] == 'ARCHIVE') {
434
+				}
435
+				$row = $sth->fetch(PDO::FETCH_ASSOC);
436
+				if ($row['engine'] == 'ARCHIVE') {
437 437
 			$query = "CREATE TABLE copy LIKE spotter_archive; 
438 438
 				ALTER TABLE copy ENGINE=ARCHIVE;
439 439
 				ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE;
440 440
 				INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`;
441 441
 				DROP TABLE spotter_archive;
442 442
 				RENAME TABLE copy TO spotter_archive;";
443
-            	    } else {
444
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445
-            	    }
446
-                } else {
447
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448
-                }
449
-        	try {
450
-            	    $sth = $Connection->db->prepare($query);
451
-		    $sth->execute();
452
-    		} catch(PDOException $e) {
453
-		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454
-    		}
443
+					} else {
444
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445
+					}
446
+				} else {
447
+				$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448
+				}
449
+			try {
450
+					$sth = $Connection->db->prepare($query);
451
+			$sth->execute();
452
+			} catch(PDOException $e) {
453
+			return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454
+			}
455 455
 
456 456
 		$error = '';
457 457
 		
458 458
 		$query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'";
459
-        	try {
460
-            	    $sth = $Connection->db->prepare($query);
461
-		    $sth->execute();
462
-    		} catch(PDOException $e) {
463
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
464
-    		}
459
+			try {
460
+					$sth = $Connection->db->prepare($query);
461
+			$sth->execute();
462
+			} catch(PDOException $e) {
463
+			return "error (update schema_version) : ".$e->getMessage()."\n";
464
+			}
465 465
 		return $error;
466 466
 	}
467 467
 	private static function update_from_12() {
468
-    		$Connection = new Connection();
468
+			$Connection = new Connection();
469 469
 		$error = '';
470
-    		// Add tables
470
+			// Add tables
471 471
 		$error .= create_db::import_file('../db/stats.sql');
472 472
 		if ($error != '') return $error;
473 473
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
@@ -484,166 +484,166 @@  discard block
 block discarded – undo
484 484
 		if ($error != '') return $error;
485 485
 		
486 486
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487
-        	try {
488
-            	    $sth = $Connection->db->prepare($query);
489
-		    $sth->execute();
490
-    		} catch(PDOException $e) {
491
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
492
-    		}
487
+			try {
488
+					$sth = $Connection->db->prepare($query);
489
+			$sth->execute();
490
+			} catch(PDOException $e) {
491
+			return "error (update schema_version) : ".$e->getMessage()."\n";
492
+			}
493 493
 		return $error;
494 494
 	}
495 495
 
496 496
 	private static function update_from_13() {
497
-    		$Connection = new Connection();
498
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
497
+			$Connection = new Connection();
498
+			if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499
+				$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500
 			try {
501 501
 				$sth = $Connection->db->prepare($query);
502 502
 				$sth->execute();
503
-	    		} catch(PDOException $e) {
503
+				} catch(PDOException $e) {
504 504
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505
-    			}
505
+				}
506 506
 		}
507
-    		$error = '';
507
+			$error = '';
508 508
 		$query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'";
509
-        	try {
510
-            	    $sth = $Connection->db->prepare($query);
511
-		    $sth->execute();
512
-    		} catch(PDOException $e) {
513
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
514
-    		}
509
+			try {
510
+					$sth = $Connection->db->prepare($query);
511
+			$sth->execute();
512
+			} catch(PDOException $e) {
513
+			return "error (update schema_version) : ".$e->getMessage()."\n";
514
+			}
515 515
 		return $error;
516 516
 	}
517 517
 
518 518
 	private static function update_from_14() {
519
-    		$Connection = new Connection();
519
+			$Connection = new Connection();
520 520
 		$error = '';
521
-    		// Add tables
522
-    		if (!$Connection->tableExists('stats_flight')) {
521
+			// Add tables
522
+			if (!$Connection->tableExists('stats_flight')) {
523 523
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 524
 			if ($error != '') return $error;
525 525
 		}
526 526
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527
-        	try {
528
-            	    $sth = $Connection->db->prepare($query);
529
-		    $sth->execute();
530
-    		} catch(PDOException $e) {
531
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
532
-    		}
527
+			try {
528
+					$sth = $Connection->db->prepare($query);
529
+			$sth->execute();
530
+			} catch(PDOException $e) {
531
+			return "error (update schema_version) : ".$e->getMessage()."\n";
532
+			}
533 533
 		return $error;
534 534
 	}
535 535
 
536 536
 
537 537
 	private static function update_from_15() {
538
-    		$Connection = new Connection();
538
+			$Connection = new Connection();
539 539
 		$error = '';
540
-    		// Add tables
541
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542
-        	try {
543
-            	    $sth = $Connection->db->prepare($query);
544
-		    $sth->execute();
545
-    		} catch(PDOException $e) {
546
-		    return "error (update stats) : ".$e->getMessage()."\n";
547
-    		}
540
+			// Add tables
541
+			$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542
+			try {
543
+					$sth = $Connection->db->prepare($query);
544
+			$sth->execute();
545
+			} catch(PDOException $e) {
546
+			return "error (update stats) : ".$e->getMessage()."\n";
547
+			}
548 548
 		if ($error != '') return $error;
549 549
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550
-        	try {
551
-            	    $sth = $Connection->db->prepare($query);
552
-		    $sth->execute();
553
-    		} catch(PDOException $e) {
554
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
555
-    		}
550
+			try {
551
+					$sth = $Connection->db->prepare($query);
552
+			$sth->execute();
553
+			} catch(PDOException $e) {
554
+			return "error (update schema_version) : ".$e->getMessage()."\n";
555
+			}
556 556
 		return $error;
557 557
 	}
558 558
 
559 559
 	private static function update_from_16() {
560
-    		$Connection = new Connection();
560
+			$Connection = new Connection();
561 561
 		$error = '';
562
-    		// Add tables
563
-    		if (!$Connection->tableExists('stats_registration')) {
562
+			// Add tables
563
+			if (!$Connection->tableExists('stats_registration')) {
564 564
 			$error .= create_db::import_file('../db/stats_registration.sql');
565 565
 		}
566
-    		if (!$Connection->tableExists('stats_callsign')) {
566
+			if (!$Connection->tableExists('stats_callsign')) {
567 567
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 568
 		}
569 569
 		if ($error != '') return $error;
570 570
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571
-        	try {
572
-            	    $sth = $Connection->db->prepare($query);
573
-		    $sth->execute();
574
-    		} catch(PDOException $e) {
575
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
576
-    		}
571
+			try {
572
+					$sth = $Connection->db->prepare($query);
573
+			$sth->execute();
574
+			} catch(PDOException $e) {
575
+			return "error (update schema_version) : ".$e->getMessage()."\n";
576
+			}
577 577
 		return $error;
578 578
 	}
579 579
 
580 580
 	private static function update_from_17() {
581
-    		$Connection = new Connection();
581
+			$Connection = new Connection();
582 582
 		$error = '';
583
-    		// Add tables
584
-    		if (!$Connection->tableExists('stats_country')) {
583
+			// Add tables
584
+			if (!$Connection->tableExists('stats_country')) {
585 585
 			$error .= create_db::import_file('../db/stats_country.sql');
586 586
 		}
587 587
 		if ($error != '') return $error;
588 588
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589
-        	try {
590
-            	    $sth = $Connection->db->prepare($query);
591
-		    $sth->execute();
592
-    		} catch(PDOException $e) {
593
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
594
-    		}
589
+			try {
590
+					$sth = $Connection->db->prepare($query);
591
+			$sth->execute();
592
+			} catch(PDOException $e) {
593
+			return "error (update schema_version) : ".$e->getMessage()."\n";
594
+			}
595 595
 		return $error;
596 596
 	}
597 597
 	private static function update_from_18() {
598
-    		$Connection = new Connection();
598
+			$Connection = new Connection();
599 599
 		$error = '';
600
-    		// Modify stats_airport table
601
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602
-    			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603
-    	        	try {
604
-	            	    $sth = $Connection->db->prepare($query);
605
-			    $sth->execute();
606
-    			} catch(PDOException $e) {
607
-			    return "error (update stats) : ".$e->getMessage()."\n";
608
-    			}
609
-    		}
600
+			// Modify stats_airport table
601
+			if (!$Connection->checkColumnName('stats_airport','airport_name')) {
602
+				$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603
+					try {
604
+						$sth = $Connection->db->prepare($query);
605
+				$sth->execute();
606
+				} catch(PDOException $e) {
607
+				return "error (update stats) : ".$e->getMessage()."\n";
608
+				}
609
+			}
610 610
 		if ($error != '') return $error;
611 611
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612
-        	try {
613
-            	    $sth = $Connection->db->prepare($query);
614
-		    $sth->execute();
615
-    		} catch(PDOException $e) {
616
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
617
-    		}
612
+			try {
613
+					$sth = $Connection->db->prepare($query);
614
+			$sth->execute();
615
+			} catch(PDOException $e) {
616
+			return "error (update schema_version) : ".$e->getMessage()."\n";
617
+			}
618 618
 		return $error;
619 619
 	}
620 620
 
621 621
 	private static function update_from_19() {
622
-    		$Connection = new Connection();
622
+			$Connection = new Connection();
623 623
 		$error = '';
624
-    		// Update airport table
624
+			// Update airport table
625 625
 		$error .= create_db::import_file('../db/airport.sql');
626 626
 		if ($error != '') return 'Import airport.sql : '.$error;
627 627
 		// Remove primary key on Spotter_Archive
628 628
 		$query = "alter table spotter_archive drop spotter_archive_id";
629
-        	try {
630
-            	    $sth = $Connection->db->prepare($query);
631
-		    $sth->execute();
632
-    		} catch(PDOException $e) {
633
-		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634
-    		}
629
+			try {
630
+					$sth = $Connection->db->prepare($query);
631
+			$sth->execute();
632
+			} catch(PDOException $e) {
633
+			return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634
+			}
635 635
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636
-        	try {
637
-            	    $sth = $Connection->db->prepare($query);
638
-		    $sth->execute();
639
-    		} catch(PDOException $e) {
640
-		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641
-    		}
636
+			try {
637
+					$sth = $Connection->db->prepare($query);
638
+			$sth->execute();
639
+			} catch(PDOException $e) {
640
+			return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641
+			}
642 642
 		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
643 643
 			// Add column over_country
644
-    			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
644
+				$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645
 			try {
646
-            			$sth = $Connection->db->prepare($query);
646
+						$sth = $Connection->db->prepare($query);
647 647
 				$sth->execute();
648 648
 			} catch(PDOException $e) {
649 649
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -651,9 +651,9 @@  discard block
 block discarded – undo
651 651
 		}
652 652
 		if (!$Connection->checkColumnName('spotter_live','over_country')) {
653 653
 			// Add column over_country
654
-    			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
654
+				$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655
 			try {
656
-            			$sth = $Connection->db->prepare($query);
656
+						$sth = $Connection->db->prepare($query);
657 657
 				$sth->execute();
658 658
 			} catch(PDOException $e) {
659 659
 				return "error (add over_country) : ".$e->getMessage()."\n";
@@ -661,74 +661,74 @@  discard block
 block discarded – undo
661 661
 		}
662 662
 		if (!$Connection->checkColumnName('spotter_output','source_name')) {
663 663
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664
-    			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
664
+				$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665
 			try {
666 666
 				$sth = $Connection->db->prepare($query);
667 667
 				$sth->execute();
668 668
 			} catch(PDOException $e) {
669 669
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670
-    			}
671
-    		}
670
+				}
671
+			}
672 672
 		if (!$Connection->checkColumnName('spotter_live','source_name')) {
673 673
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674
-    			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
674
+				$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675
 			try {
676 676
 				$sth = $Connection->db->prepare($query);
677 677
 				$sth->execute();
678 678
 			} catch(PDOException $e) {
679 679
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680
-    			}
681
-    		}
680
+				}
681
+			}
682 682
 		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
683 683
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684
-    			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
684
+				$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685
 			try {
686 686
 				$sth = $Connection->db->prepare($query);
687 687
 				$sth->execute();
688 688
 			} catch(PDOException $e) {
689 689
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690
-    			}
691
-    		}
690
+				}
691
+			}
692 692
 		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
693 693
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694
-    			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
694
+				$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695
 			try {
696 696
 				$sth = $Connection->db->prepare($query);
697 697
 				$sth->execute();
698 698
 			} catch(PDOException $e) {
699 699
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700
-    			}
701
-    		}
700
+				}
701
+			}
702 702
 		if ($error != '') return $error;
703 703
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704
-        	try {
705
-            	    $sth = $Connection->db->prepare($query);
706
-		    $sth->execute();
707
-    		} catch(PDOException $e) {
708
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
709
-    		}
704
+			try {
705
+					$sth = $Connection->db->prepare($query);
706
+			$sth->execute();
707
+			} catch(PDOException $e) {
708
+			return "error (update schema_version) : ".$e->getMessage()."\n";
709
+			}
710 710
 		return $error;
711 711
 	}
712 712
 
713 713
 	private static function update_from_20() {
714 714
 		global $globalIVAO, $globalVATSIM, $globalphpVMS;
715
-    		$Connection = new Connection();
715
+			$Connection = new Connection();
716 716
 		$error = '';
717
-    		// Update airline table
718
-    		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
717
+			// Update airline table
718
+			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 719
 			$error .= create_db::import_file('../db/airlines.sql');
720 720
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721
 		}
722 722
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 723
 			// Add column over_country
724
-    			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725
-        		try {
724
+				$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725
+				try {
726 726
 				$sth = $Connection->db->prepare($query);
727 727
 				$sth->execute();
728 728
 			} catch(PDOException $e) {
729 729
 				return "error (add over_country) : ".$e->getMessage()."\n";
730
-    			}
731
-    		}
730
+				}
731
+			}
732 732
 		if ($error != '') return $error;
733 733
 		/*
734 734
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
@@ -738,12 +738,12 @@  discard block
 block discarded – undo
738 738
 		}
739 739
 		*/
740 740
 		$query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'";
741
-        	try {
742
-            	    $sth = $Connection->db->prepare($query);
743
-		    $sth->execute();
744
-    		} catch(PDOException $e) {
745
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
746
-    		}
741
+			try {
742
+					$sth = $Connection->db->prepare($query);
743
+			$sth->execute();
744
+			} catch(PDOException $e) {
745
+			return "error (update schema_version) : ".$e->getMessage()."\n";
746
+			}
747 747
 		return $error;
748 748
 	}
749 749
 
@@ -762,35 +762,35 @@  discard block
 block discarded – undo
762 762
 			if ($error != '') return $error;
763 763
 		}
764 764
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765
-        	try {
766
-            	    $sth = $Connection->db->prepare($query);
767
-		    $sth->execute();
768
-    		} catch(PDOException $e) {
769
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
770
-    		}
765
+			try {
766
+					$sth = $Connection->db->prepare($query);
767
+			$sth->execute();
768
+			} catch(PDOException $e) {
769
+			return "error (update schema_version) : ".$e->getMessage()."\n";
770
+			}
771 771
 		return $error;
772 772
 	}
773 773
 
774 774
 	private static function update_from_22() {
775 775
 		global $globalDBdriver;
776
-    		$Connection = new Connection();
776
+			$Connection = new Connection();
777 777
 		$error = '';
778 778
 		// Add table stats polar
779
-    		if (!$Connection->tableExists('stats_source')) {
779
+			if (!$Connection->tableExists('stats_source')) {
780 780
 			if ($globalDBdriver == 'mysql') {
781
-    				$error .= create_db::import_file('../db/stats_source.sql');
781
+					$error .= create_db::import_file('../db/stats_source.sql');
782 782
 			} else {
783 783
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 784
 			}
785 785
 			if ($error != '') return $error;
786 786
 		}
787 787
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788
-        	try {
789
-            	    $sth = $Connection->db->prepare($query);
790
-		    $sth->execute();
791
-    		} catch(PDOException $e) {
792
-		    return "error (update schema_version) : ".$e->getMessage()."\n";
793
-    		}
788
+			try {
789
+					$sth = $Connection->db->prepare($query);
790
+			$sth->execute();
791
+			} catch(PDOException $e) {
792
+			return "error (update schema_version) : ".$e->getMessage()."\n";
793
+			}
794 794
 		return $error;
795 795
 	}
796 796
 
@@ -821,14 +821,14 @@  discard block
 block discarded – undo
821 821
 		}
822 822
 		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
823 823
 			// Add aircraft_manufacturer to stats_aircraft
824
-    			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
824
+				$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
825 825
 			try {
826 826
 				$sth = $Connection->db->prepare($query);
827 827
 				$sth->execute();
828 828
 			} catch(PDOException $e) {
829 829
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
830
-    			}
831
-    		}
830
+				}
831
+			}
832 832
 		
833 833
 		$query = "UPDATE config SET value = '24' WHERE name = 'schema_version'";
834 834
 		try {
@@ -1176,7 +1176,7 @@  discard block
 block discarded – undo
1176 1176
 			} catch(PDOException $e) {
1177 1177
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1178 1178
 			}
1179
-                }
1179
+				}
1180 1180
 		if (!$Connection->checkColumnName('aircraft','manufacturer')) {
1181 1181
 			// Add mfr to aircraft
1182 1182
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
@@ -1206,141 +1206,141 @@  discard block
 block discarded – undo
1206 1206
 	}
1207 1207
 
1208 1208
 
1209
-    	public static function check_version($update = false) {
1210
-    	    global $globalDBname;
1211
-    	    $version = 0;
1212
-    	    $Connection = new Connection();
1213
-    	    if ($Connection->tableExists('aircraft')) {
1214
-    		if (!$Connection->tableExists('config')) {
1215
-    		    $version = '1';
1216
-    		    if ($update) return self::update_from_1();
1217
-    		    else return $version;
1209
+		public static function check_version($update = false) {
1210
+			global $globalDBname;
1211
+			$version = 0;
1212
+			$Connection = new Connection();
1213
+			if ($Connection->tableExists('aircraft')) {
1214
+			if (!$Connection->tableExists('config')) {
1215
+				$version = '1';
1216
+				if ($update) return self::update_from_1();
1217
+				else return $version;
1218 1218
 		} else {
1219
-    		    $Connection = new Connection();
1220
-		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
1221
-		    try {
1222
-            		$sth = $Connection->db->prepare($query);
1223
-		        $sth->execute();
1224
-		    } catch(PDOException $e) {
1219
+				$Connection = new Connection();
1220
+			$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
1221
+			try {
1222
+					$sth = $Connection->db->prepare($query);
1223
+				$sth->execute();
1224
+			} catch(PDOException $e) {
1225 1225
 			return "error : ".$e->getMessage()."\n";
1226
-    		    }
1227
-    		    $result = $sth->fetch(PDO::FETCH_ASSOC);
1228
-    		    if ($update) {
1229
-    			if ($result['value'] == '2') {
1230
-    			    $error = self::update_from_2();
1231
-    			    if ($error != '') return $error;
1232
-    			    else return self::check_version(true);
1233
-    			} elseif ($result['value'] == '3') {
1234
-    			    $error = self::update_from_3();
1235
-    			    if ($error != '') return $error;
1236
-    			    else return self::check_version(true);
1237
-    			} elseif ($result['value'] == '4') {
1238
-    			    $error = self::update_from_4();
1239
-    			    if ($error != '') return $error;
1240
-    			    else return self::check_version(true);
1241
-    			} elseif ($result['value'] == '5') {
1242
-    			    $error = self::update_from_5();
1243
-    			    if ($error != '') return $error;
1244
-    			    else return self::check_version(true);
1245
-    			} elseif ($result['value'] == '6') {
1246
-    			    $error = self::update_from_6();
1247
-    			    if ($error != '') return $error;
1248
-    			    else return self::check_version(true);
1249
-    			} elseif ($result['value'] == '7') {
1250
-    			    $error = self::update_from_7();
1251
-    			    if ($error != '') return $error;
1252
-    			    else return self::check_version(true);
1253
-    			} elseif ($result['value'] == '8') {
1254
-    			    $error = self::update_from_8();
1255
-    			    if ($error != '') return $error;
1256
-    			    else return self::check_version(true);
1257
-    			} elseif ($result['value'] == '9') {
1258
-    			    $error = self::update_from_9();
1259
-    			    if ($error != '') return $error;
1260
-    			    else return self::check_version(true);
1261
-    			} elseif ($result['value'] == '10') {
1262
-    			    $error = self::update_from_10();
1263
-    			    if ($error != '') return $error;
1264
-    			    else return self::check_version(true);
1265
-    			} elseif ($result['value'] == '11') {
1266
-    			    $error = self::update_from_11();
1267
-    			    if ($error != '') return $error;
1268
-    			    else return self::check_version(true);
1269
-    			} elseif ($result['value'] == '12') {
1270
-    			    $error = self::update_from_12();
1271
-    			    if ($error != '') return $error;
1272
-    			    else return self::check_version(true);
1273
-    			} elseif ($result['value'] == '13') {
1274
-    			    $error = self::update_from_13();
1275
-    			    if ($error != '') return $error;
1276
-    			    else return self::check_version(true);
1277
-    			} elseif ($result['value'] == '14') {
1278
-    			    $error = self::update_from_14();
1279
-    			    if ($error != '') return $error;
1280
-    			    else return self::check_version(true);
1281
-    			} elseif ($result['value'] == '15') {
1282
-    			    $error = self::update_from_15();
1283
-    			    if ($error != '') return $error;
1284
-    			    else return self::check_version(true);
1285
-    			} elseif ($result['value'] == '16') {
1286
-    			    $error = self::update_from_16();
1287
-    			    if ($error != '') return $error;
1288
-    			    else return self::check_version(true);
1289
-    			} elseif ($result['value'] == '17') {
1290
-    			    $error = self::update_from_17();
1291
-    			    if ($error != '') return $error;
1292
-    			    else return self::check_version(true);
1293
-    			} elseif ($result['value'] == '18') {
1294
-    			    $error = self::update_from_18();
1295
-    			    if ($error != '') return $error;
1296
-    			    else return self::check_version(true);
1297
-    			} elseif ($result['value'] == '19') {
1298
-    			    $error = self::update_from_19();
1299
-    			    if ($error != '') return $error;
1300
-    			    else return self::check_version(true);
1301
-    			} elseif ($result['value'] == '20') {
1302
-    			    $error = self::update_from_20();
1303
-    			    if ($error != '') return $error;
1304
-    			    else return self::check_version(true);
1305
-    			} elseif ($result['value'] == '21') {
1306
-    			    $error = self::update_from_21();
1307
-    			    if ($error != '') return $error;
1308
-    			    else return self::check_version(true);
1309
-    			} elseif ($result['value'] == '22') {
1310
-    			    $error = self::update_from_22();
1311
-    			    if ($error != '') return $error;
1312
-    			    else return self::check_version(true);
1313
-    			} elseif ($result['value'] == '23') {
1314
-    			    $error = self::update_from_23();
1315
-    			    if ($error != '') return $error;
1316
-    			    else return self::check_version(true);
1317
-    			} elseif ($result['value'] == '24') {
1318
-    			    $error = self::update_from_24();
1319
-    			    if ($error != '') return $error;
1320
-    			    else return self::check_version(true);
1321
-    			} elseif ($result['value'] == '25') {
1322
-    			    $error = self::update_from_25();
1323
-    			    if ($error != '') return $error;
1324
-    			    else return self::check_version(true);
1325
-    			} elseif ($result['value'] == '26') {
1326
-    			    $error = self::update_from_26();
1327
-    			    if ($error != '') return $error;
1328
-    			    else return self::check_version(true);
1329
-    			} elseif ($result['value'] == '27') {
1330
-    			    $error = self::update_from_27();
1331
-    			    if ($error != '') return $error;
1332
-    			    else return self::check_version(true);
1333
-    			} elseif ($result['value'] == '28') {
1334
-    			    $error = self::update_from_28();
1335
-    			    if ($error != '') return $error;
1336
-    			    else return self::check_version(true);
1337
-    			} else return '';
1338
-    		    }
1339
-    		    else return $result['value'];
1226
+				}
1227
+				$result = $sth->fetch(PDO::FETCH_ASSOC);
1228
+				if ($update) {
1229
+				if ($result['value'] == '2') {
1230
+					$error = self::update_from_2();
1231
+					if ($error != '') return $error;
1232
+					else return self::check_version(true);
1233
+				} elseif ($result['value'] == '3') {
1234
+					$error = self::update_from_3();
1235
+					if ($error != '') return $error;
1236
+					else return self::check_version(true);
1237
+				} elseif ($result['value'] == '4') {
1238
+					$error = self::update_from_4();
1239
+					if ($error != '') return $error;
1240
+					else return self::check_version(true);
1241
+				} elseif ($result['value'] == '5') {
1242
+					$error = self::update_from_5();
1243
+					if ($error != '') return $error;
1244
+					else return self::check_version(true);
1245
+				} elseif ($result['value'] == '6') {
1246
+					$error = self::update_from_6();
1247
+					if ($error != '') return $error;
1248
+					else return self::check_version(true);
1249
+				} elseif ($result['value'] == '7') {
1250
+					$error = self::update_from_7();
1251
+					if ($error != '') return $error;
1252
+					else return self::check_version(true);
1253
+				} elseif ($result['value'] == '8') {
1254
+					$error = self::update_from_8();
1255
+					if ($error != '') return $error;
1256
+					else return self::check_version(true);
1257
+				} elseif ($result['value'] == '9') {
1258
+					$error = self::update_from_9();
1259
+					if ($error != '') return $error;
1260
+					else return self::check_version(true);
1261
+				} elseif ($result['value'] == '10') {
1262
+					$error = self::update_from_10();
1263
+					if ($error != '') return $error;
1264
+					else return self::check_version(true);
1265
+				} elseif ($result['value'] == '11') {
1266
+					$error = self::update_from_11();
1267
+					if ($error != '') return $error;
1268
+					else return self::check_version(true);
1269
+				} elseif ($result['value'] == '12') {
1270
+					$error = self::update_from_12();
1271
+					if ($error != '') return $error;
1272
+					else return self::check_version(true);
1273
+				} elseif ($result['value'] == '13') {
1274
+					$error = self::update_from_13();
1275
+					if ($error != '') return $error;
1276
+					else return self::check_version(true);
1277
+				} elseif ($result['value'] == '14') {
1278
+					$error = self::update_from_14();
1279
+					if ($error != '') return $error;
1280
+					else return self::check_version(true);
1281
+				} elseif ($result['value'] == '15') {
1282
+					$error = self::update_from_15();
1283
+					if ($error != '') return $error;
1284
+					else return self::check_version(true);
1285
+				} elseif ($result['value'] == '16') {
1286
+					$error = self::update_from_16();
1287
+					if ($error != '') return $error;
1288
+					else return self::check_version(true);
1289
+				} elseif ($result['value'] == '17') {
1290
+					$error = self::update_from_17();
1291
+					if ($error != '') return $error;
1292
+					else return self::check_version(true);
1293
+				} elseif ($result['value'] == '18') {
1294
+					$error = self::update_from_18();
1295
+					if ($error != '') return $error;
1296
+					else return self::check_version(true);
1297
+				} elseif ($result['value'] == '19') {
1298
+					$error = self::update_from_19();
1299
+					if ($error != '') return $error;
1300
+					else return self::check_version(true);
1301
+				} elseif ($result['value'] == '20') {
1302
+					$error = self::update_from_20();
1303
+					if ($error != '') return $error;
1304
+					else return self::check_version(true);
1305
+				} elseif ($result['value'] == '21') {
1306
+					$error = self::update_from_21();
1307
+					if ($error != '') return $error;
1308
+					else return self::check_version(true);
1309
+				} elseif ($result['value'] == '22') {
1310
+					$error = self::update_from_22();
1311
+					if ($error != '') return $error;
1312
+					else return self::check_version(true);
1313
+				} elseif ($result['value'] == '23') {
1314
+					$error = self::update_from_23();
1315
+					if ($error != '') return $error;
1316
+					else return self::check_version(true);
1317
+				} elseif ($result['value'] == '24') {
1318
+					$error = self::update_from_24();
1319
+					if ($error != '') return $error;
1320
+					else return self::check_version(true);
1321
+				} elseif ($result['value'] == '25') {
1322
+					$error = self::update_from_25();
1323
+					if ($error != '') return $error;
1324
+					else return self::check_version(true);
1325
+				} elseif ($result['value'] == '26') {
1326
+					$error = self::update_from_26();
1327
+					if ($error != '') return $error;
1328
+					else return self::check_version(true);
1329
+				} elseif ($result['value'] == '27') {
1330
+					$error = self::update_from_27();
1331
+					if ($error != '') return $error;
1332
+					else return self::check_version(true);
1333
+				} elseif ($result['value'] == '28') {
1334
+					$error = self::update_from_28();
1335
+					if ($error != '') return $error;
1336
+					else return self::check_version(true);
1337
+				} else return '';
1338
+				}
1339
+				else return $result['value'];
1340 1340
 		}
1341 1341
 		
1342
-	    } else return $version;
1343
-    	}
1342
+		} else return $version;
1343
+		}
1344 1344
     	
1345 1345
 }
1346 1346
 //echo update_schema::check_version();
Please login to merge, or discard this patch.
Spacing   +135 added lines, -135 removed lines patch added patch discarded remove patch
@@ -14,11 +14,11 @@  discard block
 block discarded – undo
14 14
             try {
15 15
             	$sth = $Connection->db->prepare($query);
16 16
 		$sth->execute();
17
-    	    } catch(PDOException $e) {
17
+    	    } catch (PDOException $e) {
18 18
 		return "error : ".$e->getMessage()."\n";
19 19
     	    }
20 20
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
21
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
22 22
     	    }
23 23
 	
24 24
 	}
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         	try {
51 51
             	    $sth = $Connection->db->prepare($query);
52 52
 		    $sth->execute();
53
-    		} catch(PDOException $e) {
53
+    		} catch (PDOException $e) {
54 54
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 55
     		}
56 56
     		// Copy schedules data to routes table
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
         	try {
61 61
             	    $sth = $Connection->db->prepare($query);
62 62
 		    $sth->execute();
63
-    		} catch(PDOException $e) {
63
+    		} catch (PDOException $e) {
64 64
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65 65
     		}
66 66
     		// Add source column
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     		try {
69 69
             	    $sth = $Connection->db->prepare($query);
70 70
 		    $sth->execute();
71
-    		} catch(PDOException $e) {
71
+    		} catch (PDOException $e) {
72 72
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 73
     		}
74 74
 		// Delete unused column
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
     		try {
77 77
             	    $sth = $Connection->db->prepare($query);
78 78
 		    $sth->execute();
79
-    		} catch(PDOException $e) {
79
+    		} catch (PDOException $e) {
80 80
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 81
     		}
82 82
 		// Add ModeS column
@@ -84,14 +84,14 @@  discard block
 block discarded – undo
84 84
     		try {
85 85
             	    $sth = $Connection->db->prepare($query);
86 86
 		    $sth->execute();
87
-    		} catch(PDOException $e) {
87
+    		} catch (PDOException $e) {
88 88
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 89
     		}
90 90
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91 91
     		try {
92 92
             	    $sth = $Connection->db->prepare($query);
93 93
 		    $sth->execute();
94
-    		} catch(PDOException $e) {
94
+    		} catch (PDOException $e) {
95 95
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 96
     		}
97 97
     		// Add auto_increment for aircraft_modes
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     		try {
100 100
             	    $sth = $Connection->db->prepare($query);
101 101
 		    $sth->execute();
102
-    		} catch(PDOException $e) {
102
+    		} catch (PDOException $e) {
103 103
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 104
     		}
105 105
     		$error = '';
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         	try {
111 111
             	    $sth = $Connection->db->prepare($query);
112 112
 		    $sth->execute();
113
-    		} catch(PDOException $e) {
113
+    		} catch (PDOException $e) {
114 114
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
115 115
     		}
116 116
 		return $error;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         	try {
124 124
             	    $sth = $Connection->db->prepare($query);
125 125
 		    $sth->execute();
126
-    		} catch(PDOException $e) {
126
+    		} catch (PDOException $e) {
127 127
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 128
     		}
129 129
     		$error = '';
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
         	try {
135 135
             	    $sth = $Connection->db->prepare($query);
136 136
 		    $sth->execute();
137
-    		} catch(PDOException $e) {
137
+    		} catch (PDOException $e) {
138 138
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
139 139
     		}
140 140
 		return $error;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         	try {
148 148
             	    $sth = $Connection->db->prepare($query);
149 149
 		    $sth->execute();
150
-    		} catch(PDOException $e) {
150
+    		} catch (PDOException $e) {
151 151
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 152
     		}
153 153
     		// Add image_source_website column to spotter_image
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
         	try {
156 156
             	    $sth = $Connection->db->prepare($query);
157 157
 		    $sth->execute();
158
-    		} catch(PDOException $e) {
158
+    		} catch (PDOException $e) {
159 159
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 160
     		}
161 161
     		$error = '';
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         	try {
165 165
             	    $sth = $Connection->db->prepare($query);
166 166
 		    $sth->execute();
167
-    		} catch(PDOException $e) {
167
+    		} catch (PDOException $e) {
168 168
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
169 169
     		}
170 170
 		return $error;
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         	    try {
183 183
             		$sth = $Connection->db->prepare($query);
184 184
 			$sth->execute();
185
-    		    } catch(PDOException $e) {
185
+    		    } catch (PDOException $e) {
186 186
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187 187
     		    }
188 188
     		}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
         	try {
197 197
             	    $sth = $Connection->db->prepare($query);
198 198
 		    $sth->execute();
199
-    		} catch(PDOException $e) {
199
+    		} catch (PDOException $e) {
200 200
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 201
     		}
202 202
     		// Add aircraft_shadow column to aircraft
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
         	try {
205 205
             	    $sth = $Connection->db->prepare($query);
206 206
 		    $sth->execute();
207
-    		} catch(PDOException $e) {
207
+    		} catch (PDOException $e) {
208 208
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 209
     		}
210 210
     		// Add aircraft_shadow column to spotter_live
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
         	try {
213 213
             	    $sth = $Connection->db->prepare($query);
214 214
 		    $sth->execute();
215
-    		} catch(PDOException $e) {
215
+    		} catch (PDOException $e) {
216 216
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 217
     		}
218 218
     		$error = '';
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         	try {
226 226
             	    $sth = $Connection->db->prepare($query);
227 227
 		    $sth->execute();
228
-    		} catch(PDOException $e) {
228
+    		} catch (PDOException $e) {
229 229
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
230 230
     		}
231 231
 		return $error;
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
 	private static function update_from_6() {
235 235
     		$Connection = new Connection();
236
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
236
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
237 237
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239
 			ALTER TABLE spotter_output ADD INDEX(ident);
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
         	    try {
251 251
             		$sth = $Connection->db->prepare($query);
252 252
 			$sth->execute();
253
-    		    } catch(PDOException $e) {
253
+    		    } catch (PDOException $e) {
254 254
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255 255
     		    }
256 256
     		}
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
         	try {
266 266
             	    $sth = $Connection->db->prepare($query);
267 267
 		    $sth->execute();
268
-    		} catch(PDOException $e) {
268
+    		} catch (PDOException $e) {
269 269
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
270 270
     		}
271 271
 		return $error;
@@ -274,12 +274,12 @@  discard block
 block discarded – undo
274 274
 	private static function update_from_7() {
275 275
 		global $globalDBname, $globalDBdriver;
276 276
     		$Connection = new Connection();
277
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
277
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279 279
         	try {
280 280
             	    $sth = $Connection->db->prepare($query);
281 281
 		    $sth->execute();
282
-    		} catch(PDOException $e) {
282
+    		} catch (PDOException $e) {
283 283
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 284
     		}
285 285
     		if ($globalDBdriver == 'mysql') {
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 		    try {
288 288
             		$sth = $Connection->db->prepare($query);
289 289
 			$sth->execute();
290
-    		    } catch(PDOException $e) {
290
+    		    } catch (PDOException $e) {
291 291
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292 292
     		    }
293 293
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -299,15 +299,15 @@  discard block
 block discarded – undo
299 299
 				DROP TABLE spotter_archive;
300 300
 				RENAME TABLE copy TO spotter_archive;";
301 301
             	    } else {
302
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
302
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 303
             	    }
304 304
                 } else {
305
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
305
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 306
                 }
307 307
         	try {
308 308
             	    $sth = $Connection->db->prepare($query);
309 309
 		    $sth->execute();
310
-    		} catch(PDOException $e) {
310
+    		} catch (PDOException $e) {
311 311
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 312
     		}
313 313
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
         	try {
321 321
             	    $sth = $Connection->db->prepare($query);
322 322
 		    $sth->execute();
323
-    		} catch(PDOException $e) {
323
+    		} catch (PDOException $e) {
324 324
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
325 325
     		}
326 326
 		return $error;
@@ -339,14 +339,14 @@  discard block
 block discarded – undo
339 339
         	try {
340 340
             	    $sth = $Connection->db->prepare($query);
341 341
 		    $sth->execute();
342
-    		} catch(PDOException $e) {
342
+    		} catch (PDOException $e) {
343 343
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344 344
     		}
345 345
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346 346
         	try {
347 347
             	    $sth = $Connection->db->prepare($query);
348 348
 		    $sth->execute();
349
-    		} catch(PDOException $e) {
349
+    		} catch (PDOException $e) {
350 350
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
351 351
     		}
352 352
 		return $error;
@@ -354,12 +354,12 @@  discard block
 block discarded – undo
354 354
 
355 355
 	private static function update_from_9() {
356 356
     		$Connection = new Connection();
357
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
357
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359 359
         	try {
360 360
             	    $sth = $Connection->db->prepare($query);
361 361
 		    $sth->execute();
362
-    		} catch(PDOException $e) {
362
+    		} catch (PDOException $e) {
363 363
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 364
     		}
365 365
 		$error = '';
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
         	try {
372 372
             	    $sth = $Connection->db->prepare($query);
373 373
 		    $sth->execute();
374
-    		} catch(PDOException $e) {
374
+    		} catch (PDOException $e) {
375 375
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
376 376
     		}
377 377
 		return $error;
@@ -379,11 +379,11 @@  discard block
 block discarded – undo
379 379
 
380 380
 	private static function update_from_10() {
381 381
     		$Connection = new Connection();
382
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
382
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 383
         	try {
384 384
             	    $sth = $Connection->db->prepare($query);
385 385
 		    $sth->execute();
386
-    		} catch(PDOException $e) {
386
+    		} catch (PDOException $e) {
387 387
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 388
     		}
389 389
 		$error = '';
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
         	try {
402 402
             	    $sth = $Connection->db->prepare($query);
403 403
 		    $sth->execute();
404
-    		} catch(PDOException $e) {
404
+    		} catch (PDOException $e) {
405 405
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
406 406
     		}
407 407
 		return $error;
@@ -410,18 +410,18 @@  discard block
 block discarded – undo
410 410
 	private static function update_from_11() {
411 411
 		global $globalDBdriver, $globalDBname;
412 412
     		$Connection = new Connection();
413
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
413
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 414
         	try {
415 415
             	    $sth = $Connection->db->prepare($query);
416 416
 		    $sth->execute();
417
-    		} catch(PDOException $e) {
417
+    		} catch (PDOException $e) {
418 418
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 419
     		}
420
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
420
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 421
         	try {
422 422
             	    $sth = $Connection->db->prepare($query);
423 423
 		    $sth->execute();
424
-    		} catch(PDOException $e) {
424
+    		} catch (PDOException $e) {
425 425
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 426
     		}
427 427
     		if ($globalDBdriver == 'mysql') {
@@ -429,7 +429,7 @@  discard block
 block discarded – undo
429 429
 		    try {
430 430
             		$sth = $Connection->db->prepare($query);
431 431
 			$sth->execute();
432
-    		    } catch(PDOException $e) {
432
+    		    } catch (PDOException $e) {
433 433
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434 434
     		    }
435 435
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -441,15 +441,15 @@  discard block
 block discarded – undo
441 441
 				DROP TABLE spotter_archive;
442 442
 				RENAME TABLE copy TO spotter_archive;";
443 443
             	    } else {
444
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
444
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 445
             	    }
446 446
                 } else {
447
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
447
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 448
                 }
449 449
         	try {
450 450
             	    $sth = $Connection->db->prepare($query);
451 451
 		    $sth->execute();
452
-    		} catch(PDOException $e) {
452
+    		} catch (PDOException $e) {
453 453
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 454
     		}
455 455
 
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
         	try {
460 460
             	    $sth = $Connection->db->prepare($query);
461 461
 		    $sth->execute();
462
-    		} catch(PDOException $e) {
462
+    		} catch (PDOException $e) {
463 463
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
464 464
     		}
465 465
 		return $error;
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
         	try {
488 488
             	    $sth = $Connection->db->prepare($query);
489 489
 		    $sth->execute();
490
-    		} catch(PDOException $e) {
490
+    		} catch (PDOException $e) {
491 491
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
492 492
     		}
493 493
 		return $error;
@@ -495,12 +495,12 @@  discard block
 block discarded – undo
495 495
 
496 496
 	private static function update_from_13() {
497 497
     		$Connection = new Connection();
498
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
498
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
499
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500
 			try {
501 501
 				$sth = $Connection->db->prepare($query);
502 502
 				$sth->execute();
503
-	    		} catch(PDOException $e) {
503
+	    		} catch (PDOException $e) {
504 504
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505 505
     			}
506 506
 		}
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
         	try {
510 510
             	    $sth = $Connection->db->prepare($query);
511 511
 		    $sth->execute();
512
-    		} catch(PDOException $e) {
512
+    		} catch (PDOException $e) {
513 513
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
514 514
     		}
515 515
 		return $error;
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
         	try {
528 528
             	    $sth = $Connection->db->prepare($query);
529 529
 		    $sth->execute();
530
-    		} catch(PDOException $e) {
530
+    		} catch (PDOException $e) {
531 531
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
532 532
     		}
533 533
 		return $error;
@@ -538,11 +538,11 @@  discard block
 block discarded – undo
538 538
     		$Connection = new Connection();
539 539
 		$error = '';
540 540
     		// Add tables
541
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
541
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 542
         	try {
543 543
             	    $sth = $Connection->db->prepare($query);
544 544
 		    $sth->execute();
545
-    		} catch(PDOException $e) {
545
+    		} catch (PDOException $e) {
546 546
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 547
     		}
548 548
 		if ($error != '') return $error;
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
         	try {
551 551
             	    $sth = $Connection->db->prepare($query);
552 552
 		    $sth->execute();
553
-    		} catch(PDOException $e) {
553
+    		} catch (PDOException $e) {
554 554
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
555 555
     		}
556 556
 		return $error;
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
         	try {
572 572
             	    $sth = $Connection->db->prepare($query);
573 573
 		    $sth->execute();
574
-    		} catch(PDOException $e) {
574
+    		} catch (PDOException $e) {
575 575
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
576 576
     		}
577 577
 		return $error;
@@ -589,7 +589,7 @@  discard block
 block discarded – undo
589 589
         	try {
590 590
             	    $sth = $Connection->db->prepare($query);
591 591
 		    $sth->execute();
592
-    		} catch(PDOException $e) {
592
+    		} catch (PDOException $e) {
593 593
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
594 594
     		}
595 595
 		return $error;
@@ -598,12 +598,12 @@  discard block
 block discarded – undo
598 598
     		$Connection = new Connection();
599 599
 		$error = '';
600 600
     		// Modify stats_airport table
601
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
601
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
602 602
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 603
     	        	try {
604 604
 	            	    $sth = $Connection->db->prepare($query);
605 605
 			    $sth->execute();
606
-    			} catch(PDOException $e) {
606
+    			} catch (PDOException $e) {
607 607
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 608
     			}
609 609
     		}
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
         	try {
613 613
             	    $sth = $Connection->db->prepare($query);
614 614
 		    $sth->execute();
615
-    		} catch(PDOException $e) {
615
+    		} catch (PDOException $e) {
616 616
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
617 617
     		}
618 618
 		return $error;
@@ -629,73 +629,73 @@  discard block
 block discarded – undo
629 629
         	try {
630 630
             	    $sth = $Connection->db->prepare($query);
631 631
 		    $sth->execute();
632
-    		} catch(PDOException $e) {
632
+    		} catch (PDOException $e) {
633 633
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 634
     		}
635 635
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636 636
         	try {
637 637
             	    $sth = $Connection->db->prepare($query);
638 638
 		    $sth->execute();
639
-    		} catch(PDOException $e) {
639
+    		} catch (PDOException $e) {
640 640
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 641
     		}
642
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
642
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
643 643
 			// Add column over_country
644 644
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645
 			try {
646 646
             			$sth = $Connection->db->prepare($query);
647 647
 				$sth->execute();
648
-			} catch(PDOException $e) {
648
+			} catch (PDOException $e) {
649 649
 				return "error (add over_country) : ".$e->getMessage()."\n";
650 650
 			}
651 651
 		}
652
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
652
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
653 653
 			// Add column over_country
654 654
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655
 			try {
656 656
             			$sth = $Connection->db->prepare($query);
657 657
 				$sth->execute();
658
-			} catch(PDOException $e) {
658
+			} catch (PDOException $e) {
659 659
 				return "error (add over_country) : ".$e->getMessage()."\n";
660 660
 			}
661 661
 		}
662
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
662
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
663 663
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664 664
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665
 			try {
666 666
 				$sth = $Connection->db->prepare($query);
667 667
 				$sth->execute();
668
-			} catch(PDOException $e) {
668
+			} catch (PDOException $e) {
669 669
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670 670
     			}
671 671
     		}
672
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
672
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
673 673
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674 674
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675
 			try {
676 676
 				$sth = $Connection->db->prepare($query);
677 677
 				$sth->execute();
678
-			} catch(PDOException $e) {
678
+			} catch (PDOException $e) {
679 679
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680 680
     			}
681 681
     		}
682
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
682
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
683 683
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684 684
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685
 			try {
686 686
 				$sth = $Connection->db->prepare($query);
687 687
 				$sth->execute();
688
-			} catch(PDOException $e) {
688
+			} catch (PDOException $e) {
689 689
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690 690
     			}
691 691
     		}
692
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
692
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
693 693
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694 694
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695
 			try {
696 696
 				$sth = $Connection->db->prepare($query);
697 697
 				$sth->execute();
698
-			} catch(PDOException $e) {
698
+			} catch (PDOException $e) {
699 699
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 700
     			}
701 701
     		}
@@ -704,7 +704,7 @@  discard block
 block discarded – undo
704 704
         	try {
705 705
             	    $sth = $Connection->db->prepare($query);
706 706
 		    $sth->execute();
707
-    		} catch(PDOException $e) {
707
+    		} catch (PDOException $e) {
708 708
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
709 709
     		}
710 710
 		return $error;
@@ -719,13 +719,13 @@  discard block
 block discarded – undo
719 719
 			$error .= create_db::import_file('../db/airlines.sql');
720 720
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721
 		}
722
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
722
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
723 723
 			// Add column over_country
724 724
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 725
         		try {
726 726
 				$sth = $Connection->db->prepare($query);
727 727
 				$sth->execute();
728
-			} catch(PDOException $e) {
728
+			} catch (PDOException $e) {
729 729
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 730
     			}
731 731
     		}
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
         	try {
742 742
             	    $sth = $Connection->db->prepare($query);
743 743
 		    $sth->execute();
744
-    		} catch(PDOException $e) {
744
+    		} catch (PDOException $e) {
745 745
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
746 746
     		}
747 747
 		return $error;
@@ -750,13 +750,13 @@  discard block
 block discarded – undo
750 750
 	private static function update_from_21() {
751 751
 		$Connection = new Connection();
752 752
 		$error = '';
753
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
753
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
754 754
 			// Rename type to stats_type
755 755
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
756 756
 			try {
757 757
 				$sth = $Connection->db->prepare($query);
758 758
 				$sth->execute();
759
-			} catch(PDOException $e) {
759
+			} catch (PDOException $e) {
760 760
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 761
 			}
762 762
 			if ($error != '') return $error;
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
         	try {
766 766
             	    $sth = $Connection->db->prepare($query);
767 767
 		    $sth->execute();
768
-    		} catch(PDOException $e) {
768
+    		} catch (PDOException $e) {
769 769
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
770 770
     		}
771 771
 		return $error;
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
         	try {
789 789
             	    $sth = $Connection->db->prepare($query);
790 790
 		    $sth->execute();
791
-    		} catch(PDOException $e) {
791
+    		} catch (PDOException $e) {
792 792
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
793 793
     		}
794 794
 		return $error;
@@ -815,17 +815,17 @@  discard block
 block discarded – undo
815 815
 			try {
816 816
 				$sth = $Connection->db->prepare($query);
817 817
 				$sth->execute();
818
-			} catch(PDOException $e) {
818
+			} catch (PDOException $e) {
819 819
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
820 820
 			}
821 821
 		}
822
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
822
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
823 823
 			// Add aircraft_manufacturer to stats_aircraft
824 824
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
825 825
 			try {
826 826
 				$sth = $Connection->db->prepare($query);
827 827
 				$sth->execute();
828
-			} catch(PDOException $e) {
828
+			} catch (PDOException $e) {
829 829
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
830 830
     			}
831 831
     		}
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 		try {
835 835
 			$sth = $Connection->db->prepare($query);
836 836
 			$sth->execute();
837
-		} catch(PDOException $e) {
837
+		} catch (PDOException $e) {
838 838
 			return "error (update schema_version) : ".$e->getMessage()."\n";
839 839
 		}
840 840
 		return $error;
@@ -850,23 +850,23 @@  discard block
 block discarded – undo
850 850
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
851 851
 		}
852 852
 		if ($error != '') return 'Import airlines.sql : '.$error;
853
-		if (!$Connection->checkColumnName('airlines','forsource')) {
853
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
854 854
 			// Add forsource to airlines
855 855
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
856 856
 			try {
857 857
 				$sth = $Connection->db->prepare($query);
858 858
 				$sth->execute();
859
-			} catch(PDOException $e) {
859
+			} catch (PDOException $e) {
860 860
 				return "error (add forsource column) : ".$e->getMessage()."\n";
861 861
 			}
862 862
 		}
863
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
863
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
864 864
 			// Add forsource to airlines
865 865
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
866 866
 			try {
867 867
 				$sth = $Connection->db->prepare($query);
868 868
 				$sth->execute();
869
-			} catch(PDOException $e) {
869
+			} catch (PDOException $e) {
870 870
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
871 871
 			}
872 872
 			// Add unique key
@@ -878,17 +878,17 @@  discard block
 block discarded – undo
878 878
 			try {
879 879
 				$sth = $Connection->db->prepare($query);
880 880
 				$sth->execute();
881
-			} catch(PDOException $e) {
881
+			} catch (PDOException $e) {
882 882
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
883 883
 			}
884 884
 		}
885
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
885
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
886 886
 			// Add forsource to airlines
887 887
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
888 888
 			try {
889 889
 				$sth = $Connection->db->prepare($query);
890 890
 				$sth->execute();
891
-			} catch(PDOException $e) {
891
+			} catch (PDOException $e) {
892 892
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
893 893
 			}
894 894
 			// Add unique key
@@ -900,17 +900,17 @@  discard block
 block discarded – undo
900 900
 			try {
901 901
 				$sth = $Connection->db->prepare($query);
902 902
 				$sth->execute();
903
-			} catch(PDOException $e) {
903
+			} catch (PDOException $e) {
904 904
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
905 905
 			}
906 906
 		}
907
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
907
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
908 908
 			// Add forsource to airlines
909 909
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
910 910
 			try {
911 911
 				$sth = $Connection->db->prepare($query);
912 912
 				$sth->execute();
913
-			} catch(PDOException $e) {
913
+			} catch (PDOException $e) {
914 914
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
915 915
 			}
916 916
 			// Add unique key
@@ -922,36 +922,36 @@  discard block
 block discarded – undo
922 922
 			try {
923 923
 				$sth = $Connection->db->prepare($query);
924 924
 				$sth->execute();
925
-			} catch(PDOException $e) {
925
+			} catch (PDOException $e) {
926 926
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
927 927
 			}
928 928
 		}
929
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
929
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
930 930
 			// Add forsource to airlines
931 931
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
932 932
 			try {
933 933
 				$sth = $Connection->db->prepare($query);
934 934
 				$sth->execute();
935
-			} catch(PDOException $e) {
935
+			} catch (PDOException $e) {
936 936
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
937 937
 			}
938 938
 		}
939
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
939
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
940 940
 			// Add forsource to airlines
941 941
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
942 942
 			try {
943 943
 				$sth = $Connection->db->prepare($query);
944 944
 				$sth->execute();
945
-			} catch(PDOException $e) {
945
+			} catch (PDOException $e) {
946 946
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
947 947
 			}
948
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
948
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
949 949
 				// Add unique key
950 950
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
951 951
 				try {
952 952
 					$sth = $Connection->db->prepare($query);
953 953
 					$sth->execute();
954
-				} catch(PDOException $e) {
954
+				} catch (PDOException $e) {
955 955
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
956 956
 				}
957 957
 			} else {
@@ -964,18 +964,18 @@  discard block
 block discarded – undo
964 964
 				try {
965 965
 					$sth = $Connection->db->prepare($query);
966 966
 					$sth->execute();
967
-				} catch(PDOException $e) {
967
+				} catch (PDOException $e) {
968 968
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
969 969
 				}
970 970
 			}
971 971
 		}
972
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
972
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
973 973
 			// Add forsource to airlines
974 974
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
975 975
 			try {
976 976
 				$sth = $Connection->db->prepare($query);
977 977
 				$sth->execute();
978
-			} catch(PDOException $e) {
978
+			} catch (PDOException $e) {
979 979
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
980 980
 			}
981 981
 			// Add unique key
@@ -987,17 +987,17 @@  discard block
 block discarded – undo
987 987
 			try {
988 988
 				$sth = $Connection->db->prepare($query);
989 989
 				$sth->execute();
990
-			} catch(PDOException $e) {
990
+			} catch (PDOException $e) {
991 991
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
992 992
 			}
993 993
 		}
994
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
994
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
995 995
 			// Add forsource to airlines
996 996
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
997 997
 			try {
998 998
 				$sth = $Connection->db->prepare($query);
999 999
 				$sth->execute();
1000
-			} catch(PDOException $e) {
1000
+			} catch (PDOException $e) {
1001 1001
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
1002 1002
 			}
1003 1003
 			// Add unique key
@@ -1009,17 +1009,17 @@  discard block
 block discarded – undo
1009 1009
 			try {
1010 1010
 				$sth = $Connection->db->prepare($query);
1011 1011
 				$sth->execute();
1012
-			} catch(PDOException $e) {
1012
+			} catch (PDOException $e) {
1013 1013
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1014 1014
 			}
1015 1015
 		}
1016
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
1016
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
1017 1017
 			// Add forsource to airlines
1018 1018
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1019 1019
 			try {
1020 1020
 				$sth = $Connection->db->prepare($query);
1021 1021
 				$sth->execute();
1022
-			} catch(PDOException $e) {
1022
+			} catch (PDOException $e) {
1023 1023
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
1024 1024
 			}
1025 1025
 			// Add unique key
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
 			try {
1032 1032
 				$sth = $Connection->db->prepare($query);
1033 1033
 				$sth->execute();
1034
-			} catch(PDOException $e) {
1034
+			} catch (PDOException $e) {
1035 1035
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1036 1036
 			}
1037 1037
 		}
@@ -1040,7 +1040,7 @@  discard block
 block discarded – undo
1040 1040
 		try {
1041 1041
 			$sth = $Connection->db->prepare($query);
1042 1042
 			$sth->execute();
1043
-		} catch(PDOException $e) {
1043
+		} catch (PDOException $e) {
1044 1044
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1045 1045
 		}
1046 1046
 		return $error;
@@ -1050,13 +1050,13 @@  discard block
 block discarded – undo
1050 1050
 		global $globalDBdriver;
1051 1051
 		$Connection = new Connection();
1052 1052
 		$error = '';
1053
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
1053
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
1054 1054
 			// Add forsource to airlines
1055 1055
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1056 1056
 			try {
1057 1057
 				$sth = $Connection->db->prepare($query);
1058 1058
 				$sth->execute();
1059
-			} catch(PDOException $e) {
1059
+			} catch (PDOException $e) {
1060 1060
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
1061 1061
 			}
1062 1062
 			// Add unique key
@@ -1068,17 +1068,17 @@  discard block
 block discarded – undo
1068 1068
 			try {
1069 1069
 				$sth = $Connection->db->prepare($query);
1070 1070
 				$sth->execute();
1071
-			} catch(PDOException $e) {
1071
+			} catch (PDOException $e) {
1072 1072
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
1073 1073
 			}
1074 1074
 		}
1075
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
1075
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
1076 1076
 			// Add forsource to airlines
1077 1077
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1078 1078
 			try {
1079 1079
 				$sth = $Connection->db->prepare($query);
1080 1080
 				$sth->execute();
1081
-			} catch(PDOException $e) {
1081
+			} catch (PDOException $e) {
1082 1082
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
1083 1083
 			}
1084 1084
 			// Add unique key
@@ -1090,7 +1090,7 @@  discard block
 block discarded – undo
1090 1090
 			try {
1091 1091
 				$sth = $Connection->db->prepare($query);
1092 1092
 				$sth->execute();
1093
-			} catch(PDOException $e) {
1093
+			} catch (PDOException $e) {
1094 1094
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
1095 1095
 			}
1096 1096
 		}
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
 		try {
1099 1099
 			$sth = $Connection->db->prepare($query);
1100 1100
 			$sth->execute();
1101
-		} catch(PDOException $e) {
1101
+		} catch (PDOException $e) {
1102 1102
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1103 1103
 		}
1104 1104
 		return $error;
@@ -1108,12 +1108,12 @@  discard block
 block discarded – undo
1108 1108
 		global $globalDBdriver;
1109 1109
 		$Connection = new Connection();
1110 1110
 		$error = '';
1111
-		if (!$Connection->checkColumnName('atc','format_source')) {
1111
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
1112 1112
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
1113 1113
 			try {
1114 1114
 				$sth = $Connection->db->prepare($query);
1115 1115
 				$sth->execute();
1116
-			} catch(PDOException $e) {
1116
+			} catch (PDOException $e) {
1117 1117
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
1118 1118
 			}
1119 1119
 		}
@@ -1121,7 +1121,7 @@  discard block
 block discarded – undo
1121 1121
 		try {
1122 1122
 			$sth = $Connection->db->prepare($query);
1123 1123
 			$sth->execute();
1124
-		} catch(PDOException $e) {
1124
+		} catch (PDOException $e) {
1125 1125
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1126 1126
 		}
1127 1127
 		return $error;
@@ -1131,13 +1131,13 @@  discard block
 block discarded – undo
1131 1131
 		global $globalDBdriver;
1132 1132
 		$Connection = new Connection();
1133 1133
 		$error = '';
1134
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
1134
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
1135 1135
 			// Add forsource to airlines
1136 1136
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
1137 1137
 			try {
1138 1138
 				$sth = $Connection->db->prepare($query);
1139 1139
 				$sth->execute();
1140
-			} catch(PDOException $e) {
1140
+			} catch (PDOException $e) {
1141 1141
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
1142 1142
 			}
1143 1143
 			// Add unique key
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 			try {
1150 1150
 				$sth = $Connection->db->prepare($query);
1151 1151
 				$sth->execute();
1152
-			} catch(PDOException $e) {
1152
+			} catch (PDOException $e) {
1153 1153
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
1154 1154
 			}
1155 1155
 		}
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
 		try {
1158 1158
 			$sth = $Connection->db->prepare($query);
1159 1159
 			$sth->execute();
1160
-		} catch(PDOException $e) {
1160
+		} catch (PDOException $e) {
1161 1161
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1162 1162
 		}
1163 1163
 		return $error;
@@ -1167,23 +1167,23 @@  discard block
 block discarded – undo
1167 1167
 		global $globalDBdriver;
1168 1168
 		$Connection = new Connection();
1169 1169
 		$error = '';
1170
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
1170
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
1171 1171
 			// Add unique key
1172 1172
 			$query = "alter table spotter_live add index(latitude,longitude)";
1173 1173
 			try {
1174 1174
 				$sth = $Connection->db->prepare($query);
1175 1175
 				$sth->execute();
1176
-			} catch(PDOException $e) {
1176
+			} catch (PDOException $e) {
1177 1177
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1178 1178
 			}
1179 1179
                 }
1180
-		if (!$Connection->checkColumnName('aircraft','manufacturer')) {
1180
+		if (!$Connection->checkColumnName('aircraft', 'manufacturer')) {
1181 1181
 			// Add mfr to aircraft
1182 1182
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
1183 1183
 			try {
1184 1184
 				$sth = $Connection->db->prepare($query);
1185 1185
 				$sth->execute();
1186
-			} catch(PDOException $e) {
1186
+			} catch (PDOException $e) {
1187 1187
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
1188 1188
 			}
1189 1189
 		}
@@ -1199,7 +1199,7 @@  discard block
 block discarded – undo
1199 1199
 		try {
1200 1200
 			$sth = $Connection->db->prepare($query);
1201 1201
 			$sth->execute();
1202
-		} catch(PDOException $e) {
1202
+		} catch (PDOException $e) {
1203 1203
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1204 1204
 		}
1205 1205
 		return $error;
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 		    try {
1222 1222
             		$sth = $Connection->db->prepare($query);
1223 1223
 		        $sth->execute();
1224
-		    } catch(PDOException $e) {
1224
+		    } catch (PDOException $e) {
1225 1225
 			return "error : ".$e->getMessage()."\n";
1226 1226
     		    }
1227 1227
     		    $result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
Braces   +235 added lines, -88 removed lines patch added patch discarded remove patch
@@ -258,7 +258,9 @@  discard block
 block discarded – undo
258 258
     		// Update table countries
259 259
     		if ($Connection->tableExists('airspace')) {
260 260
     		    $error .= update_db::update_countries();
261
-		    if ($error != '') return $error;
261
+		    if ($error != '') {
262
+		    	return $error;
263
+		    }
262 264
 		}
263 265
 		// Update schema_version to 7
264 266
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@  discard block
 block discarded – undo
314 316
     		$error = '';
315 317
     		// Update table aircraft
316 318
 		$error .= create_db::import_file('../db/source_location.sql');
317
-		if ($error != '') return $error;
319
+		if ($error != '') {
320
+			return $error;
321
+		}
318 322
 		// Update schema_version to 6
319 323
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 324
         	try {
@@ -331,7 +335,9 @@  discard block
 block discarded – undo
331 335
     		$error = '';
332 336
     		// Update table aircraft
333 337
 		$error .= create_db::import_file('../db/notam.sql');
334
-		if ($error != '') return $error;
338
+		if ($error != '') {
339
+			return $error;
340
+		}
335 341
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 342
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 343
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@  discard block
 block discarded – undo
365 371
 		$error = '';
366 372
     		// Update table atc
367 373
 		$error .= create_db::import_file('../db/atc.sql');
368
-		if ($error != '') return $error;
374
+		if ($error != '') {
375
+			return $error;
376
+		}
369 377
 		
370 378
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 379
         	try {
@@ -389,13 +397,21 @@  discard block
 block discarded – undo
389 397
 		$error = '';
390 398
     		// Add tables
391 399
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392
-		if ($error != '') return $error;
400
+		if ($error != '') {
401
+			return $error;
402
+		}
393 403
 		$error .= create_db::import_file('../db/metar.sql');
394
-		if ($error != '') return $error;
404
+		if ($error != '') {
405
+			return $error;
406
+		}
395 407
 		$error .= create_db::import_file('../db/taf.sql');
396
-		if ($error != '') return $error;
408
+		if ($error != '') {
409
+			return $error;
410
+		}
397 411
 		$error .= create_db::import_file('../db/airport.sql');
398
-		if ($error != '') return $error;
412
+		if ($error != '') {
413
+			return $error;
414
+		}
399 415
 		
400 416
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 417
         	try {
@@ -469,19 +485,33 @@  discard block
 block discarded – undo
469 485
 		$error = '';
470 486
     		// Add tables
471 487
 		$error .= create_db::import_file('../db/stats.sql');
472
-		if ($error != '') return $error;
488
+		if ($error != '') {
489
+			return $error;
490
+		}
473 491
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
474
-		if ($error != '') return $error;
492
+		if ($error != '') {
493
+			return $error;
494
+		}
475 495
 		$error .= create_db::import_file('../db/stats_airline.sql');
476
-		if ($error != '') return $error;
496
+		if ($error != '') {
497
+			return $error;
498
+		}
477 499
 		$error .= create_db::import_file('../db/stats_airport.sql');
478
-		if ($error != '') return $error;
500
+		if ($error != '') {
501
+			return $error;
502
+		}
479 503
 		$error .= create_db::import_file('../db/stats_owner.sql');
480
-		if ($error != '') return $error;
504
+		if ($error != '') {
505
+			return $error;
506
+		}
481 507
 		$error .= create_db::import_file('../db/stats_pilot.sql');
482
-		if ($error != '') return $error;
508
+		if ($error != '') {
509
+			return $error;
510
+		}
483 511
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
484
-		if ($error != '') return $error;
512
+		if ($error != '') {
513
+			return $error;
514
+		}
485 515
 		
486 516
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 517
         	try {
@@ -521,7 +551,9 @@  discard block
 block discarded – undo
521 551
     		// Add tables
522 552
     		if (!$Connection->tableExists('stats_flight')) {
523 553
 			$error .= create_db::import_file('../db/stats_flight.sql');
524
-			if ($error != '') return $error;
554
+			if ($error != '') {
555
+				return $error;
556
+			}
525 557
 		}
526 558
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 559
         	try {
@@ -545,7 +577,9 @@  discard block
 block discarded – undo
545 577
     		} catch(PDOException $e) {
546 578
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 579
     		}
548
-		if ($error != '') return $error;
580
+		if ($error != '') {
581
+			return $error;
582
+		}
549 583
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 584
         	try {
551 585
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@  discard block
 block discarded – undo
566 600
     		if (!$Connection->tableExists('stats_callsign')) {
567 601
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 602
 		}
569
-		if ($error != '') return $error;
603
+		if ($error != '') {
604
+			return $error;
605
+		}
570 606
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 607
         	try {
572 608
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@  discard block
 block discarded – undo
584 620
     		if (!$Connection->tableExists('stats_country')) {
585 621
 			$error .= create_db::import_file('../db/stats_country.sql');
586 622
 		}
587
-		if ($error != '') return $error;
623
+		if ($error != '') {
624
+			return $error;
625
+		}
588 626
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 627
         	try {
590 628
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@  discard block
 block discarded – undo
607 645
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 646
     			}
609 647
     		}
610
-		if ($error != '') return $error;
648
+		if ($error != '') {
649
+			return $error;
650
+		}
611 651
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 652
         	try {
613 653
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@  discard block
 block discarded – undo
623 663
 		$error = '';
624 664
     		// Update airport table
625 665
 		$error .= create_db::import_file('../db/airport.sql');
626
-		if ($error != '') return 'Import airport.sql : '.$error;
666
+		if ($error != '') {
667
+			return 'Import airport.sql : '.$error;
668
+		}
627 669
 		// Remove primary key on Spotter_Archive
628 670
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 671
         	try {
@@ -699,7 +741,9 @@  discard block
 block discarded – undo
699 741
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 742
     			}
701 743
     		}
702
-		if ($error != '') return $error;
744
+		if ($error != '') {
745
+			return $error;
746
+		}
703 747
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 748
         	try {
705 749
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@  discard block
 block discarded – undo
717 761
     		// Update airline table
718 762
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 763
 			$error .= create_db::import_file('../db/airlines.sql');
720
-			if ($error != '') return 'Import airlines.sql : '.$error;
764
+			if ($error != '') {
765
+				return 'Import airlines.sql : '.$error;
766
+			}
721 767
 		}
722 768
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 769
 			// Add column over_country
@@ -729,7 +775,9 @@  discard block
 block discarded – undo
729 775
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 776
     			}
731 777
     		}
732
-		if ($error != '') return $error;
778
+		if ($error != '') {
779
+			return $error;
780
+		}
733 781
 		/*
734 782
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
735 783
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@  discard block
 block discarded – undo
759 807
 			} catch(PDOException $e) {
760 808
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 809
 			}
762
-			if ($error != '') return $error;
810
+			if ($error != '') {
811
+				return $error;
812
+			}
763 813
 		}
764 814
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 815
         	try {
@@ -782,7 +832,9 @@  discard block
 block discarded – undo
782 832
 			} else {
783 833
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 834
 			}
785
-			if ($error != '') return $error;
835
+			if ($error != '') {
836
+				return $error;
837
+			}
786 838
 		}
787 839
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 840
         	try {
@@ -804,12 +856,16 @@  discard block
 block discarded – undo
804 856
 		if ($globalDBdriver == 'mysql') {
805 857
 			if (!$Connection->tableExists('tle')) {
806 858
 				$error .= create_db::import_file('../db/tle.sql');
807
-				if ($error != '') return $error;
859
+				if ($error != '') {
860
+					return $error;
861
+				}
808 862
 			}
809 863
 		} else {
810 864
 			if (!$Connection->tableExists('tle')) {
811 865
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
812
-				if ($error != '') return $error;
866
+				if ($error != '') {
867
+					return $error;
868
+				}
813 869
 			}
814 870
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
815 871
 			try {
@@ -849,7 +905,9 @@  discard block
 block discarded – undo
849 905
 		} else {
850 906
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
851 907
 		}
852
-		if ($error != '') return 'Import airlines.sql : '.$error;
908
+		if ($error != '') {
909
+			return 'Import airlines.sql : '.$error;
910
+		}
853 911
 		if (!$Connection->checkColumnName('airlines','forsource')) {
854 912
 			// Add forsource to airlines
855 913
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1213,8 +1271,11 @@  discard block
 block discarded – undo
1213 1271
     	    if ($Connection->tableExists('aircraft')) {
1214 1272
     		if (!$Connection->tableExists('config')) {
1215 1273
     		    $version = '1';
1216
-    		    if ($update) return self::update_from_1();
1217
-    		    else return $version;
1274
+    		    if ($update) {
1275
+    		    	return self::update_from_1();
1276
+    		    } else {
1277
+    		    	return $version;
1278
+    		    }
1218 1279
 		} else {
1219 1280
     		    $Connection = new Connection();
1220 1281
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -1228,118 +1289,204 @@  discard block
 block discarded – undo
1228 1289
     		    if ($update) {
1229 1290
     			if ($result['value'] == '2') {
1230 1291
     			    $error = self::update_from_2();
1231
-    			    if ($error != '') return $error;
1232
-    			    else return self::check_version(true);
1292
+    			    if ($error != '') {
1293
+    			    	return $error;
1294
+    			    } else {
1295
+    			    	return self::check_version(true);
1296
+    			    }
1233 1297
     			} elseif ($result['value'] == '3') {
1234 1298
     			    $error = self::update_from_3();
1235
-    			    if ($error != '') return $error;
1236
-    			    else return self::check_version(true);
1299
+    			    if ($error != '') {
1300
+    			    	return $error;
1301
+    			    } else {
1302
+    			    	return self::check_version(true);
1303
+    			    }
1237 1304
     			} elseif ($result['value'] == '4') {
1238 1305
     			    $error = self::update_from_4();
1239
-    			    if ($error != '') return $error;
1240
-    			    else return self::check_version(true);
1306
+    			    if ($error != '') {
1307
+    			    	return $error;
1308
+    			    } else {
1309
+    			    	return self::check_version(true);
1310
+    			    }
1241 1311
     			} elseif ($result['value'] == '5') {
1242 1312
     			    $error = self::update_from_5();
1243
-    			    if ($error != '') return $error;
1244
-    			    else return self::check_version(true);
1313
+    			    if ($error != '') {
1314
+    			    	return $error;
1315
+    			    } else {
1316
+    			    	return self::check_version(true);
1317
+    			    }
1245 1318
     			} elseif ($result['value'] == '6') {
1246 1319
     			    $error = self::update_from_6();
1247
-    			    if ($error != '') return $error;
1248
-    			    else return self::check_version(true);
1320
+    			    if ($error != '') {
1321
+    			    	return $error;
1322
+    			    } else {
1323
+    			    	return self::check_version(true);
1324
+    			    }
1249 1325
     			} elseif ($result['value'] == '7') {
1250 1326
     			    $error = self::update_from_7();
1251
-    			    if ($error != '') return $error;
1252
-    			    else return self::check_version(true);
1327
+    			    if ($error != '') {
1328
+    			    	return $error;
1329
+    			    } else {
1330
+    			    	return self::check_version(true);
1331
+    			    }
1253 1332
     			} elseif ($result['value'] == '8') {
1254 1333
     			    $error = self::update_from_8();
1255
-    			    if ($error != '') return $error;
1256
-    			    else return self::check_version(true);
1334
+    			    if ($error != '') {
1335
+    			    	return $error;
1336
+    			    } else {
1337
+    			    	return self::check_version(true);
1338
+    			    }
1257 1339
     			} elseif ($result['value'] == '9') {
1258 1340
     			    $error = self::update_from_9();
1259
-    			    if ($error != '') return $error;
1260
-    			    else return self::check_version(true);
1341
+    			    if ($error != '') {
1342
+    			    	return $error;
1343
+    			    } else {
1344
+    			    	return self::check_version(true);
1345
+    			    }
1261 1346
     			} elseif ($result['value'] == '10') {
1262 1347
     			    $error = self::update_from_10();
1263
-    			    if ($error != '') return $error;
1264
-    			    else return self::check_version(true);
1348
+    			    if ($error != '') {
1349
+    			    	return $error;
1350
+    			    } else {
1351
+    			    	return self::check_version(true);
1352
+    			    }
1265 1353
     			} elseif ($result['value'] == '11') {
1266 1354
     			    $error = self::update_from_11();
1267
-    			    if ($error != '') return $error;
1268
-    			    else return self::check_version(true);
1355
+    			    if ($error != '') {
1356
+    			    	return $error;
1357
+    			    } else {
1358
+    			    	return self::check_version(true);
1359
+    			    }
1269 1360
     			} elseif ($result['value'] == '12') {
1270 1361
     			    $error = self::update_from_12();
1271
-    			    if ($error != '') return $error;
1272
-    			    else return self::check_version(true);
1362
+    			    if ($error != '') {
1363
+    			    	return $error;
1364
+    			    } else {
1365
+    			    	return self::check_version(true);
1366
+    			    }
1273 1367
     			} elseif ($result['value'] == '13') {
1274 1368
     			    $error = self::update_from_13();
1275
-    			    if ($error != '') return $error;
1276
-    			    else return self::check_version(true);
1369
+    			    if ($error != '') {
1370
+    			    	return $error;
1371
+    			    } else {
1372
+    			    	return self::check_version(true);
1373
+    			    }
1277 1374
     			} elseif ($result['value'] == '14') {
1278 1375
     			    $error = self::update_from_14();
1279
-    			    if ($error != '') return $error;
1280
-    			    else return self::check_version(true);
1376
+    			    if ($error != '') {
1377
+    			    	return $error;
1378
+    			    } else {
1379
+    			    	return self::check_version(true);
1380
+    			    }
1281 1381
     			} elseif ($result['value'] == '15') {
1282 1382
     			    $error = self::update_from_15();
1283
-    			    if ($error != '') return $error;
1284
-    			    else return self::check_version(true);
1383
+    			    if ($error != '') {
1384
+    			    	return $error;
1385
+    			    } else {
1386
+    			    	return self::check_version(true);
1387
+    			    }
1285 1388
     			} elseif ($result['value'] == '16') {
1286 1389
     			    $error = self::update_from_16();
1287
-    			    if ($error != '') return $error;
1288
-    			    else return self::check_version(true);
1390
+    			    if ($error != '') {
1391
+    			    	return $error;
1392
+    			    } else {
1393
+    			    	return self::check_version(true);
1394
+    			    }
1289 1395
     			} elseif ($result['value'] == '17') {
1290 1396
     			    $error = self::update_from_17();
1291
-    			    if ($error != '') return $error;
1292
-    			    else return self::check_version(true);
1397
+    			    if ($error != '') {
1398
+    			    	return $error;
1399
+    			    } else {
1400
+    			    	return self::check_version(true);
1401
+    			    }
1293 1402
     			} elseif ($result['value'] == '18') {
1294 1403
     			    $error = self::update_from_18();
1295
-    			    if ($error != '') return $error;
1296
-    			    else return self::check_version(true);
1404
+    			    if ($error != '') {
1405
+    			    	return $error;
1406
+    			    } else {
1407
+    			    	return self::check_version(true);
1408
+    			    }
1297 1409
     			} elseif ($result['value'] == '19') {
1298 1410
     			    $error = self::update_from_19();
1299
-    			    if ($error != '') return $error;
1300
-    			    else return self::check_version(true);
1411
+    			    if ($error != '') {
1412
+    			    	return $error;
1413
+    			    } else {
1414
+    			    	return self::check_version(true);
1415
+    			    }
1301 1416
     			} elseif ($result['value'] == '20') {
1302 1417
     			    $error = self::update_from_20();
1303
-    			    if ($error != '') return $error;
1304
-    			    else return self::check_version(true);
1418
+    			    if ($error != '') {
1419
+    			    	return $error;
1420
+    			    } else {
1421
+    			    	return self::check_version(true);
1422
+    			    }
1305 1423
     			} elseif ($result['value'] == '21') {
1306 1424
     			    $error = self::update_from_21();
1307
-    			    if ($error != '') return $error;
1308
-    			    else return self::check_version(true);
1425
+    			    if ($error != '') {
1426
+    			    	return $error;
1427
+    			    } else {
1428
+    			    	return self::check_version(true);
1429
+    			    }
1309 1430
     			} elseif ($result['value'] == '22') {
1310 1431
     			    $error = self::update_from_22();
1311
-    			    if ($error != '') return $error;
1312
-    			    else return self::check_version(true);
1432
+    			    if ($error != '') {
1433
+    			    	return $error;
1434
+    			    } else {
1435
+    			    	return self::check_version(true);
1436
+    			    }
1313 1437
     			} elseif ($result['value'] == '23') {
1314 1438
     			    $error = self::update_from_23();
1315
-    			    if ($error != '') return $error;
1316
-    			    else return self::check_version(true);
1439
+    			    if ($error != '') {
1440
+    			    	return $error;
1441
+    			    } else {
1442
+    			    	return self::check_version(true);
1443
+    			    }
1317 1444
     			} elseif ($result['value'] == '24') {
1318 1445
     			    $error = self::update_from_24();
1319
-    			    if ($error != '') return $error;
1320
-    			    else return self::check_version(true);
1446
+    			    if ($error != '') {
1447
+    			    	return $error;
1448
+    			    } else {
1449
+    			    	return self::check_version(true);
1450
+    			    }
1321 1451
     			} elseif ($result['value'] == '25') {
1322 1452
     			    $error = self::update_from_25();
1323
-    			    if ($error != '') return $error;
1324
-    			    else return self::check_version(true);
1453
+    			    if ($error != '') {
1454
+    			    	return $error;
1455
+    			    } else {
1456
+    			    	return self::check_version(true);
1457
+    			    }
1325 1458
     			} elseif ($result['value'] == '26') {
1326 1459
     			    $error = self::update_from_26();
1327
-    			    if ($error != '') return $error;
1328
-    			    else return self::check_version(true);
1460
+    			    if ($error != '') {
1461
+    			    	return $error;
1462
+    			    } else {
1463
+    			    	return self::check_version(true);
1464
+    			    }
1329 1465
     			} elseif ($result['value'] == '27') {
1330 1466
     			    $error = self::update_from_27();
1331
-    			    if ($error != '') return $error;
1332
-    			    else return self::check_version(true);
1467
+    			    if ($error != '') {
1468
+    			    	return $error;
1469
+    			    } else {
1470
+    			    	return self::check_version(true);
1471
+    			    }
1333 1472
     			} elseif ($result['value'] == '28') {
1334 1473
     			    $error = self::update_from_28();
1335
-    			    if ($error != '') return $error;
1336
-    			    else return self::check_version(true);
1337
-    			} else return '';
1474
+    			    if ($error != '') {
1475
+    			    	return $error;
1476
+    			    } else {
1477
+    			    	return self::check_version(true);
1478
+    			    }
1479
+    			} else {
1480
+    				return '';
1481
+    			}
1482
+    		    } else {
1483
+    		    	return $result['value'];
1338 1484
     		    }
1339
-    		    else return $result['value'];
1340 1485
 		}
1341 1486
 		
1342
-	    } else return $version;
1487
+	    } else {
1488
+	    	return $version;
1489
+	    }
1343 1490
     	}
1344 1491
     	
1345 1492
 }
Please login to merge, or discard this patch.
incident-latest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 $page_url = $globalURL.'/accident-latest';
10 10
 
11
-if(!isset($_GET['limit']))
11
+if (!isset($_GET['limit']))
12 12
 {
13 13
 	$limit_start = 0;
14 14
 	$limit_end = 25;
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 print '<div class="table column">';
36 36
 print '<p>'._("The table below shows the latest Incidents.").'</p>';
37
-$spotter_array = $Accident->getLatestAccidentData($limit_start.",".$absolute_difference,'incident');
37
+$spotter_array = $Accident->getLatestAccidentData($limit_start.",".$absolute_difference, 'incident');
38 38
 //print_r($spotter_array);
39 39
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
40 40
 	include('table-output.php');
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,8 +38,12 @@
 block discarded – undo
38 38
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
39 39
 	include('table-output.php');
40 40
 	print '<div class="pagination">';
41
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
42
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
41
+	if ($limit_previous_1 >= 0) {
42
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
43
+	}
44
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
45
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
46
+	}
43 47
 	print '</div>';
44 48
 }
45 49
 print '</div>';
Please login to merge, or discard this patch.
scripts/update_db.php 1 patch
Braces   +19 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,7 +9,9 @@  discard block
 block discarded – undo
9 9
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
10 10
 	exec("ps ux", $output, $result);
11 11
 	$j = 0;
12
-	foreach ($output as $line) if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
12
+	foreach ($output as $line) {
13
+		if(strpos($line, "update_db.php") && !strpos($line, "sh ")) $j++;
14
+	}
13 15
 	if ($j > 1) {
14 16
 		echo "Script is already runnning...";
15 17
 		die();
@@ -29,14 +31,18 @@  discard block
 block discarded – undo
29 31
 			$update_db->update_notam();
30 32
 		}
31 33
 		$update_db->insert_last_notam_update();
32
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
34
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
35
+		echo "NOTAM are only updated once a day.\n";
36
+	}
33 37
 	if ($update_db->check_last_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
34 38
 		$update_db->update_all();
35 39
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
36 40
 	//	$Spotter = new Spotter();
37 41
 	//	$Spotter->updateFieldsFromOtherTables();
38 42
 		$update_db->insert_last_update();
39
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
43
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
44
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
45
+	}
40 46
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
41 47
 		echo "Check if new airspace version exist...";
42 48
 		echo $update_db->update_airspace_fam();
@@ -52,8 +58,10 @@  discard block
 block discarded – undo
52 58
 	if ($METAR->check_last_update()) {
53 59
 		$METAR->addMETARCycle();
54 60
 		$METAR->insert_last_update();
55
-	} else echo "METAR are only updated every 30 minutes.\n";
56
-}
61
+	} else {
62
+		echo "METAR are only updated every 30 minutes.\n";
63
+	}
64
+	}
57 65
 
58 66
 
59 67
 if ($update_db->check_last_owner_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
@@ -62,14 +70,18 @@  discard block
 block discarded – undo
62 70
 	$update_db->update_owner_fam();
63 71
 	$update_db->delete_duplicateowner();
64 72
 	$update_db->insert_last_owner_update();
65
-} elseif (isset($globalDebug) && $globalDebug && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
73
+} elseif (isset($globalDebug) && $globalDebug && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
74
+	echo "Owner are only updated every 15 days.\n";
75
+}
66 76
 
67 77
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
68 78
 	echo "Updating schedules...";
69 79
 	//$update_db->update_oneworld();
70 80
 	$update_db->update_skyteam();
71 81
 	$update_db->insert_last_schedules_update();
72
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
82
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
83
+	echo "Schedules are only updated every 15 days.\n";
84
+}
73 85
 
74 86
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
75 87
 	echo "Updating statistics and archive old data...";
Please login to merge, or discard this patch.