View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( e2a702...676958 )
by Yannick
44:36 queued 16:19
created
Status
Category
Toggle Patches
require/class.GeoidHeight.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch 
@@ -11,7 +11,7 @@  discard block
 
 block discarded – undo
11 11 
 * Translated to PHP of GeographicLib/src/Geoid.cpp
12 12 
 * by Ycarus <[email protected]> in 2017
13 13 
 */
14 
-class GeoidHeight  {
14 
+class GeoidHeight {
15 15 
 	private $c0 = 240;
16 16 
 	private $c3 = [[9, -18, -88, 0, 96, 90, 0, 0, -60, -20], [-9, 18, 8, 0, -96, 30, 0, 0, 60, -20], [9, -88, -18, 90, 96, 0, -20, -60, 0, 0], [186, -42, -42, -150, -96, -150, 60, 60, 60, 60], [54, 162, -78, 30, -24, -90, -60, 60, -60, 60], [-9, -32, 18, 30, 24, 0, 20, -60, 0, 0], [-9, 8, 18, 30, -96, 0, -20, 60, 0, 0], [54, -78, 162, -90, -24, 30, 60, -60, 60, -60], [-54, 78, 78, 90, 144, 90, -60, -60, -60, -60], [9, -8, -18, -30, -24, 0, 20, 60, 0, 0], [-9, 18, -32, 0, 24, 30, 0, 0, -60, 20], [9, -18, -8, 0, -24, -30, 0, 0, 60, 20]];
17 17 
 	private $c0n = 372;
 
@@ -34,7 +34,7 @@  discard block
 
 block discarded – undo
34 34 
 	private $v10 = null;
35 35 
 	private $v11 = null;
36 36
37 
-	public function __construct($name='') {
37 
+	public function __construct($name = '') {
38 38 
 		global $globalGeoidSource;
39 39 
 		//if ($name == '') $name = dirname(__FILE__).'/../install/tmp/egm2008-1.pgm';
40 40 
 		if ($name == '') {
 
@@ -45,35 +45,35 @@  discard block
 
 block discarded – undo
45 45 
 		if (file_exists($name) === FALSE) {
46 46 
 			throw new Exception($name." doesn't exist");
47 47 
 		}
48 
-		$f = @fopen($name,"r");
48 
+		$f = @fopen($name, "r");
49 49 
 		if ($f === FALSE) {
50 50 
 			throw new Exception("Can't open ".$name);
51 51 
 		}
52 
-		$line = fgets($f,4096);
52 
+		$line = fgets($f, 4096);
53 53 
 		if (trim($line) != 'P5') {
54 54 
 			throw new Exception('No PGM header');
55 55 
 		}
56 56 
 		$headerlen = strlen($line);
57 57 
 		while (true) {
58 
-			$line = fgets($f,4096);
58 
+			$line = fgets($f, 4096);
59 59 
 			if ((strlen($line) == 0)) {
60 60 
 				throw new Exception('EOF before end of file header');
61 61 
 			}
62 62 
 			$headerlen += strlen($line);
63 
-			if (strpos($line,'# Offset ') !== FALSE) {
63 
+			if (strpos($line, '# Offset ') !== FALSE) {
64 64 
 				$this->offset = substr($line, 9);
65 
-			} else if (strpos($line,'# Scale ') !== FALSE) {
65 
+			} else if (strpos($line, '# Scale ') !== FALSE) {
66 66 
 				$this->scale = substr($line, 8);
67 
-			} else if ((strpos($line,'#') === FALSE)) {
68 
-				list($this->width, $this->height) = preg_split('/\s+/',$line);
67 
+			} else if ((strpos($line, '#') === FALSE)) {
68 
+				list($this->width, $this->height) = preg_split('/\s+/', $line);
69 69 
 				break;
70 70 
 			}
71 71 
 		}
72 
-		$line = fgets($f,4096);
72 
+		$line = fgets($f, 4096);
73 73 
 		$headerlen += strlen($line);
74 
-		$levels = (int)$line;
75 
-		$this->width = (int)$this->width;
76 
-		$this->height = (int)$this->height;
74 
+		$levels = (int) $line;
75 
+		$this->width = (int) $this->width;
76 
+		$this->height = (int) $this->height;
77 77 
 		if (($levels != 65535)) {
78 78 
 			throw new Exception('PGM file must have 65535 gray levels ('.$levels.')');
79 79 
 		}
 
@@ -88,42 +88,42 @@  discard block
 
 block discarded – undo
88 88 
 		}
89 89
90 90 
 		$fullsize = filesize($name);
91 
-		if ((($fullsize - $headerlen) != (($this->width * $this->height) * 2))) {
91 
+		if ((($fullsize - $headerlen) != (($this->width*$this->height)*2))) {
92 92 
 			throw new Exception('File has the wrong length');
93 93 
 		}
94 94
95 95 
 		$this->headerlen = $headerlen;
96 
-		$this->raw= $f;
97 
-		$this->rlonres = ($this->width / 360.0);
98 
-		$this->rlatres = (($this->height - 1) / 180.0);
96 
+		$this->raw = $f;
97 
+		$this->rlonres = ($this->width/360.0);
98 
+		$this->rlatres = (($this->height - 1)/180.0);
99 99 
 	}
100 100
101 
-	private function _rawval($ix,$iy) {
101 
+	private function _rawval($ix, $iy) {
102 102 
 		if (($iy < 0)) {
103 103 
 			$iy = -$iy;
104 
-			$ix += ($this->width / 2);
104 
+			$ix += ($this->width/2);
105 105 
 		} else if (($iy >= $this->height)) {
106 
-			$iy = ((2 * ($this->height - 1)) - $iy);
107 
-			$ix += ($this->width / 2);
106 
+			$iy = ((2*($this->height - 1)) - $iy);
107 
+			$ix += ($this->width/2);
108 108 
 		}
109 109 
 		if (($ix < 0)) {
110 110 
 			$ix += $this->width;
111 111 
 		} else if (($ix >= $this->width)) {
112 112 
 			$ix -= $this->width;
113 113 
 		}
114 
-		$k = ((($iy * $this->width) + $ix) * 2) + $this->headerlen;
115 
-		fseek($this->raw,$k);
116 
-		return unpack('n',fread($this->raw,2))[1];
114 
+		$k = ((($iy*$this->width) + $ix)*2) + $this->headerlen;
115 
+		fseek($this->raw, $k);
116 
+		return unpack('n', fread($this->raw, 2))[1];
117 117 
 	}
118 118
119 
-	public function get($lat,$lon,$cubic=true) {
119 
+	public function get($lat, $lon, $cubic = true) {
120 120 
 		if (($lon < 0)) {
121 121 
 			$lon += 360;
122 122 
 		}
123 
-		$fy = ((90 - $lat) * $this->rlatres);
124 
-		$fx = ($lon * $this->rlonres);
125 
-		$iy = (int)$fy;
126 
-		$ix = (int)$fx;
123 
+		$fy = ((90 - $lat)*$this->rlatres);
124 
+		$fx = ($lon*$this->rlonres);
125 
+		$iy = (int) $fy;
126 
+		$ix = (int) $fx;
127 127 
 		$fx -= $ix;
128 128 
 		$fy -= $iy;
129 129 
 		$t = array();
 
@@ -150,7 +150,7 @@  discard block
 
 block discarded – undo
150 150 
 					$c3x = $this->c3;
151 151 
 					$c0x = $this->c0;
152 152 
 				}
153 
-				for ($i = 0; $i < 10;++$i) {
153 
+				for ($i = 0; $i < 10; ++$i) {
154 154 
 					$t[$i] = 0;
155 155 
 					for ($j = 0; $j < 12; ++$j) {
156 156 
 						$t[$i] += $v[$j]*$c3x[$j][$i];
 
@@ -161,13 +161,13 @@  discard block
 
 block discarded – undo
161 161 
 			$this->t = $t;
162 162 
 		} else $t = $this->t;
163 163 
 		if (!($cubic)) {
164 
-			$a = (((1 - $fx) * $this->v00) + ($fx * $this->v01));
165 
-			$b = (((1 - $fx) * $this->v10) + ($fx * $this->v11));
166 
-			$h = (((1 - $fy) * $a) + ($fy * $b));
164 
+			$a = (((1 - $fx)*$this->v00) + ($fx*$this->v01));
165 
+			$b = (((1 - $fx)*$this->v10) + ($fx*$this->v11));
166 
+			$h = (((1 - $fy)*$a) + ($fy*$b));
167 167 
 		} else {
168 
-			$h = (($t[0] + ($fx * ($t[1] + ($fx * ($t[3] + ($fx * $t[6])))))) + ($fy * (($t[2] + ($fx * ($t[4] + ($fx * $t[7])))) + ($fy * (($t[5] + ($fx * $t[8])) + ($fy * $t[9]))))));
168 
+			$h = (($t[0] + ($fx*($t[1] + ($fx*($t[3] + ($fx*$t[6])))))) + ($fy*(($t[2] + ($fx*($t[4] + ($fx*$t[7])))) + ($fy*(($t[5] + ($fx*$t[8])) + ($fy*$t[9]))))));
169 169 
 		}
170 
-		return ((float)$this->offset + ((float)$this->scale * (float)$h));
170 
+		return ((float) $this->offset + ((float) $this->scale*(float) $h));
171 171 
 	}
172 172 
 }
173 173 
 /*
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Spacing   +643 added lines, -643 removed lines patch added patch discarded remove patch 
@@ -28,14 +28,14 @@  discard block
 
 block discarded – undo
28 28 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
29 29 
 	}
30 30
31 
-	public function addLastStatsUpdate($type,$stats_date) {
31 
+	public function addLastStatsUpdate($type, $stats_date) {
32 32 
 		$query = "DELETE FROM config WHERE name = :type;
33 33 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
34 
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
34 
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
35 35 
 		try {
36 36 
 			$sth = $this->db->prepare($query);
37 37 
 			$sth->execute($query_values);
38 
-		} catch(PDOException $e) {
38 
+		} catch (PDOException $e) {
39 39 
 			return "error : ".$e->getMessage();
40 40 
 		}
41 41 
 	}
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
 		try {
46 46 
 			$sth = $this->db->prepare($query);
47 47 
 			$sth->execute(array(':type' => $type));
48 
-		} catch(PDOException $e) {
48 
+		} catch (PDOException $e) {
49 49 
 			echo "error : ".$e->getMessage();
50 50 
 		}
51 51 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -66,7 +66,7 @@  discard block
 
 block discarded – undo
66 66 
 		try {
67 67 
 			$sth = $this->db->prepare($query);
68 68 
 			$sth->execute(array(':filter_name' => $filter_name));
69 
-		} catch(PDOException $e) {
69 
+		} catch (PDOException $e) {
70 70 
 			return "error : ".$e->getMessage();
71 71 
 		}
72 72 
 	}
 
@@ -79,14 +79,14 @@  discard block
 
 block discarded – undo
79 79 
 		try {
80 80 
 			$sth = $this->db->prepare($query);
81 81 
 			$sth->execute();
82 
-		} catch(PDOException $e) {
82 
+		} catch (PDOException $e) {
83 83 
 			return "error : ".$e->getMessage();
84 84 
 		}
85 85 
 		$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;";
86 86 
 		try {
87 87 
 			$sth = $this->db->prepare($query);
88 88 
 			$sth->execute(array(':filter_name' => $filter_name));
89 
-		} catch(PDOException $e) {
89 
+		} catch (PDOException $e) {
90 90 
 			return "error : ".$e->getMessage();
91 91 
 		}
92 92 
 	}
 
@@ -98,77 +98,77 @@  discard block
 
 block discarded – undo
98 98 
 		 try {
99 99 
 			$sth = $this->db->prepare($query);
100 100 
 			$sth->execute(array(':filter_name' => $filter_name));
101 
-		} catch(PDOException $e) {
101 
+		} catch (PDOException $e) {
102 102 
 			echo "error : ".$e->getMessage();
103 103 
 		}
104 104 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
105 105 
 		if (empty($all)) {
106 106 
 			$filters = array();
107 107 
 			if ($filter_name != '') {
108 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
108 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
109 109 
 			}
110 110 
 			$Spotter = new Spotter($this->db);
111 
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
111 
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
112 112 
 		}
113 113 
 		return $all;
114 114 
 	}
115 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
115 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
116 116 
 		if ($filter_name == '') $filter_name = $this->filter_name;
117 117 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
118 118 
 		try {
119 119 
 			$sth = $this->db->prepare($query);
120 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
121 
-		} catch(PDOException $e) {
120 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
121 
+		} catch (PDOException $e) {
122 122 
 			echo "error : ".$e->getMessage();
123 123 
 		}
124 124 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
125 125 
 		return $all;
126 126 
 	}
127 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
127 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
128 128 
 		if ($filter_name == '') $filter_name = $this->filter_name;
129 129 
 		$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";
130 130 
 		try {
131 131 
 			$sth = $this->db->prepare($query);
132 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
133 
-		} catch(PDOException $e) {
132 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
133 
+		} catch (PDOException $e) {
134 134 
 			echo "error : ".$e->getMessage();
135 135 
 		}
136 136 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
137 137 
 		return $all;
138 138 
 	}
139 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
139 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
140 140 
 		if ($filter_name == '') $filter_name = $this->filter_name;
141 141 
 		$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";
142 142 
 		try {
143 143 
 			$sth = $this->db->prepare($query);
144 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
145 
-		} catch(PDOException $e) {
144 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
145 
+		} catch (PDOException $e) {
146 146 
 			echo "error : ".$e->getMessage();
147 147 
 		}
148 148 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
149 149 
 		return $all;
150 150 
 	}
151 151
152 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
152 
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
153 153 
 		if ($filter_name == '') $filter_name = $this->filter_name;
154 154 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
155 155 
 		try {
156 156 
 			$sth = $this->db->prepare($query);
157 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
158 
-		} catch(PDOException $e) {
157 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
158 
+		} catch (PDOException $e) {
159 159 
 			echo "error : ".$e->getMessage();
160 160 
 		}
161 161 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
162 162 
 		return $all;
163 163 
 	}
164 164
165 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
165 
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
166 166 
 		if ($filter_name == '') $filter_name = $this->filter_name;
167 167 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
168 168 
 		try {
169 169 
 			$sth = $this->db->prepare($query);
170 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
171 
-		} catch(PDOException $e) {
170 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
171 
+		} catch (PDOException $e) {
172 172 
 			echo "error : ".$e->getMessage();
173 173 
 		}
174 174 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -176,23 +176,23 @@  discard block
 
 block discarded – undo
176 176 
 	}
177 177
178 178
179 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
179 
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
180 180 
 		global $globalStatsFilters;
181 181 
 		if ($filter_name == '') $filter_name = $this->filter_name;
182 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
182 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
183 183 
 			$Spotter = new Spotter($this->db);
184 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
184 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
185 185 
 			$alliance_airlines = array();
186 186 
 			foreach ($airlines as $airline) {
187 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
187 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
188 188 
 			}
189 189 
 			if ($year == '' && $month == '') {
190 
-				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
191 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
190 
+				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
191 
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
192 192 
 				try {
193 193 
 					$sth = $this->db->prepare($query);
194 194 
 					$sth->execute(array(':filter_name' => $filter_name));
195 
-				} catch(PDOException $e) {
195 
+				} catch (PDOException $e) {
196 196 
 					echo "error : ".$e->getMessage();
197 197 
 				}
198 198 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -203,29 +203,29 @@  discard block
 
 block discarded – undo
203 203 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
204 204 
 				try {
205 205 
 					$sth = $this->db->prepare($query);
206 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
207 
-				} catch(PDOException $e) {
206 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
207 
+				} catch (PDOException $e) {
208 208 
 					echo "error : ".$e->getMessage();
209 209 
 				}
210 210 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
211 211 
 			} else $all = array();
212 212 
 		}
213 213 
 		if (empty($all)) {
214 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
215 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
214 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
215 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
216 216 
 			} else {
217 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
217 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
218 218 
 			}
219 219 
 			if ($filter_name != '') {
220 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
220 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
221 221 
 			}
222 222 
 			$Spotter = new Spotter($this->db);
223 223 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
224 
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
224 
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
225 225 
 		}
226 226 
 		return $all;
227 227 
 	}
228 
-	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
228 
+	public function countAllMarineTypes($limit = true, $filter_name = '', $year = '', $month = '') {
229 229 
 		global $globalStatsFilters;
230 230 
 		if ($filter_name == '') $filter_name = $this->filter_name;
231 231 
 		if ($year == '' && $month == '') {
 
@@ -234,23 +234,23 @@  discard block
 
 block discarded – undo
234 234 
 			try {
235 235 
 				$sth = $this->db->prepare($query);
236 236 
 				$sth->execute(array(':filter_name' => $filter_name));
237 
-			} catch(PDOException $e) {
237 
+			} catch (PDOException $e) {
238 238 
 				echo "error : ".$e->getMessage();
239 239 
 			}
240 240 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
241 241 
 		} else $all = array();
242 242 
 		if (empty($all)) {
243 
-			$filters = array('year' => $year,'month' => $month);
243 
+			$filters = array('year' => $year, 'month' => $month);
244 244 
 			if ($filter_name != '') {
245 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
245 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
246 246 
 			}
247 247 
 			$Marine = new Marine($this->db);
248 248 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
249 
-			$all = $Marine->countAllMarineTypes($limit,0,'',$filters);
249 
+			$all = $Marine->countAllMarineTypes($limit, 0, '', $filters);
250 250 
 		}
251 251 
 		return $all;
252 252 
 	}
253 
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
253 
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
254 254 
 		global $globalStatsFilters;
255 255 
 		if ($filter_name == '') $filter_name = $this->filter_name;
256 256 
 		if ($year == '' && $month == '') {
 
@@ -259,7 +259,7 @@  discard block
 
 block discarded – undo
259 259 
 			try {
260 260 
 				$sth = $this->db->prepare($query);
261 261 
 				$sth->execute(array(':filter_name' => $filter_name));
262 
-			} catch(PDOException $e) {
262 
+			} catch (PDOException $e) {
263 263 
 				echo "error : ".$e->getMessage();
264 264 
 			}
265 265 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -267,32 +267,32 @@  discard block
 
 block discarded – undo
267 267 
 		if (empty($all)) {
268 268 
 			$Spotter = new Spotter($this->db);
269 269 
 			$filters = array();
270 
-			$filters = array('year' => $year,'month' => $month);
270 
+			$filters = array('year' => $year, 'month' => $month);
271 271 
 			if ($filter_name != '') {
272 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
272 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
273 273 
 			}
274 274 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
275 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
275 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
276 276 
 		}
277 277 
 		return $all;
278 278 
 	}
279 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
279 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
280 280 
 		global $globalStatsFilters;
281 281 
 		if ($filter_name == '') $filter_name = $this->filter_name;
282 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
282 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
283 283 
 			$Spotter = new Spotter($this->db);
284 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
284 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
285 285 
 			$alliance_airlines = array();
286 286 
 			foreach ($airlines as $airline) {
287 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
287 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
288 288 
 			}
289 289 
 			if ($year == '' && $month == '') {
290 
-				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";
291 
-				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";
290 
+				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";
291 
+				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";
292 292 
 				try {
293 293 
 					$sth = $this->db->prepare($query);
294 294 
 					$sth->execute(array(':filter_name' => $filter_name));
295 
-				} catch(PDOException $e) {
295 
+				} catch (PDOException $e) {
296 296 
 					echo "error : ".$e->getMessage();
297 297 
 				}
298 298 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -303,21 +303,21 @@  discard block
 
 block discarded – undo
303 303 
 				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";
304 304 
 				try {
305 305 
 					$sth = $this->db->prepare($query);
306 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
307 
-				} catch(PDOException $e) {
306 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
307 
+				} catch (PDOException $e) {
308 308 
 					echo "error : ".$e->getMessage();
309 309 
 				}
310 310 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
311 311 
 			} else $all = array();
312 312 
 		}
313 313 
 		if (empty($all)) {
314 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
315 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
314 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
315 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
316 316 
 			} else {
317 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
317 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
318 318 
 			}
319 319 
 			if ($filter_name != '') {
320 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
320 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
321 321 
 			}
322 322 
 			$Spotter = new Spotter($this->db);
323 323 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -326,23 +326,23 @@  discard block
 
 block discarded – undo
326 326 
 		return $all;
327 327 
 	}
328 328
329 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
329 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
330 330 
 		global $globalStatsFilters;
331 331 
 		if ($filter_name == '') $filter_name = $this->filter_name;
332 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
332 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
333 333 
 			$Spotter = new Spotter($this->db);
334 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
334 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
335 335 
 			$alliance_airlines = array();
336 336 
 			foreach ($airlines as $airline) {
337 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
337 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
338 338 
 			}
339 339 
 			if ($year == '' && $month == '') {
340 
-				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";
341 
-				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";
340 
+				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";
341 
+				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";
342 342 
 				try {
343 343 
 					$sth = $this->db->prepare($query);
344 344 
 					$sth->execute(array(':filter_name' => $filter_name));
345 
-				} catch(PDOException $e) {
345 
+				} catch (PDOException $e) {
346 346 
 					echo "error : ".$e->getMessage();
347 347 
 				}
348 348 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -353,61 +353,61 @@  discard block
 
 block discarded – undo
353 353 
 				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";
354 354 
 				try {
355 355 
 					$sth = $this->db->prepare($query);
356 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
357 
-				} catch(PDOException $e) {
356 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
357 
+				} catch (PDOException $e) {
358 358 
 					echo "error : ".$e->getMessage();
359 359 
 				}
360 360 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
361 361 
 			} else $all = array();
362 362 
 		}
363 363 
 		if (empty($all)) {
364 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
365 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
364 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
365 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
366 366 
 			} else {
367 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
367 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
368 368 
 			}
369 369 
 			if ($filter_name != '') {
370 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
370 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
371 371 
 			}
372 372 
 			$Spotter = new Spotter($this->db);
373 373 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
374 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
374 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
375 375 
 		}
376 376 
 		return $all;
377 377 
 	}
378 378 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
379 379 
 		global $globalStatsFilters;
380 380 
 		if ($filter_name == '') $filter_name = $this->filter_name;
381 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
381 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
382 382 
 			$Spotter = new Spotter($this->db);
383 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
383 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
384 384 
 			$alliance_airlines = array();
385 385 
 			foreach ($airlines as $airline) {
386 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
386 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
387 387 
 			}
388 
-			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";
389 
-			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";
388 
+			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";
389 
+			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";
390 390 
 			$query_values = array(':filter_name' => $filter_name);
391 391 
 		} else {
392 392 
 			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";
393 393 
 			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";
394 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
394 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
395 395 
 		}
396 396 
 		try {
397 397 
 			$sth = $this->db->prepare($query);
398 398 
 			$sth->execute($query_values);
399 
-		} catch(PDOException $e) {
399 
+		} catch (PDOException $e) {
400 400 
 			echo "error : ".$e->getMessage();
401 401 
 		}
402 402 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
403 403 
 		if (empty($all)) {
404 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
405 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
404 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
405 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
406 406 
 			} else {
407 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
407 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
408 408 
 			}
409 409 
 			if ($filter_name != '') {
410 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
410 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
411 411 
 			}
412 412 
 			$Spotter = new Spotter($this->db);
413 413 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -416,7 +416,7 @@  discard block
 
 block discarded – undo
416 416 
 		return $all;
417 417 
 	}
418 418
419 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
419 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
420 420 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
421 421 
 		if ($filter_name == '') $filter_name = $this->filter_name;
422 422 
 		if ($year == '' && $month == '') {
 
@@ -425,7 +425,7 @@  discard block
 
 block discarded – undo
425 425 
 			if (isset($forsource)) {
426 426 
 				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";
427 427 
 				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";
428 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
428 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
429 429 
 			} else {
430 430 
 				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";
431 431 
 				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";
 
@@ -434,7 +434,7 @@  discard block
 
 block discarded – undo
434 434 
 			try {
435 435 
 				$sth = $this->db->prepare($query);
436 436 
 				$sth->execute($query_values);
437 
-			} catch(PDOException $e) {
437 
+			} catch (PDOException $e) {
438 438 
 				echo "error : ".$e->getMessage();
439 439 
 			}
440 440 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -442,32 +442,32 @@  discard block
 
 block discarded – undo
442 442 
                 if (empty($all)) {
443 443 
 	                $Spotter = new Spotter($this->db);
444 444 
             		$filters = array();
445 
-			$filters = array('year' => $year,'month' => $month);
445 
+			$filters = array('year' => $year, 'month' => $month);
446 446 
             		if ($filter_name != '') {
447 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
447 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
448 448 
 			}
449 449 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
450 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
450 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
451 451 
                 }
452 452 
                 return $all;
453 453 
 	}
454 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
454 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
455 455 
 		global $globalStatsFilters;
456 456 
 		if ($filter_name == '') $filter_name = $this->filter_name;
457 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
457 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
458 458 
 			$Spotter = new Spotter($this->db);
459 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
459 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
460 460 
 			$alliance_airlines = array();
461 461 
 			foreach ($airlines as $airline) {
462 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
462 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
463 463 
 			}
464 464 
 			if ($year == '' && $month == '') {
465 
-				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";
466 
-				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";
465 
+				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";
466 
+				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";
467 467 
 				try {
468 468 
 					$sth = $this->db->prepare($query);
469 469 
 					$sth->execute(array(':filter_name' => $filter_name));
470 
-				} catch(PDOException $e) {
470 
+				} catch (PDOException $e) {
471 471 
 					echo "error : ".$e->getMessage();
472 472 
 				}
473 473 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -478,45 +478,45 @@  discard block
 
 block discarded – undo
478 478 
 				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";
479 479 
 				try {
480 480 
 					$sth = $this->db->prepare($query);
481 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
482 
-				} catch(PDOException $e) {
481 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
482 
+				} catch (PDOException $e) {
483 483 
 					echo "error : ".$e->getMessage();
484 484 
 				}
485 485 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
486 486 
 			} else $all = array();
487 487 
 		}
488 488 
 		if (empty($all)) {
489 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
490 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
489 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
490 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
491 491 
 			} else {
492 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
492 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
493 493 
 			}
494 494 
 			if ($filter_name != '') {
495 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
495 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
496 496 
 			}
497 497 
 			$Spotter = new Spotter($this->db);
498 498 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
499 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
499 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
500 500 
 		}
501 501 
 		return $all;
502 502 
 	}
503 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
503 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
504 504 
 		global $globalStatsFilters;
505 505 
 		if ($filter_name == '') $filter_name = $this->filter_name;
506 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
506 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
507 507 
 			$Spotter = new Spotter($this->db);
508 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
508 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
509 509 
 			$alliance_airlines = array();
510 510 
 			foreach ($airlines as $airline) {
511 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
511 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
512 512 
 			}
513 513 
 			if ($year == '' && $month == '') {
514 
-				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";
515 
-				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";
514 
+				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";
515 
+				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";
516 516 
 				 try {
517 517 
 					$sth = $this->db->prepare($query);
518 518 
 					$sth->execute(array(':filter_name' => $filter_name));
519 
-				} catch(PDOException $e) {
519 
+				} catch (PDOException $e) {
520 520 
 					echo "error : ".$e->getMessage();
521 521 
 				}
522 522 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -527,46 +527,46 @@  discard block
 
 block discarded – undo
527 527 
 				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";
528 528 
 				 try {
529 529 
 					$sth = $this->db->prepare($query);
530 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
531 
-				} catch(PDOException $e) {
530 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
531 
+				} catch (PDOException $e) {
532 532 
 					echo "error : ".$e->getMessage();
533 533 
 				}
534 534 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
535 535 
 			} else $all = array();
536 536 
 		}
537 537 
 		if (empty($all)) {
538 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
539 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
538 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
539 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
540 540 
 			} else {
541 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
541 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
542 542 
 			}
543 543 
 			if ($filter_name != '') {
544 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
544 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
545 545 
 			}
546 546 
 			$Spotter = new Spotter($this->db);
547 547 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
548 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
548 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
549 549 
 		}
550 550 
 		return $all;
551 551 
 	}
552 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
552 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
553 553 
 		$Connection = new Connection($this->db);
554 554 
 		if ($filter_name == '') $filter_name = $this->filter_name;
555 555 
 		if ($Connection->tableExists('countries')) {
556 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
556 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
557 557 
 				$Spotter = new Spotter($this->db);
558 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
558 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
559 559 
 				if ($year == '' && $month == '') {
560 560 
 					$alliance_airlines = array();
561 561 
 					foreach ($airlines as $airline) {
562 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
562 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
563 563 
 					}
564 
-					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";
565 
-					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";
564 
+					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";
565 
+					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";
566 566 
 					 try {
567 567 
 						$sth = $this->db->prepare($query);
568 568 
 						$sth->execute(array(':filter_name' => $filter_name));
569 
-					} catch(PDOException $e) {
569 
+					} catch (PDOException $e) {
570 570 
 						echo "error : ".$e->getMessage();
571 571 
 					}
572 572 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -578,8 +578,8 @@  discard block
 
 block discarded – undo
578 578 
 					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";
579 579 
 					 try {
580 580 
 						$sth = $this->db->prepare($query);
581 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
582 
-					} catch(PDOException $e) {
581 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
582 
+					} catch (PDOException $e) {
583 583 
 						echo "error : ".$e->getMessage();
584 584 
 					}
585 585 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -590,7 +590,7 @@  discard block
 
 block discarded – undo
590 590 
 			return $Spotter->countAllFlightOverCountries($limit);
591 591 
 		} else return array();
592 592 
 	}
593 
-	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
593 
+	public function countAllMarineOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
594 594 
 		$Connection = new Connection($this->db);
595 595 
 		if ($filter_name == '') $filter_name = $this->filter_name;
596 596 
 		if ($Connection->tableExists('countries')) {
 
@@ -601,7 +601,7 @@  discard block
 
 block discarded – undo
601 601 
 				 try {
602 602 
 					$sth = $this->db->prepare($query);
603 603 
 					$sth->execute(array(':filter_name' => $filter_name));
604 
-				} catch(PDOException $e) {
604 
+				} catch (PDOException $e) {
605 605 
 					echo "error : ".$e->getMessage();
606 606 
 				}
607 607 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -609,15 +609,15 @@  discard block
 
 block discarded – undo
609 609 
 			if (empty($all)) {
610 610 
 				$filters = array();
611 611 
 				if ($filter_name != '') {
612 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
612 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
613 613 
 				}
614 614 
 				$Marine = new Marine($this->db);
615 
-				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
615 
+				$all = $Marine->countAllMarineOverCountries($limit, 0, '', $filters);
616 616 
 			}
617 617 
 			return $all;
618 618 
 		} else return array();
619 619 
 	}
620 
-	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
620 
+	public function countAllTrackerOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
621 621 
 		global $globalStatsFilters;
622 622 
 		$Connection = new Connection($this->db);
623 623 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -629,7 +629,7 @@  discard block
 
 block discarded – undo
629 629 
 				 try {
630 630 
 					$sth = $this->db->prepare($query);
631 631 
 					$sth->execute(array(':filter_name' => $filter_name));
632 
-				} catch(PDOException $e) {
632 
+				} catch (PDOException $e) {
633 633 
 					echo "error : ".$e->getMessage();
634 634 
 				}
635 635 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -638,15 +638,15 @@  discard block
 
 block discarded – undo
638 638 
 			if (empty($all)) {
639 639 
 				$filters = array();
640 640 
 				if ($filter_name != '') {
641 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
642 642 
 				}
643 643 
 				$Tracker = new Tracker($this->db);
644 
-				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
644 
+				$all = $Tracker->countAllTrackerOverCountries($limit, 0, '', $filters);
645 645 
 			}
646 646 
 			return $all;
647 647 
 		} else return array();
648 648 
 	}
649 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
649 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
650 650 
 		global $globalStatsFilters;
651 651 
 		if ($filter_name == '') $filter_name = $this->filter_name;
652 652 
 		if ($year == '' && $month == '') {
 
@@ -654,41 +654,41 @@  discard block
 
 block discarded – undo
654 654 
 			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";
655 655 
 			try {
656 656 
 				$sth = $this->db->prepare($query);
657 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
658 
-			} catch(PDOException $e) {
657 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
658 
+			} catch (PDOException $e) {
659 659 
 				echo "error : ".$e->getMessage();
660 660 
 			}
661 661 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 662 
 		} else $all = array();
663 663 
 		if (empty($all)) {
664 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
664 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
665 665 
 			if ($filter_name != '') {
666 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
666 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
667 667 
 			}
668 668 
 			$Spotter = new Spotter($this->db);
669 669 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
670 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
670 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
671 671 
 		}
672 672 
 		return $all;
673 673 
 	}
674 674
675 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
675 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
676 676 
 		global $globalStatsFilters;
677 677 
 		if ($filter_name == '') $filter_name = $this->filter_name;
678 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
678 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
679 679 
 			$Spotter = new Spotter($this->db);
680 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
680 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
681 681 
 			if ($year == '' && $month == '') {
682 682 
 				$alliance_airlines = array();
683 683 
 				foreach ($airlines as $airline) {
684 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
684 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
685 685 
 				}
686 
-				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";
687 
-				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";
686 
+				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";
687 
+				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";
688 688 
 				try {
689 689 
 					$sth = $this->db->prepare($query);
690 690 
 					$sth->execute(array(':filter_name' => $filter_name));
691 
-				} catch(PDOException $e) {
691 
+				} catch (PDOException $e) {
692 692 
 					echo "error : ".$e->getMessage();
693 693 
 				}
694 694 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -699,45 +699,45 @@  discard block
 
 block discarded – undo
699 699 
 				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";
700 700 
 				try {
701 701 
 					$sth = $this->db->prepare($query);
702 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
703 
-				} catch(PDOException $e) {
702 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
703 
+				} catch (PDOException $e) {
704 704 
 					echo "error : ".$e->getMessage();
705 705 
 				}
706 706 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
707 707 
 			} else $all = array();
708 708 
 		}
709 709 
 		if (empty($all)) {
710 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
711 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
710 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
712 712 
 			} else {
713 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
713 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
714 714 
 			}
715 715 
 			if ($filter_name != '') {
716 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
716 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
717 717 
 			}
718 718 
 			$Spotter = new Spotter($this->db);
719 719 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
720 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
720 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
721 721 
 		}
722 722 
 		return $all;
723 723 
 	}
724 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
724 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
725 725 
 		global $globalStatsFilters;
726 726 
 		if ($filter_name == '') $filter_name = $this->filter_name;
727 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
727 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
728 728 
 			$Spotter = new Spotter($this->db);
729 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
729 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
730 730 
 			if ($year == '' && $month == '') {
731 731 
 				$alliance_airlines = array();
732 732 
 				foreach ($airlines as $airline) {
733 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
733 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
734 734 
 				}
735 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
736 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
735 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
736 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
737 737 
 				try {
738 738 
 					$sth = $this->db->prepare($query);
739 739 
 					$sth->execute(array(':filter_name' => $filter_name));
740 
-				} catch(PDOException $e) {
740 
+				} catch (PDOException $e) {
741 741 
 					echo "error : ".$e->getMessage();
742 742 
 				}
743 743 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -748,27 +748,27 @@  discard block
 
 block discarded – undo
748 748 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
749 749 
 				try {
750 750 
 					$sth = $this->db->prepare($query);
751 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
752 
-				} catch(PDOException $e) {
751 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
752 
+				} catch (PDOException $e) {
753 753 
 					echo "error : ".$e->getMessage();
754 754 
 				}
755 755 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
756 756 
 			} else $all = array();
757 757 
 		}
758 758 
 		if (empty($all)) {
759 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
760 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
759 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
760 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
761 761 
 			} else {
762 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
762 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
763 763 
 			}
764 764 
 			if ($filter_name != '') {
765 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
765 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
766 766 
 			}
767 767 
 			$Spotter = new Spotter($this->db);
768 768 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
769 769 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
770 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
771 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
770 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
771 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
772 772 
 			$all = array();
773 773 
 			foreach ($pall as $value) {
774 774 
 				$icao = $value['airport_departure_icao'];
 
@@ -784,27 +784,27 @@  discard block
 
 block discarded – undo
784 784 
 			foreach ($all as $key => $row) {
785 785 
 				$count[$key] = $row['airport_departure_icao_count'];
786 786 
 			}
787 
-			array_multisort($count,SORT_DESC,$all);
787 
+			array_multisort($count, SORT_DESC, $all);
788 788 
 		}
789 789 
 		return $all;
790 790 
 	}
791 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
791 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
792 792 
 		global $globalStatsFilters;
793 793 
 		if ($filter_name == '') $filter_name = $this->filter_name;
794 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
794 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
795 795 
 			$Spotter = new Spotter($this->db);
796 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
796 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
797 797 
 			if ($year == '' && $month == '') {
798 798 
 				$alliance_airlines = array();
799 799 
 				foreach ($airlines as $airline) {
800 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
800 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
801 801 
 				}
802 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
803 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
802 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
803 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
804 804 
 				try {
805 805 
 					$sth = $this->db->prepare($query);
806 806 
 					$sth->execute(array(':filter_name' => $filter_name));
807 
-				} catch(PDOException $e) {
807 
+				} catch (PDOException $e) {
808 808 
 					echo "error : ".$e->getMessage();
809 809 
 				}
810 810 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -815,27 +815,27 @@  discard block
 
 block discarded – undo
815 815 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
816 816 
 				try {
817 817 
 					$sth = $this->db->prepare($query);
818 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
819 
-				} catch(PDOException $e) {
818 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
819 
+				} catch (PDOException $e) {
820 820 
 					echo "error : ".$e->getMessage();
821 821 
 				}
822 822 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
823 823 
 			} else $all = array();
824 824 
 		}
825 825 
 		if (empty($all)) {
826 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
827 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
826 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
827 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
828 828 
 			} else {
829 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
829 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
830 830 
 			}
831 831 
 			if ($filter_name != '') {
832 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
832 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
833 833 
 			}
834 834 
 			$Spotter = new Spotter($this->db);
835 835 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
836 836 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
837 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
838 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
837 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
838 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
839 839 
 			$all = array();
840 840 
 			foreach ($pall as $value) {
841 841 
 				$icao = $value['airport_arrival_icao'];
 
@@ -851,26 +851,26 @@  discard block
 
 block discarded – undo
851 851 
 			foreach ($all as $key => $row) {
852 852 
 				$count[$key] = $row['airport_arrival_icao_count'];
853 853 
 			}
854 
-			array_multisort($count,SORT_DESC,$all);
854 
+			array_multisort($count, SORT_DESC, $all);
855 855 
 		}
856 856 
 		return $all;
857 857 
 	}
858 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
858 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
859 859 
 		global $globalDBdriver, $globalStatsFilters;
860 860 
 		if ($filter_name == '') $filter_name = $this->filter_name;
861 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
861 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
862 862 
 			$Spotter = new Spotter($this->db);
863 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
863 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
864 864 
 			$alliance_airlines = array();
865 865 
 			foreach ($airlines as $airline) {
866 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
866 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
867 867 
 			}
868 868 
 			if ($globalDBdriver == 'mysql') {
869 
-				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";
870 
-				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";
869 
+				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";
870 
+				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";
871 871 
 			} else {
872 
-				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";
873 
-				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";
872 
+				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";
873 
+				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";
874 874 
 			}
875 875 
 			$query_data = array(':filter_name' => $filter_name);
876 876 
 		} else {
 
@@ -881,23 +881,23 @@  discard block
 
 block discarded – undo
881 881 
 				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";
882 882 
 				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";
883 883 
 			}
884 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
884 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
885 885 
 		}
886 886 
 		try {
887 887 
 			$sth = $this->db->prepare($query);
888 888 
 			$sth->execute($query_data);
889 
-		} catch(PDOException $e) {
889 
+		} catch (PDOException $e) {
890 890 
 			echo "error : ".$e->getMessage();
891 891 
 		}
892 892 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
893 893 
 		if (empty($all)) {
894 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
895 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
894 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
895 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
896 896 
 			} else {
897 897 
 				$filters = array('airlines' => array($stats_airline));
898 898 
 			}
899 899 
 			if ($filter_name != '') {
900 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
900 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
901 901 
 			}
902 902 
 			$Spotter = new Spotter($this->db);
903 903 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -905,7 +905,7 @@  discard block
 
 block discarded – undo
905 905 
 		return $all;
906 906 
 	}
907 907
908 
-	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
908 
+	public function countAllMarineMonthsLastYear($limit = true, $filter_name = '') {
909 909 
 		global $globalDBdriver, $globalStatsFilters;
910 910 
 		if ($filter_name == '') $filter_name = $this->filter_name;
911 911 
 		if ($globalDBdriver == 'mysql') {
 
@@ -919,14 +919,14 @@  discard block
 
 block discarded – undo
919 919 
 		try {
920 920 
 			$sth = $this->db->prepare($query);
921 921 
 			$sth->execute($query_data);
922 
-		} catch(PDOException $e) {
922 
+		} catch (PDOException $e) {
923 923 
 			echo "error : ".$e->getMessage();
924 924 
 		}
925 925 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
926 926 
 		if (empty($all)) {
927 927 
 			$filters = array();
928 928 
 			if ($filter_name != '') {
929 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
929 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
930 930 
 			}
931 931 
 			$Marine = new Marine($this->db);
932 932 
 			$all = $Marine->countAllMonthsLastYear($filters);
 
@@ -934,7 +934,7 @@  discard block
 
 block discarded – undo
934 934 
 		return $all;
935 935 
 	}
936 936
937 
-	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
937 
+	public function countAllTrackerMonthsLastYear($limit = true, $filter_name = '') {
938 938 
 		global $globalDBdriver, $globalStatsFilters;
939 939 
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940 
 		if ($globalDBdriver == 'mysql') {
 
@@ -948,14 +948,14 @@  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 
 			$Tracker = new Tracker($this->db);
961 961 
 			$all = $Tracker->countAllMonthsLastYear($filters);
 
@@ -963,37 +963,37 @@  discard block
 
 block discarded – undo
963 963 
 		return $all;
964 964 
 	}
965 965
966 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
966 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
967 967 
 		global $globalStatsFilters;
968 968 
 		if ($filter_name == '') $filter_name = $this->filter_name;
969 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
970 970 
 			$Spotter = new Spotter($this->db);
971 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
971 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
972 972 
 			$alliance_airlines = array();
973 973 
 			foreach ($airlines as $airline) {
974 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
974 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
975 975 
 			}
976 
-			$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";
976 
+			$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";
977 977 
 			$query_data = array(':filter_name' => $filter_name);
978 978 
 		} else {
979 979 
 			$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";
980 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
980 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
981 981 
 		}
982 982 
 		try {
983 983 
 			$sth = $this->db->prepare($query);
984 984 
 			$sth->execute($query_data);
985 
-		} catch(PDOException $e) {
985 
+		} catch (PDOException $e) {
986 986 
 			echo "error : ".$e->getMessage();
987 987 
 		}
988 988 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
989 989 
 		if (empty($all)) {
990 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
991 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
990 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
991 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
992 992 
 			} else {
993 993 
 				$filters = array('airlines' => array($stats_airline));
994 994 
 			}
995 995 
 			if ($filter_name != '') {
996 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
996 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
997 997 
 			}
998 998 
 			$Spotter = new Spotter($this->db);
999 999 
 			$all = $Spotter->countAllDatesLastMonth($filters);
 
@@ -1008,14 +1008,14 @@  discard block
 
 block discarded – undo
1008 1008 
 		try {
1009 1009 
 			$sth = $this->db->prepare($query);
1010 1010 
 			$sth->execute($query_data);
1011 
-		} catch(PDOException $e) {
1011 
+		} catch (PDOException $e) {
1012 1012 
 			echo "error : ".$e->getMessage();
1013 1013 
 		}
1014 1014 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1015 1015 
 		if (empty($all)) {
1016 1016 
 			$filters = array();
1017 1017 
 			if ($filter_name != '') {
1018 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1018 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1019 1019 
 			}
1020 1020 
 			$Marine = new Marine($this->db);
1021 1021 
 			$all = $Marine->countAllDatesLastMonth($filters);
 
@@ -1030,34 +1030,34 @@  discard block
 
 block discarded – undo
1030 1030 
 		try {
1031 1031 
 			$sth = $this->db->prepare($query);
1032 1032 
 			$sth->execute($query_data);
1033 
-		} catch(PDOException $e) {
1033 
+		} catch (PDOException $e) {
1034 1034 
 			echo "error : ".$e->getMessage();
1035 1035 
 		}
1036 1036 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037 1037 
 		if (empty($all)) {
1038 1038 
 			$filters = array();
1039 1039 
 			if ($filter_name != '') {
1040 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1040 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1041 1041 
 			}
1042 1042 
 			$Tracker = new Tracker($this->db);
1043 1043 
 			$all = $Tracker->countAllDatesLastMonth($filters);
1044 1044 
 		}
1045 1045 
 		return $all;
1046 1046 
 	}
1047 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1047 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
1048 1048 
 		global $globalDBdriver, $globalStatsFilters;
1049 1049 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1050 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1050 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1051 1051 
 			$Spotter = new Spotter($this->db);
1052 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1052 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1053 1053 
 			$alliance_airlines = array();
1054 1054 
 			foreach ($airlines as $airline) {
1055 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1055 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1056 1056 
 			}
1057 1057 
 			if ($globalDBdriver == 'mysql') {
1058 
-				$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";
1058 
+				$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";
1059 1059 
 			} else {
1060 
-				$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";
1060 
+				$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";
1061 1061 
 			}
1062 1062 
 			$query_data = array(':filter_name' => $filter_name);
1063 1063 
 		} else {
 
@@ -1066,23 +1066,23 @@  discard block
 
 block discarded – undo
1066 1066 
 			} else {
1067 1067 
 				$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";
1068 1068 
 			}
1069 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1069 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1070 1070 
 		}
1071 1071 
 		try {
1072 1072 
 			$sth = $this->db->prepare($query);
1073 1073 
 			$sth->execute($query_data);
1074 
-		} catch(PDOException $e) {
1074 
+		} catch (PDOException $e) {
1075 1075 
 			echo "error : ".$e->getMessage();
1076 1076 
 		}
1077 1077 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1078 1078 
 		if (empty($all)) {
1079 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1080 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1079 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1080 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1081 1081 
 			} else {
1082 1082 
 				$filters = array('airlines' => array($stats_airline));
1083 1083 
 			}
1084 1084 
 			if ($filter_name != '') {
1085 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1085 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1086 1086 
 			}
1087 1087 
 			$Spotter = new Spotter($this->db);
1088 1088 
 			$all = $Spotter->countAllDatesLast7Days($filters);
 
@@ -1101,14 +1101,14 @@  discard block
 
 block discarded – undo
1101 1101 
 		try {
1102 1102 
 			$sth = $this->db->prepare($query);
1103 1103 
 			$sth->execute($query_data);
1104 
-		} catch(PDOException $e) {
1104 
+		} catch (PDOException $e) {
1105 1105 
 			echo "error : ".$e->getMessage();
1106 1106 
 		}
1107 1107 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1108 1108 
 		if (empty($all)) {
1109 1109 
 			$filters = array();
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 
 			$Marine = new Marine($this->db);
1114 1114 
 			$all = $Marine->countAllDatesLast7Days($filters);
 
@@ -1127,51 +1127,51 @@  discard block
 
 block discarded – undo
1127 1127 
 		try {
1128 1128 
 			$sth = $this->db->prepare($query);
1129 1129 
 			$sth->execute($query_data);
1130 
-		} catch(PDOException $e) {
1130 
+		} catch (PDOException $e) {
1131 1131 
 			echo "error : ".$e->getMessage();
1132 1132 
 		}
1133 1133 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1134 1134 
 		if (empty($all)) {
1135 1135 
 			$filters = array();
1136 1136 
 			if ($filter_name != '') {
1137 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1137 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1138 1138 
 			}
1139 1139 
 			$Tracker = new Tracker($this->db);
1140 1140 
 			$all = $Tracker->countAllDatesLast7Days($filters);
1141 1141 
 		}
1142 1142 
 		return $all;
1143 1143 
 	}
1144 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
1144 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
1145 1145 
 		global $globalStatsFilters;
1146 1146 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1147 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1147 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1148 1148 
 			$Spotter = new Spotter($this->db);
1149 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1149 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1150 1150 
 			$alliance_airlines = array();
1151 1151 
 			foreach ($airlines as $airline) {
1152 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1152 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1153 1153 
 			}
1154 
-			$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";
1154 
+			$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";
1155 1155 
 			$query_data = array(':filter_name' => $filter_name);
1156 1156 
 		} else {
1157 1157 
 			$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";
1158 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1158 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1159 1159 
 		}
1160 1160 
 		try {
1161 1161 
 			$sth = $this->db->prepare($query);
1162 1162 
 			$sth->execute($query_data);
1163 
-		} catch(PDOException $e) {
1163 
+		} catch (PDOException $e) {
1164 1164 
 			echo "error : ".$e->getMessage();
1165 1165 
 		}
1166 1166 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1167 1167 
 		if (empty($all)) {
1168 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1169 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1168 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1169 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1170 1170 
 			} else {
1171 1171 
 				$filters = array('airlines' => array($stats_airline));
1172 1172 
 			}
1173 1173 
 			if ($filter_name != '') {
1174 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1174 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1175 1175 
 			}
1176 1176 
 			$Spotter = new Spotter($this->db);
1177 1177 
 			$all = $Spotter->countAllDates($filters);
 
@@ -1186,7 +1186,7 @@  discard block
 
 block discarded – undo
1186 1186 
 		try {
1187 1187 
 			$sth = $this->db->prepare($query);
1188 1188 
 			$sth->execute($query_data);
1189 
-		} catch(PDOException $e) {
1189 
+		} catch (PDOException $e) {
1190 1190 
 			echo "error : ".$e->getMessage();
1191 1191 
 		}
1192 1192 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1208,7 +1208,7 @@  discard block
 
 block discarded – undo
1208 1208 
 		try {
1209 1209 
 			$sth = $this->db->prepare($query);
1210 1210 
 			$sth->execute($query_data);
1211 
-		} catch(PDOException $e) {
1211 
+		} catch (PDOException $e) {
1212 1212 
 			echo "error : ".$e->getMessage();
1213 1213 
 		}
1214 1214 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1230,34 +1230,34 @@  discard block
 
 block discarded – undo
1230 1230 
 		try {
1231 1231 
 			$sth = $this->db->prepare($query);
1232 1232 
 			$sth->execute($query_data);
1233 
-		} catch(PDOException $e) {
1233 
+		} catch (PDOException $e) {
1234 1234 
 			echo "error : ".$e->getMessage();
1235 1235 
 		}
1236 1236 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1237 1237 
 		if (empty($all)) {
1238 1238 
 			$filters = array();
1239 1239 
 			if ($filter_name != '') {
1240 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1240 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1241 1241 
 			}
1242 1242 
 			$Spotter = new Spotter($this->db);
1243 1243 
 			$all = $Spotter->countAllDatesByAirlines($filters);
1244 1244 
 		}
1245 1245 
 		return $all;
1246 1246 
 	}
1247 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
1247 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
1248 1248 
 		global $globalStatsFilters, $globalDBdriver;
1249 1249 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1250 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1250 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1251 1251 
 			$Spotter = new Spotter($this->db);
1252 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1252 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1253 1253 
 			$alliance_airlines = array();
1254 1254 
 			foreach ($airlines as $airline) {
1255 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1255 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1256 1256 
 			}
1257 1257 
 			if ($globalDBdriver == 'mysql') {
1258 
-				$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";
1258 
+				$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";
1259 1259 
 			} else {
1260 
-				$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";
1260 
+				$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";
1261 1261 
 			}
1262 1262 
 			$query_data = array(':filter_name' => $filter_name);
1263 1263 
 		} else {
 
@@ -1271,18 +1271,18 @@  discard block
 
 block discarded – undo
1271 1271 
 		try {
1272 1272 
 			$sth = $this->db->prepare($query);
1273 1273 
 			$sth->execute($query_data);
1274 
-		} catch(PDOException $e) {
1274 
+		} catch (PDOException $e) {
1275 1275 
 			echo "error : ".$e->getMessage();
1276 1276 
 		}
1277 1277 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1278 1278 
 		if (empty($all)) {
1279 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1280 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1279 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1280 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1281 1281 
 			} else {
1282 1282 
 				$filters = array('airlines' => array($stats_airline));
1283 1283 
 			}
1284 1284 
 			if ($filter_name != '') {
1285 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1285 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1286 1286 
 			}
1287 1287 
 			$Spotter = new Spotter($this->db);
1288 1288 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1299,7 +1299,7 @@  discard block
 
 block discarded – undo
1299 1299 
 		try {
1300 1300 
 			$sth = $this->db->prepare($query);
1301 1301 
 			$sth->execute();
1302 
-		} catch(PDOException $e) {
1302 
+		} catch (PDOException $e) {
1303 1303 
 			echo "error : ".$e->getMessage();
1304 1304 
 		}
1305 1305 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1319,7 +1319,7 @@  discard block
 
 block discarded – undo
1319 1319 
 		try {
1320 1320 
 			$sth = $this->db->prepare($query);
1321 1321 
 			$sth->execute();
1322 
-		} catch(PDOException $e) {
1322 
+		} catch (PDOException $e) {
1323 1323 
 			echo "error : ".$e->getMessage();
1324 1324 
 		}
1325 1325 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1336,32 +1336,32 @@  discard block
 
 block discarded – undo
1336 1336 
 		try {
1337 1337 
 			$sth = $this->db->prepare($query);
1338 1338 
 			$sth->execute(array(':filter_name' => $filter_name));
1339 
-		} catch(PDOException $e) {
1339 
+		} catch (PDOException $e) {
1340 1340 
 			echo "error : ".$e->getMessage();
1341 1341 
 		}
1342 1342 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1343 1343 
 		if (empty($all)) {
1344 1344 
 			$filters = array();
1345 1345 
 			if ($filter_name != '') {
1346 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1346 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1347 1347 
 			}
1348 1348 
 			$Spotter = new Spotter($this->db);
1349 1349 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1350 1350 
 		}
1351 1351 
 		return $all;
1352 1352 
 	}
1353 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1353 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1354 1354 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1355 1355 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1356 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1356 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1357 1357 
 			$Spotter = new Spotter($this->db);
1358 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1358 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1359 1359 
 			$alliance_airlines = array();
1360 1360 
 			foreach ($airlines as $airline) {
1361 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1361 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1362 1362 
 			}
1363 
-			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";
1364 
-			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";
1363 
+			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";
1364 
+			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";
1365 1365 
 			$query_data = array(':filter_name' => $filter_name);
1366 1366 
 		} else {
1367 1367 
 			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";
 
@@ -1379,25 +1379,25 @@  discard block
 
 block discarded – undo
1379 1379 
 		try {
1380 1380 
 			$sth = $this->db->prepare($query);
1381 1381 
 			$sth->execute($query_data);
1382 
-		} catch(PDOException $e) {
1382 
+		} catch (PDOException $e) {
1383 1383 
 			echo "error : ".$e->getMessage();
1384 1384 
 		}
1385 1385 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1386 1386 
 		if (empty($all)) {
1387 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1388 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1387 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1388 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389 
 			} else {
1390 1390 
 				$filters = array('airlines' => array($stats_airline));
1391 1391 
 			}
1392 1392 
 			if ($filter_name != '') {
1393 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1393 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1394 1394 
 			}
1395 1395 
 			$Spotter = new Spotter($this->db);
1396 
-			$all = $Spotter->countAllHours($orderby,$filters);
1396 
+			$all = $Spotter->countAllHours($orderby, $filters);
1397 1397 
 		}
1398 1398 
 		return $all;
1399 1399 
 	}
1400 
-	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1400 
+	public function countAllMarineHours($orderby = 'hour', $limit = true, $filter_name = '') {
1401 1401 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1402 1402 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1403 1403 
 		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1414,21 +1414,21 @@  discard block
 
 block discarded – undo
1414 1414 
 		try {
1415 1415 
 			$sth = $this->db->prepare($query);
1416 1416 
 			$sth->execute($query_data);
1417 
-		} catch(PDOException $e) {
1417 
+		} catch (PDOException $e) {
1418 1418 
 			echo "error : ".$e->getMessage();
1419 1419 
 		}
1420 1420 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1421 1421 
 		if (empty($all)) {
1422 1422 
 			$filters = array();
1423 1423 
 			if ($filter_name != '') {
1424 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1424 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1425 1425 
 			}
1426 1426 
 			$Marine = new Marine($this->db);
1427 
-			$all = $Marine->countAllHours($orderby,$filters);
1427 
+			$all = $Marine->countAllHours($orderby, $filters);
1428 1428 
 		}
1429 1429 
 		return $all;
1430 1430 
 	}
1431 
-	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1431 
+	public function countAllTrackerHours($orderby = 'hour', $limit = true, $filter_name = '') {
1432 1432 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1433 1433 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1434 1434 
 		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1445,33 +1445,33 @@  discard block
 
 block discarded – undo
1445 1445 
 		try {
1446 1446 
 			$sth = $this->db->prepare($query);
1447 1447 
 			$sth->execute($query_data);
1448 
-		} catch(PDOException $e) {
1448 
+		} catch (PDOException $e) {
1449 1449 
 			echo "error : ".$e->getMessage();
1450 1450 
 		}
1451 1451 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1452 1452 
 		if (empty($all)) {
1453 1453 
 			$filters = array();
1454 1454 
 			if ($filter_name != '') {
1455 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1455 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1456 1456 
 			}
1457 1457 
 			$Tracker = new Tracker($this->db);
1458 
-			$all = $Tracker->countAllHours($orderby,$filters);
1458 
+			$all = $Tracker->countAllHours($orderby, $filters);
1459 1459 
 		}
1460 1460 
 		return $all;
1461 1461 
 	}
1462 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1462 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1463 1463 
 		global $globalStatsFilters;
1464 1464 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1465 1465 
 		if ($year == '') $year = date('Y');
1466 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1466 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1467 1467 
 		if (empty($all)) {
1468 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1469 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1468 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1469 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1470 1470 
 			} else {
1471 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1471 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1472 1472 
 			}
1473 1473 
 			if ($filter_name != '') {
1474 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1474 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1475 1475 
 			}
1476 1476 
 			$Spotter = new Spotter($this->db);
1477 1477 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1479,15 +1479,15 @@  discard block
 
 block discarded – undo
1479 1479 
 		}
1480 1480 
 		return $all;
1481 1481 
 	}
1482 
-	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1482 
+	public function countOverallMarine($filter_name = '', $year = '', $month = '') {
1483 1483 
 		global $globalStatsFilters;
1484 1484 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1485 1485 
 		if ($year == '') $year = date('Y');
1486 
-		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1486 
+		$all = $this->getSumStats('marine_bymonth', $year, '', $filter_name, $month);
1487 1487 
 		if (empty($all)) {
1488 
-			$filters = array('year' => $year,'month' => $month);
1488 
+			$filters = array('year' => $year, 'month' => $month);
1489 1489 
 			if ($filter_name != '') {
1490 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1490 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1491 1491 
 			}
1492 1492 
 			$Marine = new Marine($this->db);
1493 1493 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1495,15 +1495,15 @@  discard block
 
 block discarded – undo
1495 1495 
 		}
1496 1496 
 		return $all;
1497 1497 
 	}
1498 
-	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1498 
+	public function countOverallTracker($filter_name = '', $year = '', $month = '') {
1499 1499 
 		global $globalStatsFilters;
1500 1500 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1501 1501 
 		if ($year == '') $year = date('Y');
1502 
-		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1502 
+		$all = $this->getSumStats('tracker_bymonth', $year, '', $filter_name, $month);
1503 1503 
 		if (empty($all)) {
1504 
-			$filters = array('year' => $year,'month' => $month);
1504 
+			$filters = array('year' => $year, 'month' => $month);
1505 1505 
 			if ($filter_name != '') {
1506 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1506 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1507 1507 
 			}
1508 1508 
 			$Tracker = new Tracker($this->db);
1509 1509 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1511,16 +1511,16 @@  discard block
 
 block discarded – undo
1511 1511 
 		}
1512 1512 
 		return $all;
1513 1513 
 	}
1514 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1514 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1515 1515 
 		global $globalStatsFilters;
1516 1516 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1517 1517 
 		if ($year == '') $year = date('Y');
1518 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1518 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1519 1519 
 		if (empty($all)) {
1520 1520 
 			$filters = array();
1521 
-			$filters = array('year' => $year,'month' => $month);
1521 
+			$filters = array('year' => $year, 'month' => $month);
1522 1522 
 			if ($filter_name != '') {
1523 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1523 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1524 1524 
 			}
1525 1525 
 			$Spotter = new Spotter($this->db);
1526 1526 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1528,19 +1528,19 @@  discard block
 
 block discarded – undo
1528 1528 
 		}
1529 1529 
 		return $all;
1530 1530 
 	}
1531 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1531 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1532 1532 
 		global $globalStatsFilters;
1533 1533 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1534 1534 
 		if ($year == '') $year = date('Y');
1535 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1535 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1536 1536 
 		if (empty($all)) {
1537 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1538 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1537 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1538 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1539 1539 
 			} else {
1540 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1540 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1541 1541 
 			}
1542 1542 
 			if ($filter_name != '') {
1543 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1543 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1544 1544 
 			}
1545 1545 
 			$Spotter = new Spotter($this->db);
1546 1546 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1548,48 +1548,48 @@  discard block
 
 block discarded – undo
1548 1548 
 		}
1549 1549 
 		return $all;
1550 1550 
 	}
1551 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1551 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1552 1552 
 		global $globalStatsFilters;
1553 1553 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1554 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1554 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1555 1555 
 			$Spotter = new Spotter($this->db);
1556 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1556 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1557 1557 
 			if ($year == '' && $month == '') {
1558 1558 
 				$alliance_airlines = array();
1559 1559 
 				foreach ($airlines as $airline) {
1560 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1560 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1561 1561 
 				}
1562 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1562 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1563 1563 
 				try {
1564 1564 
 					$sth = $this->db->prepare($query);
1565 1565 
 					$sth->execute(array(':filter_name' => $filter_name));
1566 
-				} catch(PDOException $e) {
1566 
+				} catch (PDOException $e) {
1567 1567 
 					echo "error : ".$e->getMessage();
1568 1568 
 				}
1569 1569 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1570 1570 
 				$all = $result[0]['nb'];
1571 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1571 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1572 1572 
 		} else {
1573 1573 
 			if ($year == '' && $month == '') {
1574 1574 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1575 1575 
 				try {
1576 1576 
 					$sth = $this->db->prepare($query);
1577 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1578 
-				} catch(PDOException $e) {
1577 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1578 
+				} catch (PDOException $e) {
1579 1579 
 					echo "error : ".$e->getMessage();
1580 1580 
 				}
1581 1581 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1582 1582 
 				$all = $result[0]['nb'];
1583 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1583 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1584 1584 
 		}
1585 1585 
 		if (empty($all)) {
1586 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1587 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1586 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1587 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1588 1588 
 			} else {
1589 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1589 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1590 1590 
 			}
1591 1591 
 			if ($filter_name != '') {
1592 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1592 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1593 1593 
 			}
1594 1594 
 			$Spotter = new Spotter($this->db);
1595 1595 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1597,7 +1597,7 @@  discard block
 
 block discarded – undo
1597 1597 
 		}
1598 1598 
 		return $all;
1599 1599 
 	}
1600 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1600 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1601 1601 
 		global $globalStatsFilters;
1602 1602 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1603 1603 
 		if ($year == '' && $month == '') {
 
@@ -1605,17 +1605,17 @@  discard block
 
 block discarded – undo
1605 1605 
 			try {
1606 1606 
 				$sth = $this->db->prepare($query);
1607 1607 
 				$sth->execute(array(':filter_name' => $filter_name));
1608 
-			} catch(PDOException $e) {
1608 
+			} catch (PDOException $e) {
1609 1609 
 				echo "error : ".$e->getMessage();
1610 1610 
 			}
1611 1611 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1612 1612 
 			$all = $result[0]['nb_airline'];
1613 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1613 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1614 1614 
 		if (empty($all)) {
1615 1615 
 			$filters = array();
1616 
-			$filters = array('year' => $year,'month' => $month);
1616 
+			$filters = array('year' => $year, 'month' => $month);
1617 1617 
 			if ($filter_name != '') {
1618 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1618 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1619 1619 
 			}
1620 1620 
 			$Spotter = new Spotter($this->db);
1621 1621 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1623,7 +1623,7 @@  discard block
 
 block discarded – undo
1623 1623 
 		}
1624 1624 
 		return $all;
1625 1625 
 	}
1626 
-	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1626 
+	public function countOverallMarineTypes($filter_name = '', $year = '', $month = '') {
1627 1627 
 		global $globalStatsFilters;
1628 1628 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1629 1629 
 		$all = array();
 
@@ -1632,7 +1632,7 @@  discard block
 
 block discarded – undo
1632 1632 
 			try {
1633 1633 
 				$sth = $this->db->prepare($query);
1634 1634 
 				$sth->execute(array(':filter_name' => $filter_name));
1635 
-			} catch(PDOException $e) {
1635 
+			} catch (PDOException $e) {
1636 1636 
 				echo "error : ".$e->getMessage();
1637 1637 
 			}
1638 1638 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1640,9 +1640,9 @@  discard block
 
 block discarded – undo
1640 1640 
 		}
1641 1641 
 		if (empty($all)) {
1642 1642 
 			$filters = array();
1643 
-			$filters = array('year' => $year,'month' => $month);
1643 
+			$filters = array('year' => $year, 'month' => $month);
1644 1644 
 			if ($filter_name != '') {
1645 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1645 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1646 1646 
 			}
1647 1647 
 			$Marine = new Marine($this->db);
1648 1648 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1650,29 +1650,29 @@  discard block
 
 block discarded – undo
1650 1650 
 		}
1651 1651 
 		return $all;
1652 1652 
 	}
1653 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1653 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1654 1654 
 		global $globalStatsFilters;
1655 1655 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1656 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1656 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1657 1657 
 			$Spotter = new Spotter($this->db);
1658 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1658 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1659 1659 
 			if ($year == '' && $month == '') {
1660 1660 
 				$alliance_airlines = array();
1661 1661 
 				foreach ($airlines as $airline) {
1662 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1662 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1663 1663 
 				}
1664 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1664 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1665 1665 
 				$query_values = array(':filter_name' => $filter_name);
1666 1666 
 				try {
1667 1667 
 					$sth = $this->db->prepare($query);
1668 1668 
 					$sth->execute($query_values);
1669 
-				} catch(PDOException $e) {
1669 
+				} catch (PDOException $e) {
1670 1670 
 					echo "error : ".$e->getMessage();
1671 1671 
 				}
1672 1672 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1673 1673 
 				$all = $result[0]['nb'];
1674 1674 
 			} else {
1675 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1675 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1676 1676 
 			}
1677 1677 
 		} else {
1678 1678 
 			if ($year == '' && $month == '') {
 
@@ -1681,23 +1681,23 @@  discard block
 
 block discarded – undo
1681 1681 
 				try {
1682 1682 
 					$sth = $this->db->prepare($query);
1683 1683 
 					$sth->execute($query_values);
1684 
-				} catch(PDOException $e) {
1684 
+				} catch (PDOException $e) {
1685 1685 
 					echo "error : ".$e->getMessage();
1686 1686 
 				}
1687 1687 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1688 1688 
 				$all = $result[0]['nb'];
1689 1689 
 			} else {
1690 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1690 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1691 1691 
 			}
1692 1692 
 		}
1693 1693 
 		if (empty($all)) {
1694 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1695 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1694 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1695 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1696 1696 
 			} else {
1697 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1697 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1698 1698 
 			}
1699 1699 
 			if ($filter_name != '') {
1700 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1700 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1701 1701 
 			}
1702 1702 
 			$Spotter = new Spotter($this->db);
1703 1703 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1705,7 +1705,7 @@  discard block
 
 block discarded – undo
1705 1705 
 		}
1706 1706 
 		return $all;
1707 1707 
 	}
1708 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1708 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1709 1709 
 		global $globalStatsFilters;
1710 1710 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1711 1711 
 		//if ($year == '') $year = date('Y');
 
@@ -1715,18 +1715,18 @@  discard block
 
 block discarded – undo
1715 1715 
 			try {
1716 1716 
 				$sth = $this->db->prepare($query);
1717 1717 
 				$sth->execute($query_values);
1718 
-			} catch(PDOException $e) {
1718 
+			} catch (PDOException $e) {
1719 1719 
 				echo "error : ".$e->getMessage();
1720 1720 
 			}
1721 1721 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1722 1722 
 			$all = $result[0]['nb'];
1723 1723 
 		} else {
1724 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1724 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1725 1725 
 		}
1726 1726 
 		if (empty($all)) {
1727 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1727 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1728 1728 
 			if ($filter_name != '') {
1729 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1729 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1730 1730 
 			}
1731 1731 
 			$Spotter = new Spotter($this->db);
1732 1732 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1735,104 +1735,104 @@  discard block
 
 block discarded – undo
1735 1735 
 		return $all;
1736 1736 
 	}
1737 1737
1738 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1738 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1739 1739 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1740 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1740 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1741 1741 
 			$Spotter = new Spotter($this->db);
1742 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1742 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1743 1743 
 			$alliance_airlines = array();
1744 1744 
 			foreach ($airlines as $airline) {
1745 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1745 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1746 1746 
 			}
1747 
-			$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";
1748 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1747 
+			$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";
1748 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1749 1749 
 		} else {
1750 1750 
 			$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";
1751 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1751 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1752 1752 
 		}
1753 1753 
 		try {
1754 1754 
 			$sth = $this->db->prepare($query);
1755 1755 
 			$sth->execute($query_values);
1756 
-		} catch(PDOException $e) {
1756 
+		} catch (PDOException $e) {
1757 1757 
 			echo "error : ".$e->getMessage();
1758 1758 
 		}
1759 1759 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1760 1760 
 		return $all;
1761 1761 
 	}
1762 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1762 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1763 1763 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1764 1764 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1765 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1765 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1766 1766 
 		try {
1767 1767 
 			$sth = $this->db->prepare($query);
1768 1768 
 			$sth->execute($query_values);
1769 
-		} catch(PDOException $e) {
1769 
+		} catch (PDOException $e) {
1770 1770 
 			echo "error : ".$e->getMessage();
1771 1771 
 		}
1772 1772 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1773 1773 
 		return $all;
1774 1774 
 	}
1775 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1775 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1776 1776 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1777 1777 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1778 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1778 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1779 1779 
 		try {
1780 1780 
 			$sth = $this->db->prepare($query);
1781 1781 
 			$sth->execute($query_values);
1782 
-		} catch(PDOException $e) {
1782 
+		} catch (PDOException $e) {
1783 1783 
 			echo "error : ".$e->getMessage();
1784 1784 
 		}
1785 1785 
 	}
1786 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1786 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1787 1787 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1788 1788 
 		global $globalArchiveMonths, $globalDBdriver;
1789 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1789 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1790 1790 
 			$Spotter = new Spotter($this->db);
1791 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1791 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1792 1792 
 			$alliance_airlines = array();
1793 1793 
 			foreach ($airlines as $airline) {
1794 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1794 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1795 1795 
 			}
1796 1796 
 			if ($globalDBdriver == 'mysql') {
1797 1797 
 				if ($month == '') {
1798 
-					$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";
1798 
+					$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";
1799 1799 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1800 1800 
 				} else {
1801 
-					$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";
1802 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1801 
+					$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";
1802 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1803 1803 
 				}
1804 1804 
 			} else {
1805 1805 
 				if ($month == '') {
1806 
-					$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";
1806 
+					$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";
1807 1807 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1808 1808 
 				} else {
1809 
-					$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";
1810 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1809 
+					$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";
1810 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1811 1811 
 				}
1812 1812 
 			}
1813 1813 
 		} else {
1814 1814 
 			if ($globalDBdriver == 'mysql') {
1815 1815 
 				if ($month == '') {
1816 1816 
 					$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";
1817 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1817 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1818 1818 
 				} else {
1819 1819 
 					$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";
1820 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1820 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1821 1821 
 				}
1822 1822 
 			} else {
1823 1823 
 				if ($month == '') {
1824 1824 
 					$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";
1825 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1825 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1826 1826 
 				} else {
1827 1827 
 					$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";
1828 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1828 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1829 1829 
 				}
1830 1830 
 			}
1831 1831 
 		}
1832 1832 
 		try {
1833 1833 
 			$sth = $this->db->prepare($query);
1834 1834 
 			$sth->execute($query_values);
1835 
-		} catch(PDOException $e) {
1835 
+		} catch (PDOException $e) {
1836 1836 
 			echo "error : ".$e->getMessage();
1837 1837 
 		}
1838 1838 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1841,17 +1841,17 @@  discard block
 
 block discarded – undo
1841 1841 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1842 1842 
 		global $globalArchiveMonths, $globalDBdriver;
1843 1843 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1844 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1844 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1845 1845 
 			$Spotter = new Spotter($this->db);
1846 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1846 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1847 1847 
 			$alliance_airlines = array();
1848 1848 
 			foreach ($airlines as $airline) {
1849 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1849 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1850 1850 
 			}
1851 1851 
 			if ($globalDBdriver == 'mysql') {
1852 
-				$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";
1852 
+				$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";
1853 1853 
 			} else {
1854 
-				$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";
1854 
+				$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";
1855 1855 
 			}
1856 1856 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1857 1857 
 		} else {
 
@@ -1865,7 +1865,7 @@  discard block
 
 block discarded – undo
1865 1865 
 		try {
1866 1866 
 			$sth = $this->db->prepare($query);
1867 1867 
 			$sth->execute($query_values);
1868 
-		} catch(PDOException $e) {
1868 
+		} catch (PDOException $e) {
1869 1869 
 			echo "error : ".$e->getMessage();
1870 1870 
 		}
1871 1871 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1874,17 +1874,17 @@  discard block
 
 block discarded – undo
1874 1874 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1875 1875 
 		global $globalArchiveMonths, $globalDBdriver;
1876 1876 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1877 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1877 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1878 1878 
 			$Spotter = new Spotter($this->db);
1879 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1879 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1880 1880 
 			$alliance_airlines = array();
1881 1881 
 			foreach ($airlines as $airline) {
1882 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1882 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1883 1883 
 			}
1884 1884 
 			if ($globalDBdriver == 'mysql') {
1885 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1885 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1886 1886 
 			} else {
1887 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1887 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1888 1888 
 			}
1889 1889 
 		} else {
1890 1890 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1896,7 +1896,7 @@  discard block
 
 block discarded – undo
1896 1896 
 		try {
1897 1897 
 			$sth = $this->db->prepare($query);
1898 1898 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1899 
-		} catch(PDOException $e) {
1899 
+		} catch (PDOException $e) {
1900 1900 
 			echo "error : ".$e->getMessage();
1901 1901 
 		}
1902 1902 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1913,7 +1913,7 @@  discard block
 
 block discarded – undo
1913 1913 
 		try {
1914 1914 
 			$sth = $this->db->prepare($query);
1915 1915 
 			$sth->execute(array(':filter_name' => $filter_name));
1916 
-		} catch(PDOException $e) {
1916 
+		} catch (PDOException $e) {
1917 1917 
 			echo "error : ".$e->getMessage();
1918 1918 
 		}
1919 1919 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1930,20 +1930,20 @@  discard block
 
 block discarded – undo
1930 1930 
 		try {
1931 1931 
 			$sth = $this->db->prepare($query);
1932 1932 
 			$sth->execute(array(':filter_name' => $filter_name));
1933 
-		} catch(PDOException $e) {
1933 
+		} catch (PDOException $e) {
1934 1934 
 			echo "error : ".$e->getMessage();
1935 1935 
 		}
1936 1936 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1937 1937 
 		return $all[0]['total'];
1938 1938 
 	}
1939 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1939 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1940 1940 
 		global $globalArchiveMonths, $globalDBdriver;
1941 1941 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1942 1942 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1943 1943 
 		try {
1944 1944 
 			$sth = $this->db->prepare($query);
1945 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1946 
-		} catch(PDOException $e) {
1945 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1946 
+		} catch (PDOException $e) {
1947 1947 
 			echo "error : ".$e->getMessage();
1948 1948 
 		}
1949 1949 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1961,20 +1961,20 @@  discard block
 
 block discarded – undo
1961 1961 
 		try {
1962 1962 
 			$sth = $this->db->prepare($query);
1963 1963 
 			$sth->execute(array(':filter_name' => $filter_name));
1964 
-		} catch(PDOException $e) {
1964 
+		} catch (PDOException $e) {
1965 1965 
 			echo "error : ".$e->getMessage();
1966 1966 
 		}
1967 1967 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1968 1968 
 		return $all[0]['total'];
1969 1969 
 	}
1970 
-	public function getStatsPilot($pilot,$filter_name = '') {
1970 
+	public function getStatsPilot($pilot, $filter_name = '') {
1971 1971 
 		global $globalArchiveMonths, $globalDBdriver;
1972 1972 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1973 1973 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1974 1974 
 		try {
1975 1975 
 			$sth = $this->db->prepare($query);
1976 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1977 
-		} catch(PDOException $e) {
1976 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1977 
+		} catch (PDOException $e) {
1978 1978 
 			echo "error : ".$e->getMessage();
1979 1979 
 		}
1980 1980 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1982,7 +1982,7 @@  discard block
 
 block discarded – undo
1982 1982 
 		else return 0;
1983 1983 
 	}
1984 1984
1985 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1985 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1986 1986 
 		global $globalDBdriver;
1987 1987 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1988 1988 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1990,15 +1990,15 @@  discard block
 
 block discarded – undo
1990 1990 
 		} else {
1991 1991 
 			$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);";
1992 1992 
 		}
1993 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1993 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1994 1994 
 		try {
1995 1995 
 			$sth = $this->db->prepare($query);
1996 1996 
 			$sth->execute($query_values);
1997 
-		} catch(PDOException $e) {
1997 
+		} catch (PDOException $e) {
1998 1998 
 			return "error : ".$e->getMessage();
1999 1999 
 		}
2000 2000 
 	}
2001 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
2001 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
2002 2002 
 		global $globalDBdriver;
2003 2003 
 		if ($filter_name == '') $filter_name = $this->filter_name;
2004 2004 
 		if ($globalDBdriver == 'mysql') {
 
@@ -2007,11 +2007,11 @@  discard block
 
 block discarded – undo
2007 2007 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
2008 2008 
 			$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);";
2009 2009 
 		}
2010 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2010 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2011 2011 
 		try {
2012 2012 
 			$sth = $this->db->prepare($query);
2013 2013 
 			$sth->execute($query_values);
2014 
-		} catch(PDOException $e) {
2014 
+		} catch (PDOException $e) {
2015 2015 
 			return "error : ".$e->getMessage();
2016 2016 
 		}
2017 2017 
 	}
 
@@ -2035,95 +2035,95 @@  discard block
 
 block discarded – undo
2035 2035 
         }
2036 2036 
         */
2037 2037
2038 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
2038 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
2039 2039 
 		global $globalDBdriver;
2040 2040 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
2041 2041 
 		$query_values = array();
2042 2042 
 		if ($globalDBdriver == 'mysql') {
2043 2043 
 			if ($year != '') {
2044 2044 
 				$query .= ' AND YEAR(stats_date) = :year';
2045 
-				$query_values = array_merge($query_values,array(':year' => $year));
2045 
+				$query_values = array_merge($query_values, array(':year' => $year));
2046 2046 
 			}
2047 2047 
 			if ($month != '') {
2048 2048 
 				$query .= ' AND MONTH(stats_date) = :month';
2049 
-				$query_values = array_merge($query_values,array(':month' => $month));
2049 
+				$query_values = array_merge($query_values, array(':month' => $month));
2050 2050 
 			}
2051 2051 
 			if ($day != '') {
2052 2052 
 				$query .= ' AND DAY(stats_date) = :day';
2053 
-				$query_values = array_merge($query_values,array(':day' => $day));
2053 
+				$query_values = array_merge($query_values, array(':day' => $day));
2054 2054 
 			}
2055 2055 
 		} else {
2056 2056 
 			if ($year != '') {
2057 2057 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
2058 
-				$query_values = array_merge($query_values,array(':year' => $year));
2058 
+				$query_values = array_merge($query_values, array(':year' => $year));
2059 2059 
 			}
2060 2060 
 			if ($month != '') {
2061 2061 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
2062 
-				$query_values = array_merge($query_values,array(':month' => $month));
2062 
+				$query_values = array_merge($query_values, array(':month' => $month));
2063 2063 
 			}
2064 2064 
 			if ($day != '') {
2065 2065 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
2066 
-				$query_values = array_merge($query_values,array(':day' => $day));
2066 
+				$query_values = array_merge($query_values, array(':day' => $day));
2067 2067 
 			}
2068 2068 
 		}
2069 2069 
 		$query .= " ORDER BY source_name";
2070 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
2070 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
2071 2071 
 		try {
2072 2072 
 			$sth = $this->db->prepare($query);
2073 2073 
 			$sth->execute($query_values);
2074 
-		} catch(PDOException $e) {
2074 
+		} catch (PDOException $e) {
2075 2075 
 			echo "error : ".$e->getMessage();
2076 2076 
 		}
2077 2077 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
2078 2078 
 		return $all;
2079 2079 
 	}
2080 2080
2081 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
2081 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
2082 2082 
 		global $globalDBdriver;
2083 2083 
 		if ($globalDBdriver == 'mysql') {
2084 2084 
 			$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";
2085 2085 
 		} else {
2086 2086 
 			$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);";
2087 2087 
 		}
2088 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
2088 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
2089 2089 
 		try {
2090 2090 
 			$sth = $this->db->prepare($query);
2091 2091 
 			$sth->execute($query_values);
2092 
-		} catch(PDOException $e) {
2092 
+		} catch (PDOException $e) {
2093 2093 
 			return "error : ".$e->getMessage();
2094 2094 
 		}
2095 2095 
 	}
2096 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
2096 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
2097 2097 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
2098 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2098 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2099 2099 
 		try {
2100 2100 
 			$sth = $this->db->prepare($query);
2101 2101 
 			$sth->execute($query_values);
2102 
-		} catch(PDOException $e) {
2102 
+		} catch (PDOException $e) {
2103 2103 
 			return "error : ".$e->getMessage();
2104 2104 
 		}
2105 2105 
 	}
2106 
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
2106 
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
2107 2107 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2108 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2108 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2109 2109 
 		try {
2110 2110 
 			$sth = $this->db->prepare($query);
2111 2111 
 			$sth->execute($query_values);
2112 
-		} catch(PDOException $e) {
2112 
+		} catch (PDOException $e) {
2113 2113 
 			return "error : ".$e->getMessage();
2114 2114 
 		}
2115 2115 
 	}
2116 
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
2116 
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
2117 2117 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2118 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2118 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2119 2119 
 		try {
2120 2120 
 			$sth = $this->db->prepare($query);
2121 2121 
 			$sth->execute($query_values);
2122 
-		} catch(PDOException $e) {
2122 
+		} catch (PDOException $e) {
2123 2123 
 			return "error : ".$e->getMessage();
2124 2124 
 		}
2125 2125 
 	}
2126 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
2126 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
2127 2127 
 		global $globalDBdriver;
2128 2128 
 		if ($globalDBdriver == 'mysql') {
2129 2129 
 			if ($reset) {
 
@@ -2138,15 +2138,15 @@  discard block
 
 block discarded – undo
2138 2138 
 				$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);";
2139 2139 
 			}
2140 2140 
 		}
2141 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2141 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2142 2142 
 		try {
2143 2143 
 			$sth = $this->db->prepare($query);
2144 2144 
 			$sth->execute($query_values);
2145 
-		} catch(PDOException $e) {
2145 
+		} catch (PDOException $e) {
2146 2146 
 			return "error : ".$e->getMessage();
2147 2147 
 		}
2148 2148 
 	}
2149 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
2149 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2150 2150 
 		global $globalDBdriver;
2151 2151 
 		if ($globalDBdriver == 'mysql') {
2152 2152 
 			if ($reset) {
 
@@ -2161,15 +2161,15 @@  discard block
 
 block discarded – undo
2161 2161 
 				$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);";
2162 2162 
 			}
2163 2163 
 		}
2164 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
2164 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
2165 2165 
 		try {
2166 2166 
 			$sth = $this->db->prepare($query);
2167 2167 
 			$sth->execute($query_values);
2168 
-		} catch(PDOException $e) {
2168 
+		} catch (PDOException $e) {
2169 2169 
 			return "error : ".$e->getMessage();
2170 2170 
 		}
2171 2171 
 	}
2172 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
2172 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2173 2173 
 		global $globalDBdriver;
2174 2174 
 		if ($globalDBdriver == 'mysql') {
2175 2175 
 			if ($reset) {
 
@@ -2184,15 +2184,15 @@  discard block
 
 block discarded – undo
2184 2184 
 				$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);";
2185 2185 
 			}
2186 2186 
 		}
2187 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
2187 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
2188 2188 
 		try {
2189 2189 
 			$sth = $this->db->prepare($query);
2190 2190 
 			$sth->execute($query_values);
2191 
-		} catch(PDOException $e) {
2191 
+		} catch (PDOException $e) {
2192 2192 
 			return "error : ".$e->getMessage();
2193 2193 
 		}
2194 2194 
 	}
2195 
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2195 
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2196 2196 
 		global $globalDBdriver;
2197 2197 
 		if ($globalDBdriver == 'mysql') {
2198 2198 
 			if ($reset) {
 
@@ -2207,15 +2207,15 @@  discard block
 
 block discarded – undo
2207 2207 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_marine_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2208 2208 
 			}
2209 2209 
 		}
2210 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2210 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2211 2211 
 		try {
2212 2212 
 			$sth = $this->db->prepare($query);
2213 2213 
 			$sth->execute($query_values);
2214 
-		} catch(PDOException $e) {
2214 
+		} catch (PDOException $e) {
2215 2215 
 			return "error : ".$e->getMessage();
2216 2216 
 		}
2217 2217 
 	}
2218 
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2218 
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2219 2219 
 		global $globalDBdriver;
2220 2220 
 		if ($globalDBdriver == 'mysql') {
2221 2221 
 			if ($reset) {
 
@@ -2230,15 +2230,15 @@  discard block
 
 block discarded – undo
2230 2230 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_tracker_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2231 2231 
 			}
2232 2232 
 		}
2233 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2233 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2234 2234 
 		try {
2235 2235 
 			$sth = $this->db->prepare($query);
2236 2236 
 			$sth->execute($query_values);
2237 
-		} catch(PDOException $e) {
2237 
+		} catch (PDOException $e) {
2238 2238 
 			return "error : ".$e->getMessage();
2239 2239 
 		}
2240 2240 
 	}
2241 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2241 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2242 2242 
 		global $globalDBdriver;
2243 2243 
 		if ($globalDBdriver == 'mysql') {
2244 2244 
 			if ($reset) {
 
@@ -2253,15 +2253,15 @@  discard block
 
 block discarded – undo
2253 2253 
 				$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);";
2254 2254 
 			}
2255 2255 
 		}
2256 
-		$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);
2256 
+		$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);
2257 2257 
 		try {
2258 2258 
 			$sth = $this->db->prepare($query);
2259 2259 
 			$sth->execute($query_values);
2260 
-		} catch(PDOException $e) {
2260 
+		} catch (PDOException $e) {
2261 2261 
 			return "error : ".$e->getMessage();
2262 2262 
 		}
2263 2263 
 	}
2264 
-	public function addStatMarineType($type,$type_id,$cnt, $filter_name = '', $reset = false) {
2264 
+	public function addStatMarineType($type, $type_id, $cnt, $filter_name = '', $reset = false) {
2265 2265 
 		global $globalDBdriver;
2266 2266 
 		if ($globalDBdriver == 'mysql') {
2267 2267 
 			if ($reset) {
 
@@ -2276,15 +2276,15 @@  discard block
 
 block discarded – undo
2276 2276 
 				$query = "UPDATE stats_marine_type SET cnt = cnt+:cnt, type = :type, filter_name = :filter_name WHERE type_id = :type_id AND filter_name = :filter_name; INSERT INTO stats_marine_type (type,type_id,cnt,filter_name) SELECT :type,:type_id,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_type WHERE type_id = :type_id AND filter_name = :filter_name);";
2277 2277 
 			}
2278 2278 
 		}
2279 
-		$query_values = array(':type' => $type,':type_id' => $type_id,':cnt' => $cnt, ':filter_name' => $filter_name);
2279 
+		$query_values = array(':type' => $type, ':type_id' => $type_id, ':cnt' => $cnt, ':filter_name' => $filter_name);
2280 2280 
 		try {
2281 2281 
 			$sth = $this->db->prepare($query);
2282 2282 
 			$sth->execute($query_values);
2283 
-		} catch(PDOException $e) {
2283 
+		} catch (PDOException $e) {
2284 2284 
 			return "error : ".$e->getMessage();
2285 2285 
 		}
2286 2286 
 	}
2287 
-	public function addStatTrackerType($type,$cnt, $filter_name = '', $reset = false) {
2287 
+	public function addStatTrackerType($type, $cnt, $filter_name = '', $reset = false) {
2288 2288 
 		global $globalDBdriver;
2289 2289 
 		if ($globalDBdriver == 'mysql') {
2290 2290 
 			if ($reset) {
 
@@ -2299,15 +2299,15 @@  discard block
 
 block discarded – undo
2299 2299 
 				$query = "UPDATE stats_tracker_type SET cnt = cnt+:cnt WHERE type = :type AND filter_name = :filter_name; INSERT INTO stats_tracker_type (type,cnt,filter_name) SELECT :type,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_type WHERE type = :type AND filter_name = :filter_name);";
2300 2300 
 			}
2301 2301 
 		}
2302 
-		$query_values = array(':type' => $type,':cnt' => $cnt, ':filter_name' => $filter_name);
2302 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':filter_name' => $filter_name);
2303 2303 
 		try {
2304 2304 
 			$sth = $this->db->prepare($query);
2305 2305 
 			$sth->execute($query_values);
2306 
-		} catch(PDOException $e) {
2306 
+		} catch (PDOException $e) {
2307 2307 
 			return "error : ".$e->getMessage();
2308 2308 
 		}
2309 2309 
 	}
2310 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
2310 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
2311 2311 
 		global $globalDBdriver;
2312 2312 
 		if ($globalDBdriver == 'mysql') {
2313 2313 
 			if ($reset) {
 
@@ -2322,15 +2322,15 @@  discard block
 
 block discarded – undo
2322 2322 
 				$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);";
2323 2323 
 			}
2324 2324 
 		}
2325 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
2325 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2326 2326 
 		try {
2327 2327 
 			$sth = $this->db->prepare($query);
2328 2328 
 			$sth->execute($query_values);
2329 
-		} catch(PDOException $e) {
2329 
+		} catch (PDOException $e) {
2330 2330 
 			return "error : ".$e->getMessage();
2331 2331 
 		}
2332 2332 
 	}
2333 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
2333 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
2334 2334 
 		global $globalDBdriver;
2335 2335 
 		if ($globalDBdriver == 'mysql') {
2336 2336 
 			if ($reset) {
 
@@ -2345,15 +2345,15 @@  discard block
 
 block discarded – undo
2345 2345 
 				$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);";
2346 2346 
 			}
2347 2347 
 		}
2348 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2348 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2349 2349 
 		try {
2350 2350 
 			$sth = $this->db->prepare($query);
2351 2351 
 			$sth->execute($query_values);
2352 
-		} catch(PDOException $e) {
2352 
+		} catch (PDOException $e) {
2353 2353 
 			return "error : ".$e->getMessage();
2354 2354 
 		}
2355 2355 
 	}
2356 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
2356 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
2357 2357 
 		global $globalDBdriver;
2358 2358 
 		if ($globalDBdriver == 'mysql') {
2359 2359 
 			if ($reset) {
 
@@ -2368,15 +2368,15 @@  discard block
 
 block discarded – undo
2368 2368 
 				$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);";
2369 2369 
 			}
2370 2370 
 		}
2371 
-		$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);
2371 
+		$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);
2372 2372 
 		try {
2373 2373 
 			$sth = $this->db->prepare($query);
2374 2374 
 			$sth->execute($query_values);
2375 
-		} catch(PDOException $e) {
2375 
+		} catch (PDOException $e) {
2376 2376 
 			return "error : ".$e->getMessage();
2377 2377 
 		}
2378 2378 
 	}
2379 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
2379 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
2380 2380 
 		global $globalDBdriver;
2381 2381 
 		if ($airport_icao != '') {
2382 2382 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2392,16 +2392,16 @@  discard block
 
 block discarded – undo
2392 2392 
 					$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);";
2393 2393 
 				}
2394 2394 
 			}
2395 
-			$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);
2395 
+			$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);
2396 2396 
 			try {
2397 2397 
 				$sth = $this->db->prepare($query);
2398 2398 
 				$sth->execute($query_values);
2399 
-			} catch(PDOException $e) {
2399 
+			} catch (PDOException $e) {
2400 2400 
 				return "error : ".$e->getMessage();
2401 2401 
 			}
2402 2402 
 		}
2403 2403 
 	}
2404 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
2404 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
2405 2405 
 		global $globalDBdriver;
2406 2406 
 		if ($airport_icao != '') {
2407 2407 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2409,16 +2409,16 @@  discard block
 
 block discarded – undo
2409 2409 
 			} else {
2410 2410 
 				$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);";
2411 2411 
 			}
2412 
-			$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);
2412 
+			$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);
2413 2413 
 			 try {
2414 2414 
 				$sth = $this->db->prepare($query);
2415 2415 
 				$sth->execute($query_values);
2416 
-			} catch(PDOException $e) {
2416 
+			} catch (PDOException $e) {
2417 2417 
 				return "error : ".$e->getMessage();
2418 2418 
 			}
2419 2419 
 		}
2420 2420 
 	}
2421 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
2421 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
2422 2422 
 		global $globalDBdriver;
2423 2423 
 		if ($airport_icao != '') {
2424 2424 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2434,16 +2434,16 @@  discard block
 
 block discarded – undo
2434 2434 
 					$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);";
2435 2435 
 				}
2436 2436 
 			}
2437 
-			$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);
2437 
+			$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);
2438 2438 
 			try {
2439 2439 
 				$sth = $this->db->prepare($query);
2440 2440 
 				$sth->execute($query_values);
2441 
-			} catch(PDOException $e) {
2441 
+			} catch (PDOException $e) {
2442 2442 
 				return "error : ".$e->getMessage();
2443 2443 
 			}
2444 2444 
 		}
2445 2445 
 	}
2446 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
2446 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
2447 2447 
 		global $globalDBdriver;
2448 2448 
 		if ($airport_icao != '') {
2449 2449 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2451,11 +2451,11 @@  discard block
 
 block discarded – undo
2451 2451 
 			} else {
2452 2452 
 				$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);";
2453 2453 
 			}
2454 
-			$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);
2454 
+			$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);
2455 2455 
 			try {
2456 2456 
 				$sth = $this->db->prepare($query);
2457 2457 
 				$sth->execute($query_values);
2458 
-			} catch(PDOException $e) {
2458 
+			} catch (PDOException $e) {
2459 2459 
 				return "error : ".$e->getMessage();
2460 2460 
 			}
2461 2461 
 		}
 
@@ -2467,7 +2467,7 @@  discard block
 
 block discarded – undo
2467 2467 
 		try {
2468 2468 
 			$sth = $this->db->prepare($query);
2469 2469 
 			$sth->execute($query_values);
2470 
-		} catch(PDOException $e) {
2470 
+		} catch (PDOException $e) {
2471 2471 
 			return "error : ".$e->getMessage();
2472 2472 
 		}
2473 2473 
 	}
 
@@ -2477,7 +2477,7 @@  discard block
 
 block discarded – undo
2477 2477 
 		try {
2478 2478 
 			$sth = $this->db->prepare($query);
2479 2479 
 			$sth->execute($query_values);
2480 
-		} catch(PDOException $e) {
2480 
+		} catch (PDOException $e) {
2481 2481 
 			return "error : ".$e->getMessage();
2482 2482 
 		}
2483 2483 
 	}
 
@@ -2487,7 +2487,7 @@  discard block
 
 block discarded – undo
2487 2487 
 		try {
2488 2488 
 			$sth = $this->db->prepare($query);
2489 2489 
 			$sth->execute($query_values);
2490 
-		} catch(PDOException $e) {
2490 
+		} catch (PDOException $e) {
2491 2491 
 			return "error : ".$e->getMessage();
2492 2492 
 		}
2493 2493 
 	}
 
@@ -2497,7 +2497,7 @@  discard block
 
 block discarded – undo
2497 2497 
 		try {
2498 2498 
 			$sth = $this->db->prepare($query);
2499 2499 
 			$sth->execute($query_values);
2500 
-		} catch(PDOException $e) {
2500 
+		} catch (PDOException $e) {
2501 2501 
 			return "error : ".$e->getMessage();
2502 2502 
 		}
2503 2503 
 	}
 
@@ -2507,13 +2507,13 @@  discard block
 
 block discarded – undo
2507 2507 
 		try {
2508 2508 
 			$sth = $this->db->prepare($query);
2509 2509 
 			$sth->execute($query_values);
2510 
-		} catch(PDOException $e) {
2510 
+		} catch (PDOException $e) {
2511 2511 
 			return "error : ".$e->getMessage();
2512 2512 
 		}
2513 2513 
 	}
2514 2514
2515 2515 
 	public function addOldStats() {
2516 
-		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
2516 
+		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
2517 2517 
 		$Common = new Common();
2518 2518 
 		$Connection = new Connection($this->db);
2519 2519 
 		date_default_timezone_set('UTC');
 
@@ -2528,9 +2528,9 @@  discard block
 
 block discarded – undo
2528 2528 
 			$filtername = 'marine';
2529 2529 
 			if ($Connection->tableExists('countries')) {
2530 2530 
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2531 
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2531 
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
2532 2532 
 				foreach ($alldata as $number) {
2533 
-					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2533 
+					echo $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
2534 2534 
 				}
2535 2535 
 			}
2536 2536 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2540,44 +2540,44 @@  discard block
 
 block discarded – undo
2540 2540 
 			$lastyear = false;
2541 2541 
 			foreach ($alldata as $number) {
2542 2542 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2543 
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2543 
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2544 2544 
 			}
2545 2545 
 			echo 'Marine data...'."\n";
2546 2546 
 			$this->deleteStatMarine('month');
2547 2547 
 			echo '-> countAllDatesLastMonth...'."\n";
2548 2548 
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
2549 2549 
 			foreach ($alldata as $number) {
2550 
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
2550 
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
2551 2551 
 			}
2552 2552 
 			echo '-> countAllDates...'."\n";
2553 2553 
 			$previousdata = $this->countAllDatesMarine();
2554 2554 
 			$this->deleteStatMarine('date');
2555 
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
2555 
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
2556 2556 
 			$values = array();
2557 2557 
 			foreach ($alldata as $cnt) {
2558 2558 
 				$values[] = $cnt['date_count'];
2559 2559 
 			}
2560 
-			array_multisort($values,SORT_DESC,$alldata);
2561 
-			array_splice($alldata,11);
2560 
+			array_multisort($values, SORT_DESC, $alldata);
2561 
+			array_splice($alldata, 11);
2562 2562 
 			foreach ($alldata as $number) {
2563 
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
2563 
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
2564 2564 
 			}
2565 2565
2566 2566 
 			$this->deleteStatMarine('hour');
2567 2567 
 			echo '-> countAllHours...'."\n";
2568 
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
2568 
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
2569 2569 
 			foreach ($alldata as $number) {
2570 
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2570 
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
2571 2571 
 			}
2572 2572 
 			if ($globalDebug) echo 'Count all types...'."\n";
2573 
-			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2573 
+			$alldata = $Marine->countAllMarineTypes(false, 0, $last_update_day);
2574 2574 
 			foreach ($alldata as $number) {
2575 
-				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
2575 
+				$this->addStatMarineType($number['marine_type'], $number['marine_type_id'], $number['marine_type_count'], '', $reset);
2576 2576 
 			}
2577 2577
2578 2578 
 			echo 'Insert last stats update date...'."\n";
2579 2579 
 			date_default_timezone_set('UTC');
2580 
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
2580 
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
2581 2581 
 		}
2582 2582 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2583 2583 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
 
@@ -2589,9 +2589,9 @@  discard block
 
 block discarded – undo
2589 2589 
 			$Tracker = new Tracker($this->db);
2590 2590 
 			if ($Connection->tableExists('countries')) {
2591 2591 
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2592 
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2592 
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
2593 2593 
 				foreach ($alldata as $number) {
2594 
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2594 
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
2595 2595 
 				}
2596 2596 
 			}
2597 2597 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2601,43 +2601,43 @@  discard block
 
 block discarded – undo
2601 2601 
 			$lastyear = false;
2602 2602 
 			foreach ($alldata as $number) {
2603 2603 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2604 
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2604 
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2605 2605 
 			}
2606 2606 
 			echo 'Tracker data...'."\n";
2607 2607 
 			$this->deleteStatTracker('month');
2608 2608 
 			echo '-> countAllDatesLastMonth...'."\n";
2609 2609 
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
2610 2610 
 			foreach ($alldata as $number) {
2611 
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
2611 
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
2612 2612 
 			}
2613 2613 
 			echo '-> countAllDates...'."\n";
2614 2614 
 			$previousdata = $this->countAllDatesTracker();
2615 2615 
 			$this->deleteStatTracker('date');
2616 
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
2616 
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
2617 2617 
 			$values = array();
2618 2618 
 			foreach ($alldata as $cnt) {
2619 2619 
 				$values[] = $cnt['date_count'];
2620 2620 
 			}
2621 
-			array_multisort($values,SORT_DESC,$alldata);
2622 
-			array_splice($alldata,11);
2621 
+			array_multisort($values, SORT_DESC, $alldata);
2622 
+			array_splice($alldata, 11);
2623 2623 
 			foreach ($alldata as $number) {
2624 
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
2624 
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
2625 2625 
 			}
2626 2626
2627 2627 
 			$this->deleteStatTracker('hour');
2628 2628 
 			echo '-> countAllHours...'."\n";
2629 
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
2629 
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
2630 2630 
 			foreach ($alldata as $number) {
2631 
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2631 
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
2632 2632 
 			}
2633 2633 
 			if ($globalDebug) echo 'Count all types...'."\n";
2634 
-			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2634 
+			$alldata = $Tracker->countAllTrackerTypes(false, 0, $last_update_day);
2635 2635 
 			foreach ($alldata as $number) {
2636 
-				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
2636 
+				$this->addStatTrackerType($number['tracker_type'], $number['tracker_type_count'], '', $reset);
2637 2637 
 			}
2638 2638 
 			echo 'Insert last stats update date...'."\n";
2639 2639 
 			date_default_timezone_set('UTC');
2640 
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
2640 
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
2641 2641 
 		}
2642 2642
2643 2643 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 
@@ -2655,41 +2655,41 @@  discard block
 
 block discarded – undo
2655 2655 
 			$Spotter = new Spotter($this->db);
2656 2656
2657 2657 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2658 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2658 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2659 2659 
 			foreach ($alldata as $number) {
2660 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2660 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2661 2661 
 			}
2662 2662 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2663 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2663 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2664 2664 
 			foreach ($alldata as $number) {
2665 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2665 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2666 2666 
 			}
2667 2667 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2668 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2668 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2669 2669 
 			foreach ($alldata as $number) {
2670 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2670 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2671 2671 
 			}
2672 2672 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2673 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2673 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2674 2674 
 			foreach ($alldata as $number) {
2675 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2675 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2676 2676 
 			}
2677 2677 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2678 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2678 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2679 2679 
 			foreach ($alldata as $number) {
2680 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2680 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2681 2681 
 			}
2682 2682 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2683 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2683 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2684 2684 
 			foreach ($alldata as $number) {
2685 2685 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2686 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2686 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2687 2687 
 			}
2688 2688
2689 2689 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2690 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2690 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2691 2691 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2692 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2692 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2693 2693 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2694 2694 
 			$alldata = array();
2695 2695 
 			foreach ($pall as $value) {
 
@@ -2706,14 +2706,14 @@  discard block
 
 block discarded – undo
2706 2706 
 			foreach ($alldata as $key => $row) {
2707 2707 
 				$count[$key] = $row['airport_departure_icao_count'];
2708 2708 
 			}
2709 
-			array_multisort($count,SORT_DESC,$alldata);
2709 
+			array_multisort($count, SORT_DESC, $alldata);
2710 2710 
 			foreach ($alldata as $number) {
2711 
-				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);
2711 
+				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);
2712 2712 
 			}
2713 2713 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2714 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2714 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2715 2715 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2716 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2716 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2717 2717 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2718 2718 
 			$alldata = array();
2719 2719 
 			foreach ($pall as $value) {
 
@@ -2730,18 +2730,18 @@  discard block
 
 block discarded – undo
2730 2730 
 			foreach ($alldata as $key => $row) {
2731 2731 
 				$count[$key] = $row['airport_arrival_icao_count'];
2732 2732 
 			}
2733 
-			array_multisort($count,SORT_DESC,$alldata);
2733 
+			array_multisort($count, SORT_DESC, $alldata);
2734 2734 
 			foreach ($alldata as $number) {
2735 
-				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);
2735 
+				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);
2736 2736 
 			}
2737 2737 
 			if ($Connection->tableExists('countries')) {
2738 2738 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2739 2739 
 				//$SpotterArchive = new SpotterArchive();
2740 2740 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2741 2741 
 				$Spotter = new Spotter($this->db);
2742 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2742 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2743 2743 
 				foreach ($alldata as $number) {
2744 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2744 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2745 2745 
 				}
2746 2746 
 			}
2747 2747 
 			
@@ -2751,12 +2751,12 @@  discard block
 
 block discarded – undo
2751 2751 
 				$this->deleteStatsByType('fatalities_byyear');
2752 2752 
 				$alldata = $Accident->countFatalitiesByYear();
2753 2753 
 				foreach ($alldata as $number) {
2754 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2754 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2755 2755 
 				}
2756 2756 
 				$this->deleteStatsByType('fatalities_bymonth');
2757 2757 
 				$alldata = $Accident->countFatalitiesLast12Months();
2758 2758 
 				foreach ($alldata as $number) {
2759 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2759 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2760 2760 
 				}
2761 2761 
 			}
2762 2762 
 
@@ -2770,37 +2770,37 @@  discard block
 
 block discarded – undo
2770 2770 
 			$lastyear = false;
2771 2771 
 			foreach ($alldata as $number) {
2772 2772 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2773 
-				$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'])));
2773 
+				$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'])));
2774 2774 
 			}
2775 2775 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2776 2776 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2777 2777 
 			foreach ($alldata as $number) {
2778 
-				$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'])));
2778 
+				$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'])));
2779 2779 
 			}
2780 2780 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2781 2781 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2782 2782 
 			foreach ($alldata as $number) {
2783 
-				$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'])));
2783 
+				$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'])));
2784 2784 
 			}
2785 2785 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2786 2786 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2787 2787 
 			foreach ($alldata as $number) {
2788 
-				$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'])));
2788 
+				$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'])));
2789 2789 
 			}
2790 2790 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2791 2791 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2792 2792 
 			foreach ($alldata as $number) {
2793 
-				$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'])));
2793 
+				$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'])));
2794 2794 
 			}
2795 2795 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2796 2796 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2797 2797 
 			foreach ($alldata as $number) {
2798 
-				$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'])));
2798 
+				$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'])));
2799 2799 
 			}
2800 2800 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2801 2801 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2802 2802 
 			foreach ($alldata as $number) {
2803 
-				$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'])));
2803 
+				$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'])));
2804 2804 
 			}
2805 2805 
 			if ($globalDebug) echo 'Airports data...'."\n";
2806 2806 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2845,7 +2845,7 @@  discard block
 
 block discarded – undo
2845 2845 
 			}
2846 2846 
 			$alldata = $pall;
2847 2847 
 			foreach ($alldata as $number) {
2848 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2848 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2849 2849 
 			}
2850 2850 
 			echo '...Arrival'."\n";
2851 2851 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2886,7 +2886,7 @@  discard block
 
 block discarded – undo
2886 2886 
 			}
2887 2887 
 			$alldata = $pall;
2888 2888 
 			foreach ($alldata as $number) {
2889 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2889 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2890 2890 
 			}
2891 2891
2892 2892 
 			echo 'Flights data...'."\n";
 
@@ -2894,28 +2894,28 @@  discard block
 
 block discarded – undo
2894 2894 
 			echo '-> countAllDatesLastMonth...'."\n";
2895 2895 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2896 2896 
 			foreach ($alldata as $number) {
2897 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2897 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2898 2898 
 			}
2899 2899 
 			echo '-> countAllDates...'."\n";
2900 2900 
 			$previousdata = $this->countAllDates();
2901 2901 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2902 2902 
 			$this->deleteStatFlight('date');
2903 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2903 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2904 2904 
 			$values = array();
2905 2905 
 			foreach ($alldata as $cnt) {
2906 2906 
 				$values[] = $cnt['date_count'];
2907 2907 
 			}
2908 
-			array_multisort($values,SORT_DESC,$alldata);
2909 
-			array_splice($alldata,11);
2908 
+			array_multisort($values, SORT_DESC, $alldata);
2909 
+			array_splice($alldata, 11);
2910 2910 
 			foreach ($alldata as $number) {
2911 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2911 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2912 2912 
 			}
2913 2913
2914 2914 
 			$this->deleteStatFlight('hour');
2915 2915 
 			echo '-> countAllHours...'."\n";
2916 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2916 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2917 2917 
 			foreach ($alldata as $number) {
2918 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2918 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2919 2919 
 			}
2920 2920
2921 2921 
 			// Count by airlines
 
@@ -2924,42 +2924,42 @@  discard block
 
 block discarded – undo
2924 2924 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2925 2925 
 				$SpotterArchive = new SpotterArchive($this->db);
2926 2926 
 				//$Spotter = new Spotter($this->db);
2927 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2927 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2928 2928 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2929 2929 
 				foreach ($alldata as $number) {
2930 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2930 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2931 2931 
 				}
2932 2932 
 			}
2933 2933 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2934 2934 
 			$Spotter = new Spotter($this->db);
2935 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2935 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2936 2936 
 			foreach ($alldata as $number) {
2937 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2937 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2938 2938 
 			}
2939 2939 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2940 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2940 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2941 2941 
 			foreach ($alldata as $number) {
2942 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2942 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2943 2943 
 			}
2944 2944 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2945 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2945 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2946 2946 
 			foreach ($alldata as $number) {
2947 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2947 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2948 2948 
 			}
2949 2949 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2950 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2950 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2951 2951 
 			foreach ($alldata as $number) {
2952 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2952 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2953 2953 
 			}
2954 2954 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2955 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2955 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2956 2956 
 			foreach ($alldata as $number) {
2957 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2957 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2958 2958 
 			}
2959 2959 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2960 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2960 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2961 2961 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2962 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2962 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2963 2963 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2964 2964 
 			//$alldata = array();
2965 2965 
 			foreach ($dall as $value) {
 
@@ -2979,12 +2979,12 @@  discard block
 
 block discarded – undo
2979 2979 
 			}
2980 2980 
 			$alldata = $pall;
2981 2981 
 			foreach ($alldata as $number) {
2982 
-				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);
2982 
+				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);
2983 2983 
 			}
2984 2984 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2985 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2985 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2986 2986 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2987 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2987 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2988 2988 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2989 2989 
 			//$alldata = array();
2990 2990 
 			foreach ($dall as $value) {
 
@@ -3004,7 +3004,7 @@  discard block
 
 block discarded – undo
3004 3004 
 			}
3005 3005 
 			$alldata = $pall;
3006 3006 
 			foreach ($alldata as $number) {
3007 
-				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);
3007 
+				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);
3008 3008 
 			}
3009 3009 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3010 3010 
 			$Spotter = new Spotter($this->db);
 
@@ -3012,27 +3012,27 @@  discard block
 
 block discarded – undo
3012 3012 
 			$lastyear = false;
3013 3013 
 			foreach ($alldata as $number) {
3014 3014 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
3015 
-				$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']);
3015 
+				$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']);
3016 3016 
 			}
3017 3017 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3018 3018 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3019 3019 
 			foreach ($alldata as $number) {
3020 
-				$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']);
3020 
+				$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']);
3021 3021 
 			}
3022 3022 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3023 3023 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3024 3024 
 			foreach ($alldata as $number) {
3025 
-				$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']);
3025 
+				$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']);
3026 3026 
 			}
3027 3027 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3028 3028 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3029 3029 
 			foreach ($alldata as $number) {
3030 
-				$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']);
3030 
+				$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']);
3031 3031 
 			}
3032 3032 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3033 3033 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3034 3034 
 			foreach ($alldata as $number) {
3035 
-				$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']);
3035 
+				$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']);
3036 3036 
 			}
3037 3037 
 			if ($globalDebug) echo '...Departure'."\n";
3038 3038 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -3055,7 +3055,7 @@  discard block
 
 block discarded – undo
3055 3055 
 			}
3056 3056 
 			$alldata = $pall;
3057 3057 
 			foreach ($alldata as $number) {
3058 
-				$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']);
3058 
+				$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']);
3059 3059 
 			}
3060 3060 
 			if ($globalDebug) echo '...Arrival'."\n";
3061 3061 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -3078,32 +3078,32 @@  discard block
 
 block discarded – undo
3078 3078 
 			}
3079 3079 
 			$alldata = $pall;
3080 3080 
 			foreach ($alldata as $number) {
3081 
-				$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']);
3081 
+				$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']);
3082 3082 
 			}
3083 3083
3084 3084 
 			if ($globalDebug) echo 'Flights data...'."\n";
3085 3085 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3086 3086 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3087 3087 
 			foreach ($alldata as $number) {
3088 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3088 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
3089 3089 
 			}
3090 3090 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
3091 3091 
 			//$previousdata = $this->countAllDatesByAirlines();
3092 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3092 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
3093 3093 
 			$values = array();
3094 3094 
 			foreach ($alldata as $cnt) {
3095 3095 
 				$values[] = $cnt['date_count'];
3096 3096 
 			}
3097 
-			array_multisort($values,SORT_DESC,$alldata);
3098 
-			array_splice($alldata,11);
3097 
+			array_multisort($values, SORT_DESC, $alldata);
3098 
+			array_splice($alldata, 11);
3099 3099 
 			foreach ($alldata as $number) {
3100 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3100 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
3101 3101 
 			}
3102 3102
3103 3103 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
3104 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3104 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
3105 3105 
 			foreach ($alldata as $number) {
3106 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3106 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
3107 3107 
 			}
3108 3108
3109 3109 
 			// Stats by filters
 
@@ -3127,7 +3127,7 @@  discard block
 
 block discarded – undo
3127 3127 
 							$last_update_day = date('Y').'-01-01 00:00:00';
3128 3128 
 						}
3129 3129 
 					}
3130 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
3130 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
3131 3131 
 						$last_update_day = date('Y').'-01-01 00:00:00';
3132 3132 
 						$reset = true;
3133 3133 
 					}
 
@@ -3135,38 +3135,38 @@  discard block
 
 block discarded – undo
3135 3135 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3136 3136 
 					$Spotter = new Spotter($this->db);
3137 3137 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3138 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3138 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
3139 3139 
 					foreach ($alldata as $number) {
3140 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3140 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
3141 3141 
 					}
3142 3142 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
3143 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3143 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
3144 3144 
 					foreach ($alldata as $number) {
3145 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3145 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
3146 3146 
 					}
3147 3147 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3148 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3148 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
3149 3149 
 					foreach ($alldata as $number) {
3150 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3150 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
3151 3151 
 					}
3152 3152 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
3153 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3153 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
3154 3154 
 					foreach ($alldata as $number) {
3155 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3155 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
3156 3156 
 					}
3157 3157 
 					if ($globalDebug) echo 'Count all owners...'."\n";
3158 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3158 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
3159 3159 
 					foreach ($alldata as $number) {
3160 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3160 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
3161 3161 
 					}
3162 3162 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
3163 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3163 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
3164 3164 
 					foreach ($alldata as $number) {
3165 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3165 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
3166 3166 
 					}
3167 3167 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
3168 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3169 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3168 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
3169 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
3170 3170 
 					$alldata = array();
3171 3171 
 					foreach ($pall as $value) {
3172 3172 
 						$icao = $value['airport_departure_icao'];
 
@@ -3182,13 +3182,13 @@  discard block
 
 block discarded – undo
3182 3182 
 					foreach ($alldata as $key => $row) {
3183 3183 
 						$count[$key] = $row['airport_departure_icao_count'];
3184 3184 
 					}
3185 
-					array_multisort($count,SORT_DESC,$alldata);
3185 
+					array_multisort($count, SORT_DESC, $alldata);
3186 3186 
 					foreach ($alldata as $number) {
3187 
-						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);
3187 
+						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);
3188 3188 
 					}
3189 3189 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3190 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3191 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3190 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
3191 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
3192 3192 
 					$alldata = array();
3193 3193 
 					foreach ($pall as $value) {
3194 3194 
 						$icao = $value['airport_arrival_icao'];
 
@@ -3204,9 +3204,9 @@  discard block
 
 block discarded – undo
3204 3204 
 					foreach ($alldata as $key => $row) {
3205 3205 
 						$count[$key] = $row['airport_arrival_icao_count'];
3206 3206 
 					}
3207 
-					array_multisort($count,SORT_DESC,$alldata);
3207 
+					array_multisort($count, SORT_DESC, $alldata);
3208 3208 
 					foreach ($alldata as $number) {
3209 
-						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);
3209 
+						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);
3210 3210 
 					}
3211 3211 
 					if ($globalDebug) echo 'Count all months...'."\n";
3212 3212 
 					$Spotter = new Spotter($this->db);
 
@@ -3214,36 +3214,36 @@  discard block
 
 block discarded – undo
3214 3214 
 					$lastyear = false;
3215 3215 
 					foreach ($alldata as $number) {
3216 3216 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
3217 
-						$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);
3217 
+						$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);
3218 3218 
 					}
3219 3219 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
3220 3220 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3221 3221 
 					foreach ($alldata as $number) {
3222 
-						$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);
3222 
+						$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);
3223 3223 
 					}
3224 3224 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3225 3225 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3226 3226 
 					foreach ($alldata as $number) {
3227 
-						$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);
3227 
+						$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);
3228 3228 
 					}
3229 3229 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
3230 3230 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3231 3231 
 					foreach ($alldata as $number) {
3232 
-						$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);
3232 
+						$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);
3233 3233 
 					}
3234 3234 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3235 3235 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3236 3236 
 				    	foreach ($alldata as $number) {
3237 
-			    			$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);
3237 
+			    			$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);
3238 3238 
 					}
3239 3239 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3240 3240 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3241 3241 
 					foreach ($alldata as $number) {
3242 
-						$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);
3242 
+						$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);
3243 3243 
 					}
3244 3244 
 					echo '...Departure'."\n";
3245 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
3246 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
3245 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
3246 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
3247 3247 
 					foreach ($dall as $value) {
3248 3248 
 						$icao = $value['departure_airport_icao'];
3249 3249 
 						$ddate = $value['date'];
 
@@ -3261,11 +3261,11 @@  discard block
 
 block discarded – undo
3261 3261 
 					}
3262 3262 
 					$alldata = $pall;
3263 3263 
 					foreach ($alldata as $number) {
3264 
-						$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);
3264 
+						$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);
3265 3265 
 					}
3266 3266 
 					echo '...Arrival'."\n";
3267 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
3268 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
3267 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
3268 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
3269 3269 
 					foreach ($dall as $value) {
3270 3270 
 						$icao = $value['arrival_airport_icao'];
3271 3271 
 						$ddate = $value['date'];
 
@@ -3283,39 +3283,39 @@  discard block
 
 block discarded – undo
3283 3283 
 					}
3284 3284 
 					$alldata = $pall;
3285 3285 
 					foreach ($alldata as $number) {
3286 
-						$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);
3286 
+						$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);
3287 3287 
 					}
3288 3288 
 					echo 'Flights data...'."\n";
3289 3289 
 					echo '-> countAllDatesLastMonth...'."\n";
3290 3290 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
3291 3291 
 					foreach ($alldata as $number) {
3292 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
3292 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
3293 3293 
 					}
3294 3294 
 					echo '-> countAllDates...'."\n";
3295 
-					$previousdata = $this->countAllDates('',$filter_name);
3296 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
3295 
+					$previousdata = $this->countAllDates('', $filter_name);
3296 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
3297 3297 
 					$values = array();
3298 3298 
 					foreach ($alldata as $cnt) {
3299 3299 
 						$values[] = $cnt['date_count'];
3300 3300 
 					}
3301 
-					array_multisort($values,SORT_DESC,$alldata);
3302 
-					array_splice($alldata,11);
3301 
+					array_multisort($values, SORT_DESC, $alldata);
3302 
+					array_splice($alldata, 11);
3303 3303 
 					foreach ($alldata as $number) {
3304 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
3304 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
3305 3305 
 					}
3306 3306
3307 3307 
 					echo '-> countAllHours...'."\n";
3308 
-					$alldata = $Spotter->countAllHours('hour',$filter);
3308 
+					$alldata = $Spotter->countAllHours('hour', $filter);
3309 3309 
 					foreach ($alldata as $number) {
3310 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
3310 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
3311 3311 
 					}
3312 3312 
 					echo 'Insert last stats update date...'."\n";
3313 3313 
 					date_default_timezone_set('UTC');
3314 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
3314 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
3315 3315 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
3316 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
3316 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
3317 3317 
 							$this->deleteOldStats($filter_name);
3318 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
3318 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
3319 3319 
 						}
3320 3320 
 					}
3321 3321 
 				}
 
@@ -3328,16 +3328,16 @@  discard block
 
 block discarded – undo
3328 3328 
 				// SUM all previous month to put as year
3329 3329 
 				$previous_year = date('Y');
3330 3330 
 				$previous_year--;
3331 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3332 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3333 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3334 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3331 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3332 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3333 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3334 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3335 3335 
 				$allairlines = $this->getAllAirlineNames();
3336 3336 
 				foreach ($allairlines as $data) {
3337 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3338 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3339 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3340 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3337 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3338 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3339 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3340 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3341 3341 
 				}
3342 3342
3343 3343 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -3346,21 +3346,21 @@  discard block
 
 block discarded – undo
3346 3346 
 						try {
3347 3347 
 							$sth = $this->db->prepare($query);
3348 3348 
 							$sth->execute();
3349 
-						} catch(PDOException $e) {
3349 
+						} catch (PDOException $e) {
3350 3350 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3351 3351 
 						}
3352 3352 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
3353 3353 
 						try {
3354 3354 
 							$sth = $this->db->prepare($query);
3355 3355 
 							$sth->execute();
3356 
-						} catch(PDOException $e) {
3356 
+						} catch (PDOException $e) {
3357 3357 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3358 3358 
 						}
3359 3359 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
3360 3360 
 						try {
3361 3361 
 							$sth = $this->db->prepare($query);
3362 3362 
 							$sth->execute();
3363 
-						} catch(PDOException $e) {
3363 
+						} catch (PDOException $e) {
3364 3364 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3365 3365 
 						}
3366 3366 
 					}
 
@@ -3373,7 +3373,7 @@  discard block
 
 block discarded – undo
3373 3373 
 					try {
3374 3374 
 						$sth = $this->db->prepare($query);
3375 3375 
 						$sth->execute();
3376 
-					} catch(PDOException $e) {
3376 
+					} catch (PDOException $e) {
3377 3377 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3378 3378 
 					}
3379 3379 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3384,7 +3384,7 @@  discard block
 
 block discarded – undo
3384 3384 
 					try {
3385 3385 
 						$sth = $this->db->prepare($query);
3386 3386 
 						$sth->execute();
3387 
-					} catch(PDOException $e) {
3387 
+					} catch (PDOException $e) {
3388 3388 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3389 3389 
 					}
3390 3390 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3395,15 +3395,15 @@  discard block
 
 block discarded – undo
3395 3395 
 					try {
3396 3396 
 						$sth = $this->db->prepare($query);
3397 3397 
 						$sth->execute();
3398 
-					} catch(PDOException $e) {
3398 
+					} catch (PDOException $e) {
3399 3399 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3400 3400 
 					}
3401 3401 
 				}
3402 3402 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
3403 3403 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
3404 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
3404 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
3405 3405 
 						$this->deleteOldStats();
3406 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
3406 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
3407 3407 
 						$lastyearupdate = true;
3408 3408 
 					}
3409 3409 
 				}
 
@@ -3425,7 +3425,7 @@  discard block
 
 block discarded – undo
3425 3425 
 					try {
3426 3426 
 						$sth = $this->db->prepare($query);
3427 3427 
 						$sth->execute();
3428 
-					} catch(PDOException $e) {
3428 
+					} catch (PDOException $e) {
3429 3429 
 						return "error : ".$e->getMessage();
3430 3430 
 					}
3431 3431 
 					echo 'Archive old tracker data...'."\n";
 
@@ -3441,7 +3441,7 @@  discard block
 
 block discarded – undo
3441 3441 
 					try {
3442 3442 
 						$sth = $this->db->prepare($query);
3443 3443 
 						$sth->execute();
3444 
-					} catch(PDOException $e) {
3444 
+					} catch (PDOException $e) {
3445 3445 
 						return "error : ".$e->getMessage();
3446 3446 
 					}
3447 3447 
 					echo 'Archive old marine data...'."\n";
 
@@ -3457,7 +3457,7 @@  discard block
 
 block discarded – undo
3457 3457 
 					try {
3458 3458 
 						$sth = $this->db->prepare($query);
3459 3459 
 						$sth->execute();
3460 
-					} catch(PDOException $e) {
3460 
+					} catch (PDOException $e) {
3461 3461 
 						return "error : ".$e->getMessage();
3462 3462 
 					}
3463 3463 
 				}
 
@@ -3470,7 +3470,7 @@  discard block
 
 block discarded – undo
3470 3470 
 				try {
3471 3471 
 					$sth = $this->db->prepare($query);
3472 3472 
 					$sth->execute();
3473 
-				} catch(PDOException $e) {
3473 
+				} catch (PDOException $e) {
3474 3474 
 					return "error : ".$e->getMessage();
3475 3475 
 				}
3476 3476 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -3482,7 +3482,7 @@  discard block
 
 block discarded – undo
3482 3482 
 				try {
3483 3483 
 					$sth = $this->db->prepare($query);
3484 3484 
 					$sth->execute();
3485 
-				} catch(PDOException $e) {
3485 
+				} catch (PDOException $e) {
3486 3486 
 					return "error : ".$e->getMessage();
3487 3487 
 				}
3488 3488 
 				echo 'Deleting old marine data...'."\n";
 
@@ -3494,14 +3494,14 @@  discard block
 
 block discarded – undo
3494 3494 
 				try {
3495 3495 
 					$sth = $this->db->prepare($query);
3496 3496 
 					$sth->execute();
3497 
-				} catch(PDOException $e) {
3497 
+				} catch (PDOException $e) {
3498 3498 
 					return "error : ".$e->getMessage();
3499 3499 
 				}
3500 3500 
 			}
3501 3501 
 			if (!isset($lastyearupdate)) {
3502 3502 
 				echo 'Insert last stats update date...'."\n";
3503 3503 
 				date_default_timezone_set('UTC');
3504 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
3504 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
3505 3505 
 			}
3506 3506 
 			if ($globalStatsResetYear) {
3507 3507 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
aircraft-data.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -11,14 +11,14 @@  discard block
 
 block discarded – undo
11 11
12 12 
 $from_archive = false;
13 13 
 if (isset($_GET['ident'])) {
14 
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
14 
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
15 15 
 	if (isset($_GET['currenttime'])) {
16 
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
16 
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
17 17 
 		$currenttime = round($currenttime/1000);
18 
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
18 
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
19 19 
 		if (empty($spotter_array)) {
20 20 
 			$from_archive = true;
21 
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
21 
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
22 22 
 		}
23 23 
 	} else {
24 24 
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
 
@@ -29,15 +29,15 @@  discard block
 
 block discarded – undo
29 29 
 	}
30 30 
 }
31 31 
 if (isset($_GET['flightaware_id'])) {
32 
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
32 
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
33 33 
 	if (isset($_GET['currenttime'])) {
34 
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
34 
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
35 35 
 		$currenttime = round($currenttime/1000);
36 
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
36 
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
37 37 
 		if (empty($spotter_array)) {
38 38 
 			$from_archive = true;
39 39 
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
40 
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
40 
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
41 41 
 		}
42 42 
 	} else {
43 43 
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
 	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
58 58 
 	{
59 59 
 		if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
60 
-			$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
60 
+			$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
61 61 
 		} else $image = $spotter_item['image_thumbnail'];
62 62 
 	}
63 63 
 	/* else {
 
@@ -80,7 +80,7 @@  discard block
 
 block discarded – undo
80 80 
 		print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
81 81 
 		if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
82 82 
 			if ($spotter_item['departure_airport_time'] > 2460) {
83 
-				print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
83 
+				print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
84 84 
 			} else {
85 85 
 				print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
86 86 
 			}
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
 		print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
90 90 
 		if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
91 91 
 			if ($spotter_item['arrival_airport_time'] > 2460) {
92 
-				print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
92 
+				print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
93 93 
 			} else {
94 94 
 				print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
95 95 
 			}
 
@@ -108,7 +108,7 @@  discard block
 
 block discarded – undo
108 108 
 	print '<span>'._("Aircraft").'</span>';
109 109 
 	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
110 110 
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
111 
-		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
111 
+		$aircraft_names = explode('/', $spotter_item['aircraft_name']);
112 112 
 		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
113 113 
 		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
114 114 
 	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
 
@@ -118,8 +118,8 @@  discard block
 
 block discarded – undo
118 118 
 	print '<div id ="altitude"><span>'._("Altitude").'</span>';
119 119 
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
120 120 
 		try {
121 
-			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
122 
-		} catch(Exception $e) {
121 
+			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
122 
+		} catch (Exception $e) {
123 123 
 			// If catched not exist
124 124 
 		}
125 125 
 	}
 
@@ -158,9 +158,9 @@  discard block
 
 block discarded – undo
158 158 
 	if (isset($globalCam) && $globalCam) {
159 159 
 		require_once(dirname(__FILE__).'/require/class.Common.php');
160 160 
 		$Common = new Common();
161 
-		$azimuth = round($Common->azimuth($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude']));
162 
-		$distance = $Common->distance($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude'],'m');
163 
-		$plunge = round($Common->plunge($globalCenterAltitude,$spotter_item['real_altitude'],$distance));
161 
+		$azimuth = round($Common->azimuth($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude']));
162 
+		$distance = $Common->distance($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude'], 'm');
163 
+		$plunge = round($Common->plunge($globalCenterAltitude, $spotter_item['real_altitude'], $distance));
164 164 
 		print '<div id="camcoordinates"><span>'._("Cam Coordinates").'</span>';
165 165 
 		print 'azimuth: '.$azimuth;
166 166 
 		print ' / ';
 
@@ -170,16 +170,16 @@  discard block
 
 block discarded – undo
170 170 
 		print '</div>';
171 171 
 		//echo $Common->getData('http://127.0.0.1/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
172 172 
 		//echo $Common->getData('file://'.dirname(__FILE__).'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
173 
-		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
173 
+		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge, 'get', '', '', '', '', '', '', false, true);
174 174 
 	}
175 175
176 176 
 	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
177 177 
 	if (isset($spotter_item['verticalrate']) && $spotter_item['verticalrate'] != '') {
178 178 
 		print '<div id="verticalrate"><span>'._("Vertical rate").'</span>';
179 179 
 		if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
180 
-			print $spotter_item['verticalrate']. ' ft/min';
180 
+			print $spotter_item['verticalrate'].' ft/min';
181 181 
 		} else {
182 
-			print round($spotter_item['verticalrate']*0.3048). ' m/min';
182 
+			print round($spotter_item['verticalrate']*0.3048).' m/min';
183 183 
 		}
184 184 
 		print '</div>';
185 185 
 	}
 
@@ -214,7 +214,7 @@  discard block
 
 block discarded – undo
214 214 
 	print '</div>';
215 215 
 	if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
216 216 
 	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
217 
-	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
217 
+	if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>';
218 218 
 	if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
219 219 
 	print '</div>';
220 220 
 }
Please login to merge, or discard this patch.
require/class.Common.php 1 patch
Spacing   +118 added lines, -118 removed lines patch added patch discarded remove patch 
@@ -14,12 +14,12 @@  discard block
 
 block discarded – undo
14 14 
 	* @param Array $headers header to submit with the form
15 15 
 	* @return String the result
16 16 
 	*/
17 
-	public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '', $sizelimit = false, $async = false) {
17 
+	public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '', $sizelimit = false, $async = false) {
18 18 
 		global $globalProxy, $globalForceIPv4;
19 19 
 		$ch = curl_init();
20 20 
 		curl_setopt($ch, CURLOPT_URL, $url);
21 21 
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
22 
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
22 
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
23 23 
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
24 24 
 			}
25 25 
 		}
 
@@ -29,7 +29,7 @@  discard block
 
 block discarded – undo
29 29 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
30 30 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
31 31 
 		curl_setopt($ch, CURLINFO_HEADER_OUT, true);
32 
-		curl_setopt($ch,CURLOPT_ENCODING , "gzip");
32 
+		curl_setopt($ch, CURLOPT_ENCODING, "gzip");
33 33 
 		//curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
34 34 
 //		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0');
35 35 
 		if ($useragent == '') {
 
@@ -39,13 +39,13 @@  discard block
 
 block discarded – undo
39 39 
 		}
40 40 
 		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10);
41 41 
 		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
42 
-		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
42 
+		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback"));
43 43 
 		if ($type == 'post') {
44 44 
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
45 45 
 			if (is_array($data)) {
46 46 
 				curl_setopt($ch, CURLOPT_POST, count($data));
47 47 
 				$data_string = '';
48 
-				foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
48 
+				foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; }
49 49 
 				rtrim($data_string, '&');
50 50 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
51 51 
 			} else {
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
 		}
58 58 
 		if ($cookie != '') {
59 59 
 			if (is_array($cookie)) {
60 
-				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';'));
60 
+				curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';'));
61 61 
 			} else {
62 62 
 				curl_setopt($ch, CURLOPT_COOKIE, $cookie);
63 63 
 			}
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68 
 		if ($sizelimit === true) {
69 69 
 			curl_setopt($ch, CURLOPT_BUFFERSIZE, 128);
70 70 
 			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
71 
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr,$downloadsize, $downloaded, $uploadsize, $uploaded){
71 
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curlr, $downloadsize, $downloaded, $uploadsize, $uploaded) {
72 72 
 				return ($downloaded > (3*1024)) ? 1 : 0;
73 73 
 			});
74 74 
 		}
 
@@ -79,13 +79,13 @@  discard block
 
 block discarded – undo
79 79 
 		$result = curl_exec($ch);
80 80 
 		$info = curl_getinfo($ch);
81 81 
 		curl_close($ch);
82 
-		if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) {
82 
+		if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) {
83 83 
 			echo "Cloudflare Detected\n";
84 84 
 			require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php');
85 85 
 			$useragent = UAgent::random();
86 86 
 			cloudflare::useUserAgent($useragent);
87 87 
 			if ($clearanceCookie = cloudflare::bypass($url)) {
88 
-				return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent);
88 
+				return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent);
89 89 
 			}
90 90 
 		} else {
91 91 
 			return $result;
 
@@ -109,7 +109,7 @@  discard block
 
 block discarded – undo
109 109 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
110 110 
 		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
111 111 
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
112 
-			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
112 
+			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) {
113 113 
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
114 114 
 			}
115 115 
 		}
 
@@ -124,20 +124,20 @@  discard block
 
 block discarded – undo
124 124 
 		fclose($fp);
125 125 
 	}
126 126
127 
-	public static function gunzip($in_file,$out_file_name = '') {
127 
+	public static function gunzip($in_file, $out_file_name = '') {
128 128 
 		//echo $in_file.' -> '.$out_file_name."\n";
129 129 
 		$buffer_size = 4096; // read 4kb at a time
130 130 
 		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
131 131 
 		if ($in_file != '' && file_exists($in_file)) {
132 132 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
133 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
134 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
133 
+			if (function_exists('gzopen')) $file = gzopen($in_file, 'rb');
134 
+			elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb');
135 135 
 			else {
136 136 
 				echo 'gzopen not available';
137 137 
 				die;
138 138 
 			}
139 139 
 			$out_file = fopen($out_file_name, 'wb');
140 
-			while(!gzeof($file)) {
140 
+			while (!gzeof($file)) {
141 141 
 				fwrite($out_file, gzread($file, $buffer_size));
142 142 
 			}
143 143 
 			fclose($out_file);
 
@@ -145,19 +145,19 @@  discard block
 
 block discarded – undo
145 145 
 		}
146 146 
 	}
147 147
148 
-	public static function bunzip2($in_file,$out_file_name = '') {
148 
+	public static function bunzip2($in_file, $out_file_name = '') {
149 149 
 		//echo $in_file.' -> '.$out_file_name."\n";
150 150 
 		$buffer_size = 4096; // read 4kb at a time
151 151 
 		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file);
152 152 
 		if ($in_file != '' && file_exists($in_file)) {
153 153 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
154 
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
154 
+			if (function_exists('bzopen')) $file = bzopen($in_file, 'rb');
155 155 
 			else {
156 156 
 				echo 'bzopen not available';
157 157 
 				die;
158 158 
 			}
159 159 
 			$out_file = fopen($out_file_name, 'wb');
160 
-			while(!feof($file)) {
160 
+			while (!feof($file)) {
161 161 
 				fwrite($out_file, bzread($file, $buffer_size));
162 162 
 			}
163 163 
 			fclose($out_file);
 
@@ -175,27 +175,27 @@  discard block
 
 block discarded – undo
175 175 
 		if ($data == '') return array();
176 176 
 		$html = str_get_html($data);
177 177 
 		if ($html === false) return array();
178 
-		$tabledata=array();
179 
-		foreach($html->find('tr') as $element)
178 
+		$tabledata = array();
179 
+		foreach ($html->find('tr') as $element)
180 180 
 		{
181 181 
 			$td = array();
182 
-			foreach( $element->find('th') as $row)
182 
+			foreach ($element->find('th') as $row)
183 183 
 			{
184 184 
 				$td [] = trim($row->plaintext);
185 185 
 			}
186 
-			$td=array_filter($td);
186 
+			$td = array_filter($td);
187 187 
 			$tabledata[] = $td;
188 188
189 189 
 			$td = array();
190 190 
 			$tdi = array();
191 
-			foreach( $element->find('td') as $row)
191 
+			foreach ($element->find('td') as $row)
192 192 
 			{
193 193 
 				$td [] = trim($row->plaintext);
194 194 
 				$tdi [] = trim($row->innertext);
195 195 
 			}
196 
-			$td=array_filter($td);
197 
-			$tdi=array_filter($tdi);
198 
-			$tabledata[]=array_merge($td,$tdi);
196 
+			$td = array_filter($td);
197 
+			$tdi = array_filter($tdi);
198 
+			$tabledata[] = array_merge($td, $tdi);
199 199 
 		}
200 200 
 		$html->clear();
201 201 
 		unset($html);
 
@@ -210,8 +210,8 @@  discard block
 
 block discarded – undo
210 210 
 	public function text2array($data) {
211 211 
 		$html = str_get_html($data);
212 212 
 		if ($html === false) return array();
213 
-		$tabledata=array();
214 
-		foreach($html->find('p') as $element)
213 
+		$tabledata = array();
214 
+		foreach ($html->find('p') as $element)
215 215 
 		{
216 216 
 			$tabledata [] = trim($element->plaintext);
217 217 
 		}
 
@@ -231,11 +231,11 @@  discard block
 
 block discarded – undo
231 231 
 	*/
232 232 
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
233 233 
 		if ($lat == $latc && $lon == $lonc) return 0;
234 
-		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
234 
+		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515;
235 235 
 		if ($unit == "km") {
236 
-			return round($dist * 1.609344);
236 
+			return round($dist*1.609344);
237 237 
 		} elseif ($unit == "m") {
238 
-			return round($dist * 1.609344 * 1000);
238 
+			return round($dist*1.609344*1000);
239 239 
 		} elseif ($unit == "mile" || $unit == "mi") {
240 240 
 			return round($dist);
241 241 
 		} elseif ($unit == "nm") {
 
@@ -252,8 +252,8 @@  discard block
 
 block discarded – undo
252 252 
 	* @param String $distance distance between two points in m
253 253 
 	* @return Float plunge
254 254 
 	*/
255 
-	public function plunge($initial_altitude,$final_altitude,$distance) {
256 
-		$plunge = rad2deg(asin(($final_altitude-$initial_altitude)/$distance));
255 
+	public function plunge($initial_altitude, $final_altitude, $distance) {
256 
+		$plunge = rad2deg(asin(($final_altitude - $initial_altitude)/$distance));
257 257 
 		/*
258 258 
 		$siter = 6378137.0 + $initial_altitude;
259 259 
 		$planer = 6378137.0 + $final_altitude;
 
@@ -275,8 +275,8 @@  discard block
 
 block discarded – undo
275 275 
 	public function azimuth($lat, $lon, $latc, $lonc) {
276 276 
 		$dX = $latc - $lat;
277 277 
 		$dY = $lonc - $lon;
278 
-		$azimuth = rad2deg(atan2($dY,$dX));
279 
-		if ($azimuth < 0) return $azimuth+360;
278 
+		$azimuth = rad2deg(atan2($dY, $dX));
279 
+		if ($azimuth < 0) return $azimuth + 360;
280 280 
 		return $azimuth;
281 281 
 	}
282 282 
 	
@@ -287,7 +287,7 @@  discard block
 
 block discarded – undo
287 287 
 	* @param float $distance distance covered
288 288 
 	* @return whether distance is realistic
289 289 
 	*/
290 
-	public function withinThreshold ($timeDifference, $distance) {
290 
+	public function withinThreshold($timeDifference, $distance) {
291 291 
 		$x = abs($timeDifference);
292 292 
 		$d = abs($distance);
293 293 
 		if ($x == 0 || $d == 0) return true;
 
@@ -303,13 +303,13 @@  discard block
 
 block discarded – undo
303 303 
 		return ($array !== array_values($array));
304 304 
 	}
305 305
306 
-	public function isInteger($input){
306 
+	public function isInteger($input) {
307 307 
 		//return(ctype_digit(strval($input)));
308 
-		return preg_match('/^-?[0-9]+$/', (string)$input) ? true : false;
308 
+		return preg_match('/^-?[0-9]+$/', (string) $input) ? true : false;
309 309 
 	}
310 310
311 311
312 
-	public function convertDec($dms,$latlong) {
312 
+	public function convertDec($dms, $latlong) {
313 313 
 		if ($latlong == 'latitude') {
314 314 
 			$deg = substr($dms, 0, 2);
315 315 
 			$min = substr($dms, 2, 4);
 
@@ -317,10 +317,10 @@  discard block
 
 block discarded – undo
317 317 
 			$deg = substr($dms, 0, 3);
318 318 
 			$min = substr($dms, 3, 5);
319 319 
 		}
320 
-		return $deg+(($min*60)/3600);
320 
+		return $deg + (($min*60)/3600);
321 321 
 	}
322 322
323 
-	public function convertDM($coord,$latlong) {
323 
+	public function convertDM($coord, $latlong) {
324 324 
 		if ($latlong == 'latitude') {
325 325 
 			if ($coord < 0) $NSEW = 'S';
326 326 
 			else $NSEW = 'N';
 
@@ -330,9 +330,9 @@  discard block
 
 block discarded – undo
330 330 
 		}
331 331 
 		$coord = abs($coord);
332 332 
 		$deg = floor($coord);
333 
-		$coord = ($coord-$deg)*60;
333 
+		$coord = ($coord - $deg)*60;
334 334 
 		$min = $coord;
335 
-		return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW);
335 
+		return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW);
336 336 
 	}
337 337
338 338 
 	/**
 
@@ -344,8 +344,8 @@  discard block
 
 block discarded – undo
344 344 
 	public function xcopy($source, $dest)
345 345 
 	{
346 346 
 		$files = glob($source.'*.*');
347 
-		foreach($files as $file){
348 
-			$file_to_go = str_replace($source,$dest,$file);
347 
+		foreach ($files as $file) {
348 
+			$file_to_go = str_replace($source, $dest, $file);
349 349 
 			copy($file, $file_to_go);
350 350 
 		}
351 351 
 		return true;
 
@@ -356,9 +356,9 @@  discard block
 
 block discarded – undo
356 356 
 	* @param	String $url url to check
357 357 
 	* @return	bool Return true on succes false on failure
358 358 
 	*/
359 
-	public function urlexist($url){
360 
-		$headers=get_headers($url);
361 
-		return stripos($headers[0],"200 OK")?true:false;
359 
+	public function urlexist($url) {
360 
+		$headers = get_headers($url);
361 
+		return stripos($headers[0], "200 OK") ?true:false;
362 362 
 	}
363 363
364 364 
 	/**
 
@@ -369,7 +369,7 @@  discard block
 
 block discarded – undo
369 369 
 	public function hex2str($hex) {
370 370 
 		$str = '';
371 371 
 		$hexln = strlen($hex);
372 
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
372 
+		for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2)));
373 373 
 		return $str;
374 374 
 	}
375 375 
 	
@@ -379,7 +379,7 @@  discard block
 
 block discarded – undo
379 379 
 	* @return	String Return result
380 380 
 	*/
381 381 
 	public function hex2rgb($hex) {
382 
-		$hex = str_replace('#','',$hex);
382 
+		$hex = str_replace('#', '', $hex);
383 383 
 		return sscanf($hex, "%02x%02x%02x");
384 384 
 	}
385 385 
 	
@@ -387,33 +387,33 @@  discard block
 
 block discarded – undo
387 387 
 		//difference in longitudinal coordinates
388 388 
 		$dLon = deg2rad($lon2) - deg2rad($lon1);
389 389 
 		//difference in the phi of latitudinal coordinates
390 
-		$dPhi = log(tan(deg2rad($lat2) / 2 + M_PI / 4) / tan(deg2rad($lat1) / 2 + M_PI / 4));
390 
+		$dPhi = log(tan(deg2rad($lat2)/2 + M_PI/4)/tan(deg2rad($lat1)/2 + M_PI/4));
391 391 
 		//we need to recalculate $dLon if it is greater than pi
392 
-		if(abs($dLon) > M_PI) {
393 
-			if($dLon > 0) {
394 
-				$dLon = (2 * M_PI - $dLon) * -1;
392 
+		if (abs($dLon) > M_PI) {
393 
+			if ($dLon > 0) {
394 
+				$dLon = (2*M_PI - $dLon)*-1;
395 395 
 			} else {
396 
-				$dLon = 2 * M_PI + $dLon;
396 
+				$dLon = 2*M_PI + $dLon;
397 397 
 			}
398 398 
 		}
399 399 
 		//return the angle, normalized
400 
-		return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360;
400 
+		return (rad2deg(atan2($dLon, $dPhi)) + 360)%360;
401 401 
 	}
402 402
403 
-	public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.15) {
403 
+	public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.15) {
404 404 
 		//$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1);
405 
-		$a = -($lon2-$lon1);
405 
+		$a = -($lon2 - $lon1);
406 406 
 		$b = $lat2 - $lat1;
407 
-		$c = -($a*$lat1+$b*$lon1);
408 
-		$d = $a*$lat3+$b*$lon3+$c;
407 
+		$c = -($a*$lat1 + $b*$lon1);
408 
+		$d = $a*$lat3 + $b*$lon3 + $c;
409 409 
 		if ($d > -$approx && $d < $approx) return true;
410 410 
 		else return false;
411 411 
 	}
412 412
413 413 
 	public function array_merge_noappend() {
414 414 
 		$output = array();
415 
-		foreach(func_get_args() as $array) {
416 
-			foreach($array as $key => $value) {
415 
+		foreach (func_get_args() as $array) {
416 
+			foreach ($array as $key => $value) {
417 417 
 				$output[$key] = isset($output[$key]) ?
418 418 
 				array_merge($output[$key], $value) : $value;
419 419 
 			}
 
@@ -477,7 +477,7 @@  discard block
 
 block discarded – undo
477 477 
 		return $result;
478 478 
 	}
479 479
480 
-	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = ''){
480 
+	public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1, $seconds = '') {
481 481 
 		global $globalMapRefresh;
482 482 
 		if ($seconds == '') {
483 483 
 			$distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000;
 
@@ -488,27 +488,27 @@  discard block
 
 block discarded – undo
488 488 
 		$latitude = deg2rad($latitude);
489 489 
 		$longitude = deg2rad($longitude);
490 490 
 		$bearing = deg2rad($heading);
491 
-		$latitude2 =  asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) );
492 
-		$longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) );
493 
-		return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.',''));
491 
+		$latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing)));
492 
+		$longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2)));
493 
+		return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', ''));
494 494 
 	}
495 495
496 
-	public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) {
496 
+	public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) {
497 497 
 		// distance in meter
498 498 
 		$R = 6378.14;
499 
-		$latitude1 = $latitude * (M_PI/180);
500 
-		$longitude1 = $longitude * (M_PI/180);
501 
-		$brng = $bearing * (M_PI/180);
499 
+		$latitude1 = $latitude*(M_PI/180);
500 
+		$longitude1 = $longitude*(M_PI/180);
501 
+		$brng = $bearing*(M_PI/180);
502 502 
 		$d = $distance;
503 503
504 504 
 		$latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng));
505 
-		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2));
505 
+		$longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2));
506 506
507 
-		$latitude2 = $latitude2 * (180/M_PI);
508 
-		$longitude2 = $longitude2 * (180/M_PI);
507 
+		$latitude2 = $latitude2*(180/M_PI);
508 
+		$longitude2 = $longitude2*(180/M_PI);
509 509
510 
-		$flat = round ($latitude2,6);
511 
-		$flong = round ($longitude2,6);
510 
+		$flat = round($latitude2, 6);
511 
+		$flong = round($longitude2, 6);
512 512 
 /*
513 513 
 		$dx = $distance*cos($bearing);
514 514 
 		$dy = $distance*sin($bearing);
 
@@ -517,7 +517,7 @@  discard block
 
 block discarded – undo
517 517 
 		$flong = $longitude + $dlong;
518 518 
 		$flat = $latitude + $dlat;
519 519 
 */
520 
-		return array('latitude' => $flat,'longitude' => $flong);
520 
+		return array('latitude' => $flat, 'longitude' => $flong);
521 521 
 	}
522 522
523 523 
 	/**
 
@@ -531,14 +531,14 @@  discard block
 
 block discarded – undo
531 531 
 	 * @param integer $level GZIP compression level (default: 9)
532 532 
 	 * @return string New filename (with .gz appended) if success, or false if operation fails
533 533 
 	 */
534 
-	public function gzCompressFile($source, $level = 9){
535 
-		$dest = $source . '.gz';
536 
-		$mode = 'wb' . $level;
534 
+	public function gzCompressFile($source, $level = 9) {
535 
+		$dest = $source.'.gz';
536 
+		$mode = 'wb'.$level;
537 537 
 		$error = false;
538 538 
 		if ($fp_out = gzopen($dest, $mode)) {
539 
-			if ($fp_in = fopen($source,'rb')) {
539 
+			if ($fp_in = fopen($source, 'rb')) {
540 540 
 				while (!feof($fp_in))
541 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512));
541 
+					gzwrite($fp_out, fread($fp_in, 1024*512));
542 542 
 				fclose($fp_in);
543 543 
 			} else {
544 544 
 				$error = true; 
@@ -554,7 +554,7 @@  discard block
 
 block discarded – undo
554 554 
 	}
555 555
556 556 
 	public function remove_accents($string) {
557 
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
557 
+		if (!preg_match('/[\x80-\xff]/', $string)) return $string;
558 558 
 		$chars = array(
559 559 
 		    // Decompositions for Latin-1 Supplement
560 560 
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
 
@@ -611,7 +611,7 @@  discard block
 
 block discarded – undo
611 611 
 		    chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
612 612 
 		    chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
613 613 
 		    chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
614 
-		    chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
614 
+		    chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
615 615 
 		    chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
616 616 
 		    chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
617 617 
 		    chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
 
@@ -627,13 +627,13 @@  discard block
 
 block discarded – undo
627 627 
 		    chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
628 628 
 		    chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
629 629 
 		    chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
630 
-		    chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
631 
-		    chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
632 
-		    chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
633 
-		    chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
634 
-		    chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
635 
-		    chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
636 
-		    chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
630 
+		    chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
631 
+		    chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
632 
+		    chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
633 
+		    chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
634 
+		    chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
635 
+		    chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
636 
+		    chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
637 637 
 		    chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
638 638 
 		    chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
639 639 
 		    chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
 
@@ -667,7 +667,7 @@  discard block
 
 block discarded – undo
667 667 
 		for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) {
668 668 
 			if (is_numeric($string[$i]) && $concat_flag) {
669 669 
 				$int .= $string[$i];
670 
-			} elseif(!$concat && $concat_flag && strlen($int) > 0) {
670 
+			} elseif (!$concat && $concat_flag && strlen($int) > 0) {
671 671 
 				$concat_flag = false;
672 672 
 			}
673 673 
 		}
 
@@ -713,7 +713,7 @@  discard block
 
 block discarded – undo
713 713 
 			$slice = array_slice($arr, $offset + 1, $length);
714 714 
 			return implode("", $slice);
715 715 
 		} else {
716 
-			return mb_substr($string,$offset,$length,'UTF-8');
716 
+			return mb_substr($string, $offset, $length, 'UTF-8');
717 717 
 		}
718 718 
 	}
719 719 
 
@@ -723,14 +723,14 @@  discard block
 
 block discarded – undo
723 723 
 		//NOTE: use a trailing slash for folders!!!
724 724 
 		//see http://bugs.php.net/bug.php?id=27609
725 725 
 		//see http://bugs.php.net/bug.php?id=30931
726 
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
726 
+		if ($path{strlen($path) - 1} == '/') // recursively return a temporary file path
727 727 
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
728 728 
 		else if (is_dir($path))
729 729 
 			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
730 730 
 		// check tmp file for read/write capabilities
731 731 
 		$rm = file_exists($path);
732 732 
 		$f = @fopen($path, 'a');
733 
-		if ($f===false)
733 
+		if ($f === false)
734 734 
 			return false;
735 735 
 		fclose($f);
736 736 
 		if (!$rm)
 
@@ -749,29 +749,29 @@  discard block
 
 block discarded – undo
749 749 
 	 * @param Integer $offset Controls the likelyhood that lines will be split which cross the dateline
750 750 
 	 * @return Array Coordinate of the route
751 751 
 	*/
752 
-	public function greatcircle($begin_lat,$begin_lon,$end_lat,$end_lon,$nbpts = 20, $offset = 10) {
753 
-		if ($nbpts <= 2) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
752 
+	public function greatcircle($begin_lat, $begin_lon, $end_lat, $end_lon, $nbpts = 20, $offset = 10) {
753 
+		if ($nbpts <= 2) return array(array($begin_lon, $begin_lat), array($end_lon, $end_lat));
754 754 
 		$sx = deg2rad($begin_lon);
755 755 
 		$sy = deg2rad($begin_lat);
756 756 
 		$ex = deg2rad($end_lon);
757 757 
 		$ey = deg2rad($end_lat);
758 758 
 		$w = $sx - $ex;
759 759 
 		$h = $sy - $ey;
760 
-		$z = pow(sin($h/2.0),2) + cos($sy)*cos($ey)*pow(sin($w/2.0),2);
760 
+		$z = pow(sin($h/2.0), 2) + cos($sy)*cos($ey)*pow(sin($w/2.0), 2);
761 761 
 		$g = 2.0*asin(sqrt($z));
762 
-		if ($g == M_PI || is_nan($g)) return array(array($begin_lon,$begin_lat),array($end_lon,$end_lat));
762 
+		if ($g == M_PI || is_nan($g)) return array(array($begin_lon, $begin_lat), array($end_lon, $end_lat));
763 763 
 		$first_pass = array();
764 
-		$delta = 1.0/($nbpts-1);
765 
-		for ($i =0; $i < $nbpts; ++$i) {
764 
+		$delta = 1.0/($nbpts - 1);
765 
+		for ($i = 0; $i < $nbpts; ++$i) {
766 766 
 			$step = $delta*$i;
767 
-			$A = sin((1 - $step) * $g) / sin($g);
768 
-			$B = sin($step * $g) / sin($g);
769 
-			$x = $A * cos($sy) * cos($sx) + $B * cos($ey) * cos($ex);
770 
-			$y = $A * cos($sy) * sin($sx) + $B * cos($ey) * sin($ex);
771 
-			$z = $A * sin($sy) + $B * sin($ey);
767 
+			$A = sin((1 - $step)*$g)/sin($g);
768 
+			$B = sin($step*$g)/sin($g);
769 
+			$x = $A*cos($sy)*cos($sx) + $B*cos($ey)*cos($ex);
770 
+			$y = $A*cos($sy)*sin($sx) + $B*cos($ey)*sin($ex);
771 
+			$z = $A*sin($sy) + $B*sin($ey);
772 772 
 			$lat = rad2deg(atan2($z, sqrt(pow($x, 2) + pow($y, 2))));
773 773 
 			$lon = rad2deg(atan2($y, $x));
774 
-			$first_pass[] = array($lon,$lat);
774 
+			$first_pass[] = array($lon, $lat);
775 775 
 		}
776 776 
 		$bHasBigDiff = false;
777 777 
 		$dfMaxSmallDiffLong = 0;
 
@@ -786,7 +786,7 @@  discard block
 
 block discarded – undo
786 786 
 		// https://github.com/OSGeo/gdal/blob/7bfb9c452a59aac958bff0c8386b891edf8154ca/gdal/ogr/ogrgeometryfactory.cpp#L2342
787 787 
 		$first_pass_ln = count($first_pass);
788 788 
 		for ($j = 1; $j < $first_pass_ln; ++$j) {
789 
-			$dfPrevX = $first_pass[$j-1][0];
789 
+			$dfPrevX = $first_pass[$j - 1][0];
790 790 
 			$dfX = $first_pass[$j][0];
791 791 
 			$dfDiffLong = abs($dfX - $dfPrevX);
792 792 
 			if ($dfDiffLong > $dfDiffSpace &&
 
@@ -804,14 +804,14 @@  discard block
 
 block discarded – undo
804 804 
 			//$poMulti[] = $poNewLS;
805 805 
 			for ($k = 0; $k < $first_pass_ln; ++$k) {
806 806 
 				$dfX0 = floatval($first_pass[$k][0]);
807 
-				if ($k > 0 &&  abs($dfX0 - $first_pass[$k-1][0]) > $dfDiffSpace) {
808 
-					$dfX1 = floatval($first_pass[$k-1][0]);
809 
-					$dfY1 = floatval($first_pass[$k-1][1]);
807 
+				if ($k > 0 && abs($dfX0 - $first_pass[$k - 1][0]) > $dfDiffSpace) {
808 
+					$dfX1 = floatval($first_pass[$k - 1][0]);
809 
+					$dfY1 = floatval($first_pass[$k - 1][1]);
810 810 
 					$dfX2 = floatval($first_pass[$k][0]);
811 811 
 					$dfY2 = floatval($first_pass[$k][1]);
812 812 
 					if ($dfX1 > -180 && $dfX1 < $dfRightBorderX && $dfX2 == 180 &&
813 
-					    $k+1 < count($first_pass) &&
814 
-					    $first_pass[$k-1][0] > -180 && $first_pass[$k-1][0] < $dfRightBorderX)
813 
+					    $k + 1 < count($first_pass) &&
814 
+					    $first_pass[$k - 1][0] > -180 && $first_pass[$k - 1][0] < $dfRightBorderX)
815 815 
 					{
816 816 
 						$poNewLS[] = array(-180, $first_pass[$k][1]);
817 817 
 						$k++;
 
@@ -819,8 +819,8 @@  discard block
 
 block discarded – undo
819 819 
 						$poNewLS[] = array($first_pass[$k][0], $first_pass[$k][1]);
820 820 
 						continue;
821 821 
 					} else if ($dfX1 > $dfLeftBorderX && $dfX1 < 180 && $dfX2 == -180 &&
822 
-					    $k+1 < $first_pass_ln &&
823 
-					    $first_pass[$k-1][0] > $dfLeftBorderX && $first_pass[$k-1][0] < 180)
822 
+					    $k + 1 < $first_pass_ln &&
823 
+					    $first_pass[$k - 1][0] > $dfLeftBorderX && $first_pass[$k - 1][0] < 180)
824 824 
 					{
825 825 
 						$poNewLS[] = array(180, $first_pass[$k][1]);
826 826 
 						$k++;
 
@@ -843,12 +843,12 @@  discard block
 
 block discarded – undo
843 843 
 					}
844 844 
 					if ($dfX1 <= 180 && $dfX2 >= 180 && $dfX1 < $dfX2)
845 845 
 					{
846 
-						$dfRatio = (180 - $dfX1) / ($dfX2 - $dfX1);
847 
-						$dfY = $dfRatio * $dfY2 + (1 - $dfRatio) * $dfY1;
848 
-						$poNewLS[] = array($first_pass[$k-1][0] > $dfLeftBorderX ? 180 : -180, $dfY);
846 
+						$dfRatio = (180 - $dfX1)/($dfX2 - $dfX1);
847 
+						$dfY = $dfRatio*$dfY2 + (1 - $dfRatio)*$dfY1;
848 
+						$poNewLS[] = array($first_pass[$k - 1][0] > $dfLeftBorderX ? 180 : -180, $dfY);
849 849 
 						$poMulti[] = $poNewLS;
850 850 
 						$poNewLS = array();
851 
-						$poNewLS[] = array($first_pass[$k-1][0] > $dfLeftBorderX ? -180 : 180, $dfY);
851 
+						$poNewLS[] = array($first_pass[$k - 1][0] > $dfLeftBorderX ? -180 : 180, $dfY);
852 852 
 						//$poMulti[] = $poNewLS;
853 853 
 					} else {
854 854 
 						//$poNewLS[] = array();
 
@@ -866,7 +866,7 @@  discard block
 
 block discarded – undo
866 866 
 			$poNewLS0 = array();
867 867 
 			//$poMulti[] = $poNewLS0;
868 868 
 			for ($l = 0; $l < $first_pass_ln; ++$l) {
869 
-				$poNewLS0[] = array($first_pass[$l][0],$first_pass[$l][1]);
869 
+				$poNewLS0[] = array($first_pass[$l][0], $first_pass[$l][1]);
870 870 
 			}
871 871 
 			$poMulti[] = $poNewLS0;
872 872 
 		}
Please login to merge, or discard this patch.
statistics-sub-menu.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch 
@@ -28,11 +28,11 @@  discard block
 
 block discarded – undo
28 28 
 					$Spotter = new Spotter();
29 29 
 					$alliances = $Spotter->getAllAllianceNames();
30 30 
 					if (!empty($alliances)) {
31 
-						foreach($alliances as $alliance) {
32 
-							if (isset($airline_icao) && str_replace('_',' ',str_replace('alliance_','',$airline_icao)) == $alliance['alliance']) {
33 
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
31 
+						foreach ($alliances as $alliance) {
32 
+							if (isset($airline_icao) && str_replace('_', ' ', str_replace('alliance_', '', $airline_icao)) == $alliance['alliance']) {
33 
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'" selected>'.$alliance['alliance'].'</option>';
34 34 
 							} else {
35 
-								print '<option value="alliance_'.str_replace(' ','_',$alliance['alliance']).'">'.$alliance['alliance'].'</option>';
35 
+								print '<option value="alliance_'.str_replace(' ', '_', $alliance['alliance']).'">'.$alliance['alliance'].'</option>';
36 36 
 							}
37 37 
 						}
38 38 
 						print '<option disabled>──────────</option>';
 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
 					$Stats = new Stats();
41 41 
 					if (!isset($filter_name)) $filter_name = '';
42 42 
 					$airlines = $Stats->getAllAirlineNames($filter_name);
43 
-					foreach($airlines as $airline) {
43 
+					foreach ($airlines as $airline) {
44 44 
 						if ($airline['airline_icao'] != '') {
45 45 
 							if (isset($airline_icao) && $airline_icao != 'all' && $airline_icao == $airline['airline_icao']) {
46 46 
 								print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>';
 
@@ -65,7 +65,7 @@  discard block
 
 block discarded – undo
65 65 
 	if (!isset($type) || $type == 'aircraft') {
66 66 
 ?>
67 67 
 		<li class="dropdown">
68 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
68 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
69 69 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
70 70 
 		    </a>
71 71 
 		    <ul class="dropdown-menu">
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
 		    </ul>
77 77 
 		</li>
78 78 
 		<li class="dropdown">
79 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
79 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
80 80 
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
81 81 
 		    </a>
82 82 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 		    </ul>
93 93 
 		</li>
94 94 
 		<li class="dropdown">
95 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
95 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
96 96 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
97 97 
 		    </a>
98 98 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -103,7 +103,7 @@  discard block
 
 block discarded – undo
103 103 
 		    </ul>
104 104 
 		</li>
105 105 
 		<li class="dropdown">
106 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
106 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
107 107 
 		      <?php echo _("Route"); ?> <span class="caret"></span>
108 108 
 		    </a>
109 109 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -112,7 +112,7 @@  discard block
 
 block discarded – undo
112 112 
 		    </ul>
113 113 
 		</li>
114 114 
 		<li class="dropdown">
115 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
115 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
116 116 
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
117 117 
 		    </a>
118 118 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -124,7 +124,7 @@  discard block
 
 block discarded – undo
124 124 
 		    if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) {
125 125 
 		?>
126 126 
 		<li class="dropdown">
127 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
127 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
128 128 
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
129 129 
 		    </a>
130 130 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -139,7 +139,7 @@  discard block
 
 block discarded – undo
139 139 
 	} elseif ($type == 'marine' || $type == 'tracker') {
140 140 
 ?>
141 141 
 		<li class="dropdown">
142 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
142 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
143 143 
 			<?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
144 144 
 		    </a>
145 145 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -169,7 +169,7 @@  discard block
 
 block discarded – undo
169 169 
 	if (!isset($type) || $type == 'aircraft') {
170 170 
 ?>
171 171 
 		<li class="dropdown">
172 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" >
172 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" >
173 173 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
174 174 
 		    </a>
175 175 
 		    <ul class="dropdown-menu">
 
@@ -180,7 +180,7 @@  discard block
 
 block discarded – undo
180 180 
 		    </ul>
181 181 
 		</li>
182 182 
 		<li class="dropdown">
183 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
183 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#">
184 184 
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
185 185 
 		    </a>
186 186 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 		    </ul>
197 197 
 		</li>
198 198 
 		<li class="dropdown">
199 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
199 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
200 200 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
201 201 
 		    </a>
202 202 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -208,7 +208,7 @@  discard block
 
 block discarded – undo
208 208 
 		</li>
209 209 
 		<!--
210 210 
 		<li class="dropdown">
211 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
211 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#">
212 212 
 		      <?php echo _("Route"); ?> <span class="caret"></span>
213 213 
 		    </a>
214 214 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -219,7 +219,7 @@  discard block
 
 block discarded – undo
219 219 
 		-->
220 220 
 		<!--
221 221 
 		<li class="dropdown">
222 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
222 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
223 223 
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
224 224 
 		    </a>
225 225 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -233,7 +233,7 @@  discard block
 
 block discarded – undo
233 233 
 		?>
234 234 
 		<!--
235 235 
 		<li class="dropdown">
236 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
236 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#">
237 237 
 		      <?php echo _("Fatalities"); ?> <span class="caret"></span>
238 238 
 		    </a>
239 239 
 		    <ul class="dropdown-menu" role="menu">
 
@@ -249,7 +249,7 @@  discard block
 
 block discarded – undo
249 249 
 	} elseif ($type == 'marine' || $type == 'tracker') {
250 250 
 ?>
251 251 
 		<li class="dropdown">
252 
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
252 
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#">
253 253 
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
254 254 
 		    </a>
255 255 
 		    <ul class="dropdown-menu" role="menu">
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 
@@ -175,8 +175,7 @@  discard block
 
 block discarded – undo
175 175 
 		'\~' => 'TNC Stream SW');
176 176
177 177 
 	private function urshift($n, $s) {
178 
-		return ($n >= 0) ? ($n >> $s) :
179 
-		    (($n & 0x7fffffff) >> $s) |
178 
+		return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)|
180 179 
 		    (0x40000000 >> ($s - 1));
181 180 
 	}
182 181 
 
@@ -192,7 +191,7 @@  discard block
 
 block discarded – undo
192 191 
 		$input_len = strlen($input);
193 192
194 193 
 		/* Find the end of header checking for NULL bytes while doing it. */
195 
-		$splitpos = strpos($input,':');
194 
+		$splitpos = strpos($input, ':');
196 195
197 196 
 		/* Check that end was found and body has at least one byte. */
198 197 
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
 
@@ -202,14 +201,14 @@  discard block
 
 block discarded – undo
202 201
203 202 
 		if ($debug) echo 'input : '.$input."\n";
204 203 
 		/* Save header and body. */
205 
-		$body = substr($input,$splitpos+1,$input_len);
204 
+		$body = substr($input, $splitpos + 1, $input_len);
206 205 
 		$body_len = strlen($body);
207 
-		$header = substr($input,0,$splitpos);
206 
+		$header = substr($input, 0, $splitpos);
208 207 
 		if ($debug) echo 'header : '.$header."\n";
209 208
210 209 
 		/* Parse source, target and path. */
211 210 
 		//FLRDF0A52>APRS,qAS,LSTB
212 
-		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
211 
+		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
213 212 
 			$ident = $matches[1];
214 213 
 			$all_elements = $matches[2];
215 214 
 			if ($ident == 'AIRCRAFT') {
 
@@ -226,13 +225,13 @@  discard block
 
 block discarded – undo
226 225 
 			if ($debug) 'No ident'."\n";
227 226 
 			return false;
228 227 
 		}
229 
-		$elements = explode(',',$all_elements);
228 
+		$elements = explode(',', $all_elements);
230 229 
 		$source = end($elements);
231 230 
 		$result['source'] = $source;
232 231 
 		foreach ($elements as $element) {
233 
-			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
232 
+			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
234 233 
 			//if ($element == 'TCPIP*') return false;
235 
-			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
234 
+			} elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
236 235 
 				if ($debug) echo 'element : '.$element."\n";
237 236 
 				return false;
238 237 
 			}
 
@@ -245,14 +244,14 @@  discard block
 
 block discarded – undo
245 244 
 			*/
246 245 
 		}
247 246
248 
-		$type = substr($body,0,1);
247 
+		$type = substr($body, 0, 1);
249 248 
 		if ($debug) echo 'type : '.$type."\n";
250 249 
 		if ($type == ';') {
251 250 
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
252 
-				$result['address'] = trim(substr($body,1,9));
251 
+				$result['address'] = trim(substr($body, 1, 9));
253 252 
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
254 
-				$result['mmsi'] = trim(substr($body,1,9));
255 
-			} else $result['ident'] = trim(substr($body,1,9));
253 
+				$result['mmsi'] = trim(substr($body, 1, 9));
254 
+			} else $result['ident'] = trim(substr($body, 1, 9));
256 255 
 		} elseif ($type == ',') {
257 256 
 			// Invalid data or test data
258 257 
 			return false;
 
@@ -260,20 +259,20 @@  discard block
 
 block discarded – undo
260 259
261 260 
 		// Check for Timestamp
262 261 
 		$find = false;
263 
-		$body_parse = substr($body,1);
264 
-		if (preg_match('/^;(.){9}\*/',$body,$matches)) {
265 
-			$body_parse = substr($body_parse,10);
262 
+		$body_parse = substr($body, 1);
263 
+		if (preg_match('/^;(.){9}\*/', $body, $matches)) {
264 
+			$body_parse = substr($body_parse, 10);
266 265 
 			$find = true;
267 266 
 		}
268 
-		if (preg_match('/^`(.*)\//',$body,$matches)) {
269 
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
267 
+		if (preg_match('/^`(.*)\//', $body, $matches)) {
268 
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
270 269 
 			$find = true;
271 270 
 		}
272 
-		if (preg_match("/^'(.*)\//",$body,$matches)) {
273 
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
271 
+		if (preg_match("/^'(.*)\//", $body, $matches)) {
272 
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
274 273 
 			$find = true;
275 274 
 		}
276 
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
275 
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
277 276 
 			$find = true;
278 277 
 			$timestamp = $matches[0];
279 278 
 			if ($matches[4] == 'h') {
 
@@ -286,17 +285,17 @@  discard block
 
 block discarded – undo
286 285 
 				// This work or not ?
287 286 
 				$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
288 287 
 			}
289 
-			$body_parse = substr($body_parse,7);
288 
+			$body_parse = substr($body_parse, 7);
290 289 
 			$result['timestamp'] = $timestamp;
291 290 
 		}
292 
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
291 
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
293 292 
 			$find = true;
294 293 
 			$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
295 
-			$body_parse = substr($body_parse,8);
294 
+			$body_parse = substr($body_parse, 8);
296 295 
 			$result['timestamp'] = $timestamp;
297 296 
 		}
298 297 
 		//if (strlen($body_parse) > 19) {
299 
-		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 
+		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)) {
300 299 
 			$find = true;
301 300 
 			// 4658.70N/00707.78Ez
302 301 
 			$sind = strtoupper($matches[3]);
 
@@ -318,11 +317,11 @@  discard block
 
 block discarded – undo
318 317 
 			    */
319 318 
 			$latitude = $lat + floatval($lat_min)/60;
320 319 
 			$longitude = $lon + floatval($lon_min)/60;
321 
-			if ($sind == 'S') $latitude = 0-$latitude;
322 
-			if ($wind == 'W') $longitude = 0-$longitude;
320 
+			if ($sind == 'S') $latitude = 0 - $latitude;
321 
+			if ($wind == 'W') $longitude = 0 - $longitude;
323 322 
 			$result['latitude'] = $latitude;
324 323 
 			$result['longitude'] = $longitude;
325 
-			$body_parse = substr($body_parse,18);
324 
+			$body_parse = substr($body_parse, 18);
326 325 
 			$body_parse_len = strlen($body_parse);
327 326 
 		}
328 327 
 		$body_parse_len = strlen($body_parse);
 
@@ -349,22 +348,22 @@  discard block
 
 block discarded – undo
349 348 
 				//'
350 349 
 				//if ($type != ';' && $type != '>') {
351 350 
 				if ($type != '') {
352 
-					$body_parse = substr($body_parse,1);
351 
+					$body_parse = substr($body_parse, 1);
353 352 
 					$body_parse_len = strlen($body_parse);
354 353 
 					$result['symbol_code'] = $symbol_code;
355 354 
 					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
356 355 
 					if ($symbol_code != '_') {
357 356 
 					}
358 357 
 					if ($body_parse_len >= 7) {
359 
-						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
360 
-							$course = substr($body_parse,0,3);
358 
+						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
359 
+							$course = substr($body_parse, 0, 3);
361 360 
 							$tmp_s = intval($course);
362 361 
 							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
363 
-							$speed = substr($body_parse,4,3);
362 
+							$speed = substr($body_parse, 4, 3);
364 363 
 							if ($speed != '...') {
365 364 
 								$result['speed'] = intval($speed);
366 365 
 							}
367 
-							$body_parse = substr($body_parse,7);
366 
+							$body_parse = substr($body_parse, 7);
368 367 
 						}
369 368 
 						// Check PHGR, PHG, RNG
370 369 
 					} 
@@ -374,11 +373,11 @@  discard block
 
 block discarded – undo
374 373 
 					}
375 374 
 					*/
376 375 
 					if (strlen($body_parse) > 0) {
377 
-						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
376 
+						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
378 377 
 							$altitude = intval($matches[1]);
379 378 
 							$result['altitude'] = $altitude;
380 379 
 							//$body_parse = trim(substr($body_parse,strlen($matches[0])));
381 
-							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
380 
+							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
382 381 
 						}
383 382 
 					}
384 383 
 					// Telemetry
 
@@ -388,58 +387,58 @@  discard block
 
 block discarded – undo
388 387 
 					}
389 388 
 					*/
390 389 
 					// DAO
391 
-					if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
390 
+					if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
392 391 
 						$dao = $matches[1];
393 
-						if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
392 
+						if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
394 393 
 							$dao_split = str_split($dao);
395 
-							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
396 
-							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
394 
+							$lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
395 
+							$lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
397 396 
 							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
398 397 
 							else $result['latitude'] += $lat_off;
399 398 
 							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
400 399 
 							else $result['longitude'] += $lon_off;
401 400 
 						}
402 
-						$body_parse = substr($body_parse,6);
401 
+						$body_parse = substr($body_parse, 6);
403 402 
 					}
404 
-					if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
405 
-						$result['ident'] = str_replace('_',' ',$matches[1]);
403 
+					if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
404 
+						$result['ident'] = str_replace('_', ' ', $matches[1]);
406 405 
 					}
407 
-					if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
406 
+					if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
408 407 
 						$result['squawk'] = $matches[1];
409 408 
 					}
410 
-					if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
409 
+					if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
411 410 
 						$result['aircraft_icao'] = $matches[1];
412 411 
 					}
413 
-					if (preg_match('/VR=([-0-9]*)/',$body_parse,$matches)) {
412 
+					if (preg_match('/VR=([-0-9]*)/', $body_parse, $matches)) {
414 413 
 						$result['verticalrate'] = $matches[1];
415 414 
 					}
416 
-					if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
415 
+					if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
417 416 
 						$result['typeid'] = $matches[1];
418 417 
 					}
419 
-					if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
418 
+					if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
420 419 
 						$result['statusid'] = $matches[1];
421 420 
 					}
422 
-					if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
421 
+					if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
423 422 
 						$result['imo'] = $matches[1];
424 423 
 					}
425 
-					if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
424 
+					if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
426 425 
 						$result['arrival_date'] = $matches[1];
427 426 
 					}
428 
-					if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
429 
-						$result['arrival_code'] = str_replace('_',' ',$matches[1]);
427 
+					if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
428 
+						$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
430 429 
 					}
431 430 
 					// OGN comment
432 431 
 					//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
433 
-					if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
432 
+					if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
434 433 
 						$id = $matches[1];
435 434 
 						//$mode = substr($id,0,2);
436 
-						$address = substr($id,2);
437 
-						$addressType = (intval(substr($id,0,2),16))&3;
435 
+						$address = substr($id, 2);
436 
+						$addressType = (intval(substr($id, 0, 2), 16))&3;
438 437 
 						if ($addressType == 0) $result['addresstype'] = "RANDOM";
439 438 
 						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
440 439 
 						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
441 440 
 						elseif ($addressType == 3) $result['addresstype'] = "OGN";
442 
-						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
441 
+						$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
443 442 
 						$result['aircrafttype_code'] = $aircraftType;
444 443 
 						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
445 444 
 						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
 
@@ -456,110 +455,110 @@  discard block
 
 block discarded – undo
456 455 
 						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
457 456 
 						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
458 457 
 						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
459 
-						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
458 
+						$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
460 459 
 						$result['stealth'] = $stealth;
461 460 
 						$result['address'] = $address;
462 461 
 					}
463 462 
 					//Comment
464 463 
 					$result['comment'] = trim($body_parse);
465 464 
 					// parse weather
466 
-					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
465 
+					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
467 466 
 						$result['wind_dir'] = intval($matches[1]);
468 
-						$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
469 
-						$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
470 
-						$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
471 
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
472 
-					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
467 
+						$result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
468 
+						$result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
469 
+						$result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
470 
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
471 
+					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
473 472 
 						$result['wind_dir'] = intval($matches[1]);
474 
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
475 
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
476 
-						$result['temp'] = round(5/9*(($matches[4])-32),1);
477 
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
478 
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
473 
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
474 
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
475 
+						$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
476 
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
477 
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
479 478 
 						$result['wind_dir'] = intval($matches[1]);
480 
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
481 
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
482 
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
483 
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
479 
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
480 
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
481 
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
482 
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
484 483 
 						$result['wind_dir'] = intval($matches[1]);
485 
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
486 
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
487 
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
484 
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
485 
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
486 
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
488 487 
 					}
489 488 
 					// temperature
490 489 
 					//g012t088r000p000P000h38b10110
491 490 
 					//g011t086r000p000P000h29b10198
492 
-					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)) {
493 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
494 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
495 
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
496 
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
497 
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
491 
+					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)) {
492 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
493 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
494 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
495 
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
496 
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
498 497 
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
499 
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
500 
-						$body_parse = substr($body_parse,strlen($matches[0]));
501 
-					} 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)) {
502 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
503 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
504 
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
505 
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
506 
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
498 
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
499 
+						$body_parse = substr($body_parse, strlen($matches[0]));
500 
+					} 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)) {
501 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
502 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
503 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
504 
+						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
505 
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
507 506 
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
508 
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
509 
-						$body_parse = substr($body_parse,strlen($matches[0]));
510 
-					} 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)) {
511 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
512 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
513 
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
514 
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
515 
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
507 
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
508 
+						$body_parse = substr($body_parse, strlen($matches[0]));
509 
+					} 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)) {
510 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
511 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
512 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
513 
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
514 
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
516 515 
 						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
517 
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
518 
-						$body_parse = substr($body_parse,strlen($matches[0]));
519 
-					} 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)) {
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['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
516 
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
517 
+						$body_parse = substr($body_parse, strlen($matches[0]));
518 
+					} 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)) {
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['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
524 523 
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
525 
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/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})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$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[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
524 
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
525 
+						$body_parse = substr($body_parse, strlen($matches[0]));
526 
+					} 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)) {
527 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
528 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
529 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
530 
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
532 531 
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
533 
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
534 
-						$body_parse = substr($body_parse,strlen($matches[0]));
535 
-					} 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)) {
536 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
537 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
538 
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
539 
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
532 
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
533 
+						$body_parse = substr($body_parse, strlen($matches[0]));
534 
+					} 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)) {
535 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
536 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
537 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
538 
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
540 539 
 						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
541 
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
542 
-						$body_parse = substr($body_parse,strlen($matches[0]));
543 
-					} 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)) {
544 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
545 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540 
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
541 
+						$body_parse = substr($body_parse, strlen($matches[0]));
542 
+					} 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)) {
543 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
544 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
546 545 
 						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
547 
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
548 
-						$body_parse = substr($body_parse,strlen($matches[0]));
549 
-					} 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)) {
550 
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
551 
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
552 
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
546 
+						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
547 
+						$body_parse = substr($body_parse, strlen($matches[0]));
548 
+					} 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)) {
549 
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
550 
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
551 
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
553 552 
 						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
554 
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
555 
-						$body_parse = substr($body_parse,strlen($matches[0]));
553 
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
554 
+						$body_parse = substr($body_parse, strlen($matches[0]));
556 555 
 					}
557 556 
 					$result['comment'] = trim($body_parse);
558 557 
 				}
559 558 
 			} else $result['comment'] = trim($body_parse);
560 559 
 		}
561 
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
562 
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
560 
+		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
561 
+		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
563 562 
 		if ($debug) print_r($result);
564 563 
 		return $result;
565 564 
 	}
 
@@ -568,34 +567,34 @@  discard block
 
 block discarded – undo
568 567 
 	 * Connect to APRS server
569 568 
 	*/
570 569 
 	public function connect() {
571 
-		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
570 
+		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
572 571 
 		$aprs_connect = 0;
573 572 
 		$aprs_keep = 120;
574 573 
 		$aprs_last_tx = time();
575 574 
 		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
576 
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
575 
+		else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
577 576 
 		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
578 
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
577 
+		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
579 578 
 		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
580 579 
 		else $aprs_pass = '-1';
581 
-		$aprs_filter  = '';
580 
+		$aprs_filter = '';
582 581 
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
583 582 
 		$Common = new Common();
584 
-		$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
583 
+		$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
585 584 
 		if ($s !== false) {
586 585 
 			echo 'Connected to APRS server! '."\n";
587 586 
 			$authstart = time();
588 587 
 			$this->socket = $s;
589 
-			$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
590 
-			socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
591 
-			while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
588 
+			$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
589 
+			socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
590 
+			while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
592 591 
 				if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
593 592 
 					echo 'APRS user verified !'."\n";
594 593 
 					$this->connected = true;
595 594 
 					return true;
596 595 
 					break;
597 596 
 				}
598 
-				if (time()-$authstart > 5) {
597 
+				if (time() - $authstart > 5) {
599 598 
 					echo 'APRS timeout'."\n";
600 599 
 					break;
601 600 
 				}
 
@@ -617,7 +616,7 @@  discard block
 
 block discarded – undo
617 616 
 	public function send($data) {
618 617 
 		global $globalDebug;
619 618 
 		if ($this->connected === false) $this->connect();
620 
-		$send = socket_send( $this->socket  , $data , strlen($data),0);
619 
+		$send = socket_send($this->socket, $data, strlen($data), 0);
621 620 
 		if ($send === FALSE) {
622 621 
 			if ($globalDebug) echo 'Reconnect...';
623 622 
 			socket_close($this->socket);
 
@@ -627,17 +626,17 @@  discard block
 
 block discarded – undo
627 626 
 }
628 627
629 628 
 class APRSSpotter extends APRS {
630 
-	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) {
629 
+	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) {
631 630 
 		$Common = new Common();
632 631 
 		date_default_timezone_set('UTC');
633 632 
 		if ($latitude != '' && $longitude != '') {
634 633 
 			$lat = $latitude;
635 634 
 			$long = $longitude;
636 
-			$latitude = $Common->convertDM($latitude,'latitude');
637 
-			$longitude = $Common->convertDM($longitude,'longitude');
638 
-			$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'];
639 
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
640 
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
635 
+			$latitude = $Common->convertDM($latitude, 'latitude');
636 
+			$longitude = $Common->convertDM($longitude, 'longitude');
637 
+			$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'];
638 
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
639 
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
641 640 
 			$w = $w1.$w2;
642 641 
 			//$w = '00';
643 642 
 			$custom = '';
 
@@ -664,26 +663,26 @@  discard block
 
 block discarded – undo
664 663 
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
665 664 
 			$altitude_real = round($altitude_real + $geoid);
666 665 
 			*/
667 
-			$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");
666 
+			$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");
668 667 
 		}
669 668 
 	}
670 669 
 }
671 670 
 class APRSMarine extends APRS {
672 
-	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) {
671 
+	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) {
673 672 
 		$Common = new Common();
674 673 
 		date_default_timezone_set('UTC');
675 674 
 		if ($latitude != '' && $longitude != '') {
676 
-			$latitude = $Common->convertDM($latitude,'latitude');
677 
-			$longitude = $Common->convertDM($longitude,'longitude');
678 
-			$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'];
679 
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
680 
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
675 
+			$latitude = $Common->convertDM($latitude, 'latitude');
676 
+			$longitude = $Common->convertDM($longitude, 'longitude');
677 
+			$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'];
678 
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
679 
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
681 680 
 			$w = $w1.$w2;
682 681 
 			//$w = '00';
683 682 
 			$custom = '';
684 683 
 			if ($ident != '') {
685 684 
 				if ($custom != '') $custom .= '/';
686 
-				$custom .= 'CS='.str_replace(' ','_',$ident);
685 
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
687 686 
 			}
688 687 
 			if ($typeid != '') {
689 688 
 				if ($custom != '') $custom .= '/';
 
@@ -703,11 +702,11 @@  discard block
 
 block discarded – undo
703 702 
 			}
704 703 
 			if ($arrival_code != '') {
705 704 
 				if ($custom != '') $custom .= '/';
706 
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
705 
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
707 706 
 			}
708 707 
 			if ($custom != '') $custom = ' '.$custom;
709 708 
 			$altitude = 0;
710 
-			$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");
709 
+			$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");
711 710 
 		}
712 711 
 	}
713 712 
 }
Please login to merge, or discard this patch.
require/class.SpotterLive.php 1 patch
Spacing   +136 added lines, -136 removed lines patch added patch discarded remove patch 
@@ -17,62 +17,62 @@  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['airlines']) && !empty($flt['airlines'])) {
38 38 
 				if ($flt['airlines'][0] != '' && $flt['airlines'][0] != 'all') {
39 39 
 					if (isset($flt['source'])) {
40 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
40 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
41 41 
 					} else {
42 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
42 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
43 43 
 					}
44 44 
 				}
45 45 
 			}
46 46 
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
47 47 
 				if (isset($flt['source'])) {
48 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
48 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
49 49 
 				} else {
50 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
50 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
51 51 
 				}
52 52 
 			}
53 53 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
54 54 
 				if (isset($flt['source'])) {
55 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
55 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
56 56 
 				} else {
57 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
57 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
58 58 
 				}
59 59 
 			}
60 60 
 			if (isset($flt['registrations']) && !empty($flt['registrations'])) {
61 61 
 				if (isset($flt['source'])) {
62 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
62 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
63 63 
 				} else {
64 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
64 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
65 65 
 				}
66 66 
 			}
67 67 
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
68 68 
 				if (isset($flt['source'])) {
69 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id";
69 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id";
70 70 
 				}
71 71 
 			}
72 72 
 		}
73 73 
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
74 74 
 			if ($filter['airlines'][0] != '' && $filter['airlines'][0] != 'all') {
75 
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
75 
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
76 76 
 			}
77 77 
 		}
78 78 
 		if (isset($filter['alliance']) && !empty($filter['alliance'])) {
 
@@ -82,13 +82,13 @@  discard block
 
 block discarded – undo
82 82 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id ";
83 83 
 		}
84 84 
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
85 
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id";
85 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id";
86 86 
 		}
87 87 
 		if (isset($filter['source']) && !empty($filter['source'])) {
88 88 
 			if (count($filter['source']) == 1) {
89 89 
 				$filter_query_where .= " AND format_source = '".$filter['source'][0]."'";
90 90 
 			} else {
91 
-				$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
91 
+				$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
92 92 
 			}
93 93 
 		}
94 94 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 
@@ -121,15 +121,15 @@  discard block
 
 block discarded – undo
121 121 
 					$filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'";
122 122 
 				}
123 123 
 			}
124 
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
124 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
125 125 
 		}
126 126 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
127 
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
127 
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
128 128 
 		}
129 129 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
130 130 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
131 131 
 		if ($filter_query_where != '') {
132 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
132 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
133 133 
 		}
134 134 
 		$filter_query = $filter_query_join.$filter_query_where;
135 135 
 		return $filter_query;
 
@@ -152,8 +152,8 @@  discard block
 
 block discarded – undo
152 152 
 		if ($limit != '')
153 153 
 		{
154 154 
 			$limit_array = explode(',', $limit);
155 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
156 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
155 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
156 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
157 157 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
158 158 
 			{
159 159 
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
 
@@ -177,7 +177,7 @@  discard block
 
 block discarded – undo
177 177 
 		} else {
178 178 
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
179 179 
 		}
180 
-		$spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true);
180 
+		$spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true);
181 181
182 182 
 		return $spotter_array;
183 183 
 	}
 
@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192 
 	{
193 193 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
194 194 
 		date_default_timezone_set('UTC');
195 
-		$filter_query = $this->getFilter($filter,true,true);
195 
+		$filter_query = $this->getFilter($filter, true, true);
196 196 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
197 197 
 		if ($globalDBdriver == 'mysql') {
198 198 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 
@@ -215,7 +215,7 @@  discard block
 
 block discarded – undo
215 215 
 		try {
216 216 
 			$sth = $this->db->prepare($query);
217 217 
 			$sth->execute();
218 
-		} catch(PDOException $e) {
218 
+		} catch (PDOException $e) {
219 219 
 			echo $e->getMessage();
220 220 
 			die;
221 221 
 		}
 
@@ -229,20 +229,20 @@  discard block
 
 block discarded – undo
229 229 
 	* @return Array the spotter information
230 230 
 	*
231 231 
 	*/
232 
-	public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false, $id = '')
232 
+	public function getMinLastLiveSpotterData($coord = array(), $filter = array(), $limit = false, $id = '')
233 233 
 	{
234 234 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit;
235 235 
 		date_default_timezone_set('UTC');
236 236 
 		$usecoord = false;
237 237 
 		if (is_array($coord) && !empty($coord)) {
238 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
239 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
240 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
241 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
238 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
239 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
240 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
241 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
242 242 
 			$usecoord = true;
243 243 
 		}
244 
-		$id = filter_var($id,FILTER_SANITIZE_STRING);
245 
-		$filter_query = $this->getFilter($filter,true,true);
244 
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
245 
+		$filter_query = $this->getFilter($filter, true, true);
246 246
247 247 
 		if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200';
248 248 
 		if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300';
 
@@ -254,7 +254,7 @@  discard block
 
 block discarded – undo
254 254 
 				WHERE spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0'
255 255 
 				ORDER BY spotter_archive.flightaware_id, spotter_archive.date";
256 256 
 				*/
257 
-				$query  = 'SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source
257 
+				$query = 'SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source
258 258 
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id ";
259 259 
 				if ($usecoord) $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") ";
260 260 
 				if ($id != '') $query .= "OR spotter_archive.flightaware_id = :id ";
 
@@ -268,7 +268,7 @@  discard block
 
 block discarded – undo
268 268 
 				ORDER BY flightaware_id, date";
269 269 
 				if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit;
270 270 
 			} else {
271 
-				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
271 
+				$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
272 272 
 				FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date ";
273 273 
 				if ($usecoord) $query .= "AND (spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.") ";
274 274 
 				if ($id != '') $query .= "OR spotter_live.flightaware_id = :id ";
 
@@ -284,7 +284,7 @@  discard block
 
 block discarded – undo
284 284 
 				WHERE spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0'
285 285 
 				ORDER BY spotter_archive.flightaware_id, spotter_archive.date";
286 286 
                                */
287 
-				$query  = "SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source
287 
+				$query = "SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source
288 288 
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id ";
289 289 
 				if ($usecoord) $query .= "AND (spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong.") ";
290 290 
 				if ($id != '') $query .= "OR spotter_archive.flightaware_id = :id ";
 
@@ -311,7 +311,7 @@  discard block
 
 block discarded – undo
311 311 
 		try {
312 312 
 			$sth = $this->db->prepare($query);
313 313 
 			$sth->execute($query_values);
314 
-		} catch(PDOException $e) {
314 
+		} catch (PDOException $e) {
315 315 
 			echo $e->getMessage();
316 316 
 			die;
317 317 
 		}
 
@@ -328,7 +328,7 @@  discard block
 
 block discarded – undo
328 328 
 	public function getLiveSpotterCount($filter = array())
329 329 
 	{
330 330 
 		global $globalDBdriver, $globalLiveInterval;
331 
-		$filter_query = $this->getFilter($filter,true,true);
331 
+		$filter_query = $this->getFilter($filter, true, true);
332 332
333 333 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
334 334 
 		if ($globalDBdriver == 'mysql') {
 
@@ -341,7 +341,7 @@  discard block
 
 block discarded – undo
341 341 
 		try {
342 342 
 			$sth = $this->db->prepare($query);
343 343 
 			$sth->execute();
344 
-		} catch(PDOException $e) {
344 
+		} catch (PDOException $e) {
345 345 
 			echo $e->getMessage();
346 346 
 			die;
347 347 
 		}
 
@@ -364,10 +364,10 @@  discard block
 
 block discarded – undo
364 364 
 		$filter_query = $this->getFilter($filter);
365 365
366 366 
 		if (is_array($coord)) {
367 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
368 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
369 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
370 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
367 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
368 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
369 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
370 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
371 371 
 		} else return array();
372 372 
 		if ($globalDBdriver == 'mysql') {
373 373 
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
 
@@ -390,23 +390,23 @@  discard block
 
 block discarded – undo
390 390 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
391 391 
 		$Spotter = new Spotter($this->db);
392 392 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
393 
-		$filter_query = $this->getFilter($filter,true,true);
393 
+		$filter_query = $this->getFilter($filter, true, true);
394 394
395 395 
 		if (is_array($coord)) {
396 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
397 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
398 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
399 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
396 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
397 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
398 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
399 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
400 400 
 		} else return array();
401 401 
 		if ($globalDBdriver == 'mysql') {
402 402 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
403 
-				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
403 
+				$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
404 404 
 				FROM spotter_live
405 405 
 				'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date
406 406 
 				AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.'
407 407 
 				AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0';
408 408 
 			} else {
409 
-				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
409 
+				$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
410 410 
 				FROM spotter_live
411 411 
 				INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate
412 412 
 				    FROM spotter_live l 
@@ -418,14 +418,14 @@  discard block
 
 block discarded – undo
418 418 
 			}
419 419 
 		} else {
420 420 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
421 
-				$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
421 
+				$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
422 422 
 				FROM spotter_live
423 423 
 				".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date
424 424 
 				AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat."
425 425 
 				AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong."
426 426 
 				AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
427 427 
 			} else {
428 
-				$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
428 
+				$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
429 429 
 				FROM spotter_live
430 430 
 				INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate
431 431 
 				    FROM spotter_live l 
@@ -440,7 +440,7 @@  discard block
 
 block discarded – undo
440 440 
 		try {
441 441 
 			$sth = $this->db->prepare($query);
442 442 
 			$sth->execute();
443 
-		} catch(PDOException $e) {
443 
+		} catch (PDOException $e) {
444 444 
 			echo $e->getMessage();
445 445 
 			die;
446 446 
 		}
 
@@ -489,7 +489,7 @@  discard block
 
 block discarded – undo
489 489 
                 if ($interval == '1m')
490 490 
                 {
491 491 
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
492 
-                } else if ($interval == '15m'){
492 
+                } else if ($interval == '15m') {
493 493 
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
494 494 
                 }
495 495 
             }
 
@@ -497,14 +497,14 @@  discard block
 
 block discarded – undo
497 497 
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
498 498 
         }
499 499
500 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
500 
+                $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
501 501 
                    WHERE spotter_live.latitude <> ''
502 502 
                                    AND spotter_live.longitude <> ''
503 503 
                    ".$additional_query."
504 504 
                    HAVING distance < :radius
505 505 
                                    ORDER BY distance";
506 506
507 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
507 
+                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
508 508
509 509 
                 return $spotter_array;
510 510 
         }
 
@@ -522,9 +522,9 @@  discard block
 
 block discarded – undo
522 522 
 		date_default_timezone_set('UTC');
523 523
524 524 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
525 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
525 
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
526 526
527 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
527 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true);
528 528
529 529 
 		return $spotter_array;
530 530 
 	}
 
@@ -535,16 +535,16 @@  discard block
 
 block discarded – undo
535 535 
 	* @return Array the spotter information
536 536 
 	*
537 537 
 	*/
538 
-	public function getDateLiveSpotterDataByIdent($ident,$date)
538 
+	public function getDateLiveSpotterDataByIdent($ident, $date)
539 539 
 	{
540 540 
 		$Spotter = new Spotter($this->db);
541 541 
 		date_default_timezone_set('UTC');
542 542
543 543 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
544 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
544 
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
545 545
546 
-                $date = date('c',$date);
547 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
546 
+                $date = date('c', $date);
547 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
548 548
549 549 
 		return $spotter_array;
550 550 
 	}
 
@@ -560,8 +560,8 @@  discard block
 
 block discarded – undo
560 560 
 		$Spotter = new Spotter($this->db);
561 561 
 		date_default_timezone_set('UTC');
562 562 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
563 
-		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
564 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
563 
+		$query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
564 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true);
565 565 
 		return $spotter_array;
566 566 
 	}
567 567 
 
@@ -571,15 +571,15 @@  discard block
 
 block discarded – undo
571 571 
 	* @return Array the spotter information
572 572 
 	*
573 573 
 	*/
574 
-	public function getDateLiveSpotterDataById($id,$date)
574 
+	public function getDateLiveSpotterDataById($id, $date)
575 575 
 	{
576 576 
 		$Spotter = new Spotter($this->db);
577 577 
 		date_default_timezone_set('UTC');
578 578
579 579 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
580 
-		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
581 
-		$date = date('c',$date);
582 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
580 
+		$query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
581 
+		$date = date('c', $date);
582 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
583 583 
 		return $spotter_array;
584 584 
 	}
585 585 
 
@@ -595,13 +595,13 @@  discard block
 
 block discarded – undo
595 595 
 		date_default_timezone_set('UTC');
596 596
597 597 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
598 
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
598 
+                $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
599 599
600 600 
     		try {
601 601
602 602 
 			$sth = $this->db->prepare($query);
603 603 
 			$sth->execute(array(':ident' => $ident));
604 
-		} catch(PDOException $e) {
604 
+		} catch (PDOException $e) {
605 605 
 			echo $e->getMessage();
606 606 
 			die;
607 607 
 		}
 
@@ -616,7 +616,7 @@  discard block
 
 block discarded – undo
616 616 
 	* @return Array the spotter information
617 617 
 	*
618 618 
 	*/
619 
-	public function getAllLiveSpotterDataById($id,$liveinterval = false)
619 
+	public function getAllLiveSpotterDataById($id, $liveinterval = false)
620 620 
 	{
621 621 
 		global $globalDBdriver, $globalLiveInterval;
622 622 
 		date_default_timezone_set('UTC');
 
@@ -635,7 +635,7 @@  discard block
 
 block discarded – undo
635 635 
 		try {
636 636 
 			$sth = $this->db->prepare($query);
637 637 
 			$sth->execute(array(':id' => $id));
638 
-		} catch(PDOException $e) {
638 
+		} catch (PDOException $e) {
639 639 
 			echo $e->getMessage();
640 640 
 			die;
641 641 
 		}
 
@@ -653,12 +653,12 @@  discard block
 
 block discarded – undo
653 653 
 	{
654 654 
 		date_default_timezone_set('UTC');
655 655 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
656 
-		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
656 
+		$query = self::$global_query.' WHERE spotter_live.ident = :ident';
657 657 
     		try {
658 658
659 659 
 			$sth = $this->db->prepare($query);
660 660 
 			$sth->execute(array(':ident' => $ident));
661 
-		} catch(PDOException $e) {
661 
+		} catch (PDOException $e) {
662 662 
 			echo $e->getMessage();
663 663 
 			die;
664 664 
 		}
 
@@ -688,7 +688,7 @@  discard block
 
 block discarded – undo
688 688
689 689 
 			$sth = $this->db->prepare($query);
690 690 
 			$sth->execute();
691 
-		} catch(PDOException $e) {
691 
+		} catch (PDOException $e) {
692 692 
 			return "error";
693 693 
 		}
694 694 
 
@@ -711,14 +711,14 @@  discard block
 
 block discarded – undo
711 711
712 712 
 				$sth = $this->db->prepare($query);
713 713 
 				$sth->execute();
714 
-			} catch(PDOException $e) {
714 
+			} catch (PDOException $e) {
715 715 
 				return "error";
716 716 
 			}
717 717 
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
718 718 
                         $i = 0;
719 
-                        $j =0;
719 
+                        $j = 0;
720 720 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
721 
-			foreach($all as $row)
721 
+			foreach ($all as $row)
722 722 
 			{
723 723 
 				$i++;
724 724 
 				$j++;
 
@@ -726,9 +726,9 @@  discard block
 
 block discarded – undo
726 726 
 					if ($globalDebug) echo ".";
727 727 
 				    	try {
728 728
729 
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
729 
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
730 730 
 						$sth->execute();
731 
-					} catch(PDOException $e) {
731 
+					} catch (PDOException $e) {
732 732 
 						return "error";
733 733 
 					}
734 734 
                                 	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
 
@@ -739,9 +739,9 @@  discard block
 
 block discarded – undo
739 739 
 			if ($i > 0) {
740 740 
     				try {
741 741
742 
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
742 
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
743 743 
 					$sth->execute();
744 
-				} catch(PDOException $e) {
744 
+				} catch (PDOException $e) {
745 745 
 					return "error";
746 746 
 				}
747 747 
 			}
 
@@ -754,7 +754,7 @@  discard block
 
 block discarded – undo
754 754
755 755 
 				$sth = $this->db->prepare($query);
756 756 
 				$sth->execute();
757 
-			} catch(PDOException $e) {
757 
+			} catch (PDOException $e) {
758 758 
 				return "error";
759 759 
 			}
760 760 
 /*			$query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN (";
 
@@ -802,13 +802,13 @@  discard block
 
 block discarded – undo
802 802 
 	public function deleteLiveSpotterDataByIdent($ident)
803 803 
 	{
804 804 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
805 
-		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
805 
+		$query = 'DELETE FROM spotter_live WHERE ident = :ident';
806 806
807 807 
     		try {
808 808
809 809 
 			$sth = $this->db->prepare($query);
810 810 
 			$sth->execute(array(':ident' => $ident));
811 
-		} catch(PDOException $e) {
811 
+		} catch (PDOException $e) {
812 812 
 			return "error";
813 813 
 		}
814 814 
 
@@ -824,13 +824,13 @@  discard block
 
 block discarded – undo
824 824 
 	public function deleteLiveSpotterDataById($id)
825 825 
 	{
826 826 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
827 
-		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
827 
+		$query = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
828 828
829 829 
     		try {
830 830
831 831 
 			$sth = $this->db->prepare($query);
832 832 
 			$sth->execute(array(':id' => $id));
833 
-		} catch(PDOException $e) {
833 
+		} catch (PDOException $e) {
834 834 
 			return "error";
835 835 
 		}
836 836 
 
@@ -848,13 +848,13 @@  discard block
 
 block discarded – undo
848 848 
 	{
849 849 
 		global $globalDBdriver, $globalTimezone;
850 850 
 		if ($globalDBdriver == 'mysql') {
851 
-			$query  = 'SELECT spotter_live.ident FROM spotter_live
851 
+			$query = 'SELECT spotter_live.ident FROM spotter_live
852 852 
 				WHERE spotter_live.ident = :ident
853 853 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
854 854 
 				AND spotter_live.date < UTC_TIMESTAMP()';
855 855 
 			$query_data = array(':ident' => $ident);
856 856 
 		} else {
857 
-			$query  = "SELECT spotter_live.ident FROM spotter_live
857 
+			$query = "SELECT spotter_live.ident FROM spotter_live
858 858 
 				WHERE spotter_live.ident = :ident
859 859 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
860 860 
 				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -863,8 +863,8 @@  discard block
 
 block discarded – undo
863 863
864 864 
 		$sth = $this->db->prepare($query);
865 865 
 		$sth->execute($query_data);
866 
-		$ident_result='';
867 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
866 
+		$ident_result = '';
867 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
868 868 
 		{
869 869 
 			$ident_result = $row['ident'];
870 870 
 		}
 
@@ -881,13 +881,13 @@  discard block
 
 block discarded – undo
881 881 
 	{
882 882 
 		global $globalDBdriver, $globalTimezone;
883 883 
 		if ($globalDBdriver == 'mysql') {
884 
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
884 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
885 885 
 				WHERE spotter_live.ident = :ident
886 886 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 MINUTE)';
887 887 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
888 888 
 			$query_data = array(':ident' => $ident);
889 889 
 		} else {
890 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
890 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
891 891 
 				WHERE spotter_live.ident = :ident
892 892 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '20 MINUTES'";
893 893 
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -896,8 +896,8 @@  discard block
 
 block discarded – undo
896 896
897 897 
 		$sth = $this->db->prepare($query);
898 898 
 		$sth->execute($query_data);
899 
-		$ident_result='';
900 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
899 
+		$ident_result = '';
900 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
901 901 
 		{
902 902 
 			$ident_result = $row['flightaware_id'];
903 903 
 		}
 
@@ -914,13 +914,13 @@  discard block
 
 block discarded – undo
914 914 
 	{
915 915 
 		global $globalDBdriver, $globalTimezone;
916 916 
 		if ($globalDBdriver == 'mysql') {
917 
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
917 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
918 918 
 				WHERE spotter_live.flightaware_id = :id
919 919 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)';
920 920 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
921 921 
 			$query_data = array(':id' => $id);
922 922 
 		} else {
923 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
923 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
924 924 
 				WHERE spotter_live.flightaware_id = :id
925 925 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
926 926 
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -929,8 +929,8 @@  discard block
 
 block discarded – undo
929 929
930 930 
 		$sth = $this->db->prepare($query);
931 931 
 		$sth->execute($query_data);
932 
-		$ident_result='';
933 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
932 
+		$ident_result = '';
933 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
934 934 
 		{
935 935 
 			$ident_result = $row['flightaware_id'];
936 936 
 		}
 
@@ -947,13 +947,13 @@  discard block
 
 block discarded – undo
947 947 
 	{
948 948 
 		global $globalDBdriver, $globalTimezone;
949 949 
 		if ($globalDBdriver == 'mysql') {
950 
-			$query  = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
950 
+			$query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
951 951 
 				WHERE spotter_live.ModeS = :modes
952 952 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 MINUTE)';
953 953 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
954 954 
 			$query_data = array(':modes' => $modes);
955 955 
 		} else {
956 
-			$query  = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
956 
+			$query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
957 957 
 				WHERE spotter_live.ModeS = :modes
958 958 
 				AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 MINUTE'";
959 959 
 //			//	AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 
@@ -962,8 +962,8 @@  discard block
 
 block discarded – undo
962 962
963 963 
 		$sth = $this->db->prepare($query);
964 964 
 		$sth->execute($query_data);
965 
-		$ident_result='';
966 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
965 
+		$ident_result = '';
966 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
967 967 
 		{
968 968 
 			//$ident_result = $row['spotter_live_id'];
969 969 
 			$ident_result = $row['flightaware_id'];
 
@@ -988,8 +988,8 @@  discard block
 
 block discarded – undo
988 988 
 				return array();
989 989 
 			} else {
990 990 
 				$q_array = explode(" ", $q);
991 
-				foreach ($q_array as $q_item){
992 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
991 
+				foreach ($q_array as $q_item) {
992 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
993 993 
 					$additional_query .= " AND (";
994 994 
 					$additional_query .= "(spotter_live.aircraft_icao like '%".$q_item."%') OR ";
995 995 
 					$additional_query .= "(spotter_live.aircraft_name like '%".$q_item."%') OR ";
 
@@ -1004,11 +1004,11 @@  discard block
 
 block discarded – undo
1004 1004 
 			}
1005 1005 
 		}
1006 1006 
 		if ($globalDBdriver == 'mysql') {
1007 
-			$query  = "SELECT spotter_live.* FROM spotter_live
1007 
+			$query = "SELECT spotter_live.* FROM spotter_live
1008 1008 
 			    WHERE spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
1009 1009 
 			    AND spotter_live.date < UTC_TIMESTAMP()";
1010 1010 
 		} else {
1011 
-			$query  = "SELECT spotter_live.* FROM spotter_live
1011 
+			$query = "SELECT spotter_live.* FROM spotter_live
1012 1012 
 			    WHERE spotter_live.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
1013 1013 
 			    AND spotter_live.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
1014 1014 
 		}
 
@@ -1028,7 +1028,7 @@  discard block
 
 block discarded – undo
1028 1028 
 	* @return String success or false
1029 1029 
 	*
1030 1030 
 	*/
1031 
-	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
1031 
+	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '')
1032 1032 
 	{
1033 1033 
 		global $globalURL, $globalArchive, $globalDebug;
1034 1034 
 		$Common = new Common();
 
@@ -1128,27 +1128,27 @@  discard block
 
 block discarded – undo
1128 1128 
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
1129 1129
1130 1130
1131 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
1132 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1133 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
1134 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1135 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1136 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1137 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1138 
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
1139 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1140 
-		$altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1141 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
1142 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1143 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
1144 
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
1145 
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
1146 
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
1147 
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
1148 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
1149 
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
1150 
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
1151 
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
1131 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
1132 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1133 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
1134 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1135 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1136 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1137 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1138 
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
1139 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1140 
+		$altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1141 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
1142 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1143 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
1144 
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
1145 
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
1146 
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
1147 
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
1148 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
1149 
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
1150 
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
1151 
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
1152 1152
1153 1153 
 		$airline_name = '';
1154 1154 
 		$airline_icao = '';
 
@@ -1170,10 +1170,10 @@  discard block
 
 block discarded – undo
1170 1170 
 		$arrival_airport_country = '';
1171 1171
1172 1172
1173 
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1174 
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1175 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1176 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1173 
+            	if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
1174 
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
1175 
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
1176 
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
1177 1177
1178 1178 
 		$query = '';
1179 1179 
 		if ($globalArchive) {
 
@@ -1184,19 +1184,19 @@  discard block
 
 block discarded – undo
1184 1184 
 		$query  .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude)
1185 1185 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)';
1186 1186
1187 
-		$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real);
1187 
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real);
1188 1188 
 		try {
1189 1189
1190 1190 
 			$sth = $this->db->prepare($query);
1191 1191 
 			$sth->execute($query_values);
1192 1192 
 			$sth->closeCursor();
1193 
-		} catch(PDOException $e) {
1193 
+		} catch (PDOException $e) {
1194 1194 
 			return "error : ".$e->getMessage();
1195 1195 
 		}
1196 1196 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1197 1197 
 		    if ($globalDebug) echo '(Add to SBS archive : ';
1198 1198 
 		    $SpotterArchive = new SpotterArchive($this->db);
1199 
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1199 
+		    $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country);
1200 1200 
 		    if ($globalDebug) echo $result.')';
1201 1201 
 		} elseif ($globalDebug && $putinarchive !== true) {
1202 1202 
 			echo '(Not adding to archive)';
 
@@ -1209,7 +1209,7 @@  discard block
 
 block discarded – undo
1209 1209
1210 1210 
 	public function getOrderBy()
1211 1211 
 	{
1212 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
1212 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
1213 1213 
 		return $orderby;
1214 1214 
 	}
1215 1215
Please login to merge, or discard this patch.
js/map.3d.js.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -314,7 +314,7 @@  discard block
 
 block discarded – undo
314 314 
 			break;
315 315 
 		}
316 316 
 	}
317 
-	var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>");
317 
+	var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>");
318 318 
 	tsk_geojson.then(function(geojsondata) {
319 319 
 		tsk = new Cesium.CustomDataSource('tsk');
320 320 
 		for (var i =0;i < geojsondata.features.length; i++) {
 
@@ -389,7 +389,7 @@  discard block
 
 block discarded – undo
389 389 
 <?php
390 390 
 	if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) {
391 391 
 		if (isset($_COOKIE['lastcentercoord'])) {
392 
-			$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
392 
+			$lastcentercoord = explode(',', $_COOKIE['lastcentercoord']);
393 393 
 			if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0;
394 394 
 			else $zoom = $lastcentercoord[3];
395 395 
 			$viewcenterlatitude = $lastcentercoord[0];
Please login to merge, or discard this patch.
airspace-geojson.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -16,14 +16,14 @@  discard block
 
 block discarded – undo
16 16
17 17 
 if (isset($_GET['coord']))
18 18 
 {
19 
-	$coords = explode(',',$_GET['coord']);
19 
+	$coords = explode(',', $_GET['coord']);
20 20 
         if ($globalDBdriver == 'mysql') {
21 21 
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
22 22 
 		try {
23 23 
 			$sth = $Connection->db->prepare($query);
24 
-			$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
24 
+			$sth->execute(array(':minlon' => $coords[0], ':minlat' => $coords[1], ':maxlon' => $coords[2], ':maxlat' => $coords[3]));
25 25 
 			//$sth->execute();
26 
-		} catch(PDOException $e) {
26 
+		} catch (PDOException $e) {
27 27 
 			echo "error";
28 28 
 		}
29 29 
 	} else {
 
@@ -32,7 +32,7 @@  discard block
 
 block discarded – undo
32 32 
 			$sth = $Connection->db->prepare($query);
33 33 
 			//$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
34 34 
 			$sth->execute();
35 
-		} catch(PDOException $e) {
35 
+		} catch (PDOException $e) {
36 36 
 			echo "error";
37 37 
 		}
38 38 
 	}
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
 	try {
46 46 
 		$sth = $Connection->db->prepare($query);
47 47 
 		$sth->execute();
48 
-	} catch(PDOException $e) {
48 
+	} catch (PDOException $e) {
49 49 
 		echo "error";
50 50 
 	}
51 51 
 }
 
@@ -75,22 +75,22 @@  discard block
 
 block discarded – undo
75 75 
 		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
76 76 
 		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
77 77 
 		if (isset($properties['tops'])) {
78 
-			if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
78 
+			if (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['tops']), $matches)) {
79 79 
 				$properties['upper_limit'] = round($matches['alt']*100*0.38048);
80 
-			} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {
80 
+			} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['tops']), $matches)) {
81 81 
 				$properties['upper_limit'] = round($matches['alt']*0.38048);
82 
-			} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['tops']),$matches)) {
82 
+			} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['tops']), $matches)) {
83 83 
 				$properties['upper_limit'] = $matches['alt'];
84 84 
 			}
85 85 
 		}
86 86 
 		if (isset($properties['base'])) {
87 87 
 			if ($properties['base'] == 'SFC' || $properties['base'] == 'MSL' || $properties['base'] == 'GROUND' || $properties['base'] == 'GND') {
88 88 
 				$properties['lower_limit'] = 0;
89 
-			} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['base']),$matches)) {
89 
+			} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['base']), $matches)) {
90 90 
 				$properties['lower_limit'] = round($matches['alt']*100*0.38048);
91 
-			} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['base']),$matches)) {
91 
+			} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['base']), $matches)) {
92 92 
 				$properties['lower_limit'] = round($matches['alt']*0.38048);
93 
-			} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['base']),$matches)) {
93 
+			} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['base']), $matches)) {
94 94 
 				$properties['lower_limit'] = $matches['alt'];
95 95 
 			}
96 96 
 		}
Please login to merge, or discard this patch.