Completed
Push — master ( 983386...0a922a )
by Yannick
31:45
created
location-geojson.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,52 +12,52 @@  discard block
 block discarded – undo
12 12
 if (!isset($globalDemo)) {
13 13
 	if (isset($_GET['coord'])) 
14 14
 	{
15
-		$coords = explode(',',$_GET['coord']);
15
+		$coords = explode(',', $_GET['coord']);
16 16
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
17 17
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
18 18
 			//$spotter_array = $Source->getAllLocationInfo();
19
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
19
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords));
20 20
 		}
21 21
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
22 22
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
23
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
23
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords));
24 24
 		}
25 25
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
26 26
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
27
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
27
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords));
28 28
 		}
29 29
 		
30 30
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
31 31
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
32
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
32
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true));
33 33
 		}
34
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
34
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
35 35
 	} else {
36 36
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
37 37
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
38 38
 			//$spotter_array = $Source->getAllLocationInfo();
39
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
39
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs'));
40 40
 		}
41 41
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
42 42
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
43
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
43
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx'));
44 44
 		}
45 45
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
46 46
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
47
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
47
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning'));
48 48
 		}
49 49
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
50 50
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
51
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
51
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true));
52 52
 		}
53
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
53
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
54 54
 	}
55 55
 }
56 56
 
57 57
 $output = '{"type": "FeatureCollection","features": [';
58 58
 if (!empty($spotter_array) && count($spotter_array) > 0)
59 59
 {
60
-	foreach($spotter_array as $spotter_item)
60
+	foreach ($spotter_array as $spotter_item)
61 61
 	{
62 62
 		date_default_timezone_set('UTC');
63 63
 		$output .= '{"type": "Feature",';
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 		$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
77 77
 		$output .= '"type": "'.$spotter_item['type'].'",';
78 78
 		if ($spotter_item['type'] == 'wx') {
79
-			$weather = json_decode($spotter_item['description'],true);
80
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
79
+			$weather = json_decode($spotter_item['description'], true);
80
+			if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",';
81 81
 		}
82 82
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
83 83
 		$output .= '},';
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		$output .= '}';
88 88
 		$output .= '},';
89 89
 	}
90
-	$output  = substr($output, 0, -1);
90
+	$output = substr($output, 0, -1);
91 91
 }
92 92
 $output .= ']}';
93 93
 print $output;
Please login to merge, or discard this patch.
require/class.TrackerArchive.php 1 patch
Spacing   +107 added lines, -107 removed lines patch added patch discarded remove patch
@@ -14,33 +14,33 @@  discard block
 block discarded – undo
14 14
 	* @param Array $filter the filter
15 15
 	* @return Array the SQL part
16 16
 	*/
17
-	public function getFilter($filter = array(),$where = false,$and = false) {
17
+	public function getFilter($filter = array(), $where = false, $and = false) {
18 18
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19
 		$filters = array();
20 20
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22
 				$filters = $globalStatsFilters[$globalFilterName];
23 23
 			} else {
24
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
24
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
25 25
 			}
26 26
 		}
27 27
 		if (isset($filter[0]['source'])) {
28
-			$filters = array_merge($filters,$filter);
28
+			$filters = array_merge($filters, $filter);
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['idents']) && !empty($flt['idents'])) {
35 35
 				if (isset($flt['source'])) {
36
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
36
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
37 37
 				} else {
38
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
38
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
39 39
 				}
40 40
 			}
41 41
 		}
42 42
 		if (isset($filter['source']) && !empty($filter['source'])) {
43
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
43
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
44 44
 		}
45 45
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
46 46
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -68,38 +68,38 @@  discard block
 block discarded – undo
68 68
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'";
69 69
 				}
70 70
 			}
71
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
71
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
72 72
 		}
73 73
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
74
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
75 75
 		}
76 76
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77 77
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 78
 		if ($filter_query_where != '') {
79
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
80 80
 		}
81 81
 		$filter_query = $filter_query_join.$filter_query_where;
82 82
 		return $filter_query;
83 83
 	}
84 84
 
85 85
 	// tracker_archive
86
-	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
86
+	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
87 87
 		require_once(dirname(__FILE__).'/class.Tracker.php');
88 88
 		if ($over_country == '') {
89 89
 			$Tracker = new Tracker($this->db);
90
-			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
90
+			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude);
91 91
 			if (!empty($data_country)) $country = $data_country['iso2'];
92 92
 			else $country = '';
93 93
 		} else $country = $over_country;
94 94
 		// Route is not added in tracker_archive
95
-		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
95
+		$query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
96 96
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
97
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':comment' => $comment,':type' => $type);
97
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':comment' => $comment, ':type' => $type);
98 98
 		try {
99 99
 			$sth = $this->db->prepare($query);
100 100
 			$sth->execute($query_values);
101 101
 			$sth->closeCursor();
102
-		} catch(PDOException $e) {
102
+		} catch (PDOException $e) {
103 103
 			return "error : ".$e->getMessage();
104 104
 		}
105 105
 		return "success";
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 
120 120
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
121 121
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
122
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
122
+                $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
123 123
 
124
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
124
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident));
125 125
 
126 126
                 return $spotter_array;
127 127
         }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
141 141
                 //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
142 142
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
143
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
143
+                $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
144 144
 
145 145
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
146 146
                   /*
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
                 }
154 154
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
155 155
                 */
156
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
156
+                $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id));
157 157
 
158 158
                 return $spotter_array;
159 159
         }
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
168 168
 	{
169 169
                 date_default_timezone_set('UTC');
170 170
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
171
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
171
+                $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
172 172
 
173 173
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
174 174
 
175 175
                 try {
176 176
                         $sth = $this->db->prepare($query);
177 177
                         $sth->execute(array(':id' => $id));
178
-                } catch(PDOException $e) {
178
+                } catch (PDOException $e) {
179 179
                         echo $e->getMessage();
180 180
                         die;
181 181
                 }
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
         {
195 195
                 date_default_timezone_set('UTC');
196 196
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
197
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
197
+                $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
198 198
 
199 199
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
200 200
 
201 201
                 try {
202 202
                         $sth = $this->db->prepare($query);
203 203
                         $sth->execute(array(':id' => $id));
204
-                } catch(PDOException $e) {
204
+                } catch (PDOException $e) {
205 205
                         echo $e->getMessage();
206 206
                         die;
207 207
                 }
@@ -223,12 +223,12 @@  discard block
 block discarded – undo
223 223
                 date_default_timezone_set('UTC');
224 224
 
225 225
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
226
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
226
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
227 227
 
228 228
                 try {
229 229
                         $sth = $this->db->prepare($query);
230 230
                         $sth->execute(array(':ident' => $ident));
231
-                } catch(PDOException $e) {
231
+                } catch (PDOException $e) {
232 232
                         echo $e->getMessage();
233 233
                         die;
234 234
                 }
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
249 249
                 date_default_timezone_set('UTC');
250 250
 
251 251
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
252
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
252
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
253 253
 
254 254
                 try {
255 255
                         $sth = $this->db->prepare($query);
256 256
                         $sth->execute(array(':id' => $id));
257
-                } catch(PDOException $e) {
257
+                } catch (PDOException $e) {
258 258
                         echo $e->getMessage();
259 259
                         die;
260 260
                 }
@@ -275,12 +275,12 @@  discard block
 block discarded – undo
275 275
                 date_default_timezone_set('UTC');
276 276
 
277 277
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
278
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
278
+                $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
279 279
 
280 280
                 try {
281 281
                         $sth = $this->db->prepare($query);
282 282
                         $sth->execute(array(':id' => $id));
283
-                } catch(PDOException $e) {
283
+                } catch (PDOException $e) {
284 284
                         echo $e->getMessage();
285 285
                         die;
286 286
                 }
@@ -302,13 +302,13 @@  discard block
 block discarded – undo
302 302
                 date_default_timezone_set('UTC');
303 303
 
304 304
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
305
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
305
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
306 306
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
307 307
 
308 308
                 try {
309 309
                         $sth = $this->db->prepare($query);
310 310
                         $sth->execute(array(':ident' => $ident));
311
-                } catch(PDOException $e) {
311
+                } catch (PDOException $e) {
312 312
                         echo $e->getMessage();
313 313
                         die;
314 314
                 }
@@ -325,13 +325,13 @@  discard block
 block discarded – undo
325 325
         * @return Array the spotter information
326 326
         *
327 327
         */
328
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
328
+        public function getTrackerArchiveData($ident, $famtrackid, $date)
329 329
         {
330 330
     		$Tracker = new Tracker($this->db);
331 331
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
332
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
332
+                $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
333 333
 
334
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
334
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%'));
335 335
 
336 336
                 return $spotter_array;
337 337
         }
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
 		try {
348 348
 			$sth = $this->db->prepare($query);
349 349
 			$sth->execute();
350
-		} catch(PDOException $e) {
350
+		} catch (PDOException $e) {
351 351
 			echo $e->getMessage();
352 352
 			die;
353 353
 		}
@@ -359,24 +359,24 @@  discard block
 block discarded – undo
359 359
         * @return Array the spotter information
360 360
         *
361 361
         */
362
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
362
+        public function getMinLiveTrackerData($begindate, $enddate, $filter = array())
363 363
         {
364 364
                 global $globalDBdriver, $globalLiveInterval;
365 365
                 date_default_timezone_set('UTC');
366 366
 
367 367
                 $filter_query = '';
368 368
                 if (isset($filter['source']) && !empty($filter['source'])) {
369
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
369
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
370 370
                 }
371 371
                 // Use spotter_output also ?
372 372
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
373
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
373
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
374 374
                 }
375 375
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
376 376
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
377 377
                 }
378 378
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
379
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
379
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
380 380
                 }
381 381
 
382 382
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -395,14 +395,14 @@  discard block
 block discarded – undo
395 395
 						GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid 
396 396
 				    AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
397 397
 */
398
-			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
398
+			$query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
399 399
 				    FROM tracker_archive 
400 400
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
401 401
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
402 402
                         	    '.$filter_query.' ORDER BY famtrackid';
403 403
                 } else {
404 404
                         //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
405
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
405
+                        $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
406 406
                         	    FROM tracker_archive 
407 407
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
408 408
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
                 try {
413 413
                         $sth = $this->db->prepare($query);
414 414
                         $sth->execute();
415
-                } catch(PDOException $e) {
415
+                } catch (PDOException $e) {
416 416
                         echo $e->getMessage();
417 417
                         die;
418 418
                 }
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
427 427
         * @return Array the spotter information
428 428
         *
429 429
         */
430
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
430
+        public function getMinLiveTrackerDataPlayback($begindate, $enddate, $filter = array())
431 431
         {
432 432
                 global $globalDBdriver, $globalLiveInterval;
433 433
                 date_default_timezone_set('UTC');
434 434
 
435 435
                 $filter_query = '';
436 436
                 if (isset($filter['source']) && !empty($filter['source'])) {
437
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
437
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
438 438
                 }
439 439
                 // Should use spotter_output also ?
440 440
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
441
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
441
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
442 442
                 }
443 443
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
444 444
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
445 445
                 }
446 446
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
447
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
447
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
448 448
                 }
449 449
 
450 450
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
                     		    FROM tracker_archive 
455 455
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
456 456
 			*/
457
-			$query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
457
+			$query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
458 458
 				    FROM tracker_archive_output 
459 459
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao 
460 460
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
470 470
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
471 471
                         */
472
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
472
+                        $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
473 473
                         	    FROM tracker_archive_output 
474 474
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
475 475
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
                 try {
482 482
                         $sth = $this->db->prepare($query);
483 483
                         $sth->execute();
484
-                } catch(PDOException $e) {
484
+                } catch (PDOException $e) {
485 485
                         echo $e->getMessage();
486 486
                         die;
487 487
                 }
@@ -496,23 +496,23 @@  discard block
 block discarded – undo
496 496
         * @return Array the spotter information
497 497
         *
498 498
         */
499
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
499
+        public function getLiveTrackerCount($begindate, $enddate, $filter = array())
500 500
         {
501 501
                 global $globalDBdriver, $globalLiveInterval;
502 502
                 date_default_timezone_set('UTC');
503 503
 
504 504
                 $filter_query = '';
505 505
                 if (isset($filter['source']) && !empty($filter['source'])) {
506
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
506
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
507 507
                 }
508 508
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
509
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
509
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
510 510
                 }
511 511
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
512 512
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
513 513
                 }
514 514
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
515
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
515
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
516 516
                 }
517 517
 
518 518
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
                 try {
528 528
                         $sth = $this->db->prepare($query);
529 529
                         $sth->execute();
530
-                } catch(PDOException $e) {
530
+                } catch (PDOException $e) {
531 531
                         echo $e->getMessage();
532 532
                         die;
533 533
                 }
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
     * @return Array the spotter information
548 548
     *
549 549
     */
550
-    public function searchTrackerData($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())
550
+    public function searchTrackerData($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())
551 551
     {
552 552
 	global $globalTimezone, $globalDBdriver;
553 553
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 	        
570 570
 		$q_array = explode(" ", $q);
571 571
 		
572
-		foreach ($q_array as $q_item){
572
+		foreach ($q_array as $q_item) {
573 573
 		    $additional_query .= " AND (";
574 574
 		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
575 575
 		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
 	
602 602
 	if ($registration != "")
603 603
 	{
604
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
604
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
605 605
 	    if (!is_string($registration))
606 606
 	    {
607 607
 		return false;
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 	
613 613
 	if ($aircraft_icao != "")
614 614
 	{
615
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
615
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
616 616
 	    if (!is_string($aircraft_icao))
617 617
 	    {
618 618
 		return false;
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 	
624 624
 	if ($aircraft_manufacturer != "")
625 625
 	{
626
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
626
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
627 627
 	    if (!is_string($aircraft_manufacturer))
628 628
 	    {
629 629
 		return false;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 	
645 645
 	if ($airline_icao != "")
646 646
 	{
647
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
647
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
648 648
 	    if (!is_string($airline_icao))
649 649
 	    {
650 650
 		return false;
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 	
656 656
 	if ($airline_country != "")
657 657
 	{
658
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
658
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
659 659
 	    if (!is_string($airline_country))
660 660
 	    {
661 661
 		return false;
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 	
667 667
 	if ($airline_type != "")
668 668
 	{
669
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
669
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
670 670
 	    if (!is_string($airline_type))
671 671
 	    {
672 672
 		return false;
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 	
689 689
 	if ($airport != "")
690 690
 	{
691
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
691
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
692 692
 	    if (!is_string($airport))
693 693
 	    {
694 694
 		return false;
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
 	
700 700
 	if ($airport_country != "")
701 701
 	{
702
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
702
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
703 703
 	    if (!is_string($airport_country))
704 704
 	    {
705 705
 		return false;
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
     
711 711
 	if ($callsign != "")
712 712
 	{
713
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
713
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
714 714
 	    if (!is_string($callsign))
715 715
 	    {
716 716
 		return false;
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
718 718
 		$translate = $Translation->ident2icao($callsign);
719 719
 		if ($translate != $callsign) {
720 720
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
721
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
721
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
722 722
 		} else {
723 723
 			$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
724 724
 		}
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
727 727
 
728 728
 	if ($owner != "")
729 729
 	{
730
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
730
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
731 731
 	    if (!is_string($owner))
732 732
 	    {
733 733
 		return false;
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 
739 739
 	if ($pilot_name != "")
740 740
 	{
741
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
741
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
742 742
 	    if (!is_string($pilot_name))
743 743
 	    {
744 744
 		return false;
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 	
750 750
 	if ($pilot_id != "")
751 751
 	{
752
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
752
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
753 753
 	    if (!is_string($pilot_id))
754 754
 	    {
755 755
 		return false;
@@ -760,7 +760,7 @@  discard block
 block discarded – undo
760 760
 	
761 761
 	if ($departure_airport_route != "")
762 762
 	{
763
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
763
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
764 764
 	    if (!is_string($departure_airport_route))
765 765
 	    {
766 766
 		return false;
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
 	
772 772
 	if ($arrival_airport_route != "")
773 773
 	{
774
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
774
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
775 775
 	    if (!is_string($arrival_airport_route))
776 776
 	    {
777 777
 		return false;
@@ -784,8 +784,8 @@  discard block
 block discarded – undo
784 784
 	{
785 785
 	    $altitude_array = explode(",", $altitude);
786 786
 	    
787
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
788
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
787
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
788
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
789 789
 	    
790 790
 
791 791
 	    if ($altitude_array[1] != "")
@@ -803,8 +803,8 @@  discard block
 block discarded – undo
803 803
 	{
804 804
 	    $date_array = explode(",", $date_posted);
805 805
 	    
806
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
807
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
806
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
807
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
808 808
 	    
809 809
 	    if ($globalTimezone != '') {
810 810
 		date_default_timezone_set($globalTimezone);
@@ -836,8 +836,8 @@  discard block
 block discarded – undo
836 836
 	{
837 837
 	    $limit_array = explode(",", $limit);
838 838
 	    
839
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
840
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
839
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
840
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
841 841
 	    
842 842
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
843 843
 	    {
@@ -848,8 +848,8 @@  discard block
 block discarded – undo
848 848
 	
849 849
 
850 850
 	if ($origLat != "" && $origLon != "" && $dist != "") {
851
-		$dist = number_format($dist*0.621371,2,'.','');
852
-		$query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
851
+		$dist = number_format($dist*0.621371, 2, '.', '');
852
+		$query = "SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
853 853
                           FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
854 854
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
855 855
 	} else {
@@ -866,12 +866,12 @@  discard block
 block discarded – undo
866 866
 			$additional_query .= " AND (tracker_archive_output.waypoints <> '')";
867 867
 		}
868 868
 
869
-		$query  = "SELECT tracker_archive_output.* FROM tracker_archive_output 
869
+		$query = "SELECT tracker_archive_output.* FROM tracker_archive_output 
870 870
 		    WHERE tracker_archive_output.ident <> '' 
871 871
 		    ".$additional_query."
872 872
 		    ".$filter_query.$orderby_query;
873 873
 	}
874
-	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
874
+	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
875 875
 
876 876
 	return $spotter_array;
877 877
     }
@@ -888,7 +888,7 @@  discard block
 block discarded – undo
888 888
                 try {
889 889
                         $sth = $this->db->prepare($query);
890 890
                         $sth->execute();
891
-                } catch(PDOException $e) {
891
+                } catch (PDOException $e) {
892 892
                         return "error";
893 893
                 }
894 894
 	}
@@ -925,8 +925,8 @@  discard block
 block discarded – undo
925 925
 	{
926 926
 	    $limit_array = explode(",", $limit);
927 927
 	    
928
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
929
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
928
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
929
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
930 930
 	    
931 931
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
932 932
 	    {
@@ -967,7 +967,7 @@  discard block
 block discarded – undo
967 967
 	$query_values = array();
968 968
 	$limit_query = '';
969 969
 	$additional_query = '';
970
-	$filter_query = $this->getFilter($filter,true,true);
970
+	$filter_query = $this->getFilter($filter, true, true);
971 971
 	
972 972
 	if ($owner != "")
973 973
 	{
@@ -984,8 +984,8 @@  discard block
 block discarded – undo
984 984
 	{
985 985
 	    $limit_array = explode(",", $limit);
986 986
 	    
987
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
988
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
987
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
988
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
989 989
 	    
990 990
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
991 991
 	    {
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 	$query_values = array();
1026 1026
 	$limit_query = '';
1027 1027
 	$additional_query = '';
1028
-	$filter_query = $this->getFilter($filter,true,true);
1028
+	$filter_query = $this->getFilter($filter, true, true);
1029 1029
 	
1030 1030
 	if ($pilot != "")
1031 1031
 	{
@@ -1037,8 +1037,8 @@  discard block
 block discarded – undo
1037 1037
 	{
1038 1038
 	    $limit_array = explode(",", $limit);
1039 1039
 	    
1040
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1041
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1040
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1041
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1042 1042
 	    
1043 1043
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1044 1044
 	    {
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
     * @return Array the airline country list
1069 1069
     *
1070 1070
     */
1071
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1071
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
1072 1072
     {
1073 1073
 	global $globalDBdriver;
1074 1074
 	/*
@@ -1097,7 +1097,7 @@  discard block
 block discarded – undo
1097 1097
 	$flight_array = array();
1098 1098
 	$temp_array = array();
1099 1099
         
1100
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1100
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1101 1101
 	{
1102 1102
 	    $temp_array['flight_count'] = $row['nb'];
1103 1103
 	    $temp_array['flight_country'] = $row['name'];
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
     * @return Array the airline country list
1115 1115
     *
1116 1116
     */
1117
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1117
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
1118 1118
     {
1119 1119
 	global $globalDBdriver;
1120 1120
 	/*
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
 	$flight_array = array();
1144 1144
 	$temp_array = array();
1145 1145
         
1146
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1146
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1147 1147
 	{
1148 1148
 	    $temp_array['airline_icao'] = $row['airline_icao'];
1149 1149
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1161,14 +1161,14 @@  discard block
 block discarded – undo
1161 1161
     * @return Array the spotter information
1162 1162
     *
1163 1163
     */
1164
-    public function getDateArchiveTrackerDataById($id,$date)
1164
+    public function getDateArchiveTrackerDataById($id, $date)
1165 1165
     {
1166 1166
 	$Tracker = new Tracker($this->db);
1167 1167
 	date_default_timezone_set('UTC');
1168 1168
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
1169
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1170
-	$date = date('c',$date);
1171
-	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
1169
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1170
+	$date = date('c', $date);
1171
+	$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date));
1172 1172
 	return $spotter_array;
1173 1173
     }
1174 1174
 
@@ -1178,14 +1178,14 @@  discard block
 block discarded – undo
1178 1178
     * @return Array the spotter information
1179 1179
     *
1180 1180
     */
1181
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
1181
+    public function getDateArchiveTrackerDataByIdent($ident, $date)
1182 1182
     {
1183 1183
 	$Tracker = new Tracker($this->db);
1184 1184
 	date_default_timezone_set('UTC');
1185 1185
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1186
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1187
-	$date = date('c',$date);
1188
-	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1186
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1187
+	$date = date('c', $date);
1188
+	$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
1189 1189
 	return $spotter_array;
1190 1190
     }
1191 1191
 
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
     * @return Array the spotter information
1196 1196
     *
1197 1197
     */
1198
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1198
+    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1199 1199
     {
1200 1200
 	global $global_query;
1201 1201
 	$Tracker = new Tracker($this->db);
@@ -1203,7 +1203,7 @@  discard block
 block discarded – undo
1203 1203
 	$query_values = array();
1204 1204
 	$limit_query = '';
1205 1205
 	$additional_query = '';
1206
-	$filter_query = $this->getFilter($filters,true,true);
1206
+	$filter_query = $this->getFilter($filters, true, true);
1207 1207
 	
1208 1208
 	if ($airport != "")
1209 1209
 	{
@@ -1220,8 +1220,8 @@  discard block
 block discarded – undo
1220 1220
 	{
1221 1221
 	    $limit_array = explode(",", $limit);
1222 1222
 	    
1223
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1224
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1223
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1224
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1225 1225
 	    
1226 1226
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1227 1227
 	    {
Please login to merge, or discard this patch.
require/class.MarineArchive.php 1 patch
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -14,33 +14,33 @@  discard block
 block discarded – undo
14 14
 	* @param Array $filter the filter
15 15
 	* @return Array the SQL part
16 16
 	*/
17
-	public function getFilter($filter = array(),$where = false,$and = false) {
17
+	public function getFilter($filter = array(), $where = false, $and = false) {
18 18
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19
 		$filters = array();
20 20
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22
 				$filters = $globalStatsFilters[$globalFilterName];
23 23
 			} else {
24
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
24
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
25 25
 			}
26 26
 		}
27 27
 		if (isset($filter[0]['source'])) {
28
-			$filters = array_merge($filters,$filter);
28
+			$filters = array_merge($filters, $filter);
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['idents']) && !empty($flt['idents'])) {
35 35
 				if (isset($flt['source'])) {
36
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
36
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
37 37
 				} else {
38
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
38
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
39 39
 				}
40 40
 			}
41 41
 		}
42 42
 		if (isset($filter['source']) && !empty($filter['source'])) {
43
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
43
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
44 44
 		}
45 45
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
46 46
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -68,42 +68,42 @@  discard block
 block discarded – undo
68 68
 					$filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'";
69 69
 				}
70 70
 			}
71
-			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
71
+			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
72 72
 		}
73 73
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
74
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
75 75
 		}
76 76
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77 77
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 78
 		if ($filter_query_where != '') {
79
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
80 80
 		}
81 81
 		$filter_query = $filter_query_join.$filter_query_where;
82 82
 		return $filter_query;
83 83
 	}
84 84
 
85 85
 	// marine_archive
86
-	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
86
+	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
87 87
 		require_once(dirname(__FILE__).'/class.Marine.php');
88 88
 		if ($over_country == '') {
89 89
 			$Marine = new Marine($this->db);
90
-			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
90
+			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude);
91 91
 			if (!empty($data_country)) $country = $data_country['iso2'];
92 92
 			else $country = '';
93 93
 		} else $country = $over_country;
94 94
 		
95 95
 		//$country = $over_country;
96 96
 		// Route is not added in marine_archive
97
-		$query  = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
97
+		$query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
98 98
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)';
99 99
 
100
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
100
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
101 101
 
102 102
 		try {
103 103
 			$sth = $this->db->prepare($query);
104 104
 			$sth->execute($query_values);
105 105
 			$sth->closeCursor();
106
-		} catch(PDOException $e) {
106
+		} catch (PDOException $e) {
107 107
 			return "error : ".$e->getMessage();
108 108
 		}
109 109
 		return "success";
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 
124 124
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
125 125
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
126
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
126
+                $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
127 127
 
128
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
128
+                $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident));
129 129
 
130 130
                 return $spotter_array;
131 131
         }
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
145 145
                 //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
146 146
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
147
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
147
+                $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
148 148
 
149 149
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
150 150
                   /*
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
                 }
158 158
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
159 159
                 */
160
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
160
+                $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id));
161 161
 
162 162
                 return $spotter_array;
163 163
         }
@@ -172,14 +172,14 @@  discard block
 block discarded – undo
172 172
 	{
173 173
                 date_default_timezone_set('UTC');
174 174
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
175
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
175
+                $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
176 176
 
177 177
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
178 178
 
179 179
                 try {
180 180
                         $sth = $this->db->prepare($query);
181 181
                         $sth->execute(array(':id' => $id));
182
-                } catch(PDOException $e) {
182
+                } catch (PDOException $e) {
183 183
                         echo $e->getMessage();
184 184
                         die;
185 185
                 }
@@ -198,14 +198,14 @@  discard block
 block discarded – undo
198 198
         {
199 199
                 date_default_timezone_set('UTC');
200 200
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
201
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
201
+                $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
202 202
 
203 203
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
204 204
 
205 205
                 try {
206 206
                         $sth = $this->db->prepare($query);
207 207
                         $sth->execute(array(':id' => $id));
208
-                } catch(PDOException $e) {
208
+                } catch (PDOException $e) {
209 209
                         echo $e->getMessage();
210 210
                         die;
211 211
                 }
@@ -227,12 +227,12 @@  discard block
 block discarded – undo
227 227
                 date_default_timezone_set('UTC');
228 228
 
229 229
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
230
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
230
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
231 231
 
232 232
                 try {
233 233
                         $sth = $this->db->prepare($query);
234 234
                         $sth->execute(array(':ident' => $ident));
235
-                } catch(PDOException $e) {
235
+                } catch (PDOException $e) {
236 236
                         echo $e->getMessage();
237 237
                         die;
238 238
                 }
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
                 date_default_timezone_set('UTC');
254 254
 
255 255
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
256
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
256
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
257 257
 
258 258
                 try {
259 259
                         $sth = $this->db->prepare($query);
260 260
                         $sth->execute(array(':id' => $id));
261
-                } catch(PDOException $e) {
261
+                } catch (PDOException $e) {
262 262
                         echo $e->getMessage();
263 263
                         die;
264 264
                 }
@@ -279,12 +279,12 @@  discard block
 block discarded – undo
279 279
                 date_default_timezone_set('UTC');
280 280
 
281 281
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
282
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
282
+                $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
283 283
 
284 284
                 try {
285 285
                         $sth = $this->db->prepare($query);
286 286
                         $sth->execute(array(':id' => $id));
287
-                } catch(PDOException $e) {
287
+                } catch (PDOException $e) {
288 288
                         echo $e->getMessage();
289 289
                         die;
290 290
                 }
@@ -306,13 +306,13 @@  discard block
 block discarded – undo
306 306
                 date_default_timezone_set('UTC');
307 307
 
308 308
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
309
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
309
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
310 310
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
311 311
 
312 312
                 try {
313 313
                         $sth = $this->db->prepare($query);
314 314
                         $sth->execute(array(':ident' => $ident));
315
-                } catch(PDOException $e) {
315
+                } catch (PDOException $e) {
316 316
                         echo $e->getMessage();
317 317
                         die;
318 318
                 }
@@ -329,12 +329,12 @@  discard block
 block discarded – undo
329 329
         * @return Array the spotter information
330 330
         *
331 331
         */
332
-	public function getMarineArchiveData($ident,$fammarine_id,$date)
332
+	public function getMarineArchiveData($ident, $fammarine_id, $date)
333 333
 	{
334 334
 		$Marine = new Marine($this->db);
335 335
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
336 336
 		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
337
-		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
337
+		$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%'));
338 338
 		return $spotter_array;
339 339
 	}
340 340
 
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 		try {
354 354
 			$sth = $this->db->prepare($query);
355 355
 			$sth->execute();
356
-		} catch(PDOException $e) {
356
+		} catch (PDOException $e) {
357 357
 			echo $e->getMessage();
358 358
 			die;
359 359
 		}
@@ -365,24 +365,24 @@  discard block
 block discarded – undo
365 365
         * @return Array the spotter information
366 366
         *
367 367
         */
368
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
368
+        public function getMinLiveMarineData($begindate, $enddate, $filter = array())
369 369
         {
370 370
                 global $globalDBdriver, $globalLiveInterval;
371 371
                 date_default_timezone_set('UTC');
372 372
 
373 373
                 $filter_query = '';
374 374
                 if (isset($filter['source']) && !empty($filter['source'])) {
375
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
375
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
376 376
                 }
377 377
                 // Use spotter_output also ?
378 378
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
379
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
379
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
380 380
                 }
381 381
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
382 382
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
383 383
                 }
384 384
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
385
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
385
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
386 386
                 }
387 387
 
388 388
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -401,14 +401,14 @@  discard block
 block discarded – undo
401 401
 						GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id 
402 402
 				    AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
403 403
 */
404
-			$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
404
+			$query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
405 405
 				    FROM marine_archive 
406 406
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
407 407
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
408 408
                         	    '.$filter_query.' ORDER BY fammarine_id';
409 409
                 } else {
410 410
                         //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
411
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
411
+                        $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
412 412
                         	    FROM marine_archive 
413 413
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
414 414
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
                 try {
419 419
                         $sth = $this->db->prepare($query);
420 420
                         $sth->execute();
421
-                } catch(PDOException $e) {
421
+                } catch (PDOException $e) {
422 422
                         echo $e->getMessage();
423 423
                         die;
424 424
                 }
@@ -433,24 +433,24 @@  discard block
 block discarded – undo
433 433
         * @return Array the spotter information
434 434
         *
435 435
         */
436
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
436
+        public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array())
437 437
         {
438 438
                 global $globalDBdriver, $globalLiveInterval;
439 439
                 date_default_timezone_set('UTC');
440 440
 
441 441
                 $filter_query = '';
442 442
                 if (isset($filter['source']) && !empty($filter['source'])) {
443
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
443
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
444 444
                 }
445 445
                 // Should use spotter_output also ?
446 446
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
447
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
447
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
448 448
                 }
449 449
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
450 450
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
451 451
                 }
452 452
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
453
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
453
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
454 454
                 }
455 455
 
456 456
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
                     		    FROM marine_archive 
461 461
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
462 462
 			*/
463
-			$query  = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
463
+			$query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
464 464
 				    FROM marine_archive_output 
465 465
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao 
466 466
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
476 476
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
477 477
                         */
478
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
478
+                        $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
479 479
                         	    FROM marine_archive_output 
480 480
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
481 481
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
                 try {
488 488
                         $sth = $this->db->prepare($query);
489 489
                         $sth->execute();
490
-                } catch(PDOException $e) {
490
+                } catch (PDOException $e) {
491 491
                         echo $e->getMessage();
492 492
                         die;
493 493
                 }
@@ -502,23 +502,23 @@  discard block
 block discarded – undo
502 502
         * @return Array the spotter information
503 503
         *
504 504
         */
505
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
505
+        public function getLiveMarineCount($begindate, $enddate, $filter = array())
506 506
         {
507 507
                 global $globalDBdriver, $globalLiveInterval;
508 508
                 date_default_timezone_set('UTC');
509 509
 
510 510
                 $filter_query = '';
511 511
                 if (isset($filter['source']) && !empty($filter['source'])) {
512
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
512
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
513 513
                 }
514 514
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
515
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
515
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
516 516
                 }
517 517
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
518 518
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
519 519
                 }
520 520
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
521
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
521
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
522 522
                 }
523 523
 
524 524
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
                 try {
534 534
                         $sth = $this->db->prepare($query);
535 535
                         $sth->execute();
536
-                } catch(PDOException $e) {
536
+                } catch (PDOException $e) {
537 537
                         echo $e->getMessage();
538 538
                         die;
539 539
                 }
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
     * @return Array the spotter information
554 554
     *
555 555
     */
556
-    public function searchMarineData($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())
556
+    public function searchMarineData($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())
557 557
     {
558 558
 	global $globalTimezone, $globalDBdriver;
559 559
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 	        
576 576
 		$q_array = explode(" ", $q);
577 577
 		
578
-		foreach ($q_array as $q_item){
578
+		foreach ($q_array as $q_item) {
579 579
 		    $additional_query .= " AND (";
580 580
 		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
581 581
 		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 	
608 608
 	if ($registration != "")
609 609
 	{
610
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
610
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
611 611
 	    if (!is_string($registration))
612 612
 	    {
613 613
 		return false;
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
 	
619 619
 	if ($aircraft_icao != "")
620 620
 	{
621
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
621
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
622 622
 	    if (!is_string($aircraft_icao))
623 623
 	    {
624 624
 		return false;
@@ -629,7 +629,7 @@  discard block
 block discarded – undo
629 629
 	
630 630
 	if ($aircraft_manufacturer != "")
631 631
 	{
632
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
632
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
633 633
 	    if (!is_string($aircraft_manufacturer))
634 634
 	    {
635 635
 		return false;
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
650 650
 	
651 651
 	if ($airline_icao != "")
652 652
 	{
653
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
653
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
654 654
 	    if (!is_string($airline_icao))
655 655
 	    {
656 656
 		return false;
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
661 661
 	
662 662
 	if ($airline_country != "")
663 663
 	{
664
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
664
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
665 665
 	    if (!is_string($airline_country))
666 666
 	    {
667 667
 		return false;
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
672 672
 	
673 673
 	if ($airline_type != "")
674 674
 	{
675
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
675
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
676 676
 	    if (!is_string($airline_type))
677 677
 	    {
678 678
 		return false;
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
 	
695 695
 	if ($airport != "")
696 696
 	{
697
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
697
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
698 698
 	    if (!is_string($airport))
699 699
 	    {
700 700
 		return false;
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 	
706 706
 	if ($airport_country != "")
707 707
 	{
708
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
708
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
709 709
 	    if (!is_string($airport_country))
710 710
 	    {
711 711
 		return false;
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
     
717 717
 	if ($callsign != "")
718 718
 	{
719
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
719
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
720 720
 	    if (!is_string($callsign))
721 721
 	    {
722 722
 		return false;
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
 		$translate = $Translation->ident2icao($callsign);
725 725
 		if ($translate != $callsign) {
726 726
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
727
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
727
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
728 728
 		} else {
729 729
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
730 730
 		}
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 
734 734
 	if ($owner != "")
735 735
 	{
736
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
736
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
737 737
 	    if (!is_string($owner))
738 738
 	    {
739 739
 		return false;
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 
745 745
 	if ($pilot_name != "")
746 746
 	{
747
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
747
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
748 748
 	    if (!is_string($pilot_name))
749 749
 	    {
750 750
 		return false;
@@ -755,7 +755,7 @@  discard block
 block discarded – undo
755 755
 	
756 756
 	if ($pilot_id != "")
757 757
 	{
758
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
758
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
759 759
 	    if (!is_string($pilot_id))
760 760
 	    {
761 761
 		return false;
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
 	
767 767
 	if ($departure_airport_route != "")
768 768
 	{
769
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
769
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
770 770
 	    if (!is_string($departure_airport_route))
771 771
 	    {
772 772
 		return false;
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 	
778 778
 	if ($arrival_airport_route != "")
779 779
 	{
780
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
780
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
781 781
 	    if (!is_string($arrival_airport_route))
782 782
 	    {
783 783
 		return false;
@@ -790,8 +790,8 @@  discard block
 block discarded – undo
790 790
 	{
791 791
 	    $altitude_array = explode(",", $altitude);
792 792
 	    
793
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
794
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
793
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
794
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
795 795
 	    
796 796
 
797 797
 	    if ($altitude_array[1] != "")
@@ -809,8 +809,8 @@  discard block
 block discarded – undo
809 809
 	{
810 810
 	    $date_array = explode(",", $date_posted);
811 811
 	    
812
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
813
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
812
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
813
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
814 814
 	    
815 815
 	    if ($globalTimezone != '') {
816 816
 		date_default_timezone_set($globalTimezone);
@@ -842,8 +842,8 @@  discard block
 block discarded – undo
842 842
 	{
843 843
 	    $limit_array = explode(",", $limit);
844 844
 	    
845
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
846
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
845
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
846
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
847 847
 	    
848 848
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
849 849
 	    {
@@ -854,8 +854,8 @@  discard block
 block discarded – undo
854 854
 	
855 855
 
856 856
 	if ($origLat != "" && $origLon != "" && $dist != "") {
857
-		$dist = number_format($dist*0.621371,2,'.','');
858
-		$query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
857
+		$dist = number_format($dist*0.621371, 2, '.', '');
858
+		$query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
859 859
                           FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
860 860
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
861 861
 	} else {
@@ -872,12 +872,12 @@  discard block
 block discarded – undo
872 872
 			$additional_query .= " AND (marine_archive_output.waypoints <> '')";
873 873
 		}
874 874
 
875
-		$query  = "SELECT marine_archive_output.* FROM marine_archive_output 
875
+		$query = "SELECT marine_archive_output.* FROM marine_archive_output 
876 876
 		    WHERE marine_archive_output.ident <> '' 
877 877
 		    ".$additional_query."
878 878
 		    ".$filter_query.$orderby_query;
879 879
 	}
880
-	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
880
+	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
881 881
 
882 882
 	return $spotter_array;
883 883
     }
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
                 try {
895 895
                         $sth = $this->db->prepare($query);
896 896
                         $sth->execute();
897
-                } catch(PDOException $e) {
897
+                } catch (PDOException $e) {
898 898
                         return "error";
899 899
                 }
900 900
 	}
@@ -931,8 +931,8 @@  discard block
 block discarded – undo
931 931
 	{
932 932
 	    $limit_array = explode(",", $limit);
933 933
 	    
934
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
935
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
934
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
935
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
936 936
 	    
937 937
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
938 938
 	    {
@@ -973,7 +973,7 @@  discard block
 block discarded – undo
973 973
 	$query_values = array();
974 974
 	$limit_query = '';
975 975
 	$additional_query = '';
976
-	$filter_query = $this->getFilter($filter,true,true);
976
+	$filter_query = $this->getFilter($filter, true, true);
977 977
 	
978 978
 	if ($owner != "")
979 979
 	{
@@ -990,8 +990,8 @@  discard block
 block discarded – undo
990 990
 	{
991 991
 	    $limit_array = explode(",", $limit);
992 992
 	    
993
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
994
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
993
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
994
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
995 995
 	    
996 996
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
997 997
 	    {
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
 	$query_values = array();
1032 1032
 	$limit_query = '';
1033 1033
 	$additional_query = '';
1034
-	$filter_query = $this->getFilter($filter,true,true);
1034
+	$filter_query = $this->getFilter($filter, true, true);
1035 1035
 	
1036 1036
 	if ($pilot != "")
1037 1037
 	{
@@ -1043,8 +1043,8 @@  discard block
 block discarded – undo
1043 1043
 	{
1044 1044
 	    $limit_array = explode(",", $limit);
1045 1045
 	    
1046
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1047
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1046
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1047
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1048 1048
 	    
1049 1049
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1050 1050
 	    {
@@ -1074,7 +1074,7 @@  discard block
 block discarded – undo
1074 1074
     * @return Array the airline country list
1075 1075
     *
1076 1076
     */
1077
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1077
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
1078 1078
     {
1079 1079
 	global $globalDBdriver;
1080 1080
 	/*
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
1103 1103
 	$flight_array = array();
1104 1104
 	$temp_array = array();
1105 1105
         
1106
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1106
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1107 1107
 	{
1108 1108
 	    $temp_array['flight_count'] = $row['nb'];
1109 1109
 	    $temp_array['flight_country'] = $row['name'];
@@ -1120,7 +1120,7 @@  discard block
 block discarded – undo
1120 1120
     * @return Array the airline country list
1121 1121
     *
1122 1122
     */
1123
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1123
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
1124 1124
     {
1125 1125
 	global $globalDBdriver;
1126 1126
 	/*
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 	$flight_array = array();
1150 1150
 	$temp_array = array();
1151 1151
         
1152
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1152
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1153 1153
 	{
1154 1154
 	    $temp_array['airline_icao'] = $row['airline_icao'];
1155 1155
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1167,14 +1167,14 @@  discard block
 block discarded – undo
1167 1167
     * @return Array the spotter information
1168 1168
     *
1169 1169
     */
1170
-    public function getDateArchiveMarineDataById($id,$date)
1170
+    public function getDateArchiveMarineDataById($id, $date)
1171 1171
     {
1172 1172
 	$Marine = new Marine($this->db);
1173 1173
 	date_default_timezone_set('UTC');
1174 1174
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
1175 1175
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
1176
-	$date = date('c',$date);
1177
-	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
1176
+	$date = date('c', $date);
1177
+	$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date));
1178 1178
 	return $spotter_array;
1179 1179
     }
1180 1180
 
@@ -1184,14 +1184,14 @@  discard block
 block discarded – undo
1184 1184
     * @return Array the spotter information
1185 1185
     *
1186 1186
     */
1187
-    public function getDateArchiveMarineDataByIdent($ident,$date)
1187
+    public function getDateArchiveMarineDataByIdent($ident, $date)
1188 1188
     {
1189 1189
 	$Marine = new Marine($this->db);
1190 1190
 	date_default_timezone_set('UTC');
1191 1191
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1192 1192
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
1193
-	$date = date('c',$date);
1194
-	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1193
+	$date = date('c', $date);
1194
+	$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
1195 1195
 	return $spotter_array;
1196 1196
     }
1197 1197
 
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
     * @return Array the spotter information
1202 1202
     *
1203 1203
     */
1204
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1204
+    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1205 1205
     {
1206 1206
 	global $global_query;
1207 1207
 	$Marine = new Marine($this->db);
@@ -1209,7 +1209,7 @@  discard block
 block discarded – undo
1209 1209
 	$query_values = array();
1210 1210
 	$limit_query = '';
1211 1211
 	$additional_query = '';
1212
-	$filter_query = $this->getFilter($filters,true,true);
1212
+	$filter_query = $this->getFilter($filters, true, true);
1213 1213
 	
1214 1214
 	if ($airport != "")
1215 1215
 	{
@@ -1226,8 +1226,8 @@  discard block
 block discarded – undo
1226 1226
 	{
1227 1227
 	    $limit_array = explode(",", $limit);
1228 1228
 	    
1229
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1230
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1229
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1230
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1231 1231
 	    
1232 1232
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1233 1233
 	    {
Please login to merge, or discard this patch.
require/class.TrackerLive.php 1 patch
Spacing   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -17,33 +17,33 @@  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, $globalDBdriver;
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 30
 		if (isset($filter[0]['source'])) {
31
-			$filters = array_merge($filters,$filter);
31
+			$filters = array_merge($filters, $filter);
32 32
 		}
33
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
34 34
 		$filter_query_join = '';
35 35
 		$filter_query_where = '';
36
-		foreach($filters as $flt) {
36
+		foreach ($filters as $flt) {
37 37
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
38 38
 				if (isset($flt['source'])) {
39
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
39
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
40 40
 				} else {
41
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
41
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
42 42
 				}
43 43
 			}
44 44
 		}
45 45
 		if (isset($filter['source']) && !empty($filter['source'])) {
46
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
46
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
47 47
 		}
48 48
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
49 49
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -72,15 +72,15 @@  discard block
 block discarded – undo
72 72
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
73 73
 				}
74 74
 			}
75
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid";
75
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid";
76 76
 		}
77 77
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
78
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
78
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
79 79
 		}
80 80
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
81 81
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
82 82
 		if ($filter_query_where != '') {
83
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
83
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
84 84
 		}
85 85
 		$filter_query = $filter_query_join.$filter_query_where;
86 86
 		return $filter_query;
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 		if ($limit != '')
104 104
 		{
105 105
 			$limit_array = explode(',', $limit);
106
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
107
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
106
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
107
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
108 108
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
109 109
 			{
110 110
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		} else {
128 128
 			$query  = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate".$filter_query.$orderby_query;
129 129
 		}
130
-		$spotter_array = $Tracker->getDataFromDB($query.$limit_query,array(),'',true);
130
+		$spotter_array = $Tracker->getDataFromDB($query.$limit_query, array(), '', true);
131 131
 
132 132
 		return $spotter_array;
133 133
 	}
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 		global $globalDBdriver, $globalLiveInterval;
144 144
 		date_default_timezone_set('UTC');
145 145
 
146
-		$filter_query = $this->getFilter($filter,true,true);
146
+		$filter_query = $this->getFilter($filter, true, true);
147 147
 
148 148
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
149 149
 		if ($globalDBdriver == 'mysql') {
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 		try {
162 162
 			$sth = $this->db->prepare($query);
163 163
 			$sth->execute();
164
-		} catch(PDOException $e) {
164
+		} catch (PDOException $e) {
165 165
 			echo $e->getMessage();
166 166
 			die;
167 167
 		}
@@ -176,25 +176,25 @@  discard block
 block discarded – undo
176 176
 	* @return Array the spotter information
177 177
 	*
178 178
 	*/
179
-	public function getMinLastLiveTrackerData($coord,$filter = array(),$limit = false)
179
+	public function getMinLastLiveTrackerData($coord, $filter = array(), $limit = false)
180 180
 	{
181 181
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DTrackersLimit;
182 182
 		date_default_timezone_set('UTC');
183 183
 		$usecoord = false;
184 184
 		if (is_array($coord) && !empty($coord)) {
185
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
186
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
187
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
188
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
185
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
186
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
187
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
188
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
189 189
 			$usecoord = true;
190 190
 		}
191
-		$filter_query = $this->getFilter($filter,true,true);
191
+		$filter_query = $this->getFilter($filter, true, true);
192 192
 
193 193
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
194 194
 		if (!isset($globalMap3DTrackersLimit) || $globalMap3DTrackersLimit == '') $globalMap3DTrackersLimit = '300';
195 195
 		if ($globalDBdriver == 'mysql') {
196 196
 			if (isset($globalArchive) && $globalArchive) {
197
-				$query  = "SELECT * FROM (
197
+				$query = "SELECT * FROM (
198 198
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
199 199
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
200 200
 				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 			}
217 217
 		} else {
218 218
 			if (isset($globalArchive) && $globalArchive) {
219
-				$query  = "SELECT * FROM (
219
+				$query = "SELECT * FROM (
220 220
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
221 221
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
222 222
 				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 		try {
241 241
 			$sth = $this->db->prepare($query);
242 242
 			$sth->execute();
243
-		} catch(PDOException $e) {
243
+		} catch (PDOException $e) {
244 244
 			echo $e->getMessage();
245 245
 			die;
246 246
 		}
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	public function getLiveTrackerCount($filter = array())
258 258
 	{
259 259
 		global $globalDBdriver, $globalLiveInterval;
260
-		$filter_query = $this->getFilter($filter,true,true);
260
+		$filter_query = $this->getFilter($filter, true, true);
261 261
 
262 262
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
263 263
 		if ($globalDBdriver == 'mysql') {
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 		try {
269 269
 			$sth = $this->db->prepare($query);
270 270
 			$sth->execute();
271
-		} catch(PDOException $e) {
271
+		} catch (PDOException $e) {
272 272
 			echo $e->getMessage();
273 273
 			die;
274 274
 		}
@@ -291,10 +291,10 @@  discard block
 block discarded – undo
291 291
 		$filter_query = $this->getFilter($filter);
292 292
 
293 293
 		if (is_array($coord)) {
294
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
295
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
296
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
297
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
294
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
295
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
296
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
297
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
298 298
 		} else return array();
299 299
 		if ($globalDBdriver == 'mysql') {
300 300
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query;
@@ -316,13 +316,13 @@  discard block
 block discarded – undo
316 316
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
317 317
 		$Tracker = new Tracker($this->db);
318 318
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
319
-		$filter_query = $this->getFilter($filter,true,true);
319
+		$filter_query = $this->getFilter($filter, true, true);
320 320
 
321 321
 		if (is_array($coord)) {
322
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
323
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
324
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
325
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
322
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
323
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
324
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
325
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
326 326
 		} else return array();
327 327
 		/*
328 328
 		if ($globalDBdriver == 'mysql') {
@@ -336,13 +336,13 @@  discard block
 block discarded – undo
336 336
 		*/
337 337
 		if ($globalDBdriver == 'mysql') {
338 338
 			if (isset($globalArchive) && $globalArchive === TRUE) {
339
-				$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
339
+				$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
340 340
 				    FROM tracker_live 
341 341
 				    '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= tracker_live.date 
342 342
 				    AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.'
343 343
 				    AND tracker_live.latitude <> 0 AND tracker_live.longitude <> 0';
344 344
 			} else {
345
-				$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
345
+				$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
346 346
 				    FROM tracker_live 
347 347
 				    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate 
348 348
 					FROM tracker_live l 
@@ -354,14 +354,14 @@  discard block
 block discarded – undo
354 354
 			}
355 355
 		} else {
356 356
 			if (isset($globalArchive) && $globalArchive === TRUE) {
357
-				$query  = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
357
+				$query = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
358 358
 				    FROM tracker_live 
359 359
 				    ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date 
360 360
 				    AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." 
361 361
 				    AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." 
362 362
 				    AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0'";
363 363
 			} else {
364
-				$query  = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
364
+				$query = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
365 365
 				    FROM tracker_live 
366 366
 				    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate 
367 367
 					FROM tracker_live l 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
                 if ($interval == '1m')
419 419
                 {
420 420
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
421
-                } else if ($interval == '15m'){
421
+                } else if ($interval == '15m') {
422 422
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date ';
423 423
                 } 
424 424
             }
@@ -426,14 +426,14 @@  discard block
 block discarded – undo
426 426
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';   
427 427
         }
428 428
 
429
-                $query  = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
429
+                $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
430 430
                    WHERE tracker_live.latitude <> '' 
431 431
                                    AND tracker_live.longitude <> '' 
432 432
                    ".$additional_query."
433 433
                    HAVING distance < :radius  
434 434
                                    ORDER BY distance";
435 435
 
436
-                $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
436
+                $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
437 437
 
438 438
                 return $spotter_array;
439 439
         }
@@ -451,9 +451,9 @@  discard block
 block discarded – undo
451 451
 		date_default_timezone_set('UTC');
452 452
 
453 453
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
454
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
454
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
455 455
 
456
-		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident),'',true);
456
+		$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident), '', true);
457 457
 
458 458
 		return $spotter_array;
459 459
 	}
@@ -464,16 +464,16 @@  discard block
 block discarded – undo
464 464
 	* @return Array the spotter information
465 465
 	*
466 466
 	*/
467
-	public function getDateLiveTrackerDataByIdent($ident,$date)
467
+	public function getDateLiveTrackerDataByIdent($ident, $date)
468 468
 	{
469 469
 		$Tracker = new Tracker($this->db);
470 470
 		date_default_timezone_set('UTC');
471 471
 
472 472
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
473
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
473
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
474 474
 
475
-                $date = date('c',$date);
476
-		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
475
+                $date = date('c', $date);
476
+		$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
477 477
 
478 478
 		return $spotter_array;
479 479
 	}
@@ -490,9 +490,9 @@  discard block
 block discarded – undo
490 490
 		date_default_timezone_set('UTC');
491 491
 
492 492
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
493
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
493
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
494 494
 
495
-		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id),'',true);
495
+		$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id), '', true);
496 496
 
497 497
 		return $spotter_array;
498 498
 	}
@@ -503,15 +503,15 @@  discard block
 block discarded – undo
503 503
 	* @return Array the spotter information
504 504
 	*
505 505
 	*/
506
-	public function getDateLiveTrackerDataById($id,$date)
506
+	public function getDateLiveTrackerDataById($id, $date)
507 507
 	{
508 508
 		$Tracker = new Tracker($this->db);
509 509
 		date_default_timezone_set('UTC');
510 510
 
511 511
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
512
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
513
-                $date = date('c',$date);
514
-		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
512
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
513
+                $date = date('c', $date);
514
+		$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
515 515
 
516 516
 		return $spotter_array;
517 517
 	}
@@ -528,13 +528,13 @@  discard block
 block discarded – undo
528 528
 		date_default_timezone_set('UTC');
529 529
 
530 530
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
531
-                $query  = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
531
+                $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
532 532
 
533 533
     		try {
534 534
 			
535 535
 			$sth = $this->db->prepare($query);
536 536
 			$sth->execute(array(':ident' => $ident));
537
-		} catch(PDOException $e) {
537
+		} catch (PDOException $e) {
538 538
 			echo $e->getMessage();
539 539
 			die;
540 540
 		}
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 	* @return Array the spotter information
550 550
 	*
551 551
 	*/
552
-	public function getAllLiveTrackerDataById($id,$liveinterval = false)
552
+	public function getAllLiveTrackerDataById($id, $liveinterval = false)
553 553
 	{
554 554
 		global $globalDBdriver, $globalLiveInterval;
555 555
 		date_default_timezone_set('UTC');
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
568 568
 		try {
569 569
 			$sth = $this->db->prepare($query);
570 570
 			$sth->execute(array(':id' => $id));
571
-		} catch(PDOException $e) {
571
+		} catch (PDOException $e) {
572 572
 			echo $e->getMessage();
573 573
 			die;
574 574
 		}
@@ -586,12 +586,12 @@  discard block
 block discarded – undo
586 586
 	{
587 587
 		date_default_timezone_set('UTC');
588 588
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
589
-		$query  = self::$global_query.' WHERE tracker_live.ident = :ident';
589
+		$query = self::$global_query.' WHERE tracker_live.ident = :ident';
590 590
     		try {
591 591
 			
592 592
 			$sth = $this->db->prepare($query);
593 593
 			$sth->execute(array(':ident' => $ident));
594
-		} catch(PDOException $e) {
594
+		} catch (PDOException $e) {
595 595
 			echo $e->getMessage();
596 596
 			die;
597 597
 		}
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 			
622 622
 			$sth = $this->db->prepare($query);
623 623
 			$sth->execute();
624
-		} catch(PDOException $e) {
624
+		} catch (PDOException $e) {
625 625
 			return "error";
626 626
 		}
627 627
 
@@ -644,14 +644,14 @@  discard block
 block discarded – undo
644 644
 				
645 645
 				$sth = $this->db->prepare($query);
646 646
 				$sth->execute();
647
-			} catch(PDOException $e) {
647
+			} catch (PDOException $e) {
648 648
 				return "error";
649 649
 			}
650 650
 			$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
651 651
                         $i = 0;
652
-                        $j =0;
652
+                        $j = 0;
653 653
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
654
-			foreach($all as $row)
654
+			foreach ($all as $row)
655 655
 			{
656 656
 				$i++;
657 657
 				$j++;
@@ -659,9 +659,9 @@  discard block
 block discarded – undo
659 659
 					if ($globalDebug) echo ".";
660 660
 				    	try {
661 661
 						
662
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
662
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
663 663
 						$sth->execute();
664
-					} catch(PDOException $e) {
664
+					} catch (PDOException $e) {
665 665
 						return "error";
666 666
 					}
667 667
                                 	$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
@@ -672,9 +672,9 @@  discard block
 block discarded – undo
672 672
 			if ($i > 0) {
673 673
     				try {
674 674
 					
675
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
675
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
676 676
 					$sth->execute();
677
-				} catch(PDOException $e) {
677
+				} catch (PDOException $e) {
678 678
 					return "error";
679 679
 				}
680 680
 			}
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 				
688 688
 				$sth = $this->db->prepare($query);
689 689
 				$sth->execute();
690
-			} catch(PDOException $e) {
690
+			} catch (PDOException $e) {
691 691
 				return "error";
692 692
 			}
693 693
 /*			$query_delete = "DELETE FROM tracker_live WHERE famtrackid IN (";
@@ -735,13 +735,13 @@  discard block
 block discarded – undo
735 735
 	public function deleteLiveTrackerDataByIdent($ident)
736 736
 	{
737 737
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
738
-		$query  = 'DELETE FROM tracker_live WHERE ident = :ident';
738
+		$query = 'DELETE FROM tracker_live WHERE ident = :ident';
739 739
         
740 740
     		try {
741 741
 			
742 742
 			$sth = $this->db->prepare($query);
743 743
 			$sth->execute(array(':ident' => $ident));
744
-		} catch(PDOException $e) {
744
+		} catch (PDOException $e) {
745 745
 			return "error";
746 746
 		}
747 747
 
@@ -757,13 +757,13 @@  discard block
 block discarded – undo
757 757
 	public function deleteLiveTrackerDataById($id)
758 758
 	{
759 759
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
760
-		$query  = 'DELETE FROM tracker_live WHERE famtrackid = :id';
760
+		$query = 'DELETE FROM tracker_live WHERE famtrackid = :id';
761 761
         
762 762
     		try {
763 763
 			
764 764
 			$sth = $this->db->prepare($query);
765 765
 			$sth->execute(array(':id' => $id));
766
-		} catch(PDOException $e) {
766
+		} catch (PDOException $e) {
767 767
 			return "error";
768 768
 		}
769 769
 
@@ -781,13 +781,13 @@  discard block
 block discarded – undo
781 781
 	{
782 782
 		global $globalDBdriver, $globalTimezone;
783 783
 		if ($globalDBdriver == 'mysql') {
784
-			$query  = 'SELECT tracker_live.ident FROM tracker_live 
784
+			$query = 'SELECT tracker_live.ident FROM tracker_live 
785 785
 				WHERE tracker_live.ident = :ident 
786 786
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
787 787
 				AND tracker_live.date < UTC_TIMESTAMP()';
788 788
 			$query_data = array(':ident' => $ident);
789 789
 		} else {
790
-			$query  = "SELECT tracker_live.ident FROM tracker_live 
790
+			$query = "SELECT tracker_live.ident FROM tracker_live 
791 791
 				WHERE tracker_live.ident = :ident 
792 792
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
793 793
 				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -796,8 +796,8 @@  discard block
 block discarded – undo
796 796
 		
797 797
 		$sth = $this->db->prepare($query);
798 798
 		$sth->execute($query_data);
799
-		$ident_result='';
800
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
799
+		$ident_result = '';
800
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
801 801
 		{
802 802
 			$ident_result = $row['ident'];
803 803
 		}
@@ -814,13 +814,13 @@  discard block
 block discarded – undo
814 814
 	{
815 815
 		global $globalDBdriver, $globalTimezone;
816 816
 		if ($globalDBdriver == 'mysql') {
817
-			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
817
+			$query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
818 818
 				WHERE tracker_live.ident = :ident 
819 819
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
820 820
 //				AND tracker_live.date < UTC_TIMESTAMP()";
821 821
 			$query_data = array(':ident' => $ident);
822 822
 		} else {
823
-			$query  = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
823
+			$query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
824 824
 				WHERE tracker_live.ident = :ident 
825 825
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
826 826
 //				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -829,8 +829,8 @@  discard block
 block discarded – undo
829 829
 		
830 830
 		$sth = $this->db->prepare($query);
831 831
 		$sth->execute($query_data);
832
-		$ident_result='';
833
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
832
+		$ident_result = '';
833
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
834 834
 		{
835 835
 			$ident_result = $row['famtrackid'];
836 836
 		}
@@ -847,13 +847,13 @@  discard block
 block discarded – undo
847 847
 	{
848 848
 		global $globalDBdriver, $globalTimezone;
849 849
 		if ($globalDBdriver == 'mysql') {
850
-			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
850
+			$query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
851 851
 				WHERE tracker_live.famtrackid = :id 
852 852
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
853 853
 //				AND tracker_live.date < UTC_TIMESTAMP()";
854 854
 			$query_data = array(':id' => $id);
855 855
 		} else {
856
-			$query  = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
856
+			$query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
857 857
 				WHERE tracker_live.famtrackid = :id 
858 858
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
859 859
 //				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -862,8 +862,8 @@  discard block
 block discarded – undo
862 862
 		
863 863
 		$sth = $this->db->prepare($query);
864 864
 		$sth->execute($query_data);
865
-		$ident_result='';
866
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
865
+		$ident_result = '';
866
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
867 867
 		{
868 868
 			$ident_result = $row['famtrackid'];
869 869
 		}
@@ -881,7 +881,7 @@  discard block
 block discarded – undo
881 881
 	* @return String success or false
882 882
 	*
883 883
 	*/
884
-	public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
884
+	public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '')
885 885
 	{
886 886
 		global $globalURL, $globalArchive, $globalDebug;
887 887
 		$Common = new Common();
@@ -940,21 +940,21 @@  discard block
 block discarded – undo
940 940
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
941 941
 
942 942
         
943
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
944
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
945
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
946
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
947
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
948
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
949
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
950
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
951
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
952
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
953
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
954
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
955
-
956
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
957
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
943
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
944
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
945
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
946
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
947
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
948
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
949
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
950
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
951
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
952
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
953
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
954
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
955
+
956
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
957
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
958 958
             	
959 959
 		$query = '';
960 960
 		if ($globalArchive) {
@@ -964,12 +964,12 @@  discard block
 block discarded – undo
964 964
 		$query  .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
965 965
 		VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
966 966
 
967
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':comment' => $comment,':type' => $type);
967
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':comment' => $comment, ':type' => $type);
968 968
 		try {
969 969
 			$sth = $this->db->prepare($query);
970 970
 			$sth->execute($query_values);
971 971
 			$sth->closeCursor();
972
-		} catch(PDOException $e) {
972
+		} catch (PDOException $e) {
973 973
 			return "error : ".$e->getMessage();
974 974
 		}
975 975
                 /*
@@ -979,7 +979,7 @@  discard block
 block discarded – undo
979 979
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
980 980
 		    if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
981 981
 		    $TrackerArchive = new TrackerArchive($this->db);
982
-		    $result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
982
+		    $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident, $latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type, $noarchive, $format_source, $source_name, $over_country);
983 983
 		    if ($globalDebug) echo $result.')';
984 984
 		}
985 985
 
@@ -989,7 +989,7 @@  discard block
 block discarded – undo
989 989
 
990 990
 	public function getOrderBy()
991 991
 	{
992
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC"));
992
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC"));
993 993
 		return $orderby;
994 994
 	}
995 995
 
Please login to merge, or discard this patch.
require/class.MarineLive.php 1 patch
Spacing   +110 added lines, -110 removed lines patch added patch discarded remove patch
@@ -17,33 +17,33 @@  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, $globalDBdriver;
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 30
 		if (isset($filter[0]['source'])) {
31
-			$filters = array_merge($filters,$filter);
31
+			$filters = array_merge($filters, $filter);
32 32
 		}
33
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
34 34
 		$filter_query_join = '';
35 35
 		$filter_query_where = '';
36
-		foreach($filters as $flt) {
36
+		foreach ($filters as $flt) {
37 37
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
38 38
 				if (isset($flt['source'])) {
39
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id";
39
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id";
40 40
 				} else {
41
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id";
41
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id";
42 42
 				}
43 43
 			}
44 44
 		}
45 45
 		if (isset($filter['source']) && !empty($filter['source'])) {
46
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
46
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
47 47
 		}
48 48
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
49 49
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -72,15 +72,15 @@  discard block
 block discarded – undo
72 72
 					$filter_query_date .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
73 73
 				}
74 74
 			}
75
-			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id";
75
+			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id";
76 76
 		}
77 77
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
78
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
78
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
79 79
 		}
80 80
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
81 81
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
82 82
 		if ($filter_query_where != '') {
83
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
83
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
84 84
 		}
85 85
 		$filter_query = $filter_query_join.$filter_query_where;
86 86
 		return $filter_query;
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 		if ($limit != '')
104 104
 		{
105 105
 			$limit_array = explode(',', $limit);
106
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
107
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
106
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
107
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
108 108
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
109 109
 			{
110 110
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
120 120
 			}
121 121
 		}
122
-		if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC';
122
+		if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC';
123 123
 
124 124
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
125 125
 		if ($globalDBdriver == 'mysql') {
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		} else {
129 129
 			$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate".$filter_query.$orderby_query;
130 130
 		}
131
-		$spotter_array = $Marine->getDataFromDB($query.$limit_query,array(),'',true);
131
+		$spotter_array = $Marine->getDataFromDB($query.$limit_query, array(), '', true);
132 132
 
133 133
 		return $spotter_array;
134 134
 	}
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		global $globalDBdriver, $globalLiveInterval;
145 145
 		date_default_timezone_set('UTC');
146 146
 
147
-		$filter_query = $this->getFilter($filter,true,true);
147
+		$filter_query = $this->getFilter($filter, true, true);
148 148
 
149 149
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
150 150
 		if ($globalDBdriver == 'mysql') {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		try {
159 159
 			$sth = $this->db->prepare($query);
160 160
 			$sth->execute();
161
-		} catch(PDOException $e) {
161
+		} catch (PDOException $e) {
162 162
 			echo $e->getMessage();
163 163
 			die;
164 164
 		}
@@ -173,19 +173,19 @@  discard block
 block discarded – undo
173 173
 	* @return Array the spotter information
174 174
 	*
175 175
 	*/
176
-	public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false)
176
+	public function getMinLastLiveMarineData($coord = array(), $filter = array(), $limit = false)
177 177
 	{
178 178
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
179 179
 		date_default_timezone_set('UTC');
180 180
 		$usecoord = false;
181 181
 		if (is_array($coord) && !empty($coord)) {
182
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
183
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
184
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
185
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
182
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
183
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
184
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
185
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
186 186
 			$usecoord = true;
187 187
 		}
188
-		$filter_query = $this->getFilter($filter,true,true);
188
+		$filter_query = $this->getFilter($filter, true, true);
189 189
 
190 190
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
191 191
 		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300';
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		try {
235 235
 			$sth = $this->db->prepare($query);
236 236
 			$sth->execute();
237
-		} catch(PDOException $e) {
237
+		} catch (PDOException $e) {
238 238
 			echo $e->getMessage();
239 239
 			die;
240 240
 		}
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 	public function getLiveMarineCount($filter = array())
252 252
 	{
253 253
 		global $globalDBdriver, $globalLiveInterval;
254
-		$filter_query = $this->getFilter($filter,true,true);
254
+		$filter_query = $this->getFilter($filter, true, true);
255 255
 
256 256
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
257 257
 		if ($globalDBdriver == 'mysql') {
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 		try {
263 263
 			$sth = $this->db->prepare($query);
264 264
 			$sth->execute();
265
-		} catch(PDOException $e) {
265
+		} catch (PDOException $e) {
266 266
 			echo $e->getMessage();
267 267
 			die;
268 268
 		}
@@ -285,10 +285,10 @@  discard block
 block discarded – undo
285 285
 		$filter_query = $this->getFilter($filter);
286 286
 
287 287
 		if (is_array($coord)) {
288
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
289
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
290
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
291
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
288
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
289
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
290
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
291
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
292 292
 		} else return array();
293 293
 		if ($globalDBdriver == 'mysql') {
294 294
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
@@ -310,13 +310,13 @@  discard block
 block discarded – undo
310 310
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
311 311
 		$Marine = new Marine($this->db);
312 312
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
313
-		$filter_query = $this->getFilter($filter,true,true);
313
+		$filter_query = $this->getFilter($filter, true, true);
314 314
 
315 315
 		if (is_array($coord)) {
316
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
317
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
318
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
319
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
316
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
317
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
318
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
319
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
320 320
 		} else return array();
321 321
 		/*
322 322
 		if ($globalDBdriver == 'mysql') {
@@ -331,13 +331,13 @@  discard block
 block discarded – undo
331 331
 		*/
332 332
 		if ($globalDBdriver == 'mysql') {
333 333
 			if (isset($globalArchive) && $globalArchive === TRUE) {
334
-				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
334
+				$query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
335 335
 				    FROM marine_live 
336 336
 				    '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= marine_live.date 
337 337
 				    AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.'
338 338
 				    AND marine_live.latitude <> 0 AND marine_live.longitude <> 0';
339 339
 			} else {
340
-				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
340
+				$query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
341 341
 				    FROM marine_live 
342 342
 				    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate 
343 343
 				    FROM marine_live l 
@@ -349,14 +349,14 @@  discard block
 block discarded – undo
349 349
 			}
350 350
 		} else {
351 351
 			if (isset($globalArchive) && $globalArchive === TRUE) {
352
-				$query  = "SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
352
+				$query = "SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
353 353
 				    FROM marine_live 
354 354
 				    ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date 
355 355
 				    AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." 
356 356
 				    AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." 
357 357
 				    AND marine_live.latitude <> '0' AND marine_live.longitude <> '0'";
358 358
 			} else {
359
-				$query  = "SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
359
+				$query = "SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
360 360
 				    FROM marine_live 
361 361
 				    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate 
362 362
 				    FROM marine_live l 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
                 if ($interval == '1m')
414 414
                 {
415 415
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
416
-                } else if ($interval == '15m'){
416
+                } else if ($interval == '15m') {
417 417
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
418 418
                 } 
419 419
             }
@@ -421,14 +421,14 @@  discard block
 block discarded – undo
421 421
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
422 422
         }
423 423
 
424
-                $query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
424
+                $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
425 425
                    WHERE marine_live.latitude <> '' 
426 426
                                    AND marine_live.longitude <> '' 
427 427
                    ".$additional_query."
428 428
                    HAVING distance < :radius  
429 429
                                    ORDER BY distance";
430 430
 
431
-                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
431
+                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
432 432
 
433 433
                 return $spotter_array;
434 434
         }
@@ -446,9 +446,9 @@  discard block
 block discarded – undo
446 446
 		date_default_timezone_set('UTC');
447 447
 
448 448
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
449
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
449
+                $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
450 450
 
451
-		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
451
+		$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident), '', true);
452 452
 
453 453
 		return $spotter_array;
454 454
 	}
@@ -459,16 +459,16 @@  discard block
 block discarded – undo
459 459
 	* @return Array the spotter information
460 460
 	*
461 461
 	*/
462
-	public function getDateLiveMarineDataByIdent($ident,$date)
462
+	public function getDateLiveMarineDataByIdent($ident, $date)
463 463
 	{
464 464
 		$Marine = new Marine($this->db);
465 465
 		date_default_timezone_set('UTC');
466 466
 
467 467
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
468
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
468
+                $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
469 469
 
470
-                $date = date('c',$date);
471
-		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
470
+                $date = date('c', $date);
471
+		$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
472 472
 
473 473
 		return $spotter_array;
474 474
 	}
@@ -485,9 +485,9 @@  discard block
 block discarded – undo
485 485
 		date_default_timezone_set('UTC');
486 486
 
487 487
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
488
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
488
+                $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
489 489
 
490
-		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
490
+		$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id), '', true);
491 491
 
492 492
 		return $spotter_array;
493 493
 	}
@@ -498,15 +498,15 @@  discard block
 block discarded – undo
498 498
 	* @return Array the spotter information
499 499
 	*
500 500
 	*/
501
-	public function getDateLiveMarineDataById($id,$date)
501
+	public function getDateLiveMarineDataById($id, $date)
502 502
 	{
503 503
 		$Marine = new Marine($this->db);
504 504
 		date_default_timezone_set('UTC');
505 505
 
506 506
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
507
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
508
-                $date = date('c',$date);
509
-		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
507
+                $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
508
+                $date = date('c', $date);
509
+		$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
510 510
 
511 511
 		return $spotter_array;
512 512
 	}
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 	* @return Array the spotter information
519 519
 	*
520 520
 	*/
521
-	public function getAllLiveMarineDataById($id,$liveinterval = false)
521
+	public function getAllLiveMarineDataById($id, $liveinterval = false)
522 522
 	{
523 523
 		global $globalDBdriver, $globalLiveInterval;
524 524
 		date_default_timezone_set('UTC');
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
 		try {
538 538
 			$sth = $this->db->prepare($query);
539 539
 			$sth->execute(array(':id' => $id));
540
-		} catch(PDOException $e) {
540
+		} catch (PDOException $e) {
541 541
 			echo $e->getMessage();
542 542
 			die;
543 543
 		}
@@ -555,12 +555,12 @@  discard block
 block discarded – undo
555 555
 	{
556 556
 		date_default_timezone_set('UTC');
557 557
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
558
-		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
558
+		$query = self::$global_query.' WHERE marine_live.ident = :ident';
559 559
     		try {
560 560
 			
561 561
 			$sth = $this->db->prepare($query);
562 562
 			$sth->execute(array(':ident' => $ident));
563
-		} catch(PDOException $e) {
563
+		} catch (PDOException $e) {
564 564
 			echo $e->getMessage();
565 565
 			die;
566 566
 		}
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 			
591 591
 			$sth = $this->db->prepare($query);
592 592
 			$sth->execute();
593
-		} catch(PDOException $e) {
593
+		} catch (PDOException $e) {
594 594
 			return "error";
595 595
 		}
596 596
 
@@ -613,14 +613,14 @@  discard block
 block discarded – undo
613 613
 				
614 614
 				$sth = $this->db->prepare($query);
615 615
 				$sth->execute();
616
-			} catch(PDOException $e) {
616
+			} catch (PDOException $e) {
617 617
 				return "error";
618 618
 			}
619 619
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
620 620
                         $i = 0;
621
-                        $j =0;
621
+                        $j = 0;
622 622
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623
-			foreach($all as $row)
623
+			foreach ($all as $row)
624 624
 			{
625 625
 				$i++;
626 626
 				$j++;
@@ -628,9 +628,9 @@  discard block
 block discarded – undo
628 628
 					if ($globalDebug) echo ".";
629 629
 				    	try {
630 630
 						
631
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
631
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
632 632
 						$sth->execute();
633
-					} catch(PDOException $e) {
633
+					} catch (PDOException $e) {
634 634
 						return "error";
635 635
 					}
636 636
                                 	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
@@ -641,9 +641,9 @@  discard block
 block discarded – undo
641 641
 			if ($i > 0) {
642 642
     				try {
643 643
 					
644
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
644
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
645 645
 					$sth->execute();
646
-				} catch(PDOException $e) {
646
+				} catch (PDOException $e) {
647 647
 					return "error";
648 648
 				}
649 649
 			}
@@ -656,7 +656,7 @@  discard block
 block discarded – undo
656 656
 				
657 657
 				$sth = $this->db->prepare($query);
658 658
 				$sth->execute();
659
-			} catch(PDOException $e) {
659
+			} catch (PDOException $e) {
660 660
 				return "error";
661 661
 			}
662 662
 /*			$query_delete = "DELETE FROM marine_live WHERE fammarine_id IN (";
@@ -704,13 +704,13 @@  discard block
 block discarded – undo
704 704
 	public function deleteLiveMarineDataByIdent($ident)
705 705
 	{
706 706
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
707
-		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
707
+		$query = 'DELETE FROM marine_live WHERE ident = :ident';
708 708
         
709 709
     		try {
710 710
 			
711 711
 			$sth = $this->db->prepare($query);
712 712
 			$sth->execute(array(':ident' => $ident));
713
-		} catch(PDOException $e) {
713
+		} catch (PDOException $e) {
714 714
 			return "error";
715 715
 		}
716 716
 
@@ -726,13 +726,13 @@  discard block
 block discarded – undo
726 726
 	public function deleteLiveMarineDataById($id)
727 727
 	{
728 728
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
729
-		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
729
+		$query = 'DELETE FROM marine_live WHERE fammarine_id = :id';
730 730
         
731 731
     		try {
732 732
 			
733 733
 			$sth = $this->db->prepare($query);
734 734
 			$sth->execute(array(':id' => $id));
735
-		} catch(PDOException $e) {
735
+		} catch (PDOException $e) {
736 736
 			return "error";
737 737
 		}
738 738
 
@@ -750,13 +750,13 @@  discard block
 block discarded – undo
750 750
 	{
751 751
 		global $globalDBdriver, $globalTimezone;
752 752
 		if ($globalDBdriver == 'mysql') {
753
-			$query  = 'SELECT marine_live.ident FROM marine_live 
753
+			$query = 'SELECT marine_live.ident FROM marine_live 
754 754
 				WHERE marine_live.ident = :ident 
755 755
 				AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
756 756
 				AND marine_live.date < UTC_TIMESTAMP()';
757 757
 			$query_data = array(':ident' => $ident);
758 758
 		} else {
759
-			$query  = "SELECT marine_live.ident FROM marine_live 
759
+			$query = "SELECT marine_live.ident FROM marine_live 
760 760
 				WHERE marine_live.ident = :ident 
761 761
 				AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
762 762
 				AND marine_live.date < now() AT TIME ZONE 'UTC'";
@@ -765,8 +765,8 @@  discard block
 block discarded – undo
765 765
 		
766 766
 		$sth = $this->db->prepare($query);
767 767
 		$sth->execute($query_data);
768
-		$ident_result='';
769
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
768
+		$ident_result = '';
769
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
770 770
 		{
771 771
 			$ident_result = $row['ident'];
772 772
 		}
@@ -783,13 +783,13 @@  discard block
 block discarded – undo
783 783
 	{
784 784
 		global $globalDBdriver, $globalTimezone;
785 785
 		if ($globalDBdriver == 'mysql') {
786
-			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
786
+			$query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
787 787
 				WHERE marine_live.ident = :ident 
788 788
 				AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
789 789
 //				AND marine_live.date < UTC_TIMESTAMP()";
790 790
 			$query_data = array(':ident' => $ident);
791 791
 		} else {
792
-			$query  = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
792
+			$query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
793 793
 				WHERE marine_live.ident = :ident 
794 794
 				AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
795 795
 //				AND marine_live.date < now() AT TIME ZONE 'UTC'";
@@ -798,8 +798,8 @@  discard block
 block discarded – undo
798 798
 		
799 799
 		$sth = $this->db->prepare($query);
800 800
 		$sth->execute($query_data);
801
-		$ident_result='';
802
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
801
+		$ident_result = '';
802
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
803 803
 		{
804 804
 			$ident_result = $row['fammarine_id'];
805 805
 		}
@@ -816,13 +816,13 @@  discard block
 block discarded – undo
816 816
 	{
817 817
 		global $globalDBdriver, $globalTimezone;
818 818
 		if ($globalDBdriver == 'mysql') {
819
-			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
819
+			$query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
820 820
 				WHERE marine_live.fammarine_id = :id 
821 821
 				AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
822 822
 //				AND marine_live.date < UTC_TIMESTAMP()";
823 823
 			$query_data = array(':id' => $id);
824 824
 		} else {
825
-			$query  = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
825
+			$query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live 
826 826
 				WHERE marine_live.fammarine_id = :id 
827 827
 				AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
828 828
 //				AND marine_live.date < now() AT TIME ZONE 'UTC'";
@@ -831,8 +831,8 @@  discard block
 block discarded – undo
831 831
 		
832 832
 		$sth = $this->db->prepare($query);
833 833
 		$sth->execute($query_data);
834
-		$ident_result='';
835
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
834
+		$ident_result = '';
835
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
836 836
 		{
837 837
 			$ident_result = $row['fammarine_id'];
838 838
 		}
@@ -849,13 +849,13 @@  discard block
 block discarded – undo
849 849
 	{
850 850
 		global $globalDBdriver, $globalTimezone;
851 851
 		if ($globalDBdriver == 'mysql') {
852
-			$query  = 'SELECT marine_live.fammarine_id FROM marine_live 
852
+			$query = 'SELECT marine_live.fammarine_id FROM marine_live 
853 853
 				WHERE marine_live.mmsi = :mmsi 
854 854
 				AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
855 855
 //				AND marine_live.date < UTC_TIMESTAMP()";
856 856
 			$query_data = array(':mmsi' => $mmsi);
857 857
 		} else {
858
-			$query  = "SELECT marine_live.fammarine_id FROM marine_live 
858
+			$query = "SELECT marine_live.fammarine_id FROM marine_live 
859 859
 				WHERE marine_live.mmsi = :mmsi 
860 860
 				AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
861 861
 //				AND marine_live.date < now() AT TIME ZONE 'UTC'";
@@ -864,8 +864,8 @@  discard block
 block discarded – undo
864 864
 		
865 865
 		$sth = $this->db->prepare($query);
866 866
 		$sth->execute($query_data);
867
-		$ident_result='';
868
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
867
+		$ident_result = '';
868
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
869 869
 		{
870 870
 			$ident_result = $row['fammarine_id'];
871 871
 		}
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
883 883
 	* @return String success or false
884 884
 	*
885 885
 	*/
886
-	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
886
+	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '')
887 887
 	{
888 888
 		global $globalURL, $globalArchive, $globalDebug;
889 889
 		$Common = new Common();
@@ -935,26 +935,26 @@  discard block
 block discarded – undo
935 935
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
936 936
 
937 937
         
938
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
939
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
940
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
941
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
942
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
943
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
944
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
945
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
946
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
947
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
948
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
949
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
950
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
951
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
952
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
953
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
938
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
939
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
940
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
941
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
942
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
943
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
944
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
945
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
946
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
947
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
948
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
949
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
950
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
951
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
952
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
953
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
954 954
 		
955 955
 
956
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
957
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
956
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
957
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
958 958
             	if ($arrival_date == '') $arrival_date = NULL;
959 959
             	$query = '';
960 960
 		if ($globalArchive) {
@@ -964,19 +964,19 @@  discard block
 block discarded – undo
964 964
 		$query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
965 965
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)';
966 966
 
967
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
967
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
968 968
 		try {
969 969
 			$sth = $this->db->prepare($query);
970 970
 			$sth->execute($query_values);
971 971
 			$sth->closeCursor();
972
-		} catch(PDOException $e) {
972
+		} catch (PDOException $e) {
973 973
 			return "error : ".$e->getMessage();
974 974
 		}
975 975
 		
976 976
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
977 977
 			if ($globalDebug) echo '(Add to Marine archive : ';
978 978
 			$MarineArchive = new MarineArchive($this->db);
979
-			$result =  $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country);
979
+			$result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $noarchive, $format_source, $source_name, $over_country);
980 980
 			if ($globalDebug) echo $result.')';
981 981
 		}
982 982
 		return "success";
@@ -984,7 +984,7 @@  discard block
 block discarded – undo
984 984
 
985 985
 	public function getOrderBy()
986 986
 	{
987
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC"));
987
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC"));
988 988
 		return $orderby;
989 989
 	}
990 990
 
Please login to merge, or discard this patch.
require/class.APRS.php 1 patch
Spacing   +157 added lines, -158 removed lines patch added patch discarded remove patch
@@ -167,8 +167,7 @@  discard block
 block discarded – undo
167 167
 	
168 168
 
169 169
     private function urshift($n, $s) {
170
-	return ($n >= 0) ? ($n >> $s) :
171
-	    (($n & 0x7fffffff) >> $s) | 
170
+	return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
172 171
 		(0x40000000 >> ($s - 1));
173 172
     }
174 173
 
@@ -180,7 +179,7 @@  discard block
 block discarded – undo
180 179
 	//$split_input = str_split($input);
181 180
 
182 181
 	/* Find the end of header checking for NULL bytes while doing it. */
183
-	$splitpos = strpos($input,':');
182
+	$splitpos = strpos($input, ':');
184 183
 	
185 184
 	/* Check that end was found and body has at least one byte. */
186 185
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -190,15 +189,15 @@  discard block
 block discarded – undo
190 189
 	
191 190
 	if ($debug) echo 'input : '.$input."\n";
192 191
 	/* Save header and body. */
193
-	$body = substr($input,$splitpos+1,$input_len);
192
+	$body = substr($input, $splitpos + 1, $input_len);
194 193
 	$body_len = strlen($body);
195
-	$header = substr($input,0,$splitpos);
194
+	$header = substr($input, 0, $splitpos);
196 195
 	//$header_len = strlen($header);
197 196
 	if ($debug) echo 'header : '.$header."\n";
198 197
 	
199 198
 	/* Parse source, target and path. */
200 199
 	//FLRDF0A52>APRS,qAS,LSTB
201
-	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
200
+	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
202 201
 	    $ident = $matches[1];
203 202
 	    $all_elements = $matches[2];
204 203
 	    if ($ident == 'AIRCRAFT') {
@@ -215,14 +214,14 @@  discard block
 block discarded – undo
215 214
 	    if ($debug) 'No ident'."\n";
216 215
 	    return false;
217 216
 	}
218
-	$elements = explode(',',$all_elements);
217
+	$elements = explode(',', $all_elements);
219 218
 	$source = end($elements);
220 219
 	$result['source'] = $source;
221 220
 	foreach ($elements as $element) {
222
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
221
+	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
223 222
 	        //echo "ok";
224 223
 	        //if ($element == 'TCPIP*') return false;
225
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
224
+	    } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
226 225
 		if ($debug) echo 'element : '.$element."\n";
227 226
 		return false;
228 227
 	    }
@@ -235,14 +234,14 @@  discard block
 block discarded – undo
235 234
 	    */
236 235
 	}
237 236
 	
238
-	$type = substr($body,0,1);
237
+	$type = substr($body, 0, 1);
239 238
 	if ($debug) echo 'type : '.$type."\n";
240 239
 	if ($type == ';') {
241 240
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
242
-			$result['address'] = trim(substr($body,1,9));
241
+			$result['address'] = trim(substr($body, 1, 9));
243 242
 		} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
244
-			$result['mmsi'] = trim(substr($body,1,9));
245
-		} else $result['ident'] = trim(substr($body,1,9));
243
+			$result['mmsi'] = trim(substr($body, 1, 9));
244
+		} else $result['ident'] = trim(substr($body, 1, 9));
246 245
 	} elseif ($type == ',') {
247 246
 		// Invalid data or test data
248 247
 		return false;
@@ -250,24 +249,24 @@  discard block
 block discarded – undo
250 249
 	
251 250
 	// Check for Timestamp
252 251
 	$find = false;
253
-	$body_parse = substr($body,1);
252
+	$body_parse = substr($body, 1);
254 253
 	//echo 'Body : '.$body."\n";
255
-	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
256
-	    $body_parse = substr($body_parse,10);
254
+	if (preg_match('/^;(.){9}\*/', $body, $matches)) {
255
+	    $body_parse = substr($body_parse, 10);
257 256
 	    $find = true;
258 257
 	    //echo $body_parse."\n";
259 258
 	}
260
-	if (preg_match('/^`(.*)\//',$body,$matches)) {
261
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
259
+	if (preg_match('/^`(.*)\//', $body, $matches)) {
260
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
262 261
 	    $find = true;
263 262
 	    //echo $body_parse."\n";
264 263
 	}
265
-	if (preg_match("/^'(.*)\//",$body,$matches)) {
266
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
264
+	if (preg_match("/^'(.*)\//", $body, $matches)) {
265
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
267 266
 	    $find = true;
268 267
 	    //echo $body_parse."\n";
269 268
 	}
270
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
269
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
271 270
 	    $find = true;
272 271
 	    //print_r($matches);
273 272
 	    $timestamp = $matches[0];
@@ -282,19 +281,19 @@  discard block
 block discarded – undo
282 281
 		// This work or not ?
283 282
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
284 283
 	    }
285
-	    $body_parse = substr($body_parse,7);
284
+	    $body_parse = substr($body_parse, 7);
286 285
 	    $result['timestamp'] = $timestamp;
287 286
 	    //echo date('Ymd H:i:s',$timestamp);
288 287
 	}
289
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
288
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
290 289
 	    $find = true;
291 290
 	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
292
-	    $body_parse = substr($body_parse,8);
291
+	    $body_parse = substr($body_parse, 8);
293 292
 	    $result['timestamp'] = $timestamp;
294 293
 	    //echo date('Ymd H:i:s',$timestamp);
295 294
 	}
296 295
 	//if (strlen($body_parse) > 19) {
297
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
296
+	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
298 297
 		$find = true;
299 298
 		// 4658.70N/00707.78Ez
300 299
 		//print_r(str_split($body_parse));
@@ -321,11 +320,11 @@  discard block
 block discarded – undo
321 320
 	    */
322 321
 		$latitude = $lat + floatval($lat_min)/60;
323 322
 		$longitude = $lon + floatval($lon_min)/60;
324
-		if ($sind == 'S') $latitude = 0-$latitude;
325
-		if ($wind == 'W') $longitude = 0-$longitude;
323
+		if ($sind == 'S') $latitude = 0 - $latitude;
324
+		if ($wind == 'W') $longitude = 0 - $longitude;
326 325
 		$result['latitude'] = $latitude;
327 326
 		$result['longitude'] = $longitude;
328
-		$body_parse = substr($body_parse,18);
327
+		$body_parse = substr($body_parse, 18);
329 328
 		$body_parse_len = strlen($body_parse);
330 329
 	    }
331 330
 	    $body_parse_len = strlen($body_parse);
@@ -357,7 +356,7 @@  discard block
 block discarded – undo
357 356
 		//echo $body_parse;
358 357
 			//if ($type != ';' && $type != '>') {
359 358
 			if ($type != '') {
360
-			$body_parse = substr($body_parse,1);
359
+			$body_parse = substr($body_parse, 1);
361 360
 			$body_parse_len = strlen($body_parse);
362 361
 			$result['symbol_code'] = $symbol_code;
363 362
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
@@ -368,16 +367,16 @@  discard block
 block discarded – undo
368 367
 		    //$body_parse_len = strlen($body_parse);
369 368
 		    if ($body_parse_len >= 7) {
370 369
 			
371
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
372
-		    	    $course = substr($body_parse,0,3);
370
+		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
371
+		    	    $course = substr($body_parse, 0, 3);
373 372
 		    	    $tmp_s = intval($course);
374 373
 		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
375
-		    	    $speed = substr($body_parse,4,3);
374
+		    	    $speed = substr($body_parse, 4, 3);
376 375
 		    	    if ($speed != '...') {
377 376
 		    		//$result['speed'] = round($speed*1.852);
378 377
 		    		$result['speed'] = intval($speed);
379 378
 		    	    }
380
-		    	    $body_parse = substr($body_parse,7);
379
+		    	    $body_parse = substr($body_parse, 7);
381 380
 		        }
382 381
 		        // Check PHGR, PHG, RNG
383 382
 		    } 
@@ -387,12 +386,12 @@  discard block
 block discarded – undo
387 386
 		    }
388 387
 		    */
389 388
 		    if (strlen($body_parse) > 0) {
390
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
389
+		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
391 390
 		            $altitude = intval($matches[1]);
392 391
 		            //$result['altitude'] = round($altitude*0.3048);
393 392
 		            $result['altitude'] = $altitude;
394 393
 		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
395
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
394
+		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
396 395
 		        }
397 396
 		    }
398 397
 		    
@@ -404,13 +403,13 @@  discard block
 block discarded – undo
404 403
 		    */
405 404
 		    // DAO
406 405
 		    
407
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
406
+		    if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
408 407
 			    
409 408
 			    $dao = $matches[1];
410
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
409
+			    if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
411 410
 				$dao_split = str_split($dao);
412
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
413
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
411
+			        $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
412
+			        $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
414 413
 			    
415 414
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
416 415
 				else $result['latitude'] += $lat_off;
@@ -418,50 +417,50 @@  discard block
 block discarded – undo
418 417
 				else $result['longitude'] += $lon_off;
419 418
 			    }
420 419
 			    
421
-		            $body_parse = substr($body_parse,6);
420
+		            $body_parse = substr($body_parse, 6);
422 421
 		    }
423 422
 		    
424
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
425
-			$result['ident'] = str_replace('_',' ',$matches[1]);
423
+		    if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
424
+			$result['ident'] = str_replace('_', ' ', $matches[1]);
426 425
 		    }
427
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
426
+		    if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
428 427
 			$result['squawk'] = $matches[1];
429 428
 		    }
430
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
429
+		    if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
431 430
 			$result['aircraft_icao'] = $matches[1];
432 431
 		    }
433
-		    if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
432
+		    if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) {
434 433
 			$result['verticalrate'] = $matches[1];
435 434
 		    }
436
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
435
+		    if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
437 436
 			$result['typeid'] = $matches[1];
438 437
 		    }
439
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
438
+		    if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
440 439
 			$result['statusid'] = $matches[1];
441 440
 		    }
442
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
441
+		    if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
443 442
 			$result['imo'] = $matches[1];
444 443
 		    }
445
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
444
+		    if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
446 445
 			$result['arrival_date'] = $matches[1];
447 446
 		    }
448
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
449
-			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
447
+		    if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
448
+			$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
450 449
 		    }
451 450
 		    // OGN comment
452 451
 		   // echo "Before OGN : ".$body_parse."\n";
453 452
 		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
454
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
453
+		    if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
455 454
 			$id = $matches[1];
456 455
 			//$mode = substr($id,0,2);
457
-			$address = substr($id,2);
456
+			$address = substr($id, 2);
458 457
 			//print_r($matches);
459
-			$addressType = (intval(substr($id,0,2),16))&3;
458
+			$addressType = (intval(substr($id, 0, 2), 16))&3;
460 459
 			if ($addressType == 0) $result['addresstype'] = "RANDOM";
461 460
 			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
462 461
 			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
463 462
 			elseif ($addressType == 3) $result['addresstype'] = "OGN";
464
-			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
463
+			$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
465 464
 			$result['aircrafttype_code'] = $aircraftType;
466 465
 			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
467 466
 			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -478,7 +477,7 @@  discard block
 block discarded – undo
478 477
 			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
479 478
 			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
480 479
 			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
481
-			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
480
+			$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
482 481
 			$result['stealth'] = $stealth;
483 482
 			$result['address'] = $address;
484 483
 		    }
@@ -490,96 +489,96 @@  discard block
 block discarded – undo
490 489
 		    //$body_parse = substr($body_parse,1);
491 490
 		    //$body_parse_len = strlen($body_parse);
492 491
 		    //echo 'weather'."\n";
493
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
492
+		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
494 493
 			    $result['wind_dir'] = intval($matches[1]);
495
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
496
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
497
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
498
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
499
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
494
+			    $result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
495
+			    $result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
496
+			    $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
497
+		    	    $body_parse = substr($body_parse, strlen($matches[0]) + 1);
498
+		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
500 499
 			$result['wind_dir'] = intval($matches[1]);
501
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
502
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
503
-			$result['temp'] = round(5/9*(($matches[4])-32),1);
504
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
505
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
500
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
501
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
502
+			$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
503
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
504
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
506 505
 			$result['wind_dir'] = intval($matches[1]);
507
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
508
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
509
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
510
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
506
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
507
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
508
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
509
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
511 510
 			$result['wind_dir'] = intval($matches[1]);
512
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
513
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
514
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
511
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
512
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
513
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
515 514
 		    }
516 515
 		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
517 516
 		    //g012t088r000p000P000h38b10110
518 517
 		    //g011t086r000p000P000h29b10198
519
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
520
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
521
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
522
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
523
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
524
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
518
+		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
519
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
520
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
521
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
522
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
523
+			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
525 524
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
526
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
527
-		        $body_parse = substr($body_parse,strlen($matches[0]));
528
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
529
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
530
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
531
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
532
-			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
533
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
525
+			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
526
+		        $body_parse = substr($body_parse, strlen($matches[0]));
527
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
528
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
529
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
530
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
531
+			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
532
+			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
534 533
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
535
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
536
-		        $body_parse = substr($body_parse,strlen($matches[0]));
537
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
538
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
539
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
541
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
542
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
534
+			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
535
+		        $body_parse = substr($body_parse, strlen($matches[0]));
536
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
537
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
538
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
539
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
540
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
541
+			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
543 542
 			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
544
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
545
-		        $body_parse = substr($body_parse,strlen($matches[0]));
546
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
547
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
548
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
549
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
550
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
543
+			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
544
+		        $body_parse = substr($body_parse, strlen($matches[0]));
545
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
546
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
547
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
548
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
549
+			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
551 550
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
552
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
553
-		        $body_parse = substr($body_parse,strlen($matches[0]));
554
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
555
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
556
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
557
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
558
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
551
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
552
+		        $body_parse = substr($body_parse, strlen($matches[0]));
553
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
554
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
555
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
556
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
557
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
559 558
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
560
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
561
-		        $body_parse = substr($body_parse,strlen($matches[0]));
562
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
563
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
564
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
565
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
566
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
559
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
560
+		        $body_parse = substr($body_parse, strlen($matches[0]));
561
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
562
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
563
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
564
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
565
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
567 566
 			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
568
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
569
-		        $body_parse = substr($body_parse,strlen($matches[0]));
570
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
571
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
572
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
567
+			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
568
+		        $body_parse = substr($body_parse, strlen($matches[0]));
569
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
570
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
571
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
573 572
 			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
574
-			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
575
-		        $body_parse = substr($body_parse,strlen($matches[0]));
576
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
577
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
578
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
579
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
573
+			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
574
+		        $body_parse = substr($body_parse, strlen($matches[0]));
575
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
576
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
577
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
578
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
580 579
 			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
581
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
582
-		        $body_parse = substr($body_parse,strlen($matches[0]));
580
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
581
+		        $body_parse = substr($body_parse, strlen($matches[0]));
583 582
 		    }
584 583
 		    $result['comment'] = trim($body_parse);
585 584
 		}
@@ -587,42 +586,42 @@  discard block
 block discarded – undo
587 586
 
588 587
 	    }
589 588
 	//}
590
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
591
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
589
+	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
590
+	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
592 591
 	if ($debug) print_r($result);
593 592
 	return $result;
594 593
     }
595 594
     
596 595
     public function connect() {
597
-	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
596
+	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
598 597
 	$aprs_connect = 0;
599 598
 	$aprs_keep = 120;
600 599
 	$aprs_last_tx = time();
601 600
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
602
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
601
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
603 602
 	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
604
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
603
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
605 604
 	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
606 605
 	else $aprs_pass = '-1';
607 606
 	
608
-	$aprs_filter  = '';
607
+	$aprs_filter = '';
609 608
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
610 609
 	$Common = new Common();
611
-	$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
610
+	$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
612 611
 	if ($s !== false) {
613 612
 		echo 'Connected to APRS server! '."\n";
614 613
 		$authstart = time();
615 614
 		$this->socket = $s;
616
-		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
617
-		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
618
-		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
615
+		$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
616
+		socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
617
+		while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
619 618
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
620 619
 			    echo 'APRS user verified !'."\n";
621 620
 			    $this->connected = true;
622 621
 			    return true;
623 622
 			    break;
624 623
 			}
625
-			if (time()-$authstart > 5) {
624
+			if (time() - $authstart > 5) {
626 625
 			    echo 'APRS timeout'."\n";
627 626
 			    break;
628 627
 			}
@@ -637,7 +636,7 @@  discard block
 block discarded – undo
637 636
     public function send($data) {
638 637
 	global $globalDebug;
639 638
 	if ($this->connected === false) $this->connect();
640
-	$send = socket_send( $this->socket  , $data , strlen($data),0);
639
+	$send = socket_send($this->socket, $data, strlen($data), 0);
641 640
 	if ($send === FALSE) {
642 641
 		if ($globalDebug) echo 'Reconnect...';
643 642
 		socket_close($this->socket);
@@ -647,17 +646,17 @@  discard block
 block discarded – undo
647 646
 }
648 647
 
649 648
 class APRSSpotter extends APRS {
650
-	public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
649
+	public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
651 650
 		$Common = new Common();
652 651
 		date_default_timezone_set('UTC');
653 652
 		if ($latitude != '' && $longitude != '') {
654 653
 			$lat = $latitude;
655 654
 			$long = $longitude;
656
-			$latitude = $Common->convertDM($latitude,'latitude');
657
-			$longitude = $Common->convertDM($longitude,'longitude');
658
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
659
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
660
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
655
+			$latitude = $Common->convertDM($latitude, 'latitude');
656
+			$longitude = $Common->convertDM($longitude, 'longitude');
657
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
658
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
659
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
661 660
 			$w = $w1.$w2;
662 661
 			//$w = '00';
663 662
 			$custom = '';
@@ -684,26 +683,26 @@  discard block
 block discarded – undo
684 683
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
685 684
 			$altitude_real = round($altitude_real + $geoid);
686 685
 			*/
687
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
686
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
688 687
 		}
689 688
 	}
690 689
 }
691 690
 class APRSMarine extends APRS {
692
-	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) {
691
+	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) {
693 692
 		$Common = new Common();
694 693
 		date_default_timezone_set('UTC');
695 694
 		if ($latitude != '' && $longitude != '') {
696
-			$latitude = $Common->convertDM($latitude,'latitude');
697
-			$longitude = $Common->convertDM($longitude,'longitude');
698
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
699
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
700
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
695
+			$latitude = $Common->convertDM($latitude, 'latitude');
696
+			$longitude = $Common->convertDM($longitude, 'longitude');
697
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
698
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
699
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
701 700
 			$w = $w1.$w2;
702 701
 			//$w = '00';
703 702
 			$custom = '';
704 703
 			if ($ident != '') {
705 704
 				if ($custom != '') $custom .= '/';
706
-				$custom .= 'CS='.str_replace(' ','_',$ident);
705
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
707 706
 			}
708 707
 			if ($typeid != '') {
709 708
 				if ($custom != '') $custom .= '/';
@@ -723,11 +722,11 @@  discard block
 block discarded – undo
723 722
 			}
724 723
 			if ($arrival_code != '') {
725 724
 				if ($custom != '') $custom .= '/';
726
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
725
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
727 726
 			}
728 727
 			if ($custom != '') $custom = ' '.$custom;
729 728
 			$altitude = 0;
730
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
729
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
731 730
 		}
732 731
 	}
733 732
 }
Please login to merge, or discard this patch.
marine-data.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
 
10 10
 $from_archive = false;
11 11
 if (isset($_GET['ident'])) {
12
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
12
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
13 13
 	if (isset($_GET['currenttime'])) {
14
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
14
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
15 15
 		$currenttime = round($currenttime/1000);
16
-		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident,$currenttime);
16
+		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident, $currenttime);
17 17
 		
18 18
 		if (empty($spotter_array)) {
19 19
 			$from_archive = true;
20
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident,$currenttime);
20
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident, $currenttime);
21 21
 		}
22 22
 		
23 23
 	} else {
@@ -31,16 +31,16 @@  discard block
 block discarded – undo
31 31
 	}
32 32
 }
33 33
 if (isset($_GET['fammarine_id'])) {
34
-	$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
34
+	$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
35 35
 	if (isset($_GET['currenttime'])) {
36
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
36
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
37 37
 		$currenttime = round($currenttime/1000);
38
-		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id,$currenttime);
38
+		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id, $currenttime);
39 39
 		
40 40
 		if (empty($spotter_array)) {
41 41
 			$from_archive = true;
42 42
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
43
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($flightaware_id,$currenttime);
43
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($flightaware_id, $currenttime);
44 44
 		}
45 45
 		
46 46
 	} else {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
63 63
 {
64 64
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
65
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
65
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
66 66
 	} else $image = $spotter_item['image_thumbnail'];
67 67
 
68 68
 }
Please login to merge, or discard this patch.
install/index.php 1 patch
Spacing   +257 added lines, -257 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 require_once(dirname(__FILE__).'/class.create_db.php');
23 23
 require_once(dirname(__FILE__).'/class.update_schema.php');
24 24
 require_once(dirname(__FILE__).'/class.settings.php');
25
-$title="Install";
25
+$title = "Install";
26 26
 require(dirname(__FILE__).'/../require/settings.php');
27 27
 require_once(dirname(__FILE__).'/../require/class.Common.php');
28 28
 require(dirname(__FILE__).'/header.php');
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 	if (!extension_loaded('curl')) {
93 93
 		$error[] = "Curl is not loaded.";
94 94
 	}
95
-	if(function_exists('apache_get_modules') ){
96
-		if(!in_array('mod_rewrite',apache_get_modules())) {
95
+	if (function_exists('apache_get_modules')) {
96
+		if (!in_array('mod_rewrite', apache_get_modules())) {
97 97
 			$error[] = "mod_rewrite is not available.";
98 98
 		}
99 99
 	/*
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
 	print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>';
110 110
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
111 111
 		if (function_exists('get_headers')) {
112
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
113
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
112
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
113
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
114 114
 				print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
115 115
 			}
116 116
 		}
@@ -481,13 +481,13 @@  discard block
 block discarded – undo
481 481
 ?>
482 482
 							<tr>
483 483
 								<?php
484
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
484
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
485 485
 								?>
486 486
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
487 487
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
488 488
 								<?php
489 489
 								    } else {
490
-									$hostport = explode(':',$source['host']);
490
+									$hostport = explode(':', $source['host']);
491 491
 									if (isset($hostport[1])) {
492 492
 										$host = $hostport[0];
493 493
 										$port = $hostport[1];
@@ -534,7 +534,7 @@  discard block
 block discarded – undo
534 534
 									<select name="timezones[]" id="timezones">
535 535
 								<?php
536 536
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
537
-									foreach($timezonelist as $timezones){
537
+									foreach ($timezonelist as $timezones) {
538 538
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
539 539
 											print '<option selected>'.$timezones.'</option>';
540 540
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
 									<select name="timezones[]" id="timezones">
587 587
 								<?php
588 588
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
589
-									foreach($timezonelist as $timezones){
589
+									foreach ($timezonelist as $timezones) {
590 590
 										if ($timezones == 'UTC') {
591 591
 											print '<option selected>'.$timezones.'</option>';
592 592
 										} else print '<option>'.$timezones.'</option>';
@@ -923,7 +923,7 @@  discard block
 block discarded – undo
923 923
 			<br />
924 924
 			<p>
925 925
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
926
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
926
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
927 927
 			</p>
928 928
 			<br />
929 929
 			<p>
@@ -979,14 +979,14 @@  discard block
 block discarded – undo
979 979
 $error = '';
980 980
 
981 981
 if (isset($_POST['dbtype'])) {
982
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
983
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
984
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
985
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
986
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
987
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
988
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
989
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
982
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
983
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
984
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
985
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
986
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
987
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
988
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
989
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
990 990
 
991 991
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
992 992
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1006,49 +1006,49 @@  discard block
 block discarded – undo
1006 1006
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1007 1007
 	*/
1008 1008
 	
1009
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1009
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
1010 1010
 
1011
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
1012
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
1013
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
1014
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
1015
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
1011
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
1012
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
1013
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
1014
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
1015
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
1016 1016
 
1017
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
1018
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
1019
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
1020
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
1021
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
1022
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
1023
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
1024
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
1025
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
1026
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
1017
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
1018
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
1019
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
1020
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
1021
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
1022
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
1023
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
1024
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
1025
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
1026
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
1027 1027
 	
1028
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
1029
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
1030
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
1031
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
1032
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
1033
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
1028
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
1029
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
1030
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
1031
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
1032
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
1033
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
1034 1034
 
1035
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
1036
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
1035
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
1036
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
1037 1037
 
1038
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
1039
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
1040
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
1038
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
1039
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
1040
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
1041 1041
 
1042
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
1042
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
1043 1043
 	if ($acars == 'acars') {
1044
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
1044
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
1045 1045
 	} else {
1046
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
1046
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
1047 1047
 	}
1048 1048
 
1049
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
1050
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
1051
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
1049
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
1050
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
1051
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
1052 1052
 	
1053 1053
 	$source_name = $_POST['source_name'];
1054 1054
 	$source_latitude = $_POST['source_latitude'];
@@ -1062,8 +1062,8 @@  discard block
 block discarded – undo
1062 1062
 	
1063 1063
 	$sources = array();
1064 1064
 	foreach ($source_name as $keys => $name) {
1065
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
1066
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
1065
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
1066
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
1067 1067
 	}
1068 1068
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1069 1069
 
@@ -1076,27 +1076,27 @@  discard block
 block discarded – undo
1076 1076
 	$sbsurl = $_POST['sbsurl'];
1077 1077
 	*/
1078 1078
 
1079
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
1080
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
1081
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
1082
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
1083
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
1084
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
1085
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
1086
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1079
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
1080
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
1081
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
1082
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
1083
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
1084
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
1085
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
1086
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
1087 1087
 
1088
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1089
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1090
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1091
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1092
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1093
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1094
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1095
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1096
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1097
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1098
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1099
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1088
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
1089
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
1090
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
1091
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
1092
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
1093
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
1094
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
1095
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
1096
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
1097
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
1098
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
1099
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
1100 1100
 
1101 1101
 /*	
1102 1102
 	$globalSBS1Hosts = array();
@@ -1112,7 +1112,7 @@  discard block
 block discarded – undo
1112 1112
 	}
1113 1113
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
1114 1114
 */
1115
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
1115
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
1116 1116
 	$host = $_POST['host'];
1117 1117
 	$port = $_POST['port'];
1118 1118
 	$name = $_POST['name'];
@@ -1129,113 +1129,113 @@  discard block
 block discarded – undo
1129 1129
 		else $cov = 'FALSE';
1130 1130
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1131 1131
 		else $arch = 'FALSE';
1132
-		if (strpos($format[$key],'_callback')) {
1133
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1132
+		if (strpos($format[$key], '_callback')) {
1133
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
1134 1134
 		} elseif ($h != '' || $name[$key] != '') {
1135
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1135
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
1136 1136
 		}
1137 1137
 		if ($format[$key] == 'airwhere') $forcepilots = true;
1138 1138
 	}
1139
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1139
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1140 1140
 
1141 1141
 /*
1142 1142
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1143 1143
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1144 1144
 */
1145
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1146
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1147
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1145
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1146
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1147
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1148 1148
 
1149
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1150
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1149
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1150
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1151 1151
 
1152
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1153
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1152
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1153
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1154 1154
 
1155
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
1156
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
1155
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
1156
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
1157 1157
 
1158
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1159
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1160
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1161
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1158
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1159
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1160
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1161
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1162 1162
 
1163
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1164
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1165
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1163
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1164
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1165
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1166 1166
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1167
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1168
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1167
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1168
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1169 1169
 
1170
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1171
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1172
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1173
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1174
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1175
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1176
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1177
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1170
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1171
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1172
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1173
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1174
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1175
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1176
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1177
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1178 1178
 
1179
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1180
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1179
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1180
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1181 1181
 
1182
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1183
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1182
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1183
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1184 1184
 	
1185
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1185
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1186 1186
 	if ($archiveyear == "archiveyear") {
1187
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1187
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1188 1188
 	} else {
1189
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1189
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1190 1190
 	}
1191
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1192
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1193
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1194
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1191
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1192
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1193
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1194
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1195 1195
 
1196
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1197
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1198
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1199
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1196
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1197
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1198
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1199
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1200 1200
 
1201
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1202
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1203
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1201
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1202
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1203
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1204 1204
 
1205 1205
 	// Create in settings.php keys not yet configurable if not already here
1206 1206
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1207
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1207
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1208 1208
 
1209
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1209
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1210 1210
 	if ($resetyearstats == 'resetyearstats') {
1211
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1211
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1212 1212
 	} else {
1213
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1213
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1214 1214
 	}
1215 1215
 
1216
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1216
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1217 1217
 	if ($archive == 'archive') {
1218
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1218
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1219 1219
 	} else {
1220
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1220
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1221 1221
 	}
1222
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
1222
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
1223 1223
 	if ($archiveresults == 'archiveresults') {
1224
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
1224
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
1225 1225
 	} else {
1226
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
1226
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
1227 1227
 	}
1228
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1228
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1229 1229
 	if ($daemon == 'daemon') {
1230
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1230
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1231 1231
 	} else {
1232
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1232
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1233 1233
 	}
1234
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1234
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1235 1235
 	if ($schedules == 'schedules') {
1236
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1236
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1237 1237
 	} else {
1238
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1238
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1239 1239
 	}
1240 1240
 
1241 1241
 /*
@@ -1246,239 +1246,239 @@  discard block
 block discarded – undo
1246 1246
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1247 1247
 	}
1248 1248
 */
1249
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1250
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1251
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1252
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1253
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1249
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1250
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1251
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1252
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1253
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1254 1254
 	$va = false;
1255 1255
 	if ($globalivao == 'ivao') {
1256
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1256
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1257 1257
 		$va = true;
1258
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1258
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1259 1259
 	if ($globalvatsim == 'vatsim') {
1260
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1260
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1261 1261
 		$va = true;
1262
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1262
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1263 1263
 	if ($globalphpvms == 'phpvms') {
1264
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1264
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1265 1265
 		$va = true;
1266
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1266
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1267 1267
 	if ($globalvam == 'vam') {
1268
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1268
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1269 1269
 		$va = true;
1270
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1270
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1271 1271
 	if ($va) {
1272
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1273
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1272
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1273
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1274 1274
 	if ($globalva == 'va' || $va) {
1275
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1276
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1275
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1276
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1277 1277
 	} else {
1278
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1279
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1280
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1278
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
1279
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1280
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
1281 1281
 	}
1282 1282
 	
1283 1283
 	
1284 1284
 
1285
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1285
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1286 1286
 	if ($notam == 'notam') {
1287
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1287
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1288 1288
 	} else {
1289
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1289
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1290 1290
 	}
1291
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1291
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1292 1292
 	if ($owner == 'owner') {
1293
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1293
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1294 1294
 	} else {
1295
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1295
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1296 1296
 	}
1297
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1297
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1298 1298
 	if ($map3d == 'map3d') {
1299
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1299
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1300 1300
 	} else {
1301
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1301
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1302 1302
 	}
1303
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1303
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1304 1304
 	if ($crash == 'crash') {
1305
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1305
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1306 1306
 	} else {
1307
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1307
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1308 1308
 	}
1309
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
1309
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
1310 1310
 	if ($fires == 'fires') {
1311
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
1311
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
1312 1312
 	} else {
1313
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
1313
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
1314 1314
 	}
1315
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
1315
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
1316 1316
 	if ($firessupport == 'firessupport') {
1317
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
1317
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
1318 1318
 	} else {
1319
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
1319
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
1320 1320
 	}
1321
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1321
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1322 1322
 	if ($mapsatellites == 'mapsatellites') {
1323
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1323
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1324 1324
 	} else {
1325
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1325
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1326 1326
 	}
1327
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1327
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1328 1328
 	if ($map3ddefault == 'map3ddefault') {
1329
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1329
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1330 1330
 	} else {
1331
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1331
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1332 1332
 	}
1333
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1333
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1334 1334
 	if ($translate == 'translate') {
1335
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1335
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1336 1336
 	} else {
1337
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1337
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1338 1338
 	}
1339
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1339
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1340 1340
 	if ($realairlines == 'realairlines') {
1341
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1341
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1342 1342
 	} else {
1343
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1343
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1344 1344
 	}
1345
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1345
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1346 1346
 	if ($estimation == 'estimation') {
1347
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1347
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1348 1348
 	} else {
1349
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1349
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1350 1350
 	}
1351
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1351
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1352 1352
 	if ($metar == 'metar') {
1353
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1353
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1354 1354
 	} else {
1355
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1355
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1356 1356
 	}
1357
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1357
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1358 1358
 	if ($metarcycle == 'metarcycle') {
1359
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1359
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1360 1360
 	} else {
1361
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1361
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1362 1362
 	}
1363
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1363
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1364 1364
 	if ($fork == 'fork') {
1365
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1365
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1366 1366
 	} else {
1367
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1367
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1368 1368
 	}
1369 1369
 
1370
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1370
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1371 1371
 	if ($colormap == 'colormap') {
1372
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1372
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1373 1373
 	} else {
1374
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1374
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1375 1375
 	}
1376 1376
 	
1377 1377
 	if (isset($_POST['aircrafticoncolor'])) {
1378
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1379
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1378
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1379
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1380 1380
 	}
1381 1381
 
1382
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1383
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1382
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1383
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1384 1384
 
1385
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1386
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1387
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1388
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1389
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1390
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1385
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1386
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1387
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1388
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1389
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1390
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1391 1391
 
1392
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1392
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1393 1393
 	if ($mappopup == 'mappopup') {
1394
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1394
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1395 1395
 	} else {
1396
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1396
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1397 1397
 	}
1398
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1398
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1399 1399
 	if ($airportpopup == 'airportpopup') {
1400
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1400
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1401 1401
 	} else {
1402
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1402
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1403 1403
 	}
1404
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1404
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1405 1405
 	if ($maphistory == 'maphistory') {
1406
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1406
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1407 1407
 	} else {
1408
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1408
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1409 1409
 	}
1410
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1410
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1411 1411
 	if ($maptooltip == 'maptooltip') {
1412
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1412
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1413 1413
 	} else {
1414
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1414
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1415 1415
 	}
1416
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1416
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1417 1417
 	if ($flightroute == 'flightroute') {
1418
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1418
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1419 1419
 	} else {
1420
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1420
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1421 1421
 	}
1422
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1422
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1423 1423
 	if ($flightremainingroute == 'flightremainingroute') {
1424
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1424
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1425 1425
 	} else {
1426
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1426
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1427 1427
 	}
1428
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1428
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1429 1429
 	if ($allflights == 'allflights') {
1430
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1430
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1431 1431
 	} else {
1432
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1432
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1433 1433
 	}
1434
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1434
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1435 1435
 	if ($bbox == 'bbox') {
1436
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1436
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1437 1437
 	} else {
1438
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1438
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1439 1439
 	}
1440
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
1440
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
1441 1441
 	if ($groundaltitude == 'groundaltitude') {
1442
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
1442
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
1443 1443
 	} else {
1444
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
1444
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
1445 1445
 	}
1446
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1446
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1447 1447
 	if ($waypoints == 'waypoints') {
1448
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1448
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1449 1449
 	} else {
1450
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1450
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1451 1451
 	}
1452
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
1452
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
1453 1453
 	if ($geoid == 'geoid') {
1454
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
1454
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
1455 1455
 	} else {
1456
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
1456
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
1457 1457
 	}
1458
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
1459
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
1458
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
1459
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
1460 1460
 
1461
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1461
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1462 1462
 	if ($noairlines == 'noairlines') {
1463
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1463
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1464 1464
 	} else {
1465
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1465
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1466 1466
 	}
1467 1467
 
1468
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1468
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1469 1469
 
1470 1470
 	// Set some defaults values...
1471 1471
 	if (!isset($globalAircraftImageSources)) {
1472
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1473
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1472
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1473
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1474 1474
 	}
1475 1475
 
1476 1476
 	if (!isset($globalSchedulesSources)) {
1477
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1478
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1477
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1478
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1479 1479
     	}
1480 1480
 
1481
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1481
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1482 1482
 
1483 1483
 	if ($error == '') settings::modify_settings($settings);
1484 1484
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Spacing   +548 added lines, -548 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
20 20
 	}
21 21
 
22
-	public function addLastStatsUpdate($type,$stats_date) {
22
+	public function addLastStatsUpdate($type, $stats_date) {
23 23
 		$query = "DELETE FROM config WHERE name = :type;
24 24
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
25
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
26 26
 		try {
27 27
 			$sth = $this->db->prepare($query);
28 28
 			$sth->execute($query_values);
29
-		} catch(PDOException $e) {
29
+		} catch (PDOException $e) {
30 30
 			return "error : ".$e->getMessage();
31 31
 		}
32 32
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		try {
37 37
 			$sth = $this->db->prepare($query);
38 38
 			$sth->execute(array(':type' => $type));
39
-		} catch(PDOException $e) {
39
+		} catch (PDOException $e) {
40 40
 			echo "error : ".$e->getMessage();
41 41
 		}
42 42
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		try {
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute(array(':filter_name' => $filter_name));
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error : ".$e->getMessage();
62 62
 		}
63 63
 	}
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		try {
71 71
 			$sth = $this->db->prepare($query);
72 72
 			$sth->execute();
73
-		} catch(PDOException $e) {
73
+		} catch (PDOException $e) {
74 74
 			return "error : ".$e->getMessage();
75 75
 		}
76 76
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
77 77
 		try {
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute(array(':filter_name' => $filter_name));
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
83 83
 	}
@@ -89,77 +89,77 @@  discard block
 block discarded – undo
89 89
 		 try {
90 90
 			$sth = $this->db->prepare($query);
91 91
 			$sth->execute(array(':filter_name' => $filter_name));
92
-		} catch(PDOException $e) {
92
+		} catch (PDOException $e) {
93 93
 			echo "error : ".$e->getMessage();
94 94
 		}
95 95
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
96 96
 		if (empty($all)) {
97 97
 			$filters = array();
98 98
 			if ($filter_name != '') {
99
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
99
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
100 100
 			}
101 101
 			$Spotter = new Spotter($this->db);
102
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
102
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
103 103
 		}
104 104
 		return $all;
105 105
 	}
106
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
106
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
107 107
 		if ($filter_name == '') $filter_name = $this->filter_name;
108 108
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 109
 		try {
110 110
 			$sth = $this->db->prepare($query);
111
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
112
-		} catch(PDOException $e) {
111
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
112
+		} catch (PDOException $e) {
113 113
 			echo "error : ".$e->getMessage();
114 114
 		}
115 115
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
116 116
 		return $all;
117 117
 	}
118
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
118
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
119 119
 		if ($filter_name == '') $filter_name = $this->filter_name;
120 120
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
121 121
 		try {
122 122
 			$sth = $this->db->prepare($query);
123
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
124
-		} catch(PDOException $e) {
123
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
124
+		} catch (PDOException $e) {
125 125
 			echo "error : ".$e->getMessage();
126 126
 		}
127 127
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
128 128
 		return $all;
129 129
 	}
130
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
130
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
131 131
 		if ($filter_name == '') $filter_name = $this->filter_name;
132 132
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
133 133
 		try {
134 134
 			$sth = $this->db->prepare($query);
135
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
136
-		} catch(PDOException $e) {
135
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
136
+		} catch (PDOException $e) {
137 137
 			echo "error : ".$e->getMessage();
138 138
 		}
139 139
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
140 140
 		return $all;
141 141
 	}
142 142
 
143
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
143
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
144 144
 		if ($filter_name == '') $filter_name = $this->filter_name;
145 145
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 146
 		try {
147 147
 			$sth = $this->db->prepare($query);
148
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
149
-		} catch(PDOException $e) {
148
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
149
+		} catch (PDOException $e) {
150 150
 			echo "error : ".$e->getMessage();
151 151
 		}
152 152
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
153 153
 		return $all;
154 154
 	}
155 155
 
156
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
156
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
157 157
 		if ($filter_name == '') $filter_name = $this->filter_name;
158 158
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 159
 		try {
160 160
 			$sth = $this->db->prepare($query);
161
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
162
-		} catch(PDOException $e) {
161
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
162
+		} catch (PDOException $e) {
163 163
 			echo "error : ".$e->getMessage();
164 164
 		}
165 165
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -167,23 +167,23 @@  discard block
 block discarded – undo
167 167
 	}
168 168
 
169 169
 
170
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
170
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
171 171
 		global $globalStatsFilters;
172 172
 		if ($filter_name == '') $filter_name = $this->filter_name;
173
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
173
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
174 174
 			$Spotter = new Spotter($this->db);
175
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
175
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
176 176
 			$alliance_airlines = array();
177 177
 			foreach ($airlines as $airline) {
178
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
178
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
179 179
 			}
180 180
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
181
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 183
 				try {
184 184
 					$sth = $this->db->prepare($query);
185 185
 					$sth->execute(array(':filter_name' => $filter_name));
186
-				} catch(PDOException $e) {
186
+				} catch (PDOException $e) {
187 187
 					echo "error : ".$e->getMessage();
188 188
 				}
189 189
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -194,29 +194,29 @@  discard block
 block discarded – undo
194 194
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
195 195
 				try {
196 196
 					$sth = $this->db->prepare($query);
197
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
198
-				} catch(PDOException $e) {
197
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
198
+				} catch (PDOException $e) {
199 199
 					echo "error : ".$e->getMessage();
200 200
 				}
201 201
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 202
 			} else $all = array();
203 203
 		}
204 204
 		if (empty($all)) {
205
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
206
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
205
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
206
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
207 207
 			} else {
208
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
208
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
209 209
 			}
210 210
 			if ($filter_name != '') {
211
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212
 			}
213 213
 			$Spotter = new Spotter($this->db);
214 214
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
215
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
215
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
216 216
 		}
217 217
 		return $all;
218 218
 	}
219
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
219
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
220 220
 		global $globalStatsFilters;
221 221
 		if ($filter_name == '') $filter_name = $this->filter_name;
222 222
 		if ($year == '' && $month == '') {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 			try {
226 226
 				$sth = $this->db->prepare($query);
227 227
 				$sth->execute(array(':filter_name' => $filter_name));
228
-			} catch(PDOException $e) {
228
+			} catch (PDOException $e) {
229 229
 				echo "error : ".$e->getMessage();
230 230
 			}
231 231
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -233,32 +233,32 @@  discard block
 block discarded – undo
233 233
 		if (empty($all)) {
234 234
 			$Spotter = new Spotter($this->db);
235 235
 			$filters = array();
236
-			$filters = array('year' => $year,'month' => $month);
236
+			$filters = array('year' => $year, 'month' => $month);
237 237
 			if ($filter_name != '') {
238
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
238
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
239 239
 			}
240 240
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
241
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
241
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
242 242
 		}
243 243
 		return $all;
244 244
 	}
245
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
245
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
246 246
 		global $globalStatsFilters;
247 247
 		if ($filter_name == '') $filter_name = $this->filter_name;
248
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
248
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
249 249
 			$Spotter = new Spotter($this->db);
250
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
250
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
251 251
 			$alliance_airlines = array();
252 252
 			foreach ($airlines as $airline) {
253
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
253
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
254 254
 			}
255 255
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
256
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 258
 				try {
259 259
 					$sth = $this->db->prepare($query);
260 260
 					$sth->execute(array(':filter_name' => $filter_name));
261
-				} catch(PDOException $e) {
261
+				} catch (PDOException $e) {
262 262
 					echo "error : ".$e->getMessage();
263 263
 				}
264 264
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -269,21 +269,21 @@  discard block
 block discarded – undo
269 269
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
270 270
 				try {
271 271
 					$sth = $this->db->prepare($query);
272
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
273
-				} catch(PDOException $e) {
272
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
273
+				} catch (PDOException $e) {
274 274
 					echo "error : ".$e->getMessage();
275 275
 				}
276 276
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 277
 			} else $all = array();
278 278
 		}
279 279
 		if (empty($all)) {
280
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
281
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
280
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
281
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
282 282
 			} else {
283
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
283
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
284 284
 			}
285 285
 			if ($filter_name != '') {
286
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
286
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
287 287
 			}
288 288
 			$Spotter = new Spotter($this->db);
289 289
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -292,23 +292,23 @@  discard block
 block discarded – undo
292 292
 		return $all;
293 293
 	}
294 294
 
295
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
295
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
296 296
 		global $globalStatsFilters;
297 297
 		if ($filter_name == '') $filter_name = $this->filter_name;
298
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
298
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
299 299
 			$Spotter = new Spotter($this->db);
300
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
300
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
301 301
 			$alliance_airlines = array();
302 302
 			foreach ($airlines as $airline) {
303
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
303
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
304 304
 			}
305 305
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
306
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 308
 				try {
309 309
 					$sth = $this->db->prepare($query);
310 310
 					$sth->execute(array(':filter_name' => $filter_name));
311
-				} catch(PDOException $e) {
311
+				} catch (PDOException $e) {
312 312
 					echo "error : ".$e->getMessage();
313 313
 				}
314 314
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -319,61 +319,61 @@  discard block
 block discarded – undo
319 319
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
320 320
 				try {
321 321
 					$sth = $this->db->prepare($query);
322
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
323
-				} catch(PDOException $e) {
322
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
323
+				} catch (PDOException $e) {
324 324
 					echo "error : ".$e->getMessage();
325 325
 				}
326 326
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 327
 			} else $all = array();
328 328
 		}
329 329
 		if (empty($all)) {
330
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
331
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
330
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
331
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
332 332
 			} else {
333
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
333
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
334 334
 			}
335 335
 			if ($filter_name != '') {
336
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
336
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
337 337
 			}
338 338
 			$Spotter = new Spotter($this->db);
339 339
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
340
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
340
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
341 341
 		}
342 342
 		return $all;
343 343
 	}
344 344
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 345
 		global $globalStatsFilters;
346 346
 		if ($filter_name == '') $filter_name = $this->filter_name;
347
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
347
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
348 348
 			$Spotter = new Spotter($this->db);
349
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
349
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
350 350
 			$alliance_airlines = array();
351 351
 			foreach ($airlines as $airline) {
352
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
352
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
353 353
 			}
354
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
354
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 356
 			$query_values = array(':filter_name' => $filter_name);
357 357
 		} else {
358 358
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
359 359
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
360
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
360
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
361 361
 		}
362 362
 		try {
363 363
 			$sth = $this->db->prepare($query);
364 364
 			$sth->execute($query_values);
365
-		} catch(PDOException $e) {
365
+		} catch (PDOException $e) {
366 366
 			echo "error : ".$e->getMessage();
367 367
 		}
368 368
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
369 369
 		if (empty($all)) {
370
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
371
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
370
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
371
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
372 372
 			} else {
373
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
373
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
374 374
 			}
375 375
 			if ($filter_name != '') {
376
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
376
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
377 377
 			}
378 378
 			$Spotter = new Spotter($this->db);
379 379
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		return $all;
383 383
 	}
384 384
 
385
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
385
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
386 386
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 387
 		if ($filter_name == '') $filter_name = $this->filter_name;
388 388
 		if ($year == '' && $month == '') {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			if (isset($forsource)) {
392 392
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 393
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
394
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
394
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
395 395
 			} else {
396 396
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 397
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			try {
401 401
 				$sth = $this->db->prepare($query);
402 402
 				$sth->execute($query_values);
403
-			} catch(PDOException $e) {
403
+			} catch (PDOException $e) {
404 404
 				echo "error : ".$e->getMessage();
405 405
 			}
406 406
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -408,32 +408,32 @@  discard block
 block discarded – undo
408 408
                 if (empty($all)) {
409 409
 	                $Spotter = new Spotter($this->db);
410 410
             		$filters = array();
411
-			$filters = array('year' => $year,'month' => $month);
411
+			$filters = array('year' => $year, 'month' => $month);
412 412
             		if ($filter_name != '') {
413
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
416
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
417 417
                 }
418 418
                 return $all;
419 419
 	}
420
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
420
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
421 421
 		global $globalStatsFilters;
422 422
 		if ($filter_name == '') $filter_name = $this->filter_name;
423
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
423
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
424 424
 			$Spotter = new Spotter($this->db);
425
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
425
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
426 426
 			$alliance_airlines = array();
427 427
 			foreach ($airlines as $airline) {
428
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
428
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
429 429
 			}
430 430
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
431
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 433
 				try {
434 434
 					$sth = $this->db->prepare($query);
435 435
 					$sth->execute(array(':filter_name' => $filter_name));
436
-				} catch(PDOException $e) {
436
+				} catch (PDOException $e) {
437 437
 					echo "error : ".$e->getMessage();
438 438
 				}
439 439
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -444,45 +444,45 @@  discard block
 block discarded – undo
444 444
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
445 445
 				try {
446 446
 					$sth = $this->db->prepare($query);
447
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
448
-				} catch(PDOException $e) {
447
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
448
+				} catch (PDOException $e) {
449 449
 					echo "error : ".$e->getMessage();
450 450
 				}
451 451
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 452
 			} else $all = array();
453 453
 		}
454 454
 		if (empty($all)) {
455
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
456
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
455
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
456
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
457 457
 			} else {
458
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
458
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
459 459
 			}
460 460
 			if ($filter_name != '') {
461
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
461
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
462 462
 			}
463 463
 			$Spotter = new Spotter($this->db);
464 464
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
465
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
465
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
466 466
 		}
467 467
 		return $all;
468 468
 	}
469
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
469
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
470 470
 		global $globalStatsFilters;
471 471
 		if ($filter_name == '') $filter_name = $this->filter_name;
472
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
472
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
473 473
 			$Spotter = new Spotter($this->db);
474
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
474
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
475 475
 			$alliance_airlines = array();
476 476
 			foreach ($airlines as $airline) {
477
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
477
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
478 478
 			}
479 479
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
480
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 482
 				 try {
483 483
 					$sth = $this->db->prepare($query);
484 484
 					$sth->execute(array(':filter_name' => $filter_name));
485
-				} catch(PDOException $e) {
485
+				} catch (PDOException $e) {
486 486
 					echo "error : ".$e->getMessage();
487 487
 				}
488 488
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -493,46 +493,46 @@  discard block
 block discarded – undo
493 493
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
494 494
 				 try {
495 495
 					$sth = $this->db->prepare($query);
496
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
497
-				} catch(PDOException $e) {
496
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
497
+				} catch (PDOException $e) {
498 498
 					echo "error : ".$e->getMessage();
499 499
 				}
500 500
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 501
 			} else $all = array();
502 502
 		}
503 503
 		if (empty($all)) {
504
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
505
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
504
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
505
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
506 506
 			} else {
507
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
508 508
 			}
509 509
 			if ($filter_name != '') {
510
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
510
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
511 511
 			}
512 512
 			$Spotter = new Spotter($this->db);
513 513
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
514
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
514
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
515 515
 		}
516 516
 		return $all;
517 517
 	}
518
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
518
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
519 519
 		$Connection = new Connection($this->db);
520 520
 		if ($filter_name == '') $filter_name = $this->filter_name;
521 521
 		if ($Connection->tableExists('countries')) {
522
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
522
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
523 523
 				$Spotter = new Spotter($this->db);
524
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
524
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
525 525
 				if ($year == '' && $month == '') {
526 526
 					$alliance_airlines = array();
527 527
 					foreach ($airlines as $airline) {
528
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
528
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
529 529
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
530
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 532
 					 try {
533 533
 						$sth = $this->db->prepare($query);
534 534
 						$sth->execute(array(':filter_name' => $filter_name));
535
-					} catch(PDOException $e) {
535
+					} catch (PDOException $e) {
536 536
 						echo "error : ".$e->getMessage();
537 537
 					}
538 538
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -544,8 +544,8 @@  discard block
 block discarded – undo
544 544
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
545 545
 					 try {
546 546
 						$sth = $this->db->prepare($query);
547
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
548
-					} catch(PDOException $e) {
547
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
548
+					} catch (PDOException $e) {
549 549
 						echo "error : ".$e->getMessage();
550 550
 					}
551 551
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 			return array();
563 563
 		}
564 564
 	}
565
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
565
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
566 566
 		global $globalStatsFilters;
567 567
 		if ($filter_name == '') $filter_name = $this->filter_name;
568 568
 		if ($year == '' && $month == '') {
@@ -570,41 +570,41 @@  discard block
 block discarded – undo
570 570
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
571 571
 			try {
572 572
 				$sth = $this->db->prepare($query);
573
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
574
-			} catch(PDOException $e) {
573
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
574
+			} catch (PDOException $e) {
575 575
 				echo "error : ".$e->getMessage();
576 576
 			}
577 577
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578
 		} else $all = array();
579 579
 		if (empty($all)) {
580
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
580
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
581 581
 			if ($filter_name != '') {
582
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
583 583
 			}
584 584
 			$Spotter = new Spotter($this->db);
585 585
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
586
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
586
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
587 587
 		}
588 588
 		return $all;
589 589
 	}
590 590
 
591
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
591
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
592 592
 		global $globalStatsFilters;
593 593
 		if ($filter_name == '') $filter_name = $this->filter_name;
594
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
594
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
595 595
 			$Spotter = new Spotter($this->db);
596
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
596
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
597 597
 			if ($year == '' && $month == '') {
598 598
 				$alliance_airlines = array();
599 599
 				foreach ($airlines as $airline) {
600
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
600
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
601 601
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
602
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 604
 				try {
605 605
 					$sth = $this->db->prepare($query);
606 606
 					$sth->execute(array(':filter_name' => $filter_name));
607
-				} catch(PDOException $e) {
607
+				} catch (PDOException $e) {
608 608
 					echo "error : ".$e->getMessage();
609 609
 				}
610 610
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -615,45 +615,45 @@  discard block
 block discarded – undo
615 615
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
616 616
 				try {
617 617
 					$sth = $this->db->prepare($query);
618
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
619
-				} catch(PDOException $e) {
618
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
619
+				} catch (PDOException $e) {
620 620
 					echo "error : ".$e->getMessage();
621 621
 				}
622 622
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 623
 			} else $all = array();
624 624
 		}
625 625
 		if (empty($all)) {
626
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
627
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
626
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
627
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
628 628
 			} else {
629
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
629
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
630 630
 			}
631 631
 			if ($filter_name != '') {
632
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
632
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
633 633
 			}
634 634
 			$Spotter = new Spotter($this->db);
635 635
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
636
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
636
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
637 637
 		}
638 638
 		return $all;
639 639
 	}
640
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
640
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
641 641
 		global $globalStatsFilters;
642 642
 		if ($filter_name == '') $filter_name = $this->filter_name;
643
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
643
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
644 644
 			$Spotter = new Spotter($this->db);
645
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
645
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
646 646
 			if ($year == '' && $month == '') {
647 647
 				$alliance_airlines = array();
648 648
 				foreach ($airlines as $airline) {
649
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
649
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
650 650
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
651
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 653
 				try {
654 654
 					$sth = $this->db->prepare($query);
655 655
 					$sth->execute(array(':filter_name' => $filter_name));
656
-				} catch(PDOException $e) {
656
+				} catch (PDOException $e) {
657 657
 					echo "error : ".$e->getMessage();
658 658
 				}
659 659
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -664,27 +664,27 @@  discard block
 block discarded – undo
664 664
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
665 665
 				try {
666 666
 					$sth = $this->db->prepare($query);
667
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
668
-				} catch(PDOException $e) {
667
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
668
+				} catch (PDOException $e) {
669 669
 					echo "error : ".$e->getMessage();
670 670
 				}
671 671
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 672
 			} else $all = array();
673 673
 		}
674 674
 		if (empty($all)) {
675
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
676
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
675
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
676
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
677 677
 			} else {
678
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
678
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
679 679
 			}
680 680
 			if ($filter_name != '') {
681
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
681
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
682 682
 			}
683 683
 			$Spotter = new Spotter($this->db);
684 684
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
685 685
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
686
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
687
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
686
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
687
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
688 688
 			$all = array();
689 689
 			foreach ($pall as $value) {
690 690
 				$icao = $value['airport_departure_icao'];
@@ -700,27 +700,27 @@  discard block
 block discarded – undo
700 700
 			foreach ($all as $key => $row) {
701 701
 				$count[$key] = $row['airport_departure_icao_count'];
702 702
 			}
703
-			array_multisort($count,SORT_DESC,$all);
703
+			array_multisort($count, SORT_DESC, $all);
704 704
 		}
705 705
 		return $all;
706 706
 	}
707
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
707
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
708 708
 		global $globalStatsFilters;
709 709
 		if ($filter_name == '') $filter_name = $this->filter_name;
710
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
710
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 711
 			$Spotter = new Spotter($this->db);
712
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
712
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
713 713
 			if ($year == '' && $month == '') {
714 714
 				$alliance_airlines = array();
715 715
 				foreach ($airlines as $airline) {
716
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
716
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
717 717
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
718
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 720
 				try {
721 721
 					$sth = $this->db->prepare($query);
722 722
 					$sth->execute(array(':filter_name' => $filter_name));
723
-				} catch(PDOException $e) {
723
+				} catch (PDOException $e) {
724 724
 					echo "error : ".$e->getMessage();
725 725
 				}
726 726
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,27 +731,27 @@  discard block
 block discarded – undo
731 731
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
732 732
 				try {
733 733
 					$sth = $this->db->prepare($query);
734
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
735
-				} catch(PDOException $e) {
734
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
735
+				} catch (PDOException $e) {
736 736
 					echo "error : ".$e->getMessage();
737 737
 				}
738 738
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 739
 			} else $all = array();
740 740
 		}
741 741
 		if (empty($all)) {
742
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
743
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
742
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
743
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
744 744
 			} else {
745
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
745
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
746 746
 			}
747 747
 			if ($filter_name != '') {
748
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
748
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
749 749
 			}
750 750
 			$Spotter = new Spotter($this->db);
751 751
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
752 752
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
753
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
754
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
753
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
754
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
755 755
 			$all = array();
756 756
 			foreach ($pall as $value) {
757 757
 				$icao = $value['airport_arrival_icao'];
@@ -767,26 +767,26 @@  discard block
 block discarded – undo
767 767
 			foreach ($all as $key => $row) {
768 768
 				$count[$key] = $row['airport_arrival_icao_count'];
769 769
 			}
770
-			array_multisort($count,SORT_DESC,$all);
770
+			array_multisort($count, SORT_DESC, $all);
771 771
 		}
772 772
 		return $all;
773 773
 	}
774
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
774
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
775 775
 		global $globalDBdriver, $globalStatsFilters;
776 776
 		if ($filter_name == '') $filter_name = $this->filter_name;
777
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
777
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
778 778
 			$Spotter = new Spotter($this->db);
779
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
779
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
780 780
 			$alliance_airlines = array();
781 781
 			foreach ($airlines as $airline) {
782
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
782
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
783 783
 			}
784 784
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
785
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 787
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
788
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 790
 			}
791 791
 			$query_data = array(':filter_name' => $filter_name);
792 792
 		} else {
@@ -797,23 +797,23 @@  discard block
 block discarded – undo
797 797
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 798
 				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
799 799
 			}
800
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
800
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
801 801
 		}
802 802
 		try {
803 803
 			$sth = $this->db->prepare($query);
804 804
 			$sth->execute($query_data);
805
-		} catch(PDOException $e) {
805
+		} catch (PDOException $e) {
806 806
 			echo "error : ".$e->getMessage();
807 807
 		}
808 808
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
809 809
 		if (empty($all)) {
810
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
811
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
810
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
811
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
812 812
 			} else {
813 813
 				$filters = array('airlines' => array($stats_airline));
814 814
 			}
815 815
 			if ($filter_name != '') {
816
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
816
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
817 817
 			}
818 818
 			$Spotter = new Spotter($this->db);
819 819
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -821,57 +821,57 @@  discard block
 block discarded – undo
821 821
 		return $all;
822 822
 	}
823 823
 	
824
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
824
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
825 825
 		global $globalStatsFilters;
826 826
 		if ($filter_name == '') $filter_name = $this->filter_name;
827
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
827
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
828 828
 			$Spotter = new Spotter($this->db);
829
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
829
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
830 830
 			$alliance_airlines = array();
831 831
 			foreach ($airlines as $airline) {
832
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
832
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
833 833
 			}
834
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
834
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
835 835
 			$query_data = array(':filter_name' => $filter_name);
836 836
 		} else {
837 837
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
838
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
838
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
839 839
 		}
840 840
 		try {
841 841
 			$sth = $this->db->prepare($query);
842 842
 			$sth->execute($query_data);
843
-		} catch(PDOException $e) {
843
+		} catch (PDOException $e) {
844 844
 			echo "error : ".$e->getMessage();
845 845
 		}
846 846
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
847 847
 		if (empty($all)) {
848
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
849
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
848
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
849
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
850 850
 			} else {
851 851
 				$filters = array('airlines' => array($stats_airline));
852 852
 			}
853 853
 			if ($filter_name != '') {
854
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
854
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
855 855
 			}
856 856
 			$Spotter = new Spotter($this->db);
857 857
 			$all = $Spotter->countAllDatesLastMonth($filters);
858 858
 		}
859 859
 		return $all;
860 860
 	}
861
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
861
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
862 862
 		global $globalDBdriver, $globalStatsFilters;
863 863
 		if ($filter_name == '') $filter_name = $this->filter_name;
864
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
864
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
865 865
 			$Spotter = new Spotter($this->db);
866
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
866
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
867 867
 			$alliance_airlines = array();
868 868
 			foreach ($airlines as $airline) {
869
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
869
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
870 870
 			}
871 871
 			if ($globalDBdriver == 'mysql') {
872
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
872
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
873 873
 			} else {
874
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
874
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
875 875
 			}
876 876
 			$query_data = array(':filter_name' => $filter_name);
877 877
 		} else {
@@ -880,60 +880,60 @@  discard block
 block discarded – undo
880 880
 			} else {
881 881
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
882 882
 			}
883
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
883
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
884 884
 		}
885 885
 		try {
886 886
 			$sth = $this->db->prepare($query);
887 887
 			$sth->execute($query_data);
888
-		} catch(PDOException $e) {
888
+		} catch (PDOException $e) {
889 889
 			echo "error : ".$e->getMessage();
890 890
 		}
891 891
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
892 892
 		if (empty($all)) {
893
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
894
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
893
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
894
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
895 895
 			} else {
896 896
 				$filters = array('airlines' => array($stats_airline));
897 897
 			}
898 898
 			if ($filter_name != '') {
899
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
899
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
900 900
 			}
901 901
 			$Spotter = new Spotter($this->db);
902 902
 			$all = $Spotter->countAllDatesLast7Days($filters);
903 903
 		}
904 904
 		return $all;
905 905
 	}
906
-	public function countAllDates($stats_airline = '',$filter_name = '') {
906
+	public function countAllDates($stats_airline = '', $filter_name = '') {
907 907
 		global $globalStatsFilters;
908 908
 		if ($filter_name == '') $filter_name = $this->filter_name;
909
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
909
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
910 910
 			$Spotter = new Spotter($this->db);
911
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
911
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
912 912
 			$alliance_airlines = array();
913 913
 			foreach ($airlines as $airline) {
914
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
914
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
915 915
 			}
916
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
916
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
917 917
 			$query_data = array(':filter_name' => $filter_name);
918 918
 		} else {
919 919
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
920
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
920
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
921 921
 		}
922 922
 		try {
923 923
 			$sth = $this->db->prepare($query);
924 924
 			$sth->execute($query_data);
925
-		} catch(PDOException $e) {
925
+		} catch (PDOException $e) {
926 926
 			echo "error : ".$e->getMessage();
927 927
 		}
928 928
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
929 929
 		if (empty($all)) {
930
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
931
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
930
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
931
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
932 932
 			} else {
933 933
 				$filters = array('airlines' => array($stats_airline));
934 934
 			}
935 935
 			if ($filter_name != '') {
936
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
936
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
937 937
 			}
938 938
 			$Spotter = new Spotter($this->db);
939 939
 			$all = $Spotter->countAllDates($filters);
@@ -948,34 +948,34 @@  discard block
 block discarded – undo
948 948
 		try {
949 949
 			$sth = $this->db->prepare($query);
950 950
 			$sth->execute($query_data);
951
-		} catch(PDOException $e) {
951
+		} catch (PDOException $e) {
952 952
 			echo "error : ".$e->getMessage();
953 953
 		}
954 954
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955
 		if (empty($all)) {
956 956
 			$filters = array();
957 957
 			if ($filter_name != '') {
958
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959
 			}
960 960
 			$Spotter = new Spotter($this->db);
961 961
 			$all = $Spotter->countAllDatesByAirlines($filters);
962 962
 		}
963 963
 		return $all;
964 964
 	}
965
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
965
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
966 966
 		global $globalStatsFilters, $globalDBdriver;
967 967
 		if ($filter_name == '') $filter_name = $this->filter_name;
968
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
968
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
969 969
 			$Spotter = new Spotter($this->db);
970
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
970
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
971 971
 			$alliance_airlines = array();
972 972
 			foreach ($airlines as $airline) {
973
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
973
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
974 974
 			}
975 975
 			if ($globalDBdriver == 'mysql') {
976
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
976
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
977 977
 			} else {
978
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
978
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
979 979
 			}
980 980
 			$query_data = array(':filter_name' => $filter_name);
981 981
 		} else {
@@ -989,18 +989,18 @@  discard block
 block discarded – undo
989 989
 		try {
990 990
 			$sth = $this->db->prepare($query);
991 991
 			$sth->execute($query_data);
992
-		} catch(PDOException $e) {
992
+		} catch (PDOException $e) {
993 993
 			echo "error : ".$e->getMessage();
994 994
 		}
995 995
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
996 996
 		if (empty($all)) {
997
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
998
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
997
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
998
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
999 999
 			} else {
1000 1000
 				$filters = array('airlines' => array($stats_airline));
1001 1001
 			}
1002 1002
 			if ($filter_name != '') {
1003
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1003
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1004 1004
 			}
1005 1005
 			$Spotter = new Spotter($this->db);
1006 1006
 			$all = $Spotter->countAllMonths($filters);
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		try {
1018 1018
 			$sth = $this->db->prepare($query);
1019 1019
 			$sth->execute();
1020
-		} catch(PDOException $e) {
1020
+		} catch (PDOException $e) {
1021 1021
 			echo "error : ".$e->getMessage();
1022 1022
 		}
1023 1023
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		try {
1038 1038
 			$sth = $this->db->prepare($query);
1039 1039
 			$sth->execute();
1040
-		} catch(PDOException $e) {
1040
+		} catch (PDOException $e) {
1041 1041
 			echo "error : ".$e->getMessage();
1042 1042
 		}
1043 1043
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1054,32 +1054,32 @@  discard block
 block discarded – undo
1054 1054
 		try {
1055 1055
 			$sth = $this->db->prepare($query);
1056 1056
 			$sth->execute(array(':filter_name' => $filter_name));
1057
-		} catch(PDOException $e) {
1057
+		} catch (PDOException $e) {
1058 1058
 			echo "error : ".$e->getMessage();
1059 1059
 		}
1060 1060
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1061 1061
 		if (empty($all)) {
1062 1062
 			$filters = array();
1063 1063
 			if ($filter_name != '') {
1064
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1064
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1065 1065
 			}
1066 1066
 			$Spotter = new Spotter($this->db);
1067 1067
 			$all = $Spotter->countAllMilitaryMonths($filters);
1068 1068
 		}
1069 1069
 		return $all;
1070 1070
 	}
1071
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1071
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1072 1072
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 1073
 		if ($filter_name == '') $filter_name = $this->filter_name;
1074
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1074
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1075 1075
 			$Spotter = new Spotter($this->db);
1076
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1076
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1077 1077
 			$alliance_airlines = array();
1078 1078
 			foreach ($airlines as $airline) {
1079
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1079
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1080 1080
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1081
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1083 1083
 			$query_data = array(':filter_name' => $filter_name);
1084 1084
 		} else {
1085 1085
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1097,37 +1097,37 @@  discard block
 block discarded – undo
1097 1097
 		try {
1098 1098
 			$sth = $this->db->prepare($query);
1099 1099
 			$sth->execute($query_data);
1100
-		} catch(PDOException $e) {
1100
+		} catch (PDOException $e) {
1101 1101
 			echo "error : ".$e->getMessage();
1102 1102
 		}
1103 1103
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104 1104
 		if (empty($all)) {
1105
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1106
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1105
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1106
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1107 1107
 			} else {
1108 1108
 				$filters = array('airlines' => array($stats_airline));
1109 1109
 			}
1110 1110
 			if ($filter_name != '') {
1111
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112
 			}
1113 1113
 			$Spotter = new Spotter($this->db);
1114
-			$all = $Spotter->countAllHours($orderby,$filters);
1114
+			$all = $Spotter->countAllHours($orderby, $filters);
1115 1115
 		}
1116 1116
 		return $all;
1117 1117
 	}
1118
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1118
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1119 1119
 		global $globalStatsFilters;
1120 1120
 		if ($filter_name == '') $filter_name = $this->filter_name;
1121 1121
 		if ($year == '') $year = date('Y');
1122
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1122
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1123 1123
 		if (empty($all)) {
1124
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1125
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1124
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1125
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1126 1126
 			} else {
1127
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1127
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1128 1128
 			}
1129 1129
 			if ($filter_name != '') {
1130
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1130
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1131 1131
 			}
1132 1132
 			$Spotter = new Spotter($this->db);
1133 1133
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1135,16 +1135,16 @@  discard block
 block discarded – undo
1135 1135
 		}
1136 1136
 		return $all;
1137 1137
 	}
1138
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1138
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1139 1139
 		global $globalStatsFilters;
1140 1140
 		if ($filter_name == '') $filter_name = $this->filter_name;
1141 1141
 		if ($year == '') $year = date('Y');
1142
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1142
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1143 1143
 		if (empty($all)) {
1144 1144
 			$filters = array();
1145
-			$filters = array('year' => $year,'month' => $month);
1145
+			$filters = array('year' => $year, 'month' => $month);
1146 1146
 			if ($filter_name != '') {
1147
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1147
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1148 1148
 			}
1149 1149
 			$Spotter = new Spotter($this->db);
1150 1150
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1152,19 +1152,19 @@  discard block
 block discarded – undo
1152 1152
 		}
1153 1153
 		return $all;
1154 1154
 	}
1155
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1155
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1156 1156
 		global $globalStatsFilters;
1157 1157
 		if ($filter_name == '') $filter_name = $this->filter_name;
1158 1158
 		if ($year == '') $year = date('Y');
1159
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1159
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1160 1160
 		if (empty($all)) {
1161
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1161
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1163 1163
 			} else {
1164
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1164
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1165 1165
 			}
1166 1166
 			if ($filter_name != '') {
1167
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1167
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1168 1168
 			}
1169 1169
 			$Spotter = new Spotter($this->db);
1170 1170
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1172,48 +1172,48 @@  discard block
 block discarded – undo
1172 1172
 		}
1173 1173
 		return $all;
1174 1174
 	}
1175
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1175
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1176 1176
 		global $globalStatsFilters;
1177 1177
 		if ($filter_name == '') $filter_name = $this->filter_name;
1178
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1178
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1179 1179
 			$Spotter = new Spotter($this->db);
1180
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1180
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1181 1181
 			if ($year == '' && $month == '') {
1182 1182
 				$alliance_airlines = array();
1183 1183
 				foreach ($airlines as $airline) {
1184
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1184
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1185 1185
 				}
1186
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1186
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1187 1187
 				try {
1188 1188
 					$sth = $this->db->prepare($query);
1189 1189
 					$sth->execute(array(':filter_name' => $filter_name));
1190
-				} catch(PDOException $e) {
1190
+				} catch (PDOException $e) {
1191 1191
 					echo "error : ".$e->getMessage();
1192 1192
 				}
1193 1193
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1194
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1195
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1196 1196
 		} else {
1197 1197
 			if ($year == '' && $month == '') {
1198 1198
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1199 1199
 				try {
1200 1200
 					$sth = $this->db->prepare($query);
1201
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1202
-				} catch(PDOException $e) {
1201
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1202
+				} catch (PDOException $e) {
1203 1203
 					echo "error : ".$e->getMessage();
1204 1204
 				}
1205 1205
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1206
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1207
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1208 1208
 		}
1209 1209
 		if (empty($all)) {
1210
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1211
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1210
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1211
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1212 1212
 			} else {
1213
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1213
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1214 1214
 			}
1215 1215
 			if ($filter_name != '') {
1216
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1216
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1217 1217
 			}
1218 1218
 			$Spotter = new Spotter($this->db);
1219 1219
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 		}
1222 1222
 		return $all;
1223 1223
 	}
1224
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1224
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1225 1225
 		global $globalStatsFilters;
1226 1226
 		if ($filter_name == '') $filter_name = $this->filter_name;
1227 1227
 		if ($year == '' && $month == '') {
@@ -1229,17 +1229,17 @@  discard block
 block discarded – undo
1229 1229
 			try {
1230 1230
 				$sth = $this->db->prepare($query);
1231 1231
 				$sth->execute(array(':filter_name' => $filter_name));
1232
-			} catch(PDOException $e) {
1232
+			} catch (PDOException $e) {
1233 1233
 				echo "error : ".$e->getMessage();
1234 1234
 			}
1235 1235
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1236
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1237
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1238 1238
 		if (empty($all)) {
1239 1239
 			$filters = array();
1240
-			$filters = array('year' => $year,'month' => $month);
1240
+			$filters = array('year' => $year, 'month' => $month);
1241 1241
 			if ($filter_name != '') {
1242
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1242
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1243 1243
 			}
1244 1244
 			$Spotter = new Spotter($this->db);
1245 1245
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1247,29 +1247,29 @@  discard block
 block discarded – undo
1247 1247
 		}
1248 1248
 		return $all;
1249 1249
 	}
1250
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1250
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1251 1251
 		global $globalStatsFilters;
1252 1252
 		if ($filter_name == '') $filter_name = $this->filter_name;
1253
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1253
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1254 1254
 			$Spotter = new Spotter($this->db);
1255
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1255
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1256 1256
 			if ($year == '' && $month == '') {
1257 1257
 				$alliance_airlines = array();
1258 1258
 				foreach ($airlines as $airline) {
1259
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1259
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1260 1260
 				}
1261
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1261
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1262 1262
 				$query_values = array(':filter_name' => $filter_name);
1263 1263
 				try {
1264 1264
 					$sth = $this->db->prepare($query);
1265 1265
 					$sth->execute($query_values);
1266
-				} catch(PDOException $e) {
1266
+				} catch (PDOException $e) {
1267 1267
 					echo "error : ".$e->getMessage();
1268 1268
 				}
1269 1269
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1270 1270
 				$all = $result[0]['nb'];
1271 1271
 			} else {
1272
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1272
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1273 1273
 			}
1274 1274
 		} else {
1275 1275
 			if ($year == '' && $month == '') {
@@ -1278,23 +1278,23 @@  discard block
 block discarded – undo
1278 1278
 				try {
1279 1279
 					$sth = $this->db->prepare($query);
1280 1280
 					$sth->execute($query_values);
1281
-				} catch(PDOException $e) {
1281
+				} catch (PDOException $e) {
1282 1282
 					echo "error : ".$e->getMessage();
1283 1283
 				}
1284 1284
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1285 1285
 				$all = $result[0]['nb'];
1286 1286
 			} else {
1287
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1287
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1288 1288
 			}
1289 1289
 		}
1290 1290
 		if (empty($all)) {
1291
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1292
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1291
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1292
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1293 1293
 			} else {
1294
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1294
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1295 1295
 			}
1296 1296
 			if ($filter_name != '') {
1297
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1297
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1298 1298
 			}
1299 1299
 			$Spotter = new Spotter($this->db);
1300 1300
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
 		}
1303 1303
 		return $all;
1304 1304
 	}
1305
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1305
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1306 1306
 		global $globalStatsFilters;
1307 1307
 		if ($filter_name == '') $filter_name = $this->filter_name;
1308 1308
 		//if ($year == '') $year = date('Y');
@@ -1312,18 +1312,18 @@  discard block
 block discarded – undo
1312 1312
 			try {
1313 1313
 				$sth = $this->db->prepare($query);
1314 1314
 				$sth->execute($query_values);
1315
-			} catch(PDOException $e) {
1315
+			} catch (PDOException $e) {
1316 1316
 				echo "error : ".$e->getMessage();
1317 1317
 			}
1318 1318
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1319 1319
 			$all = $result[0]['nb'];
1320 1320
 		} else {
1321
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1321
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1322 1322
 		}
1323 1323
 		if (empty($all)) {
1324
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1324
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1325 1325
 			if ($filter_name != '') {
1326
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1326
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1327 1327
 			}
1328 1328
 			$Spotter = new Spotter($this->db);
1329 1329
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1332,104 +1332,104 @@  discard block
 block discarded – undo
1332 1332
 		return $all;
1333 1333
 	}
1334 1334
 
1335
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1335
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1336 1336
 		if ($filter_name == '') $filter_name = $this->filter_name;
1337
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1337
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 1338
 			$Spotter = new Spotter($this->db);
1339
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1339
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1340 1340
 			$alliance_airlines = array();
1341 1341
 			foreach ($airlines as $airline) {
1342
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1342
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1343 1343
 			}
1344
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1344
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1346 1346
 		} else {
1347 1347
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
1348
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1348
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1349 1349
 		}
1350 1350
 		try {
1351 1351
 			$sth = $this->db->prepare($query);
1352 1352
 			$sth->execute($query_values);
1353
-		} catch(PDOException $e) {
1353
+		} catch (PDOException $e) {
1354 1354
 			echo "error : ".$e->getMessage();
1355 1355
 		}
1356 1356
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1357 1357
 		return $all;
1358 1358
 	}
1359
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1359
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1360 1360
 		if ($filter_name == '') $filter_name = $this->filter_name;
1361 1361
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1362
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1363
 		try {
1364 1364
 			$sth = $this->db->prepare($query);
1365 1365
 			$sth->execute($query_values);
1366
-		} catch(PDOException $e) {
1366
+		} catch (PDOException $e) {
1367 1367
 			echo "error : ".$e->getMessage();
1368 1368
 		}
1369 1369
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1370
 		return $all;
1371 1371
 	}
1372
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1372
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1373 1373
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1374
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1375
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1376 1376
 		try {
1377 1377
 			$sth = $this->db->prepare($query);
1378 1378
 			$sth->execute($query_values);
1379
-		} catch(PDOException $e) {
1379
+		} catch (PDOException $e) {
1380 1380
 			echo "error : ".$e->getMessage();
1381 1381
 		}
1382 1382
 	}
1383
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1383
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1384 1384
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1385
 		global $globalArchiveMonths, $globalDBdriver;
1386
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1386
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1387 1387
 			$Spotter = new Spotter($this->db);
1388
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1388
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389
 			$alliance_airlines = array();
1390 1390
 			foreach ($airlines as $airline) {
1391
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1391
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1392 1392
 			}
1393 1393
 			if ($globalDBdriver == 'mysql') {
1394 1394
 				if ($month == '') {
1395
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1395
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1396 1396
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1397 1397
 				} else {
1398
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1399
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1398
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1399
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1400 1400
 				}
1401 1401
 			} else {
1402 1402
 				if ($month == '') {
1403
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1403
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1404 1404
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1405 1405
 				} else {
1406
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1407
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1406
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1407
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1408 1408
 				}
1409 1409
 			}
1410 1410
 		} else {
1411 1411
 			if ($globalDBdriver == 'mysql') {
1412 1412
 				if ($month == '') {
1413 1413
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1414
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1414
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1415 1415
 				} else {
1416 1416
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1417
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1417
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1418 1418
 				}
1419 1419
 			} else {
1420 1420
 				if ($month == '') {
1421 1421
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1422
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1423 1423
 				} else {
1424 1424
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1425
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1425
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1426 1426
 				}
1427 1427
 			}
1428 1428
 		}
1429 1429
 		try {
1430 1430
 			$sth = $this->db->prepare($query);
1431 1431
 			$sth->execute($query_values);
1432
-		} catch(PDOException $e) {
1432
+		} catch (PDOException $e) {
1433 1433
 			echo "error : ".$e->getMessage();
1434 1434
 		}
1435 1435
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1438,17 +1438,17 @@  discard block
 block discarded – undo
1438 1438
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1439
 		global $globalArchiveMonths, $globalDBdriver;
1440 1440
 		if ($filter_name == '') $filter_name = $this->filter_name;
1441
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1441
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1442 1442
 			$Spotter = new Spotter($this->db);
1443
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1443
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1444 1444
 			$alliance_airlines = array();
1445 1445
 			foreach ($airlines as $airline) {
1446
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1446
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1447 1447
 			}
1448 1448
 			if ($globalDBdriver == 'mysql') {
1449
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1449
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1450 1450
 			} else {
1451
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1451
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1452 1452
 			}
1453 1453
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1454 1454
 		} else {
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
 		try {
1463 1463
 			$sth = $this->db->prepare($query);
1464 1464
 			$sth->execute($query_values);
1465
-		} catch(PDOException $e) {
1465
+		} catch (PDOException $e) {
1466 1466
 			echo "error : ".$e->getMessage();
1467 1467
 		}
1468 1468
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1471,17 +1471,17 @@  discard block
 block discarded – undo
1471 1471
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1472
 		global $globalArchiveMonths, $globalDBdriver;
1473 1473
 		if ($filter_name == '') $filter_name = $this->filter_name;
1474
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1474
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1475 1475
 			$Spotter = new Spotter($this->db);
1476
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1476
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1477 1477
 			$alliance_airlines = array();
1478 1478
 			foreach ($airlines as $airline) {
1479
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1479
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1480 1480
 			}
1481 1481
 			if ($globalDBdriver == 'mysql') {
1482
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1482
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1483 1483
 			} else {
1484
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1484
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1485 1485
 			}
1486 1486
 		} else {
1487 1487
 			if ($globalDBdriver == 'mysql') {
@@ -1493,7 +1493,7 @@  discard block
 block discarded – undo
1493 1493
 		try {
1494 1494
 			$sth = $this->db->prepare($query);
1495 1495
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1496
-		} catch(PDOException $e) {
1496
+		} catch (PDOException $e) {
1497 1497
 			echo "error : ".$e->getMessage();
1498 1498
 		}
1499 1499
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1510,7 +1510,7 @@  discard block
 block discarded – undo
1510 1510
 		try {
1511 1511
 			$sth = $this->db->prepare($query);
1512 1512
 			$sth->execute(array(':filter_name' => $filter_name));
1513
-		} catch(PDOException $e) {
1513
+		} catch (PDOException $e) {
1514 1514
 			echo "error : ".$e->getMessage();
1515 1515
 		}
1516 1516
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1527,20 +1527,20 @@  discard block
 block discarded – undo
1527 1527
 		try {
1528 1528
 			$sth = $this->db->prepare($query);
1529 1529
 			$sth->execute(array(':filter_name' => $filter_name));
1530
-		} catch(PDOException $e) {
1530
+		} catch (PDOException $e) {
1531 1531
 			echo "error : ".$e->getMessage();
1532 1532
 		}
1533 1533
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1534 1534
 		return $all[0]['total'];
1535 1535
 	}
1536
-	public function getStatsOwner($owner_name,$filter_name = '') {
1536
+	public function getStatsOwner($owner_name, $filter_name = '') {
1537 1537
 		global $globalArchiveMonths, $globalDBdriver;
1538 1538
 		if ($filter_name == '') $filter_name = $this->filter_name;
1539 1539
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1540
 		try {
1541 1541
 			$sth = $this->db->prepare($query);
1542
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1543
-		} catch(PDOException $e) {
1542
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1543
+		} catch (PDOException $e) {
1544 1544
 			echo "error : ".$e->getMessage();
1545 1545
 		}
1546 1546
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1558,20 +1558,20 @@  discard block
 block discarded – undo
1558 1558
 		try {
1559 1559
 			$sth = $this->db->prepare($query);
1560 1560
 			$sth->execute(array(':filter_name' => $filter_name));
1561
-		} catch(PDOException $e) {
1561
+		} catch (PDOException $e) {
1562 1562
 			echo "error : ".$e->getMessage();
1563 1563
 		}
1564 1564
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1565 1565
 		return $all[0]['total'];
1566 1566
 	}
1567
-	public function getStatsPilot($pilot,$filter_name = '') {
1567
+	public function getStatsPilot($pilot, $filter_name = '') {
1568 1568
 		global $globalArchiveMonths, $globalDBdriver;
1569 1569
 		if ($filter_name == '') $filter_name = $this->filter_name;
1570 1570
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1571
 		try {
1572 1572
 			$sth = $this->db->prepare($query);
1573
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1574
-		} catch(PDOException $e) {
1573
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1574
+		} catch (PDOException $e) {
1575 1575
 			echo "error : ".$e->getMessage();
1576 1576
 		}
1577 1577
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 		else return 0;
1580 1580
 	}
1581 1581
 
1582
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1582
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1583 1583
 		global $globalDBdriver;
1584 1584
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585
 		if ($globalDBdriver == 'mysql') {
@@ -1587,15 +1587,15 @@  discard block
 block discarded – undo
1587 1587
 		} else {
1588 1588
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1589 1589
 		}
1590
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1590
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1591 1591
 		try {
1592 1592
 			$sth = $this->db->prepare($query);
1593 1593
 			$sth->execute($query_values);
1594
-		} catch(PDOException $e) {
1594
+		} catch (PDOException $e) {
1595 1595
 			return "error : ".$e->getMessage();
1596 1596
 		}
1597 1597
 	}
1598
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1598
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1599 1599
 		global $globalDBdriver;
1600 1600
 		if ($filter_name == '') $filter_name = $this->filter_name;
1601 1601
 		if ($globalDBdriver == 'mysql') {
@@ -1604,11 +1604,11 @@  discard block
 block discarded – undo
1604 1604
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1605 1605
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1606 1606
 		}
1607
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1607
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1608 1608
 		try {
1609 1609
 			$sth = $this->db->prepare($query);
1610 1610
 			$sth->execute($query_values);
1611
-		} catch(PDOException $e) {
1611
+		} catch (PDOException $e) {
1612 1612
 			return "error : ".$e->getMessage();
1613 1613
 		}
1614 1614
 	}
@@ -1632,75 +1632,75 @@  discard block
 block discarded – undo
1632 1632
         }
1633 1633
         */
1634 1634
 
1635
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1635
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1636 1636
 		global $globalDBdriver;
1637 1637
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1638 1638
 		$query_values = array();
1639 1639
 		if ($globalDBdriver == 'mysql') {
1640 1640
 			if ($year != '') {
1641 1641
 				$query .= ' AND YEAR(stats_date) = :year';
1642
-				$query_values = array_merge($query_values,array(':year' => $year));
1642
+				$query_values = array_merge($query_values, array(':year' => $year));
1643 1643
 			}
1644 1644
 			if ($month != '') {
1645 1645
 				$query .= ' AND MONTH(stats_date) = :month';
1646
-				$query_values = array_merge($query_values,array(':month' => $month));
1646
+				$query_values = array_merge($query_values, array(':month' => $month));
1647 1647
 			}
1648 1648
 			if ($day != '') {
1649 1649
 				$query .= ' AND DAY(stats_date) = :day';
1650
-				$query_values = array_merge($query_values,array(':day' => $day));
1650
+				$query_values = array_merge($query_values, array(':day' => $day));
1651 1651
 			}
1652 1652
 		} else {
1653 1653
 			if ($year != '') {
1654 1654
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1655
-				$query_values = array_merge($query_values,array(':year' => $year));
1655
+				$query_values = array_merge($query_values, array(':year' => $year));
1656 1656
 			}
1657 1657
 			if ($month != '') {
1658 1658
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1659
-				$query_values = array_merge($query_values,array(':month' => $month));
1659
+				$query_values = array_merge($query_values, array(':month' => $month));
1660 1660
 			}
1661 1661
 			if ($day != '') {
1662 1662
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1663
-				$query_values = array_merge($query_values,array(':day' => $day));
1663
+				$query_values = array_merge($query_values, array(':day' => $day));
1664 1664
 			}
1665 1665
 		}
1666 1666
 		$query .= " ORDER BY source_name";
1667
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1667
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1668 1668
 		try {
1669 1669
 			$sth = $this->db->prepare($query);
1670 1670
 			$sth->execute($query_values);
1671
-		} catch(PDOException $e) {
1671
+		} catch (PDOException $e) {
1672 1672
 			echo "error : ".$e->getMessage();
1673 1673
 		}
1674 1674
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1675 1675
 		return $all;
1676 1676
 	}
1677 1677
 
1678
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1678
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1679 1679
 		global $globalDBdriver;
1680 1680
 		if ($globalDBdriver == 'mysql') {
1681 1681
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1682 1682
 		} else {
1683 1683
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1684 1684
 		}
1685
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1685
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1686 1686
 		try {
1687 1687
 			$sth = $this->db->prepare($query);
1688 1688
 			$sth->execute($query_values);
1689
-		} catch(PDOException $e) {
1689
+		} catch (PDOException $e) {
1690 1690
 			return "error : ".$e->getMessage();
1691 1691
 		}
1692 1692
 	}
1693
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1693
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1694 1694
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1695
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1696 1696
 		try {
1697 1697
 			$sth = $this->db->prepare($query);
1698 1698
 			$sth->execute($query_values);
1699
-		} catch(PDOException $e) {
1699
+		} catch (PDOException $e) {
1700 1700
 			return "error : ".$e->getMessage();
1701 1701
 		}
1702 1702
 	}
1703
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1703
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1704 1704
 		global $globalDBdriver;
1705 1705
 		if ($globalDBdriver == 'mysql') {
1706 1706
 			if ($reset) {
@@ -1715,15 +1715,15 @@  discard block
 block discarded – undo
1715 1715
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1716 1716
 			}
1717 1717
 		}
1718
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1718
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1719 1719
 		try {
1720 1720
 			$sth = $this->db->prepare($query);
1721 1721
 			$sth->execute($query_values);
1722
-		} catch(PDOException $e) {
1722
+		} catch (PDOException $e) {
1723 1723
 			return "error : ".$e->getMessage();
1724 1724
 		}
1725 1725
 	}
1726
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1726
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1727 1727
 		global $globalDBdriver;
1728 1728
 		if ($globalDBdriver == 'mysql') {
1729 1729
 			if ($reset) {
@@ -1738,15 +1738,15 @@  discard block
 block discarded – undo
1738 1738
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1739 1739
 			}
1740 1740
 		}
1741
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1741
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1742 1742
 		try {
1743 1743
 			$sth = $this->db->prepare($query);
1744 1744
 			$sth->execute($query_values);
1745
-		} catch(PDOException $e) {
1745
+		} catch (PDOException $e) {
1746 1746
 			return "error : ".$e->getMessage();
1747 1747
 		}
1748 1748
 	}
1749
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1749
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1750 1750
 		global $globalDBdriver;
1751 1751
 		if ($globalDBdriver == 'mysql') {
1752 1752
 			if ($reset) {
@@ -1761,15 +1761,15 @@  discard block
 block discarded – undo
1761 1761
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1762 1762
 			}
1763 1763
 		}
1764
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1764
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1765 1765
 		try {
1766 1766
 			$sth = $this->db->prepare($query);
1767 1767
 			$sth->execute($query_values);
1768
-		} catch(PDOException $e) {
1768
+		} catch (PDOException $e) {
1769 1769
 			return "error : ".$e->getMessage();
1770 1770
 		}
1771 1771
 	}
1772
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1772
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1773 1773
 		global $globalDBdriver;
1774 1774
 		if ($globalDBdriver == 'mysql') {
1775 1775
 			if ($reset) {
@@ -1784,15 +1784,15 @@  discard block
 block discarded – undo
1784 1784
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1785 1785
 			}
1786 1786
 		}
1787
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1787
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1788 1788
 		try {
1789 1789
 			$sth = $this->db->prepare($query);
1790 1790
 			$sth->execute($query_values);
1791
-		} catch(PDOException $e) {
1791
+		} catch (PDOException $e) {
1792 1792
 			return "error : ".$e->getMessage();
1793 1793
 		}
1794 1794
 	}
1795
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1795
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1796 1796
 		global $globalDBdriver;
1797 1797
 		if ($globalDBdriver == 'mysql') {
1798 1798
 			if ($reset) {
@@ -1807,15 +1807,15 @@  discard block
 block discarded – undo
1807 1807
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1808 1808
 			}
1809 1809
 		}
1810
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1810
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1811 1811
 		try {
1812 1812
 			$sth = $this->db->prepare($query);
1813 1813
 			$sth->execute($query_values);
1814
-		} catch(PDOException $e) {
1814
+		} catch (PDOException $e) {
1815 1815
 			return "error : ".$e->getMessage();
1816 1816
 		}
1817 1817
 	}
1818
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1818
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1819 1819
 		global $globalDBdriver;
1820 1820
 		if ($globalDBdriver == 'mysql') {
1821 1821
 			if ($reset) {
@@ -1830,15 +1830,15 @@  discard block
 block discarded – undo
1830 1830
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1831 1831
 			}
1832 1832
 		}
1833
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1833
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1834 1834
 		try {
1835 1835
 			$sth = $this->db->prepare($query);
1836 1836
 			$sth->execute($query_values);
1837
-		} catch(PDOException $e) {
1837
+		} catch (PDOException $e) {
1838 1838
 			return "error : ".$e->getMessage();
1839 1839
 		}
1840 1840
 	}
1841
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1841
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1842 1842
 		global $globalDBdriver;
1843 1843
 		if ($globalDBdriver == 'mysql') {
1844 1844
 			if ($reset) {
@@ -1853,15 +1853,15 @@  discard block
 block discarded – undo
1853 1853
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1854 1854
 			}
1855 1855
 		}
1856
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1856
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
1857 1857
 		try {
1858 1858
 			$sth = $this->db->prepare($query);
1859 1859
 			$sth->execute($query_values);
1860
-		} catch(PDOException $e) {
1860
+		} catch (PDOException $e) {
1861 1861
 			return "error : ".$e->getMessage();
1862 1862
 		}
1863 1863
 	}
1864
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1864
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1865 1865
 		global $globalDBdriver;
1866 1866
 		if ($airport_icao != '') {
1867 1867
 			if ($globalDBdriver == 'mysql') {
@@ -1877,16 +1877,16 @@  discard block
 block discarded – undo
1877 1877
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1878 1878
 				}
1879 1879
 			}
1880
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1880
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1881 1881
 			try {
1882 1882
 				$sth = $this->db->prepare($query);
1883 1883
 				$sth->execute($query_values);
1884
-			} catch(PDOException $e) {
1884
+			} catch (PDOException $e) {
1885 1885
 				return "error : ".$e->getMessage();
1886 1886
 			}
1887 1887
 		}
1888 1888
 	}
1889
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1889
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1890 1890
 		global $globalDBdriver;
1891 1891
 		if ($airport_icao != '') {
1892 1892
 			if ($globalDBdriver == 'mysql') {
@@ -1894,16 +1894,16 @@  discard block
 block discarded – undo
1894 1894
 			} else {
1895 1895
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1896 1896
 			}
1897
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1897
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1898 1898
 			 try {
1899 1899
 				$sth = $this->db->prepare($query);
1900 1900
 				$sth->execute($query_values);
1901
-			} catch(PDOException $e) {
1901
+			} catch (PDOException $e) {
1902 1902
 				return "error : ".$e->getMessage();
1903 1903
 			}
1904 1904
 		}
1905 1905
 	}
1906
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1906
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1907 1907
 		global $globalDBdriver;
1908 1908
 		if ($airport_icao != '') {
1909 1909
 			if ($globalDBdriver == 'mysql') {
@@ -1919,16 +1919,16 @@  discard block
 block discarded – undo
1919 1919
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1920 1920
 				}
1921 1921
 			}
1922
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1922
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1923 1923
 			try {
1924 1924
 				$sth = $this->db->prepare($query);
1925 1925
 				$sth->execute($query_values);
1926
-			} catch(PDOException $e) {
1926
+			} catch (PDOException $e) {
1927 1927
 				return "error : ".$e->getMessage();
1928 1928
 			}
1929 1929
 		}
1930 1930
 	}
1931
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1931
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1932 1932
 		global $globalDBdriver;
1933 1933
 		if ($airport_icao != '') {
1934 1934
 			if ($globalDBdriver == 'mysql') {
@@ -1936,11 +1936,11 @@  discard block
 block discarded – undo
1936 1936
 			} else {
1937 1937
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1938 1938
 			}
1939
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1939
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1940 1940
 			try {
1941 1941
 				$sth = $this->db->prepare($query);
1942 1942
 				$sth->execute($query_values);
1943
-			} catch(PDOException $e) {
1943
+			} catch (PDOException $e) {
1944 1944
 				return "error : ".$e->getMessage();
1945 1945
 			}
1946 1946
 		}
@@ -1952,7 +1952,7 @@  discard block
 block discarded – undo
1952 1952
 		try {
1953 1953
 			$sth = $this->db->prepare($query);
1954 1954
 			$sth->execute($query_values);
1955
-		} catch(PDOException $e) {
1955
+		} catch (PDOException $e) {
1956 1956
 			return "error : ".$e->getMessage();
1957 1957
 		}
1958 1958
 	}
@@ -1962,7 +1962,7 @@  discard block
 block discarded – undo
1962 1962
 		try {
1963 1963
 			$sth = $this->db->prepare($query);
1964 1964
 			$sth->execute($query_values);
1965
-		} catch(PDOException $e) {
1965
+		} catch (PDOException $e) {
1966 1966
 			return "error : ".$e->getMessage();
1967 1967
 		}
1968 1968
 	}
@@ -1972,13 +1972,13 @@  discard block
 block discarded – undo
1972 1972
 		try {
1973 1973
 			$sth = $this->db->prepare($query);
1974 1974
 			$sth->execute($query_values);
1975
-		} catch(PDOException $e) {
1975
+		} catch (PDOException $e) {
1976 1976
 			return "error : ".$e->getMessage();
1977 1977
 		}
1978 1978
 	}
1979 1979
 
1980 1980
 	public function addOldStats() {
1981
-		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1981
+		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1982 1982
 		$Common = new Common();
1983 1983
 		$Connection = new Connection($this->db);
1984 1984
 		date_default_timezone_set('UTC');
@@ -1996,41 +1996,41 @@  discard block
 block discarded – undo
1996 1996
 			$Spotter = new Spotter($this->db);
1997 1997
 
1998 1998
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1999
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1999
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2000 2000
 			foreach ($alldata as $number) {
2001
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2001
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2002 2002
 			}
2003 2003
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2004
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2004
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2005 2005
 			foreach ($alldata as $number) {
2006
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2006
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2007 2007
 			}
2008 2008
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2009
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2009
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2010 2010
 			foreach ($alldata as $number) {
2011
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2011
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2012 2012
 			}
2013 2013
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2014
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2014
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2015 2015
 			foreach ($alldata as $number) {
2016
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2016
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2017 2017
 			}
2018 2018
 			if ($globalDebug) echo 'Count all owners...'."\n";
2019
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2019
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2020 2020
 			foreach ($alldata as $number) {
2021
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2021
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2022 2022
 			}
2023 2023
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2024
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2024
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2025 2025
 			foreach ($alldata as $number) {
2026 2026
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2027
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2027
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2028 2028
 			}
2029 2029
 			
2030 2030
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2031
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2031
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2032 2032
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2033
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2033
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2034 2034
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2035 2035
 			$alldata = array();
2036 2036
 			foreach ($pall as $value) {
@@ -2047,14 +2047,14 @@  discard block
 block discarded – undo
2047 2047
 			foreach ($alldata as $key => $row) {
2048 2048
 				$count[$key] = $row['airport_departure_icao_count'];
2049 2049
 			}
2050
-			array_multisort($count,SORT_DESC,$alldata);
2050
+			array_multisort($count, SORT_DESC, $alldata);
2051 2051
 			foreach ($alldata as $number) {
2052
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2052
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
2053 2053
 			}
2054 2054
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2055
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2055
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2056 2056
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2057
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2057
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2058 2058
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2059 2059
 			$alldata = array();
2060 2060
 			foreach ($pall as $value) {
@@ -2071,18 +2071,18 @@  discard block
 block discarded – undo
2071 2071
 			foreach ($alldata as $key => $row) {
2072 2072
 				$count[$key] = $row['airport_arrival_icao_count'];
2073 2073
 			}
2074
-			array_multisort($count,SORT_DESC,$alldata);
2074
+			array_multisort($count, SORT_DESC, $alldata);
2075 2075
 			foreach ($alldata as $number) {
2076
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2076
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
2077 2077
 			}
2078 2078
 			if ($Connection->tableExists('countries')) {
2079 2079
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2080 2080
 				//$SpotterArchive = new SpotterArchive();
2081 2081
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2082
 				$Spotter = new Spotter($this->db);
2083
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2083
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2084 2084
 				foreach ($alldata as $number) {
2085
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2085
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2086 2086
 				}
2087 2087
 			}
2088 2088
 			
@@ -2092,12 +2092,12 @@  discard block
 block discarded – undo
2092 2092
 				$this->deleteStatsByType('fatalities_byyear');
2093 2093
 				$alldata = $Accident->countFatalitiesByYear();
2094 2094
 				foreach ($alldata as $number) {
2095
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2095
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2096 2096
 				}
2097 2097
 				$this->deleteStatsByType('fatalities_bymonth');
2098 2098
 				$alldata = $Accident->countFatalitiesLast12Months();
2099 2099
 				foreach ($alldata as $number) {
2100
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2100
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2101 2101
 				}
2102 2102
 			}
2103 2103
 
@@ -2111,37 +2111,37 @@  discard block
 block discarded – undo
2111 2111
 			$lastyear = false;
2112 2112
 			foreach ($alldata as $number) {
2113 2113
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2114
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2114
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2115 2115
 			}
2116 2116
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2117 2117
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2118
 			foreach ($alldata as $number) {
2119
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2119
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2120 2120
 			}
2121 2121
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2122 2122
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2123
 			foreach ($alldata as $number) {
2124
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2124
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2125 2125
 			}
2126 2126
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2127 2127
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2128
 			foreach ($alldata as $number) {
2129
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2129
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2130 2130
 			}
2131 2131
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2132 2132
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2133
 			foreach ($alldata as $number) {
2134
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2134
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2135 2135
 			}
2136 2136
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2137 2137
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2138
 			foreach ($alldata as $number) {
2139
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2139
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2140 2140
 			}
2141 2141
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2142 2142
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2143
 			foreach ($alldata as $number) {
2144
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2144
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2145 2145
 			}
2146 2146
 			if ($globalDebug) echo 'Airports data...'."\n";
2147 2147
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
 			}
2187 2187
 			$alldata = $pall;
2188 2188
 			foreach ($alldata as $number) {
2189
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2189
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2190 2190
 			}
2191 2191
 			echo '...Arrival'."\n";
2192 2192
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2227,7 +2227,7 @@  discard block
 block discarded – undo
2227 2227
 			}
2228 2228
 			$alldata = $pall;
2229 2229
 			foreach ($alldata as $number) {
2230
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2230
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2231 2231
 			}
2232 2232
 
2233 2233
 			echo 'Flights data...'."\n";
@@ -2235,28 +2235,28 @@  discard block
 block discarded – undo
2235 2235
 			echo '-> countAllDatesLastMonth...'."\n";
2236 2236
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2237 2237
 			foreach ($alldata as $number) {
2238
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2238
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2239 2239
 			}
2240 2240
 			echo '-> countAllDates...'."\n";
2241 2241
 			$previousdata = $this->countAllDates();
2242 2242
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2243 2243
 			$this->deleteStatFlight('date');
2244
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2244
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2245 2245
 			$values = array();
2246 2246
 			foreach ($alldata as $cnt) {
2247 2247
 				$values[] = $cnt['date_count'];
2248 2248
 			}
2249
-			array_multisort($values,SORT_DESC,$alldata);
2250
-			array_splice($alldata,11);
2249
+			array_multisort($values, SORT_DESC, $alldata);
2250
+			array_splice($alldata, 11);
2251 2251
 			foreach ($alldata as $number) {
2252
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2252
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2253 2253
 			}
2254 2254
 			
2255 2255
 			$this->deleteStatFlight('hour');
2256 2256
 			echo '-> countAllHours...'."\n";
2257
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2257
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2258 2258
 			foreach ($alldata as $number) {
2259
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2259
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2260 2260
 			}
2261 2261
 
2262 2262
 			// Count by airlines
@@ -2265,42 +2265,42 @@  discard block
 block discarded – undo
2265 2265
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2266 2266
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2267
 				//$Spotter = new Spotter($this->db);
2268
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2268
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2269 2269
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2270 2270
 				foreach ($alldata as $number) {
2271
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2271
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2272 2272
 				}
2273 2273
 			}
2274 2274
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2275 2275
 			$Spotter = new Spotter($this->db);
2276
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2276
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2277 2277
 			foreach ($alldata as $number) {
2278
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2278
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2279 2279
 			}
2280 2280
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2281
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2281
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2282 2282
 			foreach ($alldata as $number) {
2283
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2283
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2284 2284
 			}
2285 2285
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2286
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2286
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2287 2287
 			foreach ($alldata as $number) {
2288
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2288
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2289 2289
 			}
2290 2290
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2291
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2291
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2292 2292
 			foreach ($alldata as $number) {
2293
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2293
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2294 2294
 			}
2295 2295
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2296
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2296
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2297 2297
 			foreach ($alldata as $number) {
2298
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2298
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2299 2299
 			}
2300 2300
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2301
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2301
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2302 2302
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2303
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2303
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2304 2304
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2305 2305
 			//$alldata = array();
2306 2306
 			foreach ($dall as $value) {
@@ -2320,12 +2320,12 @@  discard block
 block discarded – undo
2320 2320
 			}
2321 2321
 			$alldata = $pall;
2322 2322
 			foreach ($alldata as $number) {
2323
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2323
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
2324 2324
 			}
2325 2325
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2326
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2326
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2327 2327
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2328
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2328
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2329 2329
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2330 2330
 			//$alldata = array();
2331 2331
 			foreach ($dall as $value) {
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 			}
2346 2346
 			$alldata = $pall;
2347 2347
 			foreach ($alldata as $number) {
2348
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2348
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
2349 2349
 			}
2350 2350
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2351
 			$Spotter = new Spotter($this->db);
@@ -2353,27 +2353,27 @@  discard block
 block discarded – undo
2353 2353
 			$lastyear = false;
2354 2354
 			foreach ($alldata as $number) {
2355 2355
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2356
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2356
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2357 2357
 			}
2358 2358
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2359 2359
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2360
 			foreach ($alldata as $number) {
2361
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2361
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2362 2362
 			}
2363 2363
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2364 2364
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2365
 			foreach ($alldata as $number) {
2366
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2366
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2367 2367
 			}
2368 2368
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2369 2369
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2370
 			foreach ($alldata as $number) {
2371
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2371
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2372 2372
 			}
2373 2373
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2374 2374
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2375
 			foreach ($alldata as $number) {
2376
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2376
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2377 2377
 			}
2378 2378
 			if ($globalDebug) echo '...Departure'."\n";
2379 2379
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
 			}
2397 2397
 			$alldata = $pall;
2398 2398
 			foreach ($alldata as $number) {
2399
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
2399
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
2400 2400
 			}
2401 2401
 			if ($globalDebug) echo '...Arrival'."\n";
2402 2402
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -2419,32 +2419,32 @@  discard block
 block discarded – undo
2419 2419
 			}
2420 2420
 			$alldata = $pall;
2421 2421
 			foreach ($alldata as $number) {
2422
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
2422
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
2423 2423
 			}
2424 2424
 
2425 2425
 			if ($globalDebug) echo 'Flights data...'."\n";
2426 2426
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2427 2427
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2428
 			foreach ($alldata as $number) {
2429
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2429
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2430 2430
 			}
2431 2431
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2432 2432
 			//$previousdata = $this->countAllDatesByAirlines();
2433
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2433
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2434 2434
 			$values = array();
2435 2435
 			foreach ($alldata as $cnt) {
2436 2436
 				$values[] = $cnt['date_count'];
2437 2437
 			}
2438
-			array_multisort($values,SORT_DESC,$alldata);
2439
-			array_splice($alldata,11);
2438
+			array_multisort($values, SORT_DESC, $alldata);
2439
+			array_splice($alldata, 11);
2440 2440
 			foreach ($alldata as $number) {
2441
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2441
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2442 2442
 			}
2443 2443
 			
2444 2444
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2445
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2445
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2446 2446
 			foreach ($alldata as $number) {
2447
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2447
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2448 2448
 			}
2449 2449
 
2450 2450
 			// Stats by filters
@@ -2468,7 +2468,7 @@  discard block
 block discarded – undo
2468 2468
 							$last_update_day = date('Y').'-01-01 00:00:00';
2469 2469
 						}
2470 2470
 					}
2471
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2471
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2472 2472
 						$last_update_day = date('Y').'-01-01 00:00:00';
2473 2473
 						$reset = true;
2474 2474
 					}
@@ -2476,38 +2476,38 @@  discard block
 block discarded – undo
2476 2476
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2477 2477
 					$Spotter = new Spotter($this->db);
2478 2478
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2479
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2479
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2480 2480
 					foreach ($alldata as $number) {
2481
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2481
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2482 2482
 					}
2483 2483
 					if ($globalDebug) echo 'Count all airlines...'."\n";
2484
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2484
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2485 2485
 					foreach ($alldata as $number) {
2486
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2486
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2487 2487
 					}
2488 2488
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2489
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2489
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2490 2490
 					foreach ($alldata as $number) {
2491
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2491
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2492 2492
 					}
2493 2493
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
2494
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2494
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2495 2495
 					foreach ($alldata as $number) {
2496
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2496
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2497 2497
 					}
2498 2498
 					if ($globalDebug) echo 'Count all owners...'."\n";
2499
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2499
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2500 2500
 					foreach ($alldata as $number) {
2501
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2501
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2502 2502
 					}
2503 2503
 					if ($globalDebug) echo 'Count all pilots...'."\n";
2504
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2504
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2505 2505
 					foreach ($alldata as $number) {
2506
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2506
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2507 2507
 					}
2508 2508
 					if ($globalDebug) echo 'Count departure airports...'."\n";
2509
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2510
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2509
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2510
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2511 2511
 					$alldata = array();
2512 2512
 					foreach ($pall as $value) {
2513 2513
 						$icao = $value['airport_departure_icao'];
@@ -2523,13 +2523,13 @@  discard block
 block discarded – undo
2523 2523
 					foreach ($alldata as $key => $row) {
2524 2524
 						$count[$key] = $row['airport_departure_icao_count'];
2525 2525
 					}
2526
-					array_multisort($count,SORT_DESC,$alldata);
2526
+					array_multisort($count, SORT_DESC, $alldata);
2527 2527
 					foreach ($alldata as $number) {
2528
-						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2528
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
2529 2529
 					}
2530 2530
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2531
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2532
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2531
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2532
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2533 2533
 					$alldata = array();
2534 2534
 					foreach ($pall as $value) {
2535 2535
 						$icao = $value['airport_arrival_icao'];
@@ -2545,9 +2545,9 @@  discard block
 block discarded – undo
2545 2545
 					foreach ($alldata as $key => $row) {
2546 2546
 						$count[$key] = $row['airport_arrival_icao_count'];
2547 2547
 					}
2548
-					array_multisort($count,SORT_DESC,$alldata);
2548
+					array_multisort($count, SORT_DESC, $alldata);
2549 2549
 					foreach ($alldata as $number) {
2550
-						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2550
+						echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
2551 2551
 					}
2552 2552
 					if ($globalDebug) echo 'Count all months...'."\n";
2553 2553
 					$Spotter = new Spotter($this->db);
@@ -2555,36 +2555,36 @@  discard block
 block discarded – undo
2555 2555
 					$lastyear = false;
2556 2556
 					foreach ($alldata as $number) {
2557 2557
 						if ($number['year_name'] != date('Y')) $lastyear = true;
2558
-						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2558
+						$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2559 2559
 					}
2560 2560
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
2561 2561
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2562 2562
 					foreach ($alldata as $number) {
2563
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2563
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2564 2564
 					}
2565 2565
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2566 2566
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2567 2567
 					foreach ($alldata as $number) {
2568
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2568
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2569 2569
 					}
2570 2570
 					if ($globalDebug) echo 'Count all military by months...'."\n";
2571 2571
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2572 2572
 					foreach ($alldata as $number) {
2573
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2573
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2574 2574
 					}
2575 2575
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2576 2576
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 2577
 				    	foreach ($alldata as $number) {
2578
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2578
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2579 2579
 					}
2580 2580
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2581 2581
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2582 2582
 					foreach ($alldata as $number) {
2583
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2583
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2584 2584
 					}
2585 2585
 					echo '...Departure'."\n";
2586
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2587
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2586
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2587
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2588 2588
 					foreach ($dall as $value) {
2589 2589
 						$icao = $value['departure_airport_icao'];
2590 2590
 						$ddate = $value['date'];
@@ -2602,11 +2602,11 @@  discard block
 block discarded – undo
2602 2602
 					}
2603 2603
 					$alldata = $pall;
2604 2604
 					foreach ($alldata as $number) {
2605
-						$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
2605
+						$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name);
2606 2606
 					}
2607 2607
 					echo '...Arrival'."\n";
2608
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2609
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2608
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2609
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2610 2610
 					foreach ($dall as $value) {
2611 2611
 						$icao = $value['arrival_airport_icao'];
2612 2612
 						$ddate = $value['date'];
@@ -2624,39 +2624,39 @@  discard block
 block discarded – undo
2624 2624
 					}
2625 2625
 					$alldata = $pall;
2626 2626
 					foreach ($alldata as $number) {
2627
-						$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
2627
+						$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name);
2628 2628
 					}
2629 2629
 					echo 'Flights data...'."\n";
2630 2630
 					echo '-> countAllDatesLastMonth...'."\n";
2631 2631
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
2632 2632
 					foreach ($alldata as $number) {
2633
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2633
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2634 2634
 					}
2635 2635
 					echo '-> countAllDates...'."\n";
2636
-					$previousdata = $this->countAllDates('',$filter_name);
2637
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2636
+					$previousdata = $this->countAllDates('', $filter_name);
2637
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2638 2638
 					$values = array();
2639 2639
 					foreach ($alldata as $cnt) {
2640 2640
 						$values[] = $cnt['date_count'];
2641 2641
 					}
2642
-					array_multisort($values,SORT_DESC,$alldata);
2643
-					array_splice($alldata,11);
2642
+					array_multisort($values, SORT_DESC, $alldata);
2643
+					array_splice($alldata, 11);
2644 2644
 					foreach ($alldata as $number) {
2645
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2645
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2646 2646
 					}
2647 2647
 				
2648 2648
 					echo '-> countAllHours...'."\n";
2649
-					$alldata = $Spotter->countAllHours('hour',$filter);
2649
+					$alldata = $Spotter->countAllHours('hour', $filter);
2650 2650
 					foreach ($alldata as $number) {
2651
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2651
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2652 2652
 					}
2653 2653
 					echo 'Insert last stats update date...'."\n";
2654 2654
 					date_default_timezone_set('UTC');
2655
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2655
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2656 2656
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2657
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
2657
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
2658 2658
 							$this->deleteOldStats($filter_name);
2659
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2659
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2660 2660
 						}
2661 2661
 					}
2662 2662
 				}
@@ -2668,16 +2668,16 @@  discard block
 block discarded – undo
2668 2668
 				// SUM all previous month to put as year
2669 2669
 				$previous_year = date('Y');
2670 2670
 				$previous_year--;
2671
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2672
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2673
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2674
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2671
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2672
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2673
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2674
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2675 2675
 				$allairlines = $this->getAllAirlineNames();
2676 2676
 				foreach ($allairlines as $data) {
2677
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2678
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2679
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2680
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2677
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2678
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2679
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2680
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2681 2681
 				}
2682 2682
 				
2683 2683
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2686,21 +2686,21 @@  discard block
 block discarded – undo
2686 2686
 						try {
2687 2687
 							$sth = $this->db->prepare($query);
2688 2688
 							$sth->execute();
2689
-						} catch(PDOException $e) {
2689
+						} catch (PDOException $e) {
2690 2690
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2691 2691
 						}
2692 2692
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
2693 2693
 						try {
2694 2694
 							$sth = $this->db->prepare($query);
2695 2695
 							$sth->execute();
2696
-						} catch(PDOException $e) {
2696
+						} catch (PDOException $e) {
2697 2697
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2698 2698
 						}
2699 2699
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
2700 2700
 						try {
2701 2701
 							$sth = $this->db->prepare($query);
2702 2702
 							$sth->execute();
2703
-						} catch(PDOException $e) {
2703
+						} catch (PDOException $e) {
2704 2704
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2705 2705
 						}
2706 2706
 					}
@@ -2713,7 +2713,7 @@  discard block
 block discarded – undo
2713 2713
 					try {
2714 2714
 						$sth = $this->db->prepare($query);
2715 2715
 						$sth->execute();
2716
-					} catch(PDOException $e) {
2716
+					} catch (PDOException $e) {
2717 2717
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2718 2718
 					}
2719 2719
 					if ($globalDBdriver == 'mysql') {
@@ -2724,7 +2724,7 @@  discard block
 block discarded – undo
2724 2724
 					try {
2725 2725
 						$sth = $this->db->prepare($query);
2726 2726
 						$sth->execute();
2727
-					} catch(PDOException $e) {
2727
+					} catch (PDOException $e) {
2728 2728
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2729 2729
 					}
2730 2730
 					if ($globalDBdriver == 'mysql') {
@@ -2735,15 +2735,15 @@  discard block
 block discarded – undo
2735 2735
 					try {
2736 2736
 						$sth = $this->db->prepare($query);
2737 2737
 						$sth->execute();
2738
-					} catch(PDOException $e) {
2738
+					} catch (PDOException $e) {
2739 2739
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2740 2740
 					}
2741 2741
 				}
2742 2742
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2743 2743
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2744
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2744
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2745 2745
 						$this->deleteOldStats();
2746
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2746
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2747 2747
 						$lastyearupdate = true;
2748 2748
 					}
2749 2749
 				}
@@ -2765,7 +2765,7 @@  discard block
 block discarded – undo
2765 2765
 					try {
2766 2766
 						$sth = $this->db->prepare($query);
2767 2767
 						$sth->execute();
2768
-					} catch(PDOException $e) {
2768
+					} catch (PDOException $e) {
2769 2769
 						return "error : ".$e->getMessage();
2770 2770
 					}
2771 2771
 					echo 'Archive old tracker data...'."\n";
@@ -2781,7 +2781,7 @@  discard block
 block discarded – undo
2781 2781
 					try {
2782 2782
 						$sth = $this->db->prepare($query);
2783 2783
 						$sth->execute();
2784
-					} catch(PDOException $e) {
2784
+					} catch (PDOException $e) {
2785 2785
 						return "error : ".$e->getMessage();
2786 2786
 					}
2787 2787
 					echo 'Archive old marine data...'."\n";
@@ -2797,7 +2797,7 @@  discard block
 block discarded – undo
2797 2797
 					try {
2798 2798
 						$sth = $this->db->prepare($query);
2799 2799
 						$sth->execute();
2800
-					} catch(PDOException $e) {
2800
+					} catch (PDOException $e) {
2801 2801
 						return "error : ".$e->getMessage();
2802 2802
 					}
2803 2803
 				}
@@ -2810,7 +2810,7 @@  discard block
 block discarded – undo
2810 2810
 				try {
2811 2811
 					$sth = $this->db->prepare($query);
2812 2812
 					$sth->execute();
2813
-				} catch(PDOException $e) {
2813
+				} catch (PDOException $e) {
2814 2814
 					return "error : ".$e->getMessage();
2815 2815
 				}
2816 2816
 				echo 'Deleting old tracker data...'."\n";
@@ -2822,7 +2822,7 @@  discard block
 block discarded – undo
2822 2822
 				try {
2823 2823
 					$sth = $this->db->prepare($query);
2824 2824
 					$sth->execute();
2825
-				} catch(PDOException $e) {
2825
+				} catch (PDOException $e) {
2826 2826
 					return "error : ".$e->getMessage();
2827 2827
 				}
2828 2828
 				echo 'Deleting old marine data...'."\n";
@@ -2834,14 +2834,14 @@  discard block
 block discarded – undo
2834 2834
 				try {
2835 2835
 					$sth = $this->db->prepare($query);
2836 2836
 					$sth->execute();
2837
-				} catch(PDOException $e) {
2837
+				} catch (PDOException $e) {
2838 2838
 					return "error : ".$e->getMessage();
2839 2839
 				}
2840 2840
 			}
2841 2841
 			if (!isset($lastyearupdate)) {
2842 2842
 				echo 'Insert last stats update date...'."\n";
2843 2843
 				date_default_timezone_set('UTC');
2844
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2844
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2845 2845
 			}
2846 2846
 			if ($globalStatsResetYear) {
2847 2847
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.