View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( f64dc3...06e80e )
by Yannick
10:07
created
Status
Category
Toggle Patches
require/class.MarineImport.php 1 patch
Braces   +182 added lines, -62 removed lines patch added patch discarded remove patch 
@@ -53,7 +53,9 @@  discard block
 
 block discarded – undo
53 53
54 54 
     public function checkAll() {
55 55 
 	global $globalDebug;
56 
-	if ($globalDebug) echo "Update last seen tracked data...\n";
56 
+	if ($globalDebug) {
57 
+		echo "Update last seen tracked data...\n";
58 
+	}
57 59 
 	foreach ($this->all_tracked as $key => $flight) {
58 60 
 	    if (isset($this->all_tracked[$key]['id'])) {
59 61 
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
 
@@ -66,13 +68,17 @@  discard block
 
 block discarded – undo
66 68 
     public function del() {
67 69 
 	global $globalDebug, $globalNoDB, $globalNoImport;
68 70 
 	// Delete old infos
69 
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
71 
+	if ($globalDebug) {
72 
+		echo 'Delete old values and update latest data...'."\n";
73 
+	}
70 74 
 	foreach ($this->all_tracked as $key => $flight) {
71 75 
     	    if (isset($flight['lastupdate'])) {
72 76 
         	if ($flight['lastupdate'] < (time()-3000)) {
73 77 
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
74 78 
             		if (isset($this->all_tracked[$key]['id'])) {
75 
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
79 
+            		    if ($globalDebug) {
80 
+            		    	echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
81 
+            		    }
76 82 
 			    /*
77 83 
 			    $MarineLive = new MarineLive();
78 84 
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
 
@@ -82,7 +88,9 @@  discard block
 
 block discarded – undo
82 88 
             		    $Marine = new Marine($this->db);
83 89 
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
84 90 
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
85 
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
91 
+				if ($globalDebug && $result != 'success') {
92 
+					echo '!!! ERROR : '.$result."\n";
93 
+				}
86 94 
 			    }
87 95 
 			    // Put in archive
88 96 
 //				$Marine->db = null;
 
@@ -96,7 +104,9 @@  discard block
 
 block discarded – undo
96 104
97 105 
     public function add($line) {
98 106 
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
99 
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
107 
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
108 
+		$globalCoordMinChange = '0.02';
109 
+	}
100 110 
 	date_default_timezone_set('UTC');
101 111 
 	$dataFound = false;
102 112 
 	$send = false;
 
@@ -121,8 +131,11 @@  discard block
 
 block discarded – undo
121 131
122 132 
 		$Common = new Common();
123 133 
 		$AIS = new AIS();
124 
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
125 
-	        else $id = trim($line['id']);
134 
+	        if (!isset($line['id'])) {
135 
+	        	$id = trim($line['mmsi']);
136 
+	        } else {
137 
+	        	$id = trim($line['id']);
138 
+	        }
126 139
127 140 
 		if (!isset($this->all_tracked[$id])) {
128 141 
 		    $this->all_tracked[$id] = array();
 
@@ -130,10 +143,16 @@  discard block
 
 block discarded – undo
130 143 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
131 144 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
132 145 
 		    if (!isset($line['id'])) {
133 
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
146 
+			if (!isset($globalDaemon)) {
147 
+				$globalDaemon = TRUE;
148 
+			}
134 149 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
135 
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
136 
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
150 
+		     } else {
151 
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
152 
+		     }
153 
+		    if ($globalAllTracked !== FALSE) {
154 
+		    	$dataFound = true;
155 
+		    }
137 156 
 		}
138 157
139 158 
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
 
@@ -183,34 +202,49 @@  discard block
 
 block discarded – undo
183 202 
 				$Marine = new Marine($this->db);
184 203 
 				$fromsource = NULL;
185 204 
 				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
186 
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
205 
+				if ($globalDebug && $result != 'success') {
206 
+					echo '!!! ERROR : '.$result."\n";
207 
+				}
187 208 
 				$Marine->db = null;
188 
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
209 
+				if ($globalDebugTimeElapsed) {
210 
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
211 
+				}
189 212 
 			    }
190 213 
 			}
191 214 
 		    }
192 
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
215 
+		    if (!isset($this->all_tracked[$id]['id'])) {
216 
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
217 
+		    }
193 218 
 		}
194 219
195 220 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
196 221 
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
197 222 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
198 223 
 		    } else {
199 
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
200 
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
224 
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
225 
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
226 
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
227 
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
228 
+				}
201 229 
 				return '';
202 230 
 		    }
203 231 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
204 
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
232 
+			if ($globalDebug) {
233 
+				echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
234 
+			}
205 235 
 			return '';
206 236 
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
207 
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
237 
+			if ($globalDebug) {
238 
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
239 
+			}
208 240 
 			return '';
209 241 
 		} elseif (!isset($line['datetime'])) {
210 242 
 			date_default_timezone_set('UTC');
211 243 
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
212 244 
 		} else {
213 
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
245 
+			if ($globalDebug) {
246 
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
247 
+			}
214 248 
 			return '';
215 249 
 		}
216 250 
 
@@ -223,14 +257,21 @@  discard block
 
 block discarded – undo
223 257 
 		    if ($distance > 1000 && $distance < 10000) {
224 258 
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
225 259 
 			$speed = $speed*3.6;
226 
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
227 
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
260 
+			if ($speed < 1000) {
261 
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
262 
+			}
263 
+  			if ($globalDebug) {
264 
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
265 
+  			}
228 266 
 		    }
229 267 
 		}
230 268
231 269 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
232 
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
233 
-	    	    else unset($timediff);
270 
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
271 
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
272 
+	    	    } else {
273 
+	    	    	unset($timediff);
274 
+	    	    }
234 275 
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
235 276 
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
236 277 
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
 
@@ -238,22 +279,32 @@  discard block
 
 block discarded – undo
238 279 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
239 280 
 				$this->all_tracked[$id]['putinarchive'] = true;
240 281
241 
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
282 
+				if ($globalDebug) {
283 
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
284 
+				}
242 285 
 				$timeelapsed = microtime(true);
243 286 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
244 287 
 				    $Marine = new Marine($this->db);
245 288 
 				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
246 
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
289 
+				    if (!empty($all_country)) {
290 
+				    	$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
291 
+				    }
247 292 
 				    $Marine->db = null;
248 
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
293 
+				    if ($globalDebugTimeElapsed) {
294 
+				    	echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
295 
+				    }
249 296 
 				}
250 297 
 				$this->tmd = 0;
251 
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
298 
+				if ($globalDebug) {
299 
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
300 
+				}
252 301 
 			    }
253 302 
 			}
254 303
255 304 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
256 
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
305 
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
306 
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
307 
+				}
257 308 
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
258 309 
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
259 310 
 				    $dataFound = true;
 
@@ -262,8 +313,12 @@  discard block
 
 block discarded – undo
262 313 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
263 314 
 			}
264 315 
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
265 
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
266 
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
316 
+			    if ($line['longitude'] > 180) {
317 
+			    	$line['longitude'] = $line['longitude'] - 360;
318 
+			    }
319 
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
320 
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
321 
+				}
267 322 
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
268 323 
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
269 324 
 				    $dataFound = true;
 
@@ -281,7 +336,9 @@  discard block
 
 block discarded – undo
281 336 
 		    }
282 337 
 		}
283 338 
 		if (isset($line['last_update']) && $line['last_update'] != '') {
284 
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
339 
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
340 
+		    	$dataFound = true;
341 
+		    }
285 342 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
286 343 
 		}
287 344 
 		if (isset($line['format_source']) && $line['format_source'] != '') {
 
@@ -311,15 +368,21 @@  discard block
 
 block discarded – undo
311 368 
 		}
312 369
313 370 
 		if (isset($line['heading']) && $line['heading'] != '') {
314 
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
371 
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
372 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
373 
+		    }
315 374 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
316 375 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
317 376 
 		    //$dataFound = true;
318 377 
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
319 378 
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
320 379 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
321 
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
322 
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
380 
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
381 
+		    	$this->all_tracked[$id]['putinarchive'] = true;
382 
+		    }
383 
+  		    if ($globalDebug) {
384 
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
385 
+  		    }
323 386 
   		}
324 387 
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
325 388 
 
@@ -331,23 +394,38 @@  discard block
 
 block discarded – undo
331 394 
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
332 395 
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
333 396 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
334 
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
397 
+				    if ($globalDebug) {
398 
+				    	echo "Check if aircraft is already in DB...";
399 
+				    }
335 400 
 				    $timeelapsed = microtime(true);
336 401 
 				    $MarineLive = new MarineLive($this->db);
337 402 
 				    if (isset($line['id'])) {
338 403 
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
339 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
404 
+					if ($globalDebugTimeElapsed) {
405 
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
406 
+					}
340 407 
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
341 408 
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
342 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
409 
+					if ($globalDebugTimeElapsed) {
410 
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
411 
+					}
343 412 
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
344 413 
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
345 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
346 
-				    } else $recent_ident = '';
414 
+					if ($globalDebugTimeElapsed) {
415 
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
416 
+					}
417 
+				    } else {
418 
+				    	$recent_ident = '';
419 
+				    }
347 420 
 				    $MarineLive->db=null;
348 
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
349 
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
350 
-				} else $recent_ident = '';
421 
+				    if ($globalDebug && $recent_ident == '') {
422 
+				    	echo " Not in DB.\n";
423 
+				    } elseif ($globalDebug && $recent_ident != '') {
424 
+				    	echo " Already in DB.\n";
425 
+				    }
426 
+				} else {
427 
+					$recent_ident = '';
428 
+				}
351 429 
 			    } else {
352 430 
 				$recent_ident = '';
353 431 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
 
@@ -355,30 +433,44 @@  discard block
 
 block discarded – undo
355 433 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
356 434 
 			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
357 435 
 			    {
358 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
436 
+				if ($globalDebug) {
437 
+					echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
438 
+				}
359 439 
 				//adds the spotter data for the archive
360 440 
 				    $highlight = '';
361 
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
441 
+				    if (!isset($this->all_tracked[$id]['id'])) {
442 
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
443 
+				    }
362 444 
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
363 445 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
364 446 
 					    $timeelapsed = microtime(true);
365 447 
 					    $Marine = new Marine($this->db);
366 448 
 					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
367 449 
 					    $Marine->db = null;
368 
-					    if ($globalDebug && isset($result)) echo $result."\n";
369 
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
450 
+					    if ($globalDebug && isset($result)) {
451 
+					    	echo $result."\n";
452 
+					    }
453 
+					    if ($globalDebugTimeElapsed) {
454 
+					    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
455 
+					    }
370 456 
 					}
371 457 
 				    }
372 458 
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
373 459 
 					// Add source stat in DB
374 460 
 					$Stats = new Stats($this->db);
375 461 
 					if (!empty($this->stats)) {
376 
-					    if ($globalDebug) echo 'Add source stats : ';
462 
+					    if ($globalDebug) {
463 
+					    	echo 'Add source stats : ';
464 
+					    }
377 465 
 				    	    foreach($this->stats as $date => $data) {
378 466 
 						foreach($data as $source => $sourced) {
379 467 
 					    	    //print_r($sourced);
380 
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
381 
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
468 
+				    	    	    if (isset($sourced['polar'])) {
469 
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
470 
+				    	    	    }
471 
+				    	    	    if (isset($sourced['hist'])) {
472 
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
473 
+				    	    	    }
382 474 
 				    		    if (isset($sourced['msg'])) {
383 475 
 				    			if (time() - $sourced['msg']['date'] > 10) {
384 476 
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
 
@@ -391,7 +483,9 @@  discard block
 
 block discarded – undo
391 483 
 			    			    unset($this->stats[$date]);
392 484 
 			    			}
393 485 
 				    	    }
394 
-				    	    if ($globalDebug) echo 'Done'."\n";
486 
+				    	    if ($globalDebug) {
487 
+				    	    	echo 'Done'."\n";
488 
+				    	    }
395 489 
 					}
396 490 
 					$Stats->db = null;
397 491 
 				    }
 
@@ -401,13 +495,17 @@  discard block
 
 block discarded – undo
401 495 
 				$this->all_tracked[$id]['addedMarine'] = 1;
402 496 
 				//print_r($this->all_tracked[$id]);
403 497 
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
404 
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
498 
+				    if ($globalDebug) {
499 
+				    	echo "---- Deleting Live Marine data older than 9 hours...";
500 
+				    }
405 501 
 				    //MarineLive->deleteLiveMarineDataNotUpdated();
406 502 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
407 503 
 					$MarineLive = new MarineLive($this->db);
408 504 
 					$MarineLive->deleteLiveMarineData();
409 505 
 					$MarineLive->db=null;
410 
-					if ($globalDebug) echo " Done\n";
506 
+					if ($globalDebug) {
507 
+						echo " Done\n";
508 
+					}
411 509 
 				    }
412 510 
 				    $this->last_delete = time();
413 511 
 				}
 
@@ -433,15 +531,21 @@  discard block
 
 block discarded – undo
433 531
434 532 
 		    if (!$ignoreImport) {
435 533 
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
436 
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
534 
+				if ($globalDebug) {
535 
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
536 
+				}
437 537 
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
438 538 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
439 539 
 					$timeelapsed = microtime(true);
440 540 
 					$MarineLive = new MarineLive($this->db);
441 541 
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
442 542 
 					$MarineLive->db = null;
443 
-					if ($globalDebug) echo $result."\n";
444 
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
543 
+					if ($globalDebug) {
544 
+						echo $result."\n";
545 
+					}
546 
+					if ($globalDebugTimeElapsed) {
547 
+						echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
548 
+					}
445 549 
 				    }
446 550 
 				}
447 551 
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
 
@@ -453,7 +557,9 @@  discard block
 
 block discarded – undo
453 557
454 558 
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
455 559 
 					$source = $this->all_tracked[$id]['source_name'];
456 
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
560 
+					if ($source == '') {
561 
+						$source = $this->all_tracked[$id]['format_source'];
562 
+					}
457 563 
 					if (!isset($this->source_location[$source])) {
458 564 
 						$Location = new Source();
459 565 
 						$coord = $Location->getLocationInfobySourceName($source);
 
@@ -474,7 +580,9 @@  discard block
 
 block discarded – undo
474 580 
 					$stats_heading = round($stats_heading/22.5);
475 581 
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
476 582 
 					$current_date = date('Y-m-d');
477 
-					if ($stats_heading == 16) $stats_heading = 0;
583 
+					if ($stats_heading == 16) {
584 
+						$stats_heading = 0;
585 
+					}
478 586 
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
479 587 
 						for ($i=0;$i<=15;$i++) {
480 588 
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 
@@ -492,7 +600,9 @@  discard block
 
 block discarded – undo
492 600 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
493 601 
 						    end($this->stats[$current_date][$source]['hist']);
494 602 
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
495 
-						} else $mini = 0;
603 
+						} else {
604 
+							$mini = 0;
605 
+						}
496 606 
 						for ($i=$mini;$i<=$distance;$i+=10) {
497 607 
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
498 608 
 						}
 
@@ -504,19 +614,27 @@  discard block
 
 block discarded – undo
504 614
505 615
506 616 
 				$this->all_tracked[$id]['lastupdate'] = time();
507 
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
508 
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
617 
+				if ($this->all_tracked[$id]['putinarchive']) {
618 
+					$send = true;
619 
+				}
620 
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
621 
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
622 
+			}
509 623 
 			//$this->del();
510 624
511 625
512 626 
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
513 627 
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
514 
-				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
628 
+				if ($globalDebug) {
629 
+					echo "---- Deleting Live Marine data Not updated since 2 hour...";
630 
+				}
515 631 
 				$MarineLive = new MarineLive($this->db);
516 632 
 				$MarineLive->deleteLiveMarineDataNotUpdated();
517 633 
 				$MarineLive->db = null;
518 634 
 				//MarineLive->deleteLiveMarineData();
519 
-				if ($globalDebug) echo " Done\n";
635 
+				if ($globalDebug) {
636 
+					echo " Done\n";
637 
+				}
520 638 
 			    }
521 639 
 			    $this->last_delete_hourly = time();
522 640 
 			}
 
@@ -525,7 +643,9 @@  discard block
 
 block discarded – undo
525 643 
 		    //$ignoreImport = false;
526 644 
 		}
527 645 
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
528 
-		if ($send) return $this->all_tracked[$id];
646 
+		if ($send) {
647 
+			return $this->all_tracked[$id];
648 
+		}
529 649 
 	    }
530 650 
 	}
531 651 
     }
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Braces   +482 added lines, -167 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,9 @@  discard block
 
 block discarded – undo
13 13
14 14 
 	public function __construct($dbc = null) {
15 15 
 		global $globalFilterName;
16 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16 
+		if (isset($globalFilterName)) {
17 
+			$this->filter_name = $globalFilterName;
18 
+		}
17 19 
 		$Connection = new Connection($dbc);
18 20 
 		$this->db = $Connection->db();
19 21 
         }
 
@@ -81,7 +83,9 @@  discard block
 
 block discarded – undo
81 83 
                 }
82 84 
         }
83 85 
 	public function getAllAirlineNames($filter_name = '') {
84 
-		if ($filter_name == '') $filter_name = $this->filter_name;
86 
+		if ($filter_name == '') {
87 
+			$filter_name = $this->filter_name;
88 
+		}
85 89 
                 $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86 90 
                  try {
87 91 
                         $sth = $this->db->prepare($query);
 
@@ -93,7 +97,9 @@  discard block
 
 block discarded – undo
93 97 
                 return $all;
94 98 
         }
95 99 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96 
-		if ($filter_name == '') $filter_name = $this->filter_name;
100 
+		if ($filter_name == '') {
101 
+			$filter_name = $this->filter_name;
102 
+		}
97 103 
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 104 
                  try {
99 105 
                         $sth = $this->db->prepare($query);
 
@@ -105,7 +111,9 @@  discard block
 
 block discarded – undo
105 111 
                 return $all;
106 112 
         }
107 113 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108 
-		if ($filter_name == '') $filter_name = $this->filter_name;
114 
+		if ($filter_name == '') {
115 
+			$filter_name = $this->filter_name;
116 
+		}
109 117 
                 $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";
110 118 
                  try {
111 119 
                         $sth = $this->db->prepare($query);
 
@@ -117,7 +125,9 @@  discard block
 
 block discarded – undo
117 125 
                 return $all;
118 126 
         }
119 127 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120 
-		if ($filter_name == '') $filter_name = $this->filter_name;
128 
+		if ($filter_name == '') {
129 
+			$filter_name = $this->filter_name;
130 
+		}
121 131 
                 $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";
122 132 
                  try {
123 133 
                         $sth = $this->db->prepare($query);
 
@@ -130,7 +140,9 @@  discard block
 
 block discarded – undo
130 140 
         }
131 141
132 142 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133 
-		if ($filter_name == '') $filter_name = $this->filter_name;
143 
+		if ($filter_name == '') {
144 
+			$filter_name = $this->filter_name;
145 
+		}
134 146 
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 147 
                  try {
136 148 
                         $sth = $this->db->prepare($query);
 
@@ -143,7 +155,9 @@  discard block
 
 block discarded – undo
143 155 
         }
144 156
145 157 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
158 
+		if ($filter_name == '') {
159 
+			$filter_name = $this->filter_name;
160 
+		}
147 161 
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 162 
                  try {
149 163 
                         $sth = $this->db->prepare($query);
 
@@ -158,10 +172,15 @@  discard block
 
 block discarded – undo
158 172
159 173 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
160 174 
 		global $globalStatsFilters;
161 
-		if ($filter_name == '') $filter_name = $this->filter_name;
175 
+		if ($filter_name == '') {
176 
+			$filter_name = $this->filter_name;
177 
+		}
162 178 
 		if ($year == '' && $month == '') {
163 
-			if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
164 
-			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
179 
+			if ($limit) {
180 
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
181 
+			} else {
182 
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 
+			}
165 184 
 			try {
166 185 
 				$sth = $this->db->prepare($query);
167 186 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -169,7 +188,9 @@  discard block
 
 block discarded – undo
169 188 
 				echo "error : ".$e->getMessage();
170 189 
 			}
171 190 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172 
-		} else $all = array();
191 
+		} else {
192 
+			$all = array();
193 
+		}
173 194 
                 if (empty($all)) {
174 195 
             	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175 196 
             	    if ($filter_name != '') {
 
@@ -183,10 +204,15 @@  discard block
 
 block discarded – undo
183 204 
 	}
184 205 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 206 
 		global $globalStatsFilters;
186 
-		if ($filter_name == '') $filter_name = $this->filter_name;
207 
+		if ($filter_name == '') {
208 
+			$filter_name = $this->filter_name;
209 
+		}
187 210 
 		if ($year == '' && $month == '') {
188 
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
189 
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
211 
+			if ($limit) {
212 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
213 
+			} else {
214 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
215 
+			}
190 216 
 			try {
191 217 
 				$sth = $this->db->prepare($query);
192 218 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -194,7 +220,9 @@  discard block
 
 block discarded – undo
194 220 
 				echo "error : ".$e->getMessage();
195 221 
 			}
196 222 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197 
-		} else $all = array();
223 
+		} else {
224 
+			$all = array();
225 
+		}
198 226 
                 if (empty($all)) {
199 227 
             		$Spotter = new Spotter($this->db);
200 228 
             		$filters = array();
 
@@ -209,10 +237,15 @@  discard block
 
 block discarded – undo
209 237 
 	}
210 238 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 239 
 		global $globalStatsFilters;
212 
-		if ($filter_name == '') $filter_name = $this->filter_name;
240 
+		if ($filter_name == '') {
241 
+			$filter_name = $this->filter_name;
242 
+		}
213 243 
 		if ($year == '' && $month == '') {
214 
-			if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
215 
-			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";
244 
+			if ($limit) {
245 
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
246 
+			} else {
247 
+				$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";
248 
+			}
216 249 
 			try {
217 250 
 				$sth = $this->db->prepare($query);
218 251 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -220,7 +253,9 @@  discard block
 
 block discarded – undo
220 253 
 				echo "error : ".$e->getMessage();
221 254 
 			}
222 255 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
223 
-		} else $all = array();
256 
+		} else {
257 
+			$all = array();
258 
+		}
224 259 
 		if (empty($all)) {
225 260 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
226 261 
 			if ($filter_name != '') {
 
@@ -235,10 +270,15 @@  discard block
 
 block discarded – undo
235 270
236 271 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
237 272 
 		global $globalStatsFilters;
238 
-		if ($filter_name == '') $filter_name = $this->filter_name;
273 
+		if ($filter_name == '') {
274 
+			$filter_name = $this->filter_name;
275 
+		}
239 276 
 		if ($year == '' && $month == '') {
240 
-			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 = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
241 
-			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";
277 
+			if ($limit) {
278 
+				$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 = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
279 
+			} else {
280 
+				$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";
281 
+			}
242 282 
 			try {
243 283 
 				$sth = $this->db->prepare($query);
244 284 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -246,7 +286,9 @@  discard block
 
 block discarded – undo
246 286 
 				echo "error : ".$e->getMessage();
247 287 
 			}
248 288 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249 
-		} else $all = array();
289 
+		} else {
290 
+			$all = array();
291 
+		}
250 292 
                 if (empty($all)) {
251 293 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 294 
 			if ($filter_name != '') {
 
@@ -260,9 +302,14 @@  discard block
 
 block discarded – undo
260 302 
 	}
261 303 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 304 
 		global $globalStatsFilters;
263 
-		if ($filter_name == '') $filter_name = $this->filter_name;
264 
-		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";
265 
-		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";
305 
+		if ($filter_name == '') {
306 
+			$filter_name = $this->filter_name;
307 
+		}
308 
+		if ($limit) {
309 
+			$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";
310 
+		} else {
311 
+			$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";
312 
+		}
266 313 
                  try {
267 314 
                         $sth = $this->db->prepare($query);
268 315 
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -284,17 +331,29 @@  discard block
 
 block discarded – undo
284 331
285 332 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
286 333 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
287 
-		if ($filter_name == '') $filter_name = $this->filter_name;
334 
+		if ($filter_name == '') {
335 
+			$filter_name = $this->filter_name;
336 
+		}
288 337 
 		if ($year == '' && $month == '') {
289 
-			if ($globalVATSIM) $forsource = 'vatsim';
290 
-			if ($globalIVAO) $forsource = 'ivao';
338 
+			if ($globalVATSIM) {
339 
+				$forsource = 'vatsim';
340 
+			}
341 
+			if ($globalIVAO) {
342 
+				$forsource = 'ivao';
343 
+			}
291 344 
 			if (isset($forsource)) {
292 
-				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";
293 
-				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";
345 
+				if ($limit) {
346 
+					$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";
347 
+				} else {
348 
+					$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";
349 
+				}
294 350 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
295 351 
 			} else {
296 
-				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";
297 
-				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";
352 
+				if ($limit) {
353 
+					$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";
354 
+				} else {
355 
+					$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";
356 
+				}
298 357 
 				$query_values = array(':filter_name' => $filter_name);
299 358 
 			}
300 359 
 			try {
 
@@ -304,7 +363,9 @@  discard block
 
 block discarded – undo
304 363 
 				echo "error : ".$e->getMessage();
305 364 
 			}
306 365 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307 
-		} else $all = array();
366 
+		} else {
367 
+			$all = array();
368 
+		}
308 369 
                 if (empty($all)) {
309 370 
 	                $Spotter = new Spotter($this->db);
310 371 
             		$filters = array();
 
@@ -319,10 +380,15 @@  discard block
 
 block discarded – undo
319 380 
 	}
320 381 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 382 
 		global $globalStatsFilters;
322 
-		if ($filter_name == '') $filter_name = $this->filter_name;
383 
+		if ($filter_name == '') {
384 
+			$filter_name = $this->filter_name;
385 
+		}
323 386 
 		if ($year == '' && $month == '') {
324 
-			if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
325 
-			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";
387 
+			if ($limit) {
388 
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
389 
+			} else {
390 
+				$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";
391 
+			}
326 392 
 			try {
327 393 
 				$sth = $this->db->prepare($query);
328 394 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -330,7 +396,9 @@  discard block
 
 block discarded – undo
330 396 
 				echo "error : ".$e->getMessage();
331 397 
 			}
332 398 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333 
-		} else $all = array();
399 
+		} else {
400 
+			$all = array();
401 
+		}
334 402 
                 if (empty($all)) {
335 403 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 404 
 			if ($filter_name != '') {
 
@@ -344,10 +412,15 @@  discard block
 
 block discarded – undo
344 412 
 	}
345 413 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 414 
 		global $globalStatsFilters;
347 
-		if ($filter_name == '') $filter_name = $this->filter_name;
415 
+		if ($filter_name == '') {
416 
+			$filter_name = $this->filter_name;
417 
+		}
348 418 
 		if ($year == '' && $month == '') {
349 
-			if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
350 
-			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";
419 
+			if ($limit) {
420 
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
421 
+			} else {
422 
+				$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";
423 
+			}
351 424 
 			 try {
352 425 
 				$sth = $this->db->prepare($query);
353 426 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -355,7 +428,9 @@  discard block
 
 block discarded – undo
355 428 
 				echo "error : ".$e->getMessage();
356 429 
 			}
357 430 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
358 
-		} else $all = array();
431 
+		} else {
432 
+			$all = array();
433 
+		}
359 434 
 		if (empty($all)) {
360 435 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
361 436 
 			if ($filter_name != '') {
 
@@ -369,11 +444,16 @@  discard block
 
 block discarded – undo
369 444 
 	}
370 445 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
371 446 
 		$Connection = new Connection();
372 
-		if ($filter_name == '') $filter_name = $this->filter_name;
447 
+		if ($filter_name == '') {
448 
+			$filter_name = $this->filter_name;
449 
+		}
373 450 
 		if ($Connection->tableExists('countries')) {
374 451 
 			if ($year == '' && $month == '') {
375 
-				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 = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
376 
-				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";
452 
+				if ($limit) {
453 
+					$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 LIMIT 20 OFFSET 0";
454 
+				} else {
455 
+					$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";
456 
+				}
377 457 
 				 try {
378 458 
 					$sth = $this->db->prepare($query);
379 459 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -388,17 +468,24 @@  discard block
 
 block discarded – undo
388 468 
                 }
389 469 
                 */
390 470 
 				return $all;
391 
-			} else return array();
471 
+			} else {
472 
+				return array();
473 
+			}
392 474 
 		} else {
393 475 
 			return array();
394 476 
 		}
395 477 
 	}
396 478 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
397 479 
 		global $globalStatsFilters;
398 
-		if ($filter_name == '') $filter_name = $this->filter_name;
480 
+		if ($filter_name == '') {
481 
+			$filter_name = $this->filter_name;
482 
+		}
399 483 
 		if ($year == '' && $month == '') {
400 
-			if ($limit) $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 LIMIT 10 OFFSET 0";
401 
-			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";
484 
+			if ($limit) {
485 
+				$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 LIMIT 10 OFFSET 0";
486 
+			} else {
487 
+				$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";
488 
+			}
402 489 
 			try {
403 490 
 				$sth = $this->db->prepare($query);
404 491 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -406,7 +493,9 @@  discard block
 
 block discarded – undo
406 493 
 				echo "error : ".$e->getMessage();
407 494 
 			}
408 495 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409 
-		} else $all = array();
496 
+		} else {
497 
+			$all = array();
498 
+		}
410 499 
 		if (empty($all)) {
411 500 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
412 501 
 			if ($filter_name != '') {
 
@@ -421,10 +510,15 @@  discard block
 
 block discarded – undo
421 510
422 511 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
423 512 
 		global $globalStatsFilters;
424 
-		if ($filter_name == '') $filter_name = $this->filter_name;
513 
+		if ($filter_name == '') {
514 
+			$filter_name = $this->filter_name;
515 
+		}
425 516 
 		if ($year == '' && $month == '') {
426 
-			if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
427 
-			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";
517 
+			if ($limit) {
518 
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
519 
+			} else {
520 
+				$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";
521 
+			}
428 522 
 			try {
429 523 
 				$sth = $this->db->prepare($query);
430 524 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -432,7 +526,9 @@  discard block
 
 block discarded – undo
432 526 
 				echo "error : ".$e->getMessage();
433 527 
 			}
434 528 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435 
-		} else $all = array();
529 
+		} else {
530 
+			$all = array();
531 
+		}
436 532 
                 if (empty($all)) {
437 533 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 534 
 			if ($filter_name != '') {
 
@@ -446,10 +542,15 @@  discard block
 
 block discarded – undo
446 542 
 	}
447 543 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 544 
 		global $globalStatsFilters;
449 
-		if ($filter_name == '') $filter_name = $this->filter_name;
545 
+		if ($filter_name == '') {
546 
+			$filter_name = $this->filter_name;
547 
+		}
450 548 
 		if ($year == '' && $month == '') {
451 
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
452 
-			else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
549 
+			if ($limit) {
550 
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
551 
+			} else {
552 
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
553 
+			}
453 554 
 			try {
454 555 
 				$sth = $this->db->prepare($query);
455 556 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -457,7 +558,9 @@  discard block
 
 block discarded – undo
457 558 
 				echo "error : ".$e->getMessage();
458 559 
 			}
459 560 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460 
-		} else $all = array();
561 
+		} else {
562 
+			$all = array();
563 
+		}
461 564 
                 if (empty($all)) {
462 565 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463 566 
             		if ($filter_name != '') {
 
@@ -478,7 +581,9 @@  discard block
 
 block discarded – undo
478 581 
         			$icao = $value['airport_departure_icao'];
479 582 
         			if (isset($all[$icao])) {
480 583 
         				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481 
-        			} else $all[$icao] = $value;
584 
+        			} else {
585 
+        				$all[$icao] = $value;
586 
+        			}
482 587 
         		}
483 588 
         		$count = array();
484 589 
         		foreach ($all as $key => $row) {
 
@@ -490,10 +595,15 @@  discard block
 
 block discarded – undo
490 595 
 	}
491 596 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 597 
 		global $globalStatsFilters;
493 
-		if ($filter_name == '') $filter_name = $this->filter_name;
598 
+		if ($filter_name == '') {
599 
+			$filter_name = $this->filter_name;
600 
+		}
494 601 
 		if ($year == '' && $month == '') {
495 
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
496 
-			else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
602 
+			if ($limit) {
603 
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
604 
+			} else {
605 
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
606 
+			}
497 607 
 			try {
498 608 
 				$sth = $this->db->prepare($query);
499 609 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -501,7 +611,9 @@  discard block
 
 block discarded – undo
501 611 
 				echo "error : ".$e->getMessage();
502 612 
 			}
503 613 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
504 
-		} else $all = array();
614 
+		} else {
615 
+			$all = array();
616 
+		}
505 617 
 		if (empty($all)) {
506 618 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507 619 
 			if ($filter_name != '') {
 
@@ -522,7 +634,9 @@  discard block
 
 block discarded – undo
522 634 
         			$icao = $value['airport_arrival_icao'];
523 635 
         			if (isset($all[$icao])) {
524 636 
         				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525 
-        			} else $all[$icao] = $value;
637 
+        			} else {
638 
+        				$all[$icao] = $value;
639 
+        			}
526 640 
         		}
527 641 
         		$count = array();
528 642 
         		foreach ($all as $key => $row) {
 
@@ -535,13 +649,21 @@  discard block
 
 block discarded – undo
535 649 
 	}
536 650 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 651 
 		global $globalDBdriver, $globalStatsFilters;
538 
-		if ($filter_name == '') $filter_name = $this->filter_name;
652 
+		if ($filter_name == '') {
653 
+			$filter_name = $this->filter_name;
654 
+		}
539 655 
 		if ($globalDBdriver == 'mysql') {
540 
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
541 
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(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";
656 
+			if ($limit) {
657 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
658 
+			} else {
659 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(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";
660 
+			}
542 661 
 		} else {
543 
-			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";
544 
-			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";
662 
+			if ($limit) {
663 
+				$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";
664 
+			} else {
665 
+				$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";
666 
+			}
545 667 
 		}
546 668 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547 669 
                  try {
 
@@ -565,7 +687,9 @@  discard block
 
 block discarded – undo
565 687
566 688 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
567 689 
 		global $globalStatsFilters;
568 
-		if ($filter_name == '') $filter_name = $this->filter_name;
690 
+		if ($filter_name == '') {
691 
+			$filter_name = $this->filter_name;
692 
+		}
569 693 
 		$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";
570 694 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571 695 
                  try {
 
@@ -587,7 +711,9 @@  discard block
 
 block discarded – undo
587 711 
 	}
588 712 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 713 
 		global $globalDBdriver, $globalStatsFilters;
590 
-		if ($filter_name == '') $filter_name = $this->filter_name;
714 
+		if ($filter_name == '') {
715 
+			$filter_name = $this->filter_name;
716 
+		}
591 717 
 		if ($globalDBdriver == 'mysql') {
592 718 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
593 719 
 		} else {
 
@@ -613,7 +739,9 @@  discard block
 
 block discarded – undo
613 739 
 	}
614 740 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 741 
 		global $globalStatsFilters;
616 
-		if ($filter_name == '') $filter_name = $this->filter_name;
742 
+		if ($filter_name == '') {
743 
+			$filter_name = $this->filter_name;
744 
+		}
617 745 
 		$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";
618 746 
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619 747 
                  try {
 
@@ -635,7 +763,9 @@  discard block
 
 block discarded – undo
635 763 
 	}
636 764 
 	public function countAllDatesByAirlines($filter_name = '') {
637 765 
 		global $globalStatsFilters;
638 
-		if ($filter_name == '') $filter_name = $this->filter_name;
766 
+		if ($filter_name == '') {
767 
+			$filter_name = $this->filter_name;
768 
+		}
639 769 
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 770 
 		$query_data = array('filter_name' => $filter_name);
641 771 
                  try {
 
@@ -657,7 +787,9 @@  discard block
 
 block discarded – undo
657 787 
 	}
658 788 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 789 
 		global $globalStatsFilters, $globalDBdriver;
660 
-		if ($filter_name == '') $filter_name = $this->filter_name;
790 
+		if ($filter_name == '') {
791 
+			$filter_name = $this->filter_name;
792 
+		}
661 793 
 		if ($globalDBdriver == 'mysql') {
662 794 
 			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
663 795 
 		} else {
 
@@ -726,7 +858,9 @@  discard block
 
 block discarded – undo
726 858 
 	}
727 859 
 	public function countAllMilitaryMonths($filter_name = '') {
728 860 
 		global $globalStatsFilters;
729 
-		if ($filter_name == '') $filter_name = $this->filter_name;
861 
+		if ($filter_name == '') {
862 
+			$filter_name = $this->filter_name;
863 
+		}
730 864 
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731 865 
                  try {
732 866 
                         $sth = $this->db->prepare($query);
 
@@ -747,9 +881,14 @@  discard block
 
 block discarded – undo
747 881 
 	}
748 882 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 883 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
750 
-		if ($filter_name == '') $filter_name = $this->filter_name;
751 
-		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";
752 
-		else $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";
884 
+		if ($filter_name == '') {
885 
+			$filter_name = $this->filter_name;
886 
+		}
887 
+		if ($limit) {
888 
+			$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";
889 
+		} else {
890 
+			$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";
891 
+		}
753 892 
 		if ($orderby == 'hour') {
754 893 
 			if ($globalDBdriver == 'mysql') {
755 894 
 				//$query .= " ORDER BY flight_date ASC";
 
@@ -758,7 +897,9 @@  discard block
 
 block discarded – undo
758 897 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
759 898 
 			}
760 899 
 		}
761 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
900 
+		if ($orderby == 'count') {
901 
+			$query .= " ORDER BY hour_count DESC";
902 
+		}
762 903 
                  try {
763 904 
                         $sth = $this->db->prepare($query);
764 905 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
 
@@ -779,8 +920,12 @@  discard block
 
 block discarded – undo
779 920
780 921 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
781 922 
 		global $globalStatsFilters;
782 
-		if ($filter_name == '') $filter_name = $this->filter_name;
783 
-		if ($year == '') $year = date('Y');
923 
+		if ($filter_name == '') {
924 
+			$filter_name = $this->filter_name;
925 
+		}
926 
+		if ($year == '') {
927 
+			$year = date('Y');
928 
+		}
784 929 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
785 930 
 		if (empty($all)) {
786 931 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 
@@ -795,8 +940,12 @@  discard block
 
 block discarded – undo
795 940 
 	}
796 941 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
797 942 
 		global $globalStatsFilters;
798 
-		if ($filter_name == '') $filter_name = $this->filter_name;
799 
-		if ($year == '') $year = date('Y');
943 
+		if ($filter_name == '') {
944 
+			$filter_name = $this->filter_name;
945 
+		}
946 
+		if ($year == '') {
947 
+			$year = date('Y');
948 
+		}
800 949 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 950 
 		if (empty($all)) {
802 951 
 		        $filters = array();
 
@@ -812,8 +961,12 @@  discard block
 
 block discarded – undo
812 961 
 	}
813 962 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
814 963 
 		global $globalStatsFilters;
815 
-		if ($filter_name == '') $filter_name = $this->filter_name;
816 
-		if ($year == '') $year = date('Y');
964 
+		if ($filter_name == '') {
965 
+			$filter_name = $this->filter_name;
966 
+		}
967 
+		if ($year == '') {
968 
+			$year = date('Y');
969 
+		}
817 970 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
818 971 
 		if (empty($all)) {
819 972 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 
@@ -828,7 +981,9 @@  discard block
 
 block discarded – undo
828 981 
 	}
829 982 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
830 983 
 		global $globalStatsFilters;
831 
-		if ($filter_name == '') $filter_name = $this->filter_name;
984 
+		if ($filter_name == '') {
985 
+			$filter_name = $this->filter_name;
986 
+		}
832 987 
 		if ($year == '' && $month == '') {
833 988 
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
834 989 
 			try {
 
@@ -839,7 +994,9 @@  discard block
 
 block discarded – undo
839 994 
 			}
840 995 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
841 996 
 			$all = $result[0]['nb'];
842 
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
997 
+		} else {
998 
+			$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
999 
+		}
843 1000 
 		if (empty($all)) {
844 1001 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
845 1002 
 			if ($filter_name != '') {
 
@@ -853,7 +1010,9 @@  discard block
 
 block discarded – undo
853 1010 
 	}
854 1011 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
855 1012 
 		global $globalStatsFilters;
856 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1013 
+		if ($filter_name == '') {
1014 
+			$filter_name = $this->filter_name;
1015 
+		}
857 1016 
 		if ($year == '' && $month == '') {
858 1017 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
859 1018 
 			try {
 
@@ -864,7 +1023,9 @@  discard block
 
 block discarded – undo
864 1023 
 			}
865 1024 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
866 1025 
 			$all = $result[0]['nb_airline'];
867 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1026 
+		} else {
1027 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1028 
+		}
868 1029 
 		if (empty($all)) {
869 1030 
             		$filters = array();
870 1031 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -879,7 +1040,9 @@  discard block
 
 block discarded – undo
879 1040 
 	}
880 1041 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
881 1042 
 		global $globalStatsFilters;
882 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043 
+		if ($filter_name == '') {
1044 
+			$filter_name = $this->filter_name;
1045 
+		}
883 1046 
 		if ($year == '' && $month == '') {
884 1047 
 			$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
885 1048 
 			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 
@@ -907,7 +1070,9 @@  discard block
 
 block discarded – undo
907 1070 
 	}
908 1071 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
909 1072 
 		global $globalStatsFilters;
910 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1073 
+		if ($filter_name == '') {
1074 
+			$filter_name = $this->filter_name;
1075 
+		}
911 1076 
 		//if ($year == '') $year = date('Y');
912 1077 
 		if ($year == '' && $month == '') {
913 1078 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -936,7 +1101,9 @@  discard block
 
 block discarded – undo
936 1101 
 	}
937 1102
938 1103 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
939 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1104 
+		if ($filter_name == '') {
1105 
+			$filter_name = $this->filter_name;
1106 
+		}
940 1107 
 		$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";
941 1108 
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942 1109 
                  try {
 
@@ -949,7 +1116,9 @@  discard block
 
 block discarded – undo
949 1116 
                 return $all;
950 1117 
 	}
951 1118 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1119 
+		if ($filter_name == '') {
1120 
+			$filter_name = $this->filter_name;
1121 
+		}
953 1122 
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954 1123 
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955 1124 
                  try {
 
@@ -962,7 +1131,9 @@  discard block
 
 block discarded – undo
962 1131 
                 return $all;
963 1132 
         }
964 1133 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1134 
+		if ($filter_name == '') {
1135 
+			$filter_name = $this->filter_name;
1136 
+		}
966 1137 
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967 1138 
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968 1139 
                  try {
 
@@ -973,7 +1144,9 @@  discard block
 
 block discarded – undo
973 1144 
                 }
974 1145 
         }
975 1146 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
976 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1147 
+		if ($filter_name == '') {
1148 
+			$filter_name = $this->filter_name;
1149 
+		}
977 1150 
     		global $globalArchiveMonths, $globalDBdriver;
978 1151 
     		if ($globalDBdriver == 'mysql') {
979 1152 
     			if ($month == '') {
 
@@ -1003,7 +1176,9 @@  discard block
 
 block discarded – undo
1003 1176 
         }
1004 1177 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1005 1178 
     		global $globalArchiveMonths, $globalDBdriver;
1006 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1179 
+		if ($filter_name == '') {
1180 
+			$filter_name = $this->filter_name;
1181 
+		}
1007 1182 
     		if ($globalDBdriver == 'mysql') {
1008 1183 
 			$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 = :stats_airline AND filter_name = :filter_name";
1009 1184 
 		} else {
 
@@ -1021,7 +1196,9 @@  discard block
 
 block discarded – undo
1021 1196 
         }
1022 1197 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1023 1198 
     		global $globalArchiveMonths, $globalDBdriver;
1024 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1199 
+		if ($filter_name == '') {
1200 
+			$filter_name = $this->filter_name;
1201 
+		}
1025 1202 
     		if ($globalDBdriver == 'mysql') {
1026 1203 
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1027 1204 
                 } else {
 
@@ -1038,7 +1215,9 @@  discard block
 
 block discarded – undo
1038 1215 
         }
1039 1216 
 	public function getStatsAirlineTotal($filter_name = '') {
1040 1217 
     		global $globalArchiveMonths, $globalDBdriver;
1041 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1218 
+		if ($filter_name == '') {
1219 
+			$filter_name = $this->filter_name;
1220 
+		}
1042 1221 
     		if ($globalDBdriver == 'mysql') {
1043 1222 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1044 1223 
                 } else {
 
@@ -1055,7 +1234,9 @@  discard block
 
 block discarded – undo
1055 1234 
         }
1056 1235 
 	public function getStatsOwnerTotal($filter_name = '') {
1057 1236 
     		global $globalArchiveMonths, $globalDBdriver;
1058 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1237 
+		if ($filter_name == '') {
1238 
+			$filter_name = $this->filter_name;
1239 
+		}
1059 1240 
     		if ($globalDBdriver == 'mysql') {
1060 1241 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1061 1242 
 		} else {
 
@@ -1072,7 +1253,9 @@  discard block
 
 block discarded – undo
1072 1253 
         }
1073 1254 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1074 1255 
     		global $globalArchiveMonths, $globalDBdriver;
1075 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1256 
+		if ($filter_name == '') {
1257 
+			$filter_name = $this->filter_name;
1258 
+		}
1076 1259 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077 1260 
                  try {
1078 1261 
                         $sth = $this->db->prepare($query);
 
@@ -1081,12 +1264,17 @@  discard block
 
 block discarded – undo
1081 1264 
                         echo "error : ".$e->getMessage();
1082 1265 
                 }
1083 1266 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084 
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085 
-                else return 0;
1267 
+                if (isset($all[0]['cnt'])) {
1268 
+                	return $all[0]['cnt'];
1269 
+                } else {
1270 
+                	return 0;
1271 
+                }
1086 1272 
         }
1087 1273 
 	public function getStatsPilotTotal($filter_name = '') {
1088 1274 
     		global $globalArchiveMonths, $globalDBdriver;
1089 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1275 
+		if ($filter_name == '') {
1276 
+			$filter_name = $this->filter_name;
1277 
+		}
1090 1278 
     		if ($globalDBdriver == 'mysql') {
1091 1279 
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092 1280 
             	} else {
 
@@ -1103,7 +1291,9 @@  discard block
 
 block discarded – undo
1103 1291 
         }
1104 1292 
 	public function getStatsPilot($pilot,$filter_name = '') {
1105 1293 
     		global $globalArchiveMonths, $globalDBdriver;
1106 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1294 
+		if ($filter_name == '') {
1295 
+			$filter_name = $this->filter_name;
1296 
+		}
1107 1297 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108 1298 
                  try {
1109 1299 
                         $sth = $this->db->prepare($query);
 
@@ -1112,13 +1302,18 @@  discard block
 
 block discarded – undo
1112 1302 
                         echo "error : ".$e->getMessage();
1113 1303 
                 }
1114 1304 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115 
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116 
-                else return 0;
1305 
+                if (isset($all[0]['cnt'])) {
1306 
+                	return $all[0]['cnt'];
1307 
+                } else {
1308 
+                	return 0;
1309 
+                }
1117 1310 
         }
1118 1311
1119 1312 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1120 1313 
 		global $globalDBdriver;
1121 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1314 
+		if ($filter_name == '') {
1315 
+			$filter_name = $this->filter_name;
1316 
+		}
1122 1317 
 		if ($globalDBdriver == 'mysql') {
1123 1318 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1124 1319 
                 } else {
 
@@ -1134,7 +1329,9 @@  discard block
 
 block discarded – undo
1134 1329 
         }
1135 1330 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1136 1331 
 		global $globalDBdriver;
1137 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1332 
+		if ($filter_name == '') {
1333 
+			$filter_name = $this->filter_name;
1334 
+		}
1138 1335 
 		if ($globalDBdriver == 'mysql') {
1139 1336 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1140 1337 
 		} else {
 
@@ -1520,10 +1717,14 @@  discard block
 
 block discarded – undo
1520 1717 
     		$Connection = new Connection();
1521 1718 
     		date_default_timezone_set('UTC');
1522 1719 
     		$last_update = $this->getLastStatsUpdate('last_update_stats');
1523 
-			if ($globalDebug) echo 'Update stats !'."\n";
1720 
+			if ($globalDebug) {
1721 
+				echo 'Update stats !'."\n";
1722 
+			}
1524 1723 
 			if (isset($last_update[0]['value'])) {
1525 1724 
 				$last_update_day = $last_update[0]['value'];
1526 
-			} else $last_update_day = '2012-12-12 12:12:12';
1725 
+			} else {
1726 
+				$last_update_day = '2012-12-12 12:12:12';
1727 
+			}
1527 1728 
 			$reset = false;
1528 1729 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1529 1730 
 			if ($globalStatsResetYear) {
 
@@ -1532,42 +1733,60 @@  discard block
 
 block discarded – undo
1532 1733 
 			}
1533 1734 
 			$Spotter = new Spotter($this->db);
1534 1735
1535 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1736 
+			if ($globalDebug) {
1737 
+				echo 'Count all aircraft types...'."\n";
1738 
+			}
1536 1739 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1537 1740 
 			foreach ($alldata as $number) {
1538 1741 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
1539 1742 
 			}
1540 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
1743 
+			if ($globalDebug) {
1744 
+				echo 'Count all airlines...'."\n";
1745 
+			}
1541 1746 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1542 1747 
 			foreach ($alldata as $number) {
1543 1748 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
1544 1749 
 			}
1545 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
1750 
+			if ($globalDebug) {
1751 
+				echo 'Count all registrations...'."\n";
1752 
+			}
1546 1753 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1547 1754 
 			foreach ($alldata as $number) {
1548 1755 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
1549 1756 
 			}
1550 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
1757 
+			if ($globalDebug) {
1758 
+				echo 'Count all callsigns...'."\n";
1759 
+			}
1551 1760 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1552 1761 
 			foreach ($alldata as $number) {
1553 1762 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1554 1763 
 			}
1555 
-			if ($globalDebug) echo 'Count all owners...'."\n";
1764 
+			if ($globalDebug) {
1765 
+				echo 'Count all owners...'."\n";
1766 
+			}
1556 1767 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1557 1768 
 			foreach ($alldata as $number) {
1558 1769 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
1559 1770 
 			}
1560 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
1771 
+			if ($globalDebug) {
1772 
+				echo 'Count all pilots...'."\n";
1773 
+			}
1561 1774 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1562 1775 
 			foreach ($alldata as $number) {
1563 1776 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
1564 1777 
 			}
1565 1778
1566 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
1779 
+			if ($globalDebug) {
1780 
+				echo 'Count all departure airports...'."\n";
1781 
+			}
1567 1782 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1568 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1783 
+			if ($globalDebug) {
1784 
+				echo 'Count all detected departure airports...'."\n";
1785 
+			}
1569 1786 
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
1787 
+			if ($globalDebug) {
1788 
+				echo 'Order departure airports...'."\n";
1789 
+			}
1571 1790 
 	        	$alldata = array();
1572 1791
1573 1792 
     			foreach ($pall as $value) {
 
@@ -1578,7 +1797,9 @@  discard block
 
 block discarded – undo
1578 1797 
     				$icao = $value['airport_departure_icao'];
1579 1798 
         			if (isset($alldata[$icao])) {
1580 1799 
     					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1581 
-        			} else $alldata[$icao] = $value;
1800 
+        			} else {
1801 
+        				$alldata[$icao] = $value;
1802 
+        			}
1582 1803 
 			}
1583 1804 
     			$count = array();
1584 1805 
     			foreach ($alldata as $key => $row) {
 
@@ -1588,11 +1809,17 @@  discard block
 
 block discarded – undo
1588 1809 
 			foreach ($alldata as $number) {
1589 1810 
 				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);
1590 1811 
 			}
1591 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1812 
+			if ($globalDebug) {
1813 
+				echo 'Count all arrival airports...'."\n";
1814 
+			}
1592 1815 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1593 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1816 
+			if ($globalDebug) {
1817 
+				echo 'Count all detected arrival airports...'."\n";
1818 
+			}
1594 1819 
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
1820 
+			if ($globalDebug) {
1821 
+				echo 'Order arrival airports...'."\n";
1822 
+			}
1596 1823 
 	        	$alldata = array();
1597 1824 
     			foreach ($pall as $value) {
1598 1825 
 	        		$icao = $value['airport_arrival_icao'];
 
@@ -1602,7 +1829,9 @@  discard block
 
 block discarded – undo
1602 1829 
     				$icao = $value['airport_arrival_icao'];
1603 1830 
         			if (isset($alldata[$icao])) {
1604 1831 
         				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1605 
-	        		} else $alldata[$icao] = $value;
1832 
+	        		} else {
1833 
+	        			$alldata[$icao] = $value;
1834 
+	        		}
1606 1835 
     			}
1607 1836 
         		$count = array();
1608 1837 
         		foreach ($alldata as $key => $row) {
 
@@ -1613,7 +1842,9 @@  discard block
 
 block discarded – undo
1613 1842 
 				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);
1614 1843 
 			}
1615 1844 
 			if ($Connection->tableExists('countries')) {
1616 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1845 
+				if ($globalDebug) {
1846 
+					echo 'Count all flights by countries...'."\n";
1847 
+				}
1617 1848 
 				//$SpotterArchive = new SpotterArchive();
1618 1849 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1619 1850 
 				$Spotter = new Spotter($this->db);
 
@@ -1623,7 +1854,9 @@  discard block
 
 block discarded – undo
1623 1854 
 				}
1624 1855 
 			}
1625 1856
1626 
-			if ($globalDebug) echo 'Count fatalities stats...'."\n";
1857 
+			if ($globalDebug) {
1858 
+				echo 'Count fatalities stats...'."\n";
1859 
+			}
1627 1860 
 			$Accident = new Accident();
1628 1861 
 			$this->deleteStatsByType('fatalities_byyear');
1629 1862 
 			$alldata = $Accident->countFatalitiesByYear();
 
@@ -1640,46 +1873,66 @@  discard block
 
 block discarded – undo
1640 1873 
 			// Add by month using getstat if month finish...
1641 1874
1642 1875 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
1643 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
1876 
+			if ($globalDebug) {
1877 
+				echo 'Count all flights by months...'."\n";
1878 
+			}
1644 1879 
 			$Spotter = new Spotter($this->db);
1645 1880 
 			$alldata = $Spotter->countAllMonths();
1646 1881 
 			$lastyear = false;
1647 1882 
 			foreach ($alldata as $number) {
1648 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
1883 
+				if ($number['year_name'] != date('Y')) {
1884 
+					$lastyear = true;
1885 
+				}
1649 1886 
 				$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'])));
1650 1887 
 			}
1651 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1888 
+			if ($globalDebug) {
1889 
+				echo 'Count all military flights by months...'."\n";
1890 
+			}
1652 1891 
 			$alldata = $Spotter->countAllMilitaryMonths();
1653 1892 
 			foreach ($alldata as $number) {
1654 1893 
 				$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'])));
1655 1894 
 			}
1656 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
1895 
+			if ($globalDebug) {
1896 
+				echo 'Count all owners by months...'."\n";
1897 
+			}
1657 1898 
 			$alldata = $Spotter->countAllMonthsOwners();
1658 1899 
 			foreach ($alldata as $number) {
1659 1900 
 				$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'])));
1660 1901 
 			}
1661 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1902 
+			if ($globalDebug) {
1903 
+				echo 'Count all pilots by months...'."\n";
1904 
+			}
1662 1905 
 			$alldata = $Spotter->countAllMonthsPilots();
1663 1906 
 			foreach ($alldata as $number) {
1664 1907 
 				$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'])));
1665 1908 
 			}
1666 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1909 
+			if ($globalDebug) {
1910 
+				echo 'Count all airlines by months...'."\n";
1911 
+			}
1667 1912 
 			$alldata = $Spotter->countAllMonthsAirlines();
1668 1913 
 			foreach ($alldata as $number) {
1669 1914 
 				$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'])));
1670 1915 
 			}
1671 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1916 
+			if ($globalDebug) {
1917 
+				echo 'Count all aircrafts by months...'."\n";
1918 
+			}
1672 1919 
 			$alldata = $Spotter->countAllMonthsAircrafts();
1673 1920 
 			foreach ($alldata as $number) {
1674 1921 
 				$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'])));
1675 1922 
 			}
1676 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1923 
+			if ($globalDebug) {
1924 
+				echo 'Count all real arrivals by months...'."\n";
1925 
+			}
1677 1926 
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1678 1927 
 			foreach ($alldata as $number) {
1679 1928 
 				$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'])));
1680 1929 
 			}
1681 
-			if ($globalDebug) echo 'Airports data...'."\n";
1682 
-			if ($globalDebug) echo '...Departure'."\n";
1930 
+			if ($globalDebug) {
1931 
+				echo 'Airports data...'."\n";
1932 
+			}
1933 
+			if ($globalDebug) {
1934 
+				echo '...Departure'."\n";
1935 
+			}
1683 1936 
 			$this->deleteStatAirport('daily');
1684 1937 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 1938 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -1800,7 +2053,9 @@  discard block
 
 block discarded – undo
1800 2053 
 			// Count by airlines
1801 2054 
 			echo '--- Stats by airlines ---'."\n";
1802 2055 
 			if ($Connection->tableExists('countries')) {
1803 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2056 
+				if ($globalDebug) {
2057 
+					echo 'Count all flights by countries by airlines...'."\n";
2058 
+				}
1804 2059 
 				$SpotterArchive = new SpotterArchive();
1805 2060 
 				//$Spotter = new Spotter($this->db);
1806 2061 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -1809,37 +2064,53 @@  discard block
 
 block discarded – undo
1809 2064 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
1810 2065 
 				}
1811 2066 
 			}
1812 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2067 
+			if ($globalDebug) {
2068 
+				echo 'Count all aircraft types by airlines...'."\n";
2069 
+			}
1813 2070 
 			$Spotter = new Spotter($this->db);
1814 2071 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1815 2072 
 			foreach ($alldata as $number) {
1816 2073 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
1817 2074 
 			}
1818 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2075 
+			if ($globalDebug) {
2076 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2077 
+			}
1819 2078 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1820 2079 
 			foreach ($alldata as $number) {
1821 2080 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
1822 2081 
 			}
1823 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2082 
+			if ($globalDebug) {
2083 
+				echo 'Count all callsigns by airlines...'."\n";
2084 
+			}
1824 2085 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1825 2086 
 			foreach ($alldata as $number) {
1826 2087 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1827 2088 
 			}
1828 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2089 
+			if ($globalDebug) {
2090 
+				echo 'Count all owners by airlines...'."\n";
2091 
+			}
1829 2092 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1830 2093 
 			foreach ($alldata as $number) {
1831 2094 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
1832 2095 
 			}
1833 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2096 
+			if ($globalDebug) {
2097 
+				echo 'Count all pilots by airlines...'."\n";
2098 
+			}
1834 2099 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1835 2100 
 			foreach ($alldata as $number) {
1836 2101 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
1837 2102 
 			}
1838 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2103 
+			if ($globalDebug) {
2104 
+				echo 'Count all departure airports by airlines...'."\n";
2105 
+			}
1839 2106 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1840 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2107 
+			if ($globalDebug) {
2108 
+				echo 'Count all detected departure airports by airlines...'."\n";
2109 
+			}
1841 2110 
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1842 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2111 
+			if ($globalDebug) {
2112 
+				echo 'Order detected departure airports by airlines...'."\n";
2113 
+			}
1843 2114 
 	        	//$alldata = array();
1844 2115 
     			foreach ($dall as $value) {
1845 2116 
     				$icao = $value['airport_departure_icao'];
 
@@ -1860,11 +2131,17 @@  discard block
 
 block discarded – undo
1860 2131 
 			foreach ($alldata as $number) {
1861 2132 
 				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);
1862 2133 
 			}
1863 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2134 
+			if ($globalDebug) {
2135 
+				echo 'Count all arrival airports by airlines...'."\n";
2136 
+			}
1864 2137 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1865 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2138 
+			if ($globalDebug) {
2139 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2140 
+			}
1866 2141 
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1867 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2142 
+			if ($globalDebug) {
2143 
+				echo 'Order arrival airports by airlines...'."\n";
2144 
+			}
1868 2145 
 	        	//$alldata = array();
1869 2146 
     			foreach ($dall as $value) {
1870 2147 
     				$icao = $value['airport_arrival_icao'];
 
@@ -1883,37 +2160,53 @@  discard block
 
 block discarded – undo
1883 2160 
     			}
1884 2161 
     			$alldata = $pall;
1885 2162 
                         foreach ($alldata as $number) {
1886 
-				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);
2163 
+				if ($number['airline_icao'] != '') {
2164 
+					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);
2165 
+				}
2166 
+			}
2167 
+			if ($globalDebug) {
2168 
+				echo 'Count all flights by months by airlines...'."\n";
1887 2169 
 			}
1888 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1889 2170 
 			$Spotter = new Spotter($this->db);
1890 2171 
 			$alldata = $Spotter->countAllMonthsByAirlines();
1891 2172 
 			$lastyear = false;
1892 2173 
 			foreach ($alldata as $number) {
1893 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2174 
+				if ($number['year_name'] != date('Y')) {
2175 
+					$lastyear = true;
2176 
+				}
1894 2177 
 				$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']);
1895 2178 
 			}
1896 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2179 
+			if ($globalDebug) {
2180 
+				echo 'Count all owners by months by airlines...'."\n";
2181 
+			}
1897 2182 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1898 2183 
 			foreach ($alldata as $number) {
1899 2184 
 				$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']);
1900 2185 
 			}
1901 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2186 
+			if ($globalDebug) {
2187 
+				echo 'Count all pilots by months by airlines...'."\n";
2188 
+			}
1902 2189 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1903 2190 
 			foreach ($alldata as $number) {
1904 2191 
 				$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']);
1905 2192 
 			}
1906 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2193 
+			if ($globalDebug) {
2194 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2195 
+			}
1907 2196 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1908 2197 
 			foreach ($alldata as $number) {
1909 2198 
 				$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']);
1910 2199 
 			}
1911 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2200 
+			if ($globalDebug) {
2201 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2202 
+			}
1912 2203 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1913 2204 
 			foreach ($alldata as $number) {
1914 2205 
 				$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']);
1915 2206 
 			}
1916 
-			if ($globalDebug) echo '...Departure'."\n";
2207 
+			if ($globalDebug) {
2208 
+				echo '...Departure'."\n";
2209 
+			}
1917 2210 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1918 2211 
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1919 2212 
     			foreach ($dall as $value) {
 
@@ -1936,7 +2229,9 @@  discard block
 
 block discarded – undo
1936 2229 
 			foreach ($alldata as $number) {
1937 2230 
 				$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']);
1938 2231 
 			}
1939 
-			if ($globalDebug) echo '...Arrival'."\n";
2232 
+			if ($globalDebug) {
2233 
+				echo '...Arrival'."\n";
2234 
+			}
1940 2235 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1941 2236 
         		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1942 2237 
     			foreach ($dall as $value) {
 
@@ -1960,13 +2255,19 @@  discard block
 
 block discarded – undo
1960 2255 
 				$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']);
1961 2256 
 			}
1962 2257
1963 
-			if ($globalDebug) echo 'Flights data...'."\n";
1964 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2258 
+			if ($globalDebug) {
2259 
+				echo 'Flights data...'."\n";
2260 
+			}
2261 
+			if ($globalDebug) {
2262 
+				echo '-> countAllDatesLastMonth...'."\n";
2263 
+			}
1965 2264 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1966 2265 
 			foreach ($alldata as $number) {
1967 2266 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1968 2267 
 			}
1969 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2268 
+			if ($globalDebug) {
2269 
+				echo '-> countAllDates...'."\n";
2270 
+			}
1970 2271 
 			//$previousdata = $this->countAllDatesByAirlines();
1971 2272 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1972 2273 
 			$values = array();
 
@@ -1979,7 +2280,9 @@  discard block
 
 block discarded – undo
1979 2280 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1980 2281 
 			}
1981 2282
1982 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2283 
+			if ($globalDebug) {
2284 
+				echo '-> countAllHours...'."\n";
2285 
+			}
1983 2286 
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1984 2287 
 			foreach ($alldata as $number) {
1985 2288 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
 
@@ -1987,14 +2290,18 @@  discard block
 
 block discarded – undo
1987 2290
1988 2291
1989 2292 
 			// Stats by filters
1990 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2293 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2294 
+				$globalStatsFilters = array();
2295 
+			}
1991 2296 
 			foreach ($globalStatsFilters as $name => $filter) {
1992 2297 
 				//$filter_name = $filter['name'];
1993 2298 
 				$filter_name = $name;
1994 2299 
 				$reset = false;
1995 2300 
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
1996 2301 
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
1997 
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2302 
+					if ($globalDebug) {
2303 
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2304 
+					}
1998 2305 
 					$this->deleteOldStats($filter_name);
1999 2306 
 					unset($last_update);
2000 2307 
 				}
 
@@ -2013,7 +2320,9 @@  discard block
 
 block discarded – undo
2013 2320
2014 2321
2015 2322 
 				// Count by filter
2016 
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2323 
+				if ($globalDebug) {
2324 
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
2325 
+				}
2017 2326 
 				$Spotter = new Spotter($this->db);
2018 2327 
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2019 2328 
 				foreach ($alldata as $number) {
 
@@ -2050,7 +2359,9 @@  discard block
 
 block discarded – undo
2050 2359 
 	    				$icao = $value['airport_departure_icao'];
2051 2360 
         				if (isset($alldata[$icao])) {
2052 2361 
     						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2053 
-        				} else $alldata[$icao] = $value;
2362 
+        				} else {
2363 
+        					$alldata[$icao] = $value;
2364 
+        				}
2054 2365 
 				}
2055 2366 
 	    			$count = array();
2056 2367 
     				foreach ($alldata as $key => $row) {
 
@@ -2071,7 +2382,9 @@  discard block
 
 block discarded – undo
2071 2382 
 	    				$icao = $value['airport_arrival_icao'];
2072 2383 
         				if (isset($alldata[$icao])) {
2073 2384 
         					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2074 
-		        		} else $alldata[$icao] = $value;
2385 
+		        		} else {
2386 
+		        			$alldata[$icao] = $value;
2387 
+		        		}
2075 2388 
 	    			}
2076 2389 
         			$count = array();
2077 2390 
         			foreach ($alldata as $key => $row) {
 
@@ -2085,7 +2398,9 @@  discard block
 
 block discarded – undo
2085 2398 
 				$alldata = $Spotter->countAllMonths($filter);
2086 2399 
 				$lastyear = false;
2087 2400 
 				foreach ($alldata as $number) {
2088 
-					if ($number['year_name'] != date('Y')) $lastyear = true;
2401 
+					if ($number['year_name'] != date('Y')) {
2402 
+						$lastyear = true;
2403 
+					}
2089 2404 
 					$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);
2090 2405 
 				}
2091 2406 
 				$alldata = $Spotter->countAllMonthsOwners($filter);
Please login to merge, or discard this patch.
install/class.update_db.php 1 patch
Braces   +931 added lines, -322 removed lines patch added patch discarded remove patch 
@@ -17,7 +17,9 @@  discard block
 
 block discarded – undo
17 17 
 		curl_setopt($ch, CURLOPT_URL, $url);
18 18 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
19 19 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
20 
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
20 
+		if ($referer != '') {
21 
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
22 
+		}
21 23 
 		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');
22 24 
 		curl_setopt($ch, CURLOPT_FILE, $fp);
23 25 
 		curl_exec($ch);
 
@@ -28,12 +30,16 @@  discard block
 
 block discarded – undo
28 30 
 	public static function gunzip($in_file,$out_file_name = '') {
29 31 
 		//echo $in_file.' -> '.$out_file_name."\n";
30 32 
 		$buffer_size = 4096; // read 4kb at a time
31 
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
33 
+		if ($out_file_name == '') {
34 
+			$out_file_name = str_replace('.gz', '', $in_file);
35 
+		}
32 36 
 		if ($in_file != '' && file_exists($in_file)) {
33 37 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
34 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
35 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
36 
-			else {
38 
+			if (function_exists('gzopen')) {
39 
+				$file = gzopen($in_file,'rb');
40 
+			} elseif (function_exists('gzopen64')) {
41 
+				$file = gzopen64($in_file,'rb');
42 
+			} else {
37 43 
 				echo 'gzopen not available';
38 44 
 				die;
39 45 
 			}
 
@@ -54,8 +60,12 @@  discard block
 
 block discarded – undo
54 60 
 			if ($res === TRUE) {
55 61 
 				$zip->extractTo($path);
56 62 
 				$zip->close();
57 
-			} else return false;
58 
-		} else return false;
63 
+			} else {
64 
+				return false;
65 
+			}
66 
+		} else {
67 
+			return false;
68 
+		}
59 69 
 	}
60 70
61 71 
 	public static function connect_sqlite($database) {
 
@@ -70,7 +80,9 @@  discard block
 
 block discarded – undo
70 80 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
71 81 
 		global $globalDebug, $globalTransaction;
72 82 
 		//$query = 'TRUNCATE TABLE routes';
73 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
83 
+		if ($globalDebug) {
84 
+			echo " - Delete previous routes from DB -";
85 
+		}
74 86 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
75 87 
 		$Connection = new Connection();
76 88 
 		try {
 
@@ -81,7 +93,9 @@  discard block
 
 block discarded – undo
81 93 
                         return "error : ".$e->getMessage();
82 94 
                 }
83 95
84 
-    		if ($globalDebug) echo " - Add routes to DB -";
96 
+    		if ($globalDebug) {
97 
+    			echo " - Add routes to DB -";
98 
+    		}
85 99 
     		update_db::connect_sqlite($database_file);
86 100 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
87 101 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 
@@ -96,15 +110,21 @@  discard block
 
 block discarded – undo
96 110 
 		$Connection = new Connection();
97 111 
 		$sth_dest = $Connection->db->prepare($query_dest);
98 112 
 		try {
99 
-			if ($globalTransaction) $Connection->db->beginTransaction();
113 
+			if ($globalTransaction) {
114 
+				$Connection->db->beginTransaction();
115 
+			}
100 116 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
101 117 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
102 118 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
103 119 
 				$sth_dest->execute($query_dest_values);
104 120 
             		}
105 
-			if ($globalTransaction) $Connection->db->commit();
121 
+			if ($globalTransaction) {
122 
+				$Connection->db->commit();
123 
+			}
106 124 
 		} catch(PDOException $e) {
107 
-			if ($globalTransaction) $Connection->db->rollBack();
125 
+			if ($globalTransaction) {
126 
+				$Connection->db->rollBack();
127 
+			}
108 128 
 			return "error : ".$e->getMessage();
109 129 
 		}
110 130 
                 return '';
 
@@ -112,7 +132,9 @@  discard block
 
 block discarded – undo
112 132 
 	public static function retrieve_route_oneworld($database_file) {
113 133 
 		global $globalDebug, $globalTransaction;
114 134 
 		//$query = 'TRUNCATE TABLE routes';
115 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
135 
+		if ($globalDebug) {
136 
+			echo " - Delete previous routes from DB -";
137 
+		}
116 138 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
117 139 
 		$Connection = new Connection();
118 140 
 		try {
 
@@ -123,14 +145,18 @@  discard block
 
 block discarded – undo
123 145 
                         return "error : ".$e->getMessage();
124 146 
                 }
125 147
126 
-    		if ($globalDebug) echo " - Add routes to DB -";
148 
+    		if ($globalDebug) {
149 
+    			echo " - Add routes to DB -";
150 
+    		}
127 151 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
128 152 
 		$Spotter = new Spotter();
129 153 
 		if ($fh = fopen($database_file,"r")) {
130 154 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
131 155 
 			$Connection = new Connection();
132 156 
 			$sth_dest = $Connection->db->prepare($query_dest);
133 
-			if ($globalTransaction) $Connection->db->beginTransaction();
157 
+			if ($globalTransaction) {
158 
+				$Connection->db->beginTransaction();
159 
+			}
134 160 
 			while (!feof($fh)) {
135 161 
 				$line = fgetcsv($fh,9999,',');
136 162 
 				if ($line[0] != '') {
 
@@ -139,13 +165,17 @@  discard block
 
 block discarded – undo
139 165 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
140 166 
 							$sth_dest->execute($query_dest_values);
141 167 
 						} catch(PDOException $e) {
142 
-							if ($globalTransaction) $Connection->db->rollBack();
168 
+							if ($globalTransaction) {
169 
+								$Connection->db->rollBack();
170 
+							}
143 171 
 							return "error : ".$e->getMessage();
144 172 
 						}
145 173 
 					}
146 174 
 				}
147 175 
 			}
148 
-			if ($globalTransaction) $Connection->db->commit();
176 
+			if ($globalTransaction) {
177 
+				$Connection->db->commit();
178 
+			}
149 179 
 		}
150 180 
                 return '';
151 181 
 	}
 
@@ -153,7 +183,9 @@  discard block
 
 block discarded – undo
153 183 
 	public static function retrieve_route_skyteam($database_file) {
154 184 
 		global $globalDebug, $globalTransaction;
155 185 
 		//$query = 'TRUNCATE TABLE routes';
156 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
186 
+		if ($globalDebug) {
187 
+			echo " - Delete previous routes from DB -";
188 
+		}
157 189 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
158 190 
 		$Connection = new Connection();
159 191 
 		try {
 
@@ -164,7 +196,9 @@  discard block
 
 block discarded – undo
164 196 
                         return "error : ".$e->getMessage();
165 197 
                 }
166 198
167 
-    		if ($globalDebug) echo " - Add routes to DB -";
199 
+    		if ($globalDebug) {
200 
+    			echo " - Add routes to DB -";
201 
+    		}
168 202
169 203 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
170 204 
 		$Spotter = new Spotter();
 
@@ -173,7 +207,9 @@  discard block
 
 block discarded – undo
173 207 
 			$Connection = new Connection();
174 208 
 			$sth_dest = $Connection->db->prepare($query_dest);
175 209 
 			try {
176 
-				if ($globalTransaction) $Connection->db->beginTransaction();
210 
+				if ($globalTransaction) {
211 
+					$Connection->db->beginTransaction();
212 
+				}
177 213 
 				while (!feof($fh)) {
178 214 
 					$line = fgetcsv($fh,9999,',');
179 215 
 					if ($line[0] != '') {
 
@@ -184,9 +220,13 @@  discard block
 
 block discarded – undo
184 220 
 						}
185 221 
 					}
186 222 
 				}
187 
-				if ($globalTransaction) $Connection->db->commit();
223 
+				if ($globalTransaction) {
224 
+					$Connection->db->commit();
225 
+				}
188 226 
 			} catch(PDOException $e) {
189 
-				if ($globalTransaction) $Connection->db->rollBack();
227 
+				if ($globalTransaction) {
228 
+					$Connection->db->rollBack();
229 
+				}
190 230 
 				return "error : ".$e->getMessage();
191 231 
 			}
192 232 
 		}
 
@@ -229,11 +269,16 @@  discard block
 
 block discarded – undo
229 269 
 		$sth_dest = $Connection->db->prepare($query_dest);
230 270 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
231 271 
 		try {
232 
-			if ($globalTransaction) $Connection->db->beginTransaction();
272 
+			if ($globalTransaction) {
273 
+				$Connection->db->beginTransaction();
274 
+			}
233 275 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
234 276 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
235 
-				if ($values['UserString4'] == 'M') $type = 'military';
236 
-				else $type = null;
277 
+				if ($values['UserString4'] == 'M') {
278 
+					$type = 'military';
279 
+				} else {
280 
+					$type = null;
281 
+				}
237 282 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
238 283 
 				$sth_dest->execute($query_dest_values);
239 284 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
 
@@ -241,7 +286,9 @@  discard block
 
 block discarded – undo
241 286 
 				    $sth_dest_owner->execute($query_dest_owner_values);
242 287 
 				}
243 288 
             		}
244 
-			if ($globalTransaction) $Connection->db->commit();
289 
+			if ($globalTransaction) {
290 
+				$Connection->db->commit();
291 
+			}
245 292 
 		} catch(PDOException $e) {
246 293 
 			return "error : ".$e->getMessage();
247 294 
 		}
 
@@ -278,7 +325,9 @@  discard block
 
 block discarded – undo
278 325 
 			$Connection = new Connection();
279 326 
 			$sth_dest = $Connection->db->prepare($query_dest);
280 327 
 			try {
281 
-				if ($globalTransaction) $Connection->db->beginTransaction();
328 
+				if ($globalTransaction) {
329 
+					$Connection->db->beginTransaction();
330 
+				}
282 331 
             			while (!feof($fh)) {
283 332 
             				$values = array();
284 333 
             				$line = $Common->hex2str(fgets($fh,9999));
 
@@ -289,7 +338,9 @@  discard block
 
 block discarded – undo
289 338 
             				// Check if we can find ICAO, else set it to GLID
290 339 
             				$aircraft_name_split = explode(' ',$aircraft_name);
291 340 
             				$search_more = '';
292 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
341 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
342 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
343 
+            				}
293 344 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
294 345 
             				$sth_search = $Connection->db->prepare($query_search);
295 346 
 					try {
 
@@ -302,7 +353,9 @@  discard block
 
 block discarded – undo
302 353 
 					} catch(PDOException $e) {
303 354 
 						return "error : ".$e->getMessage();
304 355 
 					}
305 
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
356 
+					if (!isset($values['ICAOTypeCode'])) {
357 
+						$values['ICAOTypeCode'] = 'GLID';
358 
+					}
306 359 
 					// Add data to db
307 360 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
308 361 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 
@@ -311,7 +364,9 @@  discard block
 
 block discarded – undo
311 364 
 						$sth_dest->execute($query_dest_values);
312 365 
 					}
313 366 
 				}
314 
-				if ($globalTransaction) $Connection->db->commit();
367 
+				if ($globalTransaction) {
368 
+					$Connection->db->commit();
369 
+				}
315 370 
 			} catch(PDOException $e) {
316 371 
 				return "error : ".$e->getMessage();
317 372 
 			}
 
@@ -347,7 +402,9 @@  discard block
 
 block discarded – undo
347 402 
 			$Connection = new Connection();
348 403 
 			$sth_dest = $Connection->db->prepare($query_dest);
349 404 
 			try {
350 
-				if ($globalTransaction) $Connection->db->beginTransaction();
405 
+				if ($globalTransaction) {
406 
+					$Connection->db->beginTransaction();
407 
+				}
351 408 
 				$tmp = fgetcsv($fh,9999,',',"'");
352 409 
             			while (!feof($fh)) {
353 410 
             				$line = fgetcsv($fh,9999,',',"'");
 
@@ -360,13 +417,17 @@  discard block
 
 block discarded – undo
360 417 
             				// Check if we can find ICAO, else set it to GLID
361 418 
             				$aircraft_name_split = explode(' ',$aircraft_name);
362 419 
             				$search_more = '';
363 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
420 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
421 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
422 
+            				}
364 423 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
365 424 
             				$sth_search = $Connection->db->prepare($query_search);
366 425 
 					try {
367 426 
                                     		$sth_search->execute();
368 427 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
369 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
428 
+	            				if (isset($result['icao']) && $result['icao'] != '') {
429 
+	            					$values['ICAOTypeCode'] = $result['icao'];
430 
+	            				}
370 431 
 					} catch(PDOException $e) {
371 432 
 						return "error : ".$e->getMessage();
372 433 
 					}
 
@@ -379,7 +440,9 @@  discard block
 
 block discarded – undo
379 440 
 						$sth_dest->execute($query_dest_values);
380 441 
 					}
381 442 
 				}
382 
-				if ($globalTransaction) $Connection->db->commit();
443 
+				if ($globalTransaction) {
444 
+					$Connection->db->commit();
445 
+				}
383 446 
 			} catch(PDOException $e) {
384 447 
 				return "error : ".$e->getMessage();
385 448 
 			}
 
@@ -418,7 +481,9 @@  discard block
 
 block discarded – undo
418 481 
 			$sth_dest = $Connection->db->prepare($query_dest);
419 482 
 			$sth_modes = $Connection->db->prepare($query_modes);
420 483 
 			try {
421 
-				if ($globalTransaction) $Connection->db->beginTransaction();
484 
+				if ($globalTransaction) {
485 
+					$Connection->db->beginTransaction();
486 
+				}
422 487 
 				$tmp = fgetcsv($fh,9999,',','"');
423 488 
             			while (!feof($fh)) {
424 489 
             				$line = fgetcsv($fh,9999,',','"');
 
@@ -428,16 +493,22 @@  discard block
 
 block discarded – undo
428 493 
             				    $values['registration'] = $line[0];
429 494 
             				    $values['base'] = $line[4];
430 495 
             				    $values['owner'] = $line[5];
431 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
432 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
496 
+            				    if ($line[6] == '') {
497 
+            				    	$values['date_first_reg'] = null;
498 
+            				    } else {
499 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
500 
+					    }
433 501 
 					    $values['cancel'] = $line[7];
434 502 
 					} elseif ($country == 'EI') {
435 503 
 					    // TODO : add modeS & reg to aircraft_modes
436 504 
             				    $values['registration'] = $line[0];
437 505 
             				    $values['base'] = $line[3];
438 506 
             				    $values['owner'] = $line[2];
439 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
440 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
507 
+            				    if ($line[1] == '') {
508 
+            				    	$values['date_first_reg'] = null;
509 
+            				    } else {
510 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
511 
+					    }
441 512 
 					    $values['cancel'] = '';
442 513 
 					    $values['modes'] = $line[7];
443 514 
 					    $values['icao'] = $line[8];
 
@@ -456,16 +527,22 @@  discard block
 
 block discarded – undo
456 527 
             				    $values['registration'] = $line[3];
457 528 
             				    $values['base'] = null;
458 529 
             				    $values['owner'] = $line[5];
459 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
460 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
530 
+            				    if ($line[18] == '') {
531 
+            				    	$values['date_first_reg'] = null;
532 
+            				    } else {
533 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
534 
+					    }
461 535 
 					    $values['cancel'] = '';
462 536 
 					} elseif ($country == 'VH') {
463 537 
 					    // TODO : add modeS & reg to aircraft_modes
464 538 
             				    $values['registration'] = $line[0];
465 539 
             				    $values['base'] = null;
466 540 
             				    $values['owner'] = $line[12];
467 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
468 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
541 
+            				    if ($line[28] == '') {
542 
+            				    	$values['date_first_reg'] = null;
543 
+            				    } else {
544 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
545 
+					    }
469 546
470 547 
 					    $values['cancel'] = $line[39];
471 548 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -484,29 +561,41 @@  discard block
 
 block discarded – undo
484 561 
             				    $values['registration'] = $line[0];
485 562 
             				    $values['base'] = null;
486 563 
             				    $values['owner'] = $line[8];
487 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
488 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
564 
+            				    if ($line[7] == '') {
565 
+            				    	$values['date_first_reg'] = null;
566 
+            				    } else {
567 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
568 
+					    }
489 569 
 					    $values['cancel'] = '';
490 570 
 					} elseif ($country == 'PP') {
491 571 
             				    $values['registration'] = $line[0];
492 572 
             				    $values['base'] = null;
493 573 
             				    $values['owner'] = $line[4];
494 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
495 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
574 
+            				    if ($line[6] == '') {
575 
+            				    	$values['date_first_reg'] = null;
576 
+            				    } else {
577 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
578 
+					    }
496 579 
 					    $values['cancel'] = $line[7];
497 580 
 					} elseif ($country == 'E7') {
498 581 
             				    $values['registration'] = $line[0];
499 582 
             				    $values['base'] = null;
500 583 
             				    $values['owner'] = $line[4];
501 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
502 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
584 
+            				    if ($line[5] == '') {
585 
+            				    	$values['date_first_reg'] = null;
586 
+            				    } else {
587 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
588 
+					    }
503 589 
 					    $values['cancel'] = '';
504 590 
 					} elseif ($country == '8Q') {
505 591 
             				    $values['registration'] = $line[0];
506 592 
             				    $values['base'] = null;
507 593 
             				    $values['owner'] = $line[3];
508 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
509 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
594 
+            				    if ($line[7] == '') {
595 
+            				    	$values['date_first_reg'] = null;
596 
+            				    } else {
597 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
598 
+					    }
510 599 
 					    $values['cancel'] = '';
511 600 
 					} elseif ($country == 'ZK') {
512 601 
             				    $values['registration'] = $line[0];
 
@@ -551,7 +640,9 @@  discard block
 
 block discarded – undo
551 640 
 						$sth_modes->execute($query_modes_values);
552 641 
 					}
553 642 
 				}
554 
-				if ($globalTransaction) $Connection->db->commit();
643 
+				if ($globalTransaction) {
644 
+					$Connection->db->commit();
645 
+				}
555 646 
 			} catch(PDOException $e) {
556 647 
 				return "error : ".$e->getMessage();
557 648 
 			}
 
@@ -685,25 +776,45 @@  discard block
 
 block discarded – undo
685 776 
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
686 777 
 		$Connection = new Connection();
687 778 
 		$sth_dest = $Connection->db->prepare($query_dest);
688 
-		if ($globalTransaction) $Connection->db->beginTransaction();
779 
+		if ($globalTransaction) {
780 
+			$Connection->db->beginTransaction();
781 
+		}
689 782
690 783 
 		$i = 0;
691 784 
 		while($row = sparql_fetch_array($result))
692 785 
 		{
693 786 
 			if ($i >= 1) {
694 787 
 			//print_r($row);
695 
-			if (!isset($row['iata'])) $row['iata'] = '';
696 
-			if (!isset($row['icao'])) $row['icao'] = '';
697 
-			if (!isset($row['type'])) $row['type'] = '';
698 
-			if (!isset($row['altitude'])) $row['altitude'] = '';
788 
+			if (!isset($row['iata'])) {
789 
+				$row['iata'] = '';
790 
+			}
791 
+			if (!isset($row['icao'])) {
792 
+				$row['icao'] = '';
793 
+			}
794 
+			if (!isset($row['type'])) {
795 
+				$row['type'] = '';
796 
+			}
797 
+			if (!isset($row['altitude'])) {
798 
+				$row['altitude'] = '';
799 
+			}
699 800 
 			if (isset($row['city_bis'])) {
700 801 
 				$row['city'] = $row['city_bis'];
701 802 
 			}
702 
-			if (!isset($row['city'])) $row['city'] = '';
703 
-			if (!isset($row['country'])) $row['country'] = '';
704 
-			if (!isset($row['homepage'])) $row['homepage'] = '';
705 
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
706 
-			if (!isset($row['name'])) continue;
803 
+			if (!isset($row['city'])) {
804 
+				$row['city'] = '';
805 
+			}
806 
+			if (!isset($row['country'])) {
807 
+				$row['country'] = '';
808 
+			}
809 
+			if (!isset($row['homepage'])) {
810 
+				$row['homepage'] = '';
811 
+			}
812 
+			if (!isset($row['wikipedia_page'])) {
813 
+				$row['wikipedia_page'] = '';
814 
+			}
815 
+			if (!isset($row['name'])) {
816 
+				continue;
817 
+			}
707 818 
 			if (!isset($row['image'])) {
708 819 
 				$row['image'] = '';
709 820 
 				$row['image_thumb'] = '';
 
@@ -739,7 +850,9 @@  discard block
 
 block discarded – undo
739 850
740 851 
 			$i++;
741 852 
 		}
742 
-		if ($globalTransaction) $Connection->db->commit();
853 
+		if ($globalTransaction) {
854 
+			$Connection->db->commit();
855 
+		}
743 856 
 		echo "Delete duplicate rows...\n";
744 857 
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
745 858 
 		try {
 
@@ -751,7 +864,9 @@  discard block
 
 block discarded – undo
751 864 
                 }
752 865
753 866
754 
-		if ($globalDebug) echo "Insert Not available Airport...\n";
867 
+		if ($globalDebug) {
868 
+			echo "Insert Not available Airport...\n";
869 
+		}
755 870 
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
756 871 
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
757 872 
 		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
 
@@ -778,7 +893,9 @@  discard block
 
 block discarded – undo
778 893 
 		$delimiter = ',';
779 894 
 		$out_file = $tmp_dir.'airports.csv';
780 895 
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
781 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
896 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
897 
+			return FALSE;
898 
+		}
782 899 
 		echo "Add data from ourairports.com...\n";
783 900
784 901 
 		$header = NULL;
 
@@ -788,8 +905,9 @@  discard block
 
 block discarded – undo
788 905 
 			//$Connection->db->beginTransaction();
789 906 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
790 907 
 			{
791 
-				if(!$header) $header = $row;
792 
-				else {
908 
+				if(!$header) {
909 
+					$header = $row;
910 
+				} else {
793 911 
 					$data = array();
794 912 
 					$data = array_combine($header, $row);
795 913 
 					try {
 
@@ -827,7 +945,9 @@  discard block
 
 block discarded – undo
827 945 
 		echo "Download data from another free database...\n";
828 946 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
829 947 
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
830 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
948 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
949 
+			return FALSE;
950 
+		}
831 951 
 		update_db::unzip($out_file);
832 952 
 		$header = NULL;
833 953 
 		echo "Add data from another free database...\n";
 
@@ -838,8 +958,9 @@  discard block
 
 block discarded – undo
838 958 
 			//$Connection->db->beginTransaction();
839 959 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
840 960 
 			{
841 
-				if(!$header) $header = $row;
842 
-				else {
961 
+				if(!$header) {
962 
+					$header = $row;
963 
+				} else {
843 964 
 					$data = $row;
844 965
845 966 
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
 
@@ -1015,7 +1136,9 @@  discard block
 
 block discarded – undo
1015 1136 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1016 1137 
 		{
1017 1138 
 			$i = 0;
1018 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1139 
+			if ($globalTransaction) {
1140 
+				$Connection->db->beginTransaction();
1141 
+			}
1019 1142 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1020 1143 
 			{
1021 1144 
 				if ($i > 0) {
 
@@ -1028,7 +1151,9 @@  discard block
 
 block discarded – undo
1028 1151 
 					}
1029 1152 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1030 1153 
 					if (!empty($result_search)) {
1031 
-						if ($globalDebug) echo '.';
1154 
+						if ($globalDebug) {
1155 
+							echo '.';
1156 
+						}
1032 1157 
 							//if ($globalDBdriver == 'mysql') {
1033 1158 
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1034 1159 
 							//} else {
 
@@ -1050,8 +1175,12 @@  discard block
 
 block discarded – undo
1050 1175 
 						}
1051 1176 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1052 1177 
 						if (!empty($result_search_mfr)) {
1053 
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1054 
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1178 
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1179 
+								$data[16] = $data[23];
1180 
+							}
1181 
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1182 
+								$data[16] = $data[15];
1183 
+							}
1055 1184 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1056 1185 
 							try {
1057 1186 
 								$sthf = $Connection->db->prepare($queryf);
 
@@ -1062,7 +1191,9 @@  discard block
 
 block discarded – undo
1062 1191 
 						}
1063 1192 
 					}
1064 1193 
 					if (strtotime($data[29]) > time()) {
1065 
-						if ($globalDebug) echo 'i';
1194 
+						if ($globalDebug) {
1195 
+							echo 'i';
1196 
+						}
1066 1197 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1067 1198 
 						try {
1068 1199 
 							$sth = $Connection->db->prepare($query);
 
@@ -1073,13 +1204,19 @@  discard block
 
 block discarded – undo
1073 1204 
 					}
1074 1205 
 				}
1075 1206 
 				if ($i % 90 == 0) {
1076 
-					if ($globalTransaction) $Connection->db->commit();
1077 
-					if ($globalTransaction) $Connection->db->beginTransaction();
1207 
+					if ($globalTransaction) {
1208 
+						$Connection->db->commit();
1209 
+					}
1210 
+					if ($globalTransaction) {
1211 
+						$Connection->db->beginTransaction();
1212 
+					}
1078 1213 
 				}
1079 1214 
 				$i++;
1080 1215 
 			}
1081 1216 
 			fclose($handle);
1082 
-			if ($globalTransaction) $Connection->db->commit();
1217 
+			if ($globalTransaction) {
1218 
+				$Connection->db->commit();
1219 
+			}
1083 1220 
 		}
1084 1221 
 		print_r($mfr);
1085 1222 
 		return '';
 
@@ -1104,11 +1241,15 @@  discard block
 
 block discarded – undo
1104 1241 
 			$i = 0;
1105 1242 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1106 1243 
 			//$Connection->db->beginTransaction();
1107 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1244 
+			if ($globalTransaction) {
1245 
+				$Connection->db->beginTransaction();
1246 
+			}
1108 1247 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1109 1248 
 			{
1110 1249 
 				if ($i > 0) {
1111 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1250 
+					if ($data[1] == 'NULL') {
1251 
+						$data[1] = $data[0];
1252 
+					}
1112 1253 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1113 1254 
 					try {
1114 1255 
 						$sth = $Connection->db->prepare($query);
 
@@ -1120,7 +1261,9 @@  discard block
 
 block discarded – undo
1120 1261 
 				$i++;
1121 1262 
 			}
1122 1263 
 			fclose($handle);
1123 
-			if ($globalTransaction) $Connection->db->commit();
1264 
+			if ($globalTransaction) {
1265 
+				$Connection->db->commit();
1266 
+			}
1124 1267 
 		}
1125 1268 
 		return '';
1126 1269 
         }
 
@@ -1141,7 +1284,9 @@  discard block
 
 block discarded – undo
1141 1284 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1142 1285 
 		{
1143 1286 
 			$i = 0;
1144 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1287 
+			if ($globalTransaction) {
1288 
+				$Connection->db->beginTransaction();
1289 
+			}
1145 1290 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1146 1291 
 			{
1147 1292 
 				if ($i > 0) {
 
@@ -1157,7 +1302,9 @@  discard block
 
 block discarded – undo
1157 1302 
 				$i++;
1158 1303 
 			}
1159 1304 
 			fclose($handle);
1160 
-			if ($globalTransaction) $Connection->db->commit();
1305 
+			if ($globalTransaction) {
1306 
+				$Connection->db->commit();
1307 
+			}
1161 1308 
 		}
1162 1309 
 		return '';
1163 1310 
         }
 
@@ -1182,7 +1329,9 @@  discard block
 
 block discarded – undo
1182 1329 
 			$i = 0;
1183 1330 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1184 1331 
 			//$Connection->db->beginTransaction();
1185 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1332 
+			if ($globalTransaction) {
1333 
+				$Connection->db->beginTransaction();
1334 
+			}
1186 1335 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1187 1336 
 			{
1188 1337 
 				if ($i > 0) {
 
@@ -1197,7 +1346,9 @@  discard block
 
 block discarded – undo
1197 1346 
 				$i++;
1198 1347 
 			}
1199 1348 
 			fclose($handle);
1200 
-			if ($globalTransaction) $Connection->db->commit();
1349 
+			if ($globalTransaction) {
1350 
+				$Connection->db->commit();
1351 
+			}
1201 1352 
 		}
1202 1353 
 		return '';
1203 1354 
         }
 
@@ -1222,7 +1373,9 @@  discard block
 
 block discarded – undo
1222 1373 
 			$i = 0;
1223 1374 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1224 1375 
 			//$Connection->db->beginTransaction();
1225 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1376 
+			if ($globalTransaction) {
1377 
+				$Connection->db->beginTransaction();
1378 
+			}
1226 1379 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1227 1380 
 			{
1228 1381 
 				if ($i > 0) {
 
@@ -1237,7 +1390,9 @@  discard block
 
 block discarded – undo
1237 1390 
 				$i++;
1238 1391 
 			}
1239 1392 
 			fclose($handle);
1240 
-			if ($globalTransaction) $Connection->db->commit();
1393 
+			if ($globalTransaction) {
1394 
+				$Connection->db->commit();
1395 
+			}
1241 1396 
 		}
1242 1397 
 		return '';
1243 1398 
         }
 
@@ -1256,7 +1411,9 @@  discard block
 
 block discarded – undo
1256 1411 
 		$Connection = new Connection();
1257 1412 
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1258 1413 
 		{
1259 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1414 
+			if ($globalTransaction) {
1415 
+				$Connection->db->beginTransaction();
1416 
+			}
1260 1417 
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1261 1418 
 			{
1262 1419 
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
 
@@ -1271,7 +1428,9 @@  discard block
 
 block discarded – undo
1271 1428 
 				}
1272 1429 
 			}
1273 1430 
 			fclose($handle);
1274 
-			if ($globalTransaction) $Connection->db->commit();
1431 
+			if ($globalTransaction) {
1432 
+				$Connection->db->commit();
1433 
+			}
1275 1434 
 		}
1276 1435 
 		return '';
1277 1436 
         }
 
@@ -1422,7 +1581,9 @@  discard block
 
 block discarded – undo
1422 1581 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1423 1582 
 		{
1424 1583 
 			$i = 0;
1425 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1584 
+			if ($globalTransaction) {
1585 
+				$Connection->db->beginTransaction();
1586 
+			}
1426 1587 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1427 1588 
 			{
1428 1589 
 				$i++;
 
@@ -1450,7 +1611,9 @@  discard block
 
 block discarded – undo
1450 1611 
 				}
1451 1612 
 			}
1452 1613 
 			fclose($handle);
1453 
-			if ($globalTransaction) $Connection->db->commit();
1614 
+			if ($globalTransaction) {
1615 
+				$Connection->db->commit();
1616 
+			}
1454 1617 
 		}
1455 1618 
 		return '';
1456 1619 
         }
 
@@ -1473,7 +1636,9 @@  discard block
 
 block discarded – undo
1473 1636 
 		$Connection = new Connection();
1474 1637 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1475 1638 
 		{
1476 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1639 
+			if ($globalTransaction) {
1640 
+				$Connection->db->beginTransaction();
1641 
+			}
1477 1642 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1478 1643 
 			{
1479 1644 
 				if(count($row) > 1) {
 
@@ -1487,7 +1652,9 @@  discard block
 
 block discarded – undo
1487 1652 
 				}
1488 1653 
 			}
1489 1654 
 			fclose($handle);
1490 
-			if ($globalTransaction) $Connection->db->commit();
1655 
+			if ($globalTransaction) {
1656 
+				$Connection->db->commit();
1657 
+			}
1491 1658 
 		}
1492 1659 
 		return '';
1493 1660 
         }
 
@@ -1507,8 +1674,9 @@  discard block
 
 block discarded – undo
1507 1674 
 	        }
1508 1675
1509 1676
1510 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1511 
-		else {
1677 
+		if ($globalDBdriver == 'mysql') {
1678 
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1679 
+		} else {
1512 1680 
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1513 1681 
 			$query = "CREATE EXTENSION postgis";
1514 1682 
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
 
@@ -1527,20 +1695,30 @@  discard block
 
 block discarded – undo
1527 1695 
 		global $tmp_dir, $globalDebug;
1528 1696 
 		include_once('class.create_db.php');
1529 1697 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1530 
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
1698 
+		if ($globalDebug) {
1699 
+			echo "NOTAM from FlightAirMap website : Download...";
1700 
+		}
1531 1701 
 		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1532 1702 
 		$error = '';
1533 1703 
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
1534 
-			if ($globalDebug) echo "Gunzip...";
1704 
+			if ($globalDebug) {
1705 
+				echo "Gunzip...";
1706 
+			}
1535 1707 
 			update_db::gunzip($tmp_dir.'notam.txt.gz');
1536 
-			if ($globalDebug) echo "Add to DB...";
1708 
+			if ($globalDebug) {
1709 
+				echo "Add to DB...";
1710 
+			}
1537 1711 
 			//$error = create_db::import_file($tmp_dir.'notam.sql');
1538 1712 
 			$NOTAM = new NOTAM();
1539 1713 
 			$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1540 
-		} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1714 
+		} else {
1715 
+			$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1716 
+		}
1541 1717 
 		if ($error != '') {
1542 1718 
 			return $error;
1543 
-		} elseif ($globalDebug) echo "Done\n";
1719 
+		} elseif ($globalDebug) {
1720 
+			echo "Done\n";
1721 
+		}
1544 1722 
 		return '';
1545 1723 
 	}
1546 1724 
 
@@ -1594,67 +1772,111 @@  discard block
 
 block discarded – undo
1594 1772 
 		//if ($globalDebug) echo "IVAO : Download...";
1595 1773 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
1596 1774 
 		if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
1597 
-			if ($globalDebug) echo "Unzip...";
1775 
+			if ($globalDebug) {
1776 
+				echo "Unzip...";
1777 
+			}
1598 1778 
 			update_db::unzip($tmp_dir.'ivae_feb2013.zip');
1599 
-			if ($globalDebug) echo "Add to DB...";
1779 
+			if ($globalDebug) {
1780 
+				echo "Add to DB...";
1781 
+			}
1600 1782 
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
1601 
-			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
1783 
+			if ($globalDebug) {
1784 
+				echo "Copy airlines logos to airlines images directory...";
1785 
+			}
1602 1786 
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
1603 
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
1604 
-			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1605 
-		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1787 
+				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
1788 
+					$error = "Failed to copy airlines logo.";
1789 
+				}
1790 
+			} else {
1791 
+				$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1792 
+			}
1793 
+		} else {
1794 
+			$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1795 
+		}
1606 1796 
 		if ($error != '') {
1607 1797 
 			return $error;
1608 
-		} elseif ($globalDebug) echo "Done\n";
1798 
+		} elseif ($globalDebug) {
1799 
+			echo "Done\n";
1800 
+		}
1609 1801 
 		return '';
1610 1802 
 	}
1611 1803
1612 1804 
 	public static function update_routes() {
1613 1805 
 		global $tmp_dir, $globalDebug;
1614 1806 
 		$error = '';
1615 
-		if ($globalDebug) echo "Routes : Download...";
1807 
+		if ($globalDebug) {
1808 
+			echo "Routes : Download...";
1809 
+		}
1616 1810 
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
1617 1811 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
1618 
-			if ($globalDebug) echo "Gunzip...";
1812 
+			if ($globalDebug) {
1813 
+				echo "Gunzip...";
1814 
+			}
1619 1815 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
1620 
-			if ($globalDebug) echo "Add to DB...";
1816 
+			if ($globalDebug) {
1817 
+				echo "Add to DB...";
1818 
+			}
1621 1819 
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
1622 
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1820 
+		} else {
1821 
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1822 
+		}
1623 1823 
 		if ($error != '') {
1624 1824 
 			return $error;
1625 
-		} elseif ($globalDebug) echo "Done\n";
1825 
+		} elseif ($globalDebug) {
1826 
+			echo "Done\n";
1827 
+		}
1626 1828 
 		return '';
1627 1829 
 	}
1628 1830 
 	public static function update_oneworld() {
1629 1831 
 		global $tmp_dir, $globalDebug;
1630 1832 
 		$error = '';
1631 
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
1833 
+		if ($globalDebug) {
1834 
+			echo "Schedules Oneworld : Download...";
1835 
+		}
1632 1836 
 		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
1633 1837 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
1634 
-			if ($globalDebug) echo "Gunzip...";
1838 
+			if ($globalDebug) {
1839 
+				echo "Gunzip...";
1840 
+			}
1635 1841 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
1636 
-			if ($globalDebug) echo "Add to DB...";
1842 
+			if ($globalDebug) {
1843 
+				echo "Add to DB...";
1844 
+			}
1637 1845 
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
1638 
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1846 
+		} else {
1847 
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1848 
+		}
1639 1849 
 		if ($error != '') {
1640 1850 
 			return $error;
1641 
-		} elseif ($globalDebug) echo "Done\n";
1851 
+		} elseif ($globalDebug) {
1852 
+			echo "Done\n";
1853 
+		}
1642 1854 
 		return '';
1643 1855 
 	}
1644 1856 
 	public static function update_skyteam() {
1645 1857 
 		global $tmp_dir, $globalDebug;
1646 1858 
 		$error = '';
1647 
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
1859 
+		if ($globalDebug) {
1860 
+			echo "Schedules Skyteam : Download...";
1861 
+		}
1648 1862 
 		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
1649 1863 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
1650 
-			if ($globalDebug) echo "Gunzip...";
1864 
+			if ($globalDebug) {
1865 
+				echo "Gunzip...";
1866 
+			}
1651 1867 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
1652 
-			if ($globalDebug) echo "Add to DB...";
1868 
+			if ($globalDebug) {
1869 
+				echo "Add to DB...";
1870 
+			}
1653 1871 
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
1654 
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1872 
+		} else {
1873 
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1874 
+		}
1655 1875 
 		if ($error != '') {
1656 1876 
 			return $error;
1657 
-		} elseif ($globalDebug) echo "Done\n";
1877 
+		} elseif ($globalDebug) {
1878 
+			echo "Done\n";
1879 
+		}
1658 1880 
 		return '';
1659 1881 
 	}
1660 1882 
 	public static function update_ModeS() {
 
@@ -1671,355 +1893,619 @@  discard block
 
 block discarded – undo
1671 1893 
 			exit;
1672 1894 
 		} elseif ($globalDebug) echo "Done\n";
1673 1895 
 */
1674 
-		if ($globalDebug) echo "Modes : Download...";
1675 
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1896 
+		if ($globalDebug) {
1897 
+			echo "Modes : Download...";
1898 
+		}
1899 
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1676 1900 
 		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
1677 1901
1678 1902 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
1679 1903 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
1680 
-			if ($globalDebug) echo "Unzip...";
1681 
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1904 
+			if ($globalDebug) {
1905 
+				echo "Unzip...";
1906 
+			}
1907 
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1682 1908 
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
1683 
-			if ($globalDebug) echo "Add to DB...";
1909 
+			if ($globalDebug) {
1910 
+				echo "Add to DB...";
1911 
+			}
1684 1912 
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
1685 1913 
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
1686 
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1914 
+		} else {
1915 
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1916 
+		}
1687 1917 
 		if ($error != '') {
1688 1918 
 			return $error;
1689 
-		} elseif ($globalDebug) echo "Done\n";
1919 
+		} elseif ($globalDebug) {
1920 
+			echo "Done\n";
1921 
+		}
1690 1922 
 		return '';
1691 1923 
 	}
1692 1924
1693 1925 
 	public static function update_ModeS_faa() {
1694 1926 
 		global $tmp_dir, $globalDebug;
1695 
-		if ($globalDebug) echo "Modes FAA: Download...";
1927 
+		if ($globalDebug) {
1928 
+			echo "Modes FAA: Download...";
1929 
+		}
1696 1930 
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
1697 1931 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
1698 
-			if ($globalDebug) echo "Unzip...";
1932 
+			if ($globalDebug) {
1933 
+				echo "Unzip...";
1934 
+			}
1699 1935 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
1700 
-			if ($globalDebug) echo "Add to DB...";
1936 
+			if ($globalDebug) {
1937 
+				echo "Add to DB...";
1938 
+			}
1701 1939 
 			$error = update_db::modes_faa();
1702 
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1940 
+		} else {
1941 
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1942 
+		}
1703 1943 
 		if ($error != '') {
1704 1944 
 			return $error;
1705 
-		} elseif ($globalDebug) echo "Done\n";
1945 
+		} elseif ($globalDebug) {
1946 
+			echo "Done\n";
1947 
+		}
1706 1948 
 		return '';
1707 1949 
 	}
1708 1950
1709 1951 
 	public static function update_ModeS_flarm() {
1710 1952 
 		global $tmp_dir, $globalDebug;
1711 
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
1953 
+		if ($globalDebug) {
1954 
+			echo "Modes Flarmnet: Download...";
1955 
+		}
1712 1956 
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
1713 1957 
 		if (file_exists($tmp_dir.'data.fln')) {
1714 
-			if ($globalDebug) echo "Add to DB...";
1958 
+			if ($globalDebug) {
1959 
+				echo "Add to DB...";
1960 
+			}
1715 1961 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
1716 
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1962 
+		} else {
1963 
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1964 
+		}
1717 1965 
 		if ($error != '') {
1718 1966 
 			return $error;
1719 
-		} elseif ($globalDebug) echo "Done\n";
1967 
+		} elseif ($globalDebug) {
1968 
+			echo "Done\n";
1969 
+		}
1720 1970 
 		return '';
1721 1971 
 	}
1722 1972
1723 1973 
 	public static function update_ModeS_ogn() {
1724 1974 
 		global $tmp_dir, $globalDebug;
1725 
-		if ($globalDebug) echo "Modes OGN: Download...";
1975 
+		if ($globalDebug) {
1976 
+			echo "Modes OGN: Download...";
1977 
+		}
1726 1978 
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
1727 1979 
 		if (file_exists($tmp_dir.'ogn.csv')) {
1728 
-			if ($globalDebug) echo "Add to DB...";
1980 
+			if ($globalDebug) {
1981 
+				echo "Add to DB...";
1982 
+			}
1729 1983 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
1730 
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1984 
+		} else {
1985 
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1986 
+		}
1731 1987 
 		if ($error != '') {
1732 1988 
 			return $error;
1733 
-		} elseif ($globalDebug) echo "Done\n";
1989 
+		} elseif ($globalDebug) {
1990 
+			echo "Done\n";
1991 
+		}
1734 1992 
 		return '';
1735 1993 
 	}
1736 1994
1737 1995 
 	public static function update_owner() {
1738 1996 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
1739 1997
1740 
-		if ($globalDebug) echo "Owner France: Download...";
1998 
+		if ($globalDebug) {
1999 
+			echo "Owner France: Download...";
2000 
+		}
1741 2001 
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
1742 2002 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
1743 
-			if ($globalDebug) echo "Add to DB...";
2003 
+			if ($globalDebug) {
2004 
+				echo "Add to DB...";
2005 
+			}
1744 2006 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
1745 
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2007 
+		} else {
2008 
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2009 
+		}
1746 2010 
 		if ($error != '') {
1747 2011 
 			return $error;
1748 
-		} elseif ($globalDebug) echo "Done\n";
2012 
+		} elseif ($globalDebug) {
2013 
+			echo "Done\n";
2014 
+		}
1749 2015
1750 
-		if ($globalDebug) echo "Owner Ireland: Download...";
2016 
+		if ($globalDebug) {
2017 
+			echo "Owner Ireland: Download...";
2018 
+		}
1751 2019 
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
1752 2020 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
1753 
-			if ($globalDebug) echo "Add to DB...";
2021 
+			if ($globalDebug) {
2022 
+				echo "Add to DB...";
2023 
+			}
1754 2024 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
1755 
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2025 
+		} else {
2026 
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2027 
+		}
1756 2028 
 		if ($error != '') {
1757 2029 
 			return $error;
1758 
-		} elseif ($globalDebug) echo "Done\n";
1759 
-		if ($globalDebug) echo "Owner Switzerland: Download...";
2030 
+		} elseif ($globalDebug) {
2031 
+			echo "Done\n";
2032 
+		}
2033 
+		if ($globalDebug) {
2034 
+			echo "Owner Switzerland: Download...";
2035 
+		}
1760 2036 
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
1761 2037 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
1762 
-			if ($globalDebug) echo "Add to DB...";
2038 
+			if ($globalDebug) {
2039 
+				echo "Add to DB...";
2040 
+			}
1763 2041 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
1764 
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2042 
+		} else {
2043 
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2044 
+		}
1765 2045 
 		if ($error != '') {
1766 2046 
 			return $error;
1767 
-		} elseif ($globalDebug) echo "Done\n";
1768 
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2047 
+		} elseif ($globalDebug) {
2048 
+			echo "Done\n";
2049 
+		}
2050 
+		if ($globalDebug) {
2051 
+			echo "Owner Czech Republic: Download...";
2052 
+		}
1769 2053 
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
1770 2054 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
1771 
-			if ($globalDebug) echo "Add to DB...";
2055 
+			if ($globalDebug) {
2056 
+				echo "Add to DB...";
2057 
+			}
1772 2058 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
1773 
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2059 
+		} else {
2060 
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2061 
+		}
1774 2062 
 		if ($error != '') {
1775 2063 
 			return $error;
1776 
-		} elseif ($globalDebug) echo "Done\n";
1777 
-		if ($globalDebug) echo "Owner Australia: Download...";
2064 
+		} elseif ($globalDebug) {
2065 
+			echo "Done\n";
2066 
+		}
2067 
+		if ($globalDebug) {
2068 
+			echo "Owner Australia: Download...";
2069 
+		}
1778 2070 
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
1779 2071 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
1780 
-			if ($globalDebug) echo "Add to DB...";
2072 
+			if ($globalDebug) {
2073 
+				echo "Add to DB...";
2074 
+			}
1781 2075 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
1782 
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2076 
+		} else {
2077 
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2078 
+		}
1783 2079 
 		if ($error != '') {
1784 2080 
 			return $error;
1785 
-		} elseif ($globalDebug) echo "Done\n";
1786 
-		if ($globalDebug) echo "Owner Austria: Download...";
2081 
+		} elseif ($globalDebug) {
2082 
+			echo "Done\n";
2083 
+		}
2084 
+		if ($globalDebug) {
2085 
+			echo "Owner Austria: Download...";
2086 
+		}
1787 2087 
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
1788 2088 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
1789 
-			if ($globalDebug) echo "Add to DB...";
2089 
+			if ($globalDebug) {
2090 
+				echo "Add to DB...";
2091 
+			}
1790 2092 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
1791 
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2093 
+		} else {
2094 
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2095 
+		}
1792 2096 
 		if ($error != '') {
1793 2097 
 			return $error;
1794 
-		} elseif ($globalDebug) echo "Done\n";
1795 
-		if ($globalDebug) echo "Owner Chile: Download...";
2098 
+		} elseif ($globalDebug) {
2099 
+			echo "Done\n";
2100 
+		}
2101 
+		if ($globalDebug) {
2102 
+			echo "Owner Chile: Download...";
2103 
+		}
1796 2104 
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
1797 2105 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
1798 
-			if ($globalDebug) echo "Add to DB...";
2106 
+			if ($globalDebug) {
2107 
+				echo "Add to DB...";
2108 
+			}
1799 2109 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
1800 
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2110 
+		} else {
2111 
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2112 
+		}
1801 2113 
 		if ($error != '') {
1802 2114 
 			return $error;
1803 
-		} elseif ($globalDebug) echo "Done\n";
1804 
-		if ($globalDebug) echo "Owner Colombia: Download...";
2115 
+		} elseif ($globalDebug) {
2116 
+			echo "Done\n";
2117 
+		}
2118 
+		if ($globalDebug) {
2119 
+			echo "Owner Colombia: Download...";
2120 
+		}
1805 2121 
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
1806 2122 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
1807 
-			if ($globalDebug) echo "Add to DB...";
2123 
+			if ($globalDebug) {
2124 
+				echo "Add to DB...";
2125 
+			}
1808 2126 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
1809 
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2127 
+		} else {
2128 
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2129 
+		}
1810 2130 
 		if ($error != '') {
1811 2131 
 			return $error;
1812 
-		} elseif ($globalDebug) echo "Done\n";
1813 
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2132 
+		} elseif ($globalDebug) {
2133 
+			echo "Done\n";
2134 
+		}
2135 
+		if ($globalDebug) {
2136 
+			echo "Owner Bosnia Herzegobina: Download...";
2137 
+		}
1814 2138 
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
1815 2139 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
1816 
-			if ($globalDebug) echo "Add to DB...";
2140 
+			if ($globalDebug) {
2141 
+				echo "Add to DB...";
2142 
+			}
1817 2143 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
1818 
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2144 
+		} else {
2145 
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2146 
+		}
1819 2147 
 		if ($error != '') {
1820 2148 
 			return $error;
1821 
-		} elseif ($globalDebug) echo "Done\n";
1822 
-		if ($globalDebug) echo "Owner Brazil: Download...";
2149 
+		} elseif ($globalDebug) {
2150 
+			echo "Done\n";
2151 
+		}
2152 
+		if ($globalDebug) {
2153 
+			echo "Owner Brazil: Download...";
2154 
+		}
1823 2155 
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
1824 2156 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
1825 
-			if ($globalDebug) echo "Add to DB...";
2157 
+			if ($globalDebug) {
2158 
+				echo "Add to DB...";
2159 
+			}
1826 2160 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
1827 
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2161 
+		} else {
2162 
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2163 
+		}
1828 2164 
 		if ($error != '') {
1829 2165 
 			return $error;
1830 
-		} elseif ($globalDebug) echo "Done\n";
1831 
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2166 
+		} elseif ($globalDebug) {
2167 
+			echo "Done\n";
2168 
+		}
2169 
+		if ($globalDebug) {
2170 
+			echo "Owner Cayman Islands: Download...";
2171 
+		}
1832 2172 
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
1833 2173 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
1834 
-			if ($globalDebug) echo "Add to DB...";
2174 
+			if ($globalDebug) {
2175 
+				echo "Add to DB...";
2176 
+			}
1835 2177 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
1836 
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2178 
+		} else {
2179 
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2180 
+		}
1837 2181 
 		if ($error != '') {
1838 2182 
 			return $error;
1839 
-		} elseif ($globalDebug) echo "Done\n";
1840 
-		if ($globalDebug) echo "Owner Croatia: Download...";
2183 
+		} elseif ($globalDebug) {
2184 
+			echo "Done\n";
2185 
+		}
2186 
+		if ($globalDebug) {
2187 
+			echo "Owner Croatia: Download...";
2188 
+		}
1841 2189 
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
1842 2190 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
1843 
-			if ($globalDebug) echo "Add to DB...";
2191 
+			if ($globalDebug) {
2192 
+				echo "Add to DB...";
2193 
+			}
1844 2194 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
1845 
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2195 
+		} else {
2196 
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2197 
+		}
1846 2198 
 		if ($error != '') {
1847 2199 
 			return $error;
1848 
-		} elseif ($globalDebug) echo "Done\n";
1849 
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2200 
+		} elseif ($globalDebug) {
2201 
+			echo "Done\n";
2202 
+		}
2203 
+		if ($globalDebug) {
2204 
+			echo "Owner Luxembourg: Download...";
2205 
+		}
1850 2206 
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
1851 2207 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
1852 
-			if ($globalDebug) echo "Add to DB...";
2208 
+			if ($globalDebug) {
2209 
+				echo "Add to DB...";
2210 
+			}
1853 2211 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
1854 
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2212 
+		} else {
2213 
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2214 
+		}
1855 2215 
 		if ($error != '') {
1856 2216 
 			return $error;
1857 
-		} elseif ($globalDebug) echo "Done\n";
1858 
-		if ($globalDebug) echo "Owner Maldives: Download...";
2217 
+		} elseif ($globalDebug) {
2218 
+			echo "Done\n";
2219 
+		}
2220 
+		if ($globalDebug) {
2221 
+			echo "Owner Maldives: Download...";
2222 
+		}
1859 2223 
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
1860 2224 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
1861 
-			if ($globalDebug) echo "Add to DB...";
2225 
+			if ($globalDebug) {
2226 
+				echo "Add to DB...";
2227 
+			}
1862 2228 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
1863 
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2229 
+		} else {
2230 
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2231 
+		}
1864 2232 
 		if ($error != '') {
1865 2233 
 			return $error;
1866 
-		} elseif ($globalDebug) echo "Done\n";
1867 
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2234 
+		} elseif ($globalDebug) {
2235 
+			echo "Done\n";
2236 
+		}
2237 
+		if ($globalDebug) {
2238 
+			echo "Owner New Zealand: Download...";
2239 
+		}
1868 2240 
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
1869 2241 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
1870 
-			if ($globalDebug) echo "Add to DB...";
2242 
+			if ($globalDebug) {
2243 
+				echo "Add to DB...";
2244 
+			}
1871 2245 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
1872 
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2246 
+		} else {
2247 
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2248 
+		}
1873 2249 
 		if ($error != '') {
1874 2250 
 			return $error;
1875 
-		} elseif ($globalDebug) echo "Done\n";
1876 
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2251 
+		} elseif ($globalDebug) {
2252 
+			echo "Done\n";
2253 
+		}
2254 
+		if ($globalDebug) {
2255 
+			echo "Owner Papua New Guinea: Download...";
2256 
+		}
1877 2257 
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
1878 2258 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
1879 
-			if ($globalDebug) echo "Add to DB...";
2259 
+			if ($globalDebug) {
2260 
+				echo "Add to DB...";
2261 
+			}
1880 2262 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
1881 
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2263 
+		} else {
2264 
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2265 
+		}
1882 2266 
 		if ($error != '') {
1883 2267 
 			return $error;
1884 
-		} elseif ($globalDebug) echo "Done\n";
1885 
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2268 
+		} elseif ($globalDebug) {
2269 
+			echo "Done\n";
2270 
+		}
2271 
+		if ($globalDebug) {
2272 
+			echo "Owner Slovakia: Download...";
2273 
+		}
1886 2274 
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
1887 2275 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
1888 
-			if ($globalDebug) echo "Add to DB...";
2276 
+			if ($globalDebug) {
2277 
+				echo "Add to DB...";
2278 
+			}
1889 2279 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
1890 
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2280 
+		} else {
2281 
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2282 
+		}
1891 2283 
 		if ($error != '') {
1892 2284 
 			return $error;
1893 
-		} elseif ($globalDebug) echo "Done\n";
1894 
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2285 
+		} elseif ($globalDebug) {
2286 
+			echo "Done\n";
2287 
+		}
2288 
+		if ($globalDebug) {
2289 
+			echo "Owner Ecuador: Download...";
2290 
+		}
1895 2291 
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
1896 2292 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
1897 
-			if ($globalDebug) echo "Add to DB...";
2293 
+			if ($globalDebug) {
2294 
+				echo "Add to DB...";
2295 
+			}
1898 2296 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
1899 
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2297 
+		} else {
2298 
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2299 
+		}
1900 2300 
 		if ($error != '') {
1901 2301 
 			return $error;
1902 
-		} elseif ($globalDebug) echo "Done\n";
1903 
-		if ($globalDebug) echo "Owner Iceland: Download...";
2302 
+		} elseif ($globalDebug) {
2303 
+			echo "Done\n";
2304 
+		}
2305 
+		if ($globalDebug) {
2306 
+			echo "Owner Iceland: Download...";
2307 
+		}
1904 2308 
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
1905 2309 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
1906 
-			if ($globalDebug) echo "Add to DB...";
2310 
+			if ($globalDebug) {
2311 
+				echo "Add to DB...";
2312 
+			}
1907 2313 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
1908 
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2314 
+		} else {
2315 
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2316 
+		}
1909 2317 
 		if ($error != '') {
1910 2318 
 			return $error;
1911 
-		} elseif ($globalDebug) echo "Done\n";
1912 
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2319 
+		} elseif ($globalDebug) {
2320 
+			echo "Done\n";
2321 
+		}
2322 
+		if ($globalDebug) {
2323 
+			echo "Owner Isle of Man: Download...";
2324 
+		}
1913 2325 
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
1914 2326 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
1915 
-			if ($globalDebug) echo "Add to DB...";
2327 
+			if ($globalDebug) {
2328 
+				echo "Add to DB...";
2329 
+			}
1916 2330 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
1917 
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2331 
+		} else {
2332 
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2333 
+		}
1918 2334 
 		if ($error != '') {
1919 2335 
 			return $error;
1920 
-		} elseif ($globalDebug) echo "Done\n";
2336 
+		} elseif ($globalDebug) {
2337 
+			echo "Done\n";
2338 
+		}
1921 2339 
 		if ($globalMasterSource) {
1922 
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2340 
+			if ($globalDebug) {
2341 
+				echo "ModeS Netherlands: Download...";
2342 
+			}
1923 2343 
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
1924 2344 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
1925 
-				if ($globalDebug) echo "Add to DB...";
2345 
+				if ($globalDebug) {
2346 
+					echo "Add to DB...";
2347 
+				}
1926 2348 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
1927 
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2349 
+			} else {
2350 
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2351 
+			}
1928 2352 
 			if ($error != '') {
1929 2353 
 				return $error;
1930 
-			} elseif ($globalDebug) echo "Done\n";
1931 
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2354 
+			} elseif ($globalDebug) {
2355 
+				echo "Done\n";
2356 
+			}
2357 
+			if ($globalDebug) {
2358 
+				echo "ModeS Denmark: Download...";
2359 
+			}
1932 2360 
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
1933 2361 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
1934 
-				if ($globalDebug) echo "Add to DB...";
2362 
+				if ($globalDebug) {
2363 
+					echo "Add to DB...";
2364 
+				}
1935 2365 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
1936 
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2366 
+			} else {
2367 
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2368 
+			}
1937 2369 
 			if ($error != '') {
1938 2370 
 				return $error;
1939 
-			} elseif ($globalDebug) echo "Done\n";
1940 
-		} elseif ($globalDebug) echo "Done\n";
2371 
+			} elseif ($globalDebug) {
2372 
+				echo "Done\n";
2373 
+			}
2374 
+		} elseif ($globalDebug) {
2375 
+			echo "Done\n";
2376 
+		}
1941 2377 
 		return '';
1942 2378 
 	}
1943 2379
1944 2380 
 	public static function update_translation() {
1945 2381 
 		global $tmp_dir, $globalDebug;
1946 2382 
 		$error = '';
1947 
-		if ($globalDebug) echo "Translation : Download...";
2383 
+		if ($globalDebug) {
2384 
+			echo "Translation : Download...";
2385 
+		}
1948 2386 
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
1949 2387 
 		if (file_exists($tmp_dir.'translation.zip')) {
1950 
-			if ($globalDebug) echo "Unzip...";
2388 
+			if ($globalDebug) {
2389 
+				echo "Unzip...";
2390 
+			}
1951 2391 
 			update_db::unzip($tmp_dir.'translation.zip');
1952 
-			if ($globalDebug) echo "Add to DB...";
2392 
+			if ($globalDebug) {
2393 
+				echo "Add to DB...";
2394 
+			}
1953 2395 
 			$error = update_db::translation();
1954 
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2396 
+		} else {
2397 
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2398 
+		}
1955 2399 
 		if ($error != '') {
1956 2400 
 			return $error;
1957 
-		} elseif ($globalDebug) echo "Done\n";
2401 
+		} elseif ($globalDebug) {
2402 
+			echo "Done\n";
2403 
+		}
1958 2404 
 		return '';
1959 2405 
 	}
1960 2406
1961 2407 
 	public static function update_translation_fam() {
1962 2408 
 		global $tmp_dir, $globalDebug;
1963 
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2409 
+		if ($globalDebug) {
2410 
+			echo "Translation from FlightAirMap website : Download...";
2411 
+		}
1964 2412 
 		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
1965 2413 
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
1966 
-			if ($globalDebug) echo "Gunzip...";
2414 
+			if ($globalDebug) {
2415 
+				echo "Gunzip...";
2416 
+			}
1967 2417 
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
1968 
-			if ($globalDebug) echo "Add to DB...";
2418 
+			if ($globalDebug) {
2419 
+				echo "Add to DB...";
2420 
+			}
1969 2421 
 			$error = update_db::translation_fam();
1970 
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2422 
+		} else {
2423 
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2424 
+		}
1971 2425 
 		if ($error != '') {
1972 2426 
 			return $error;
1973 
-		} elseif ($globalDebug) echo "Done\n";
2427 
+		} elseif ($globalDebug) {
2428 
+			echo "Done\n";
2429 
+		}
1974 2430 
 		return '';
1975 2431 
 	}
1976 2432 
 	public static function update_ModeS_fam() {
1977 2433 
 		global $tmp_dir, $globalDebug;
1978 
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2434 
+		if ($globalDebug) {
2435 
+			echo "ModeS from FlightAirMap website : Download...";
2436 
+		}
1979 2437 
 		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
1980 2438 
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
1981 
-			if ($globalDebug) echo "Gunzip...";
2439 
+			if ($globalDebug) {
2440 
+				echo "Gunzip...";
2441 
+			}
1982 2442 
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
1983 
-			if ($globalDebug) echo "Add to DB...";
2443 
+			if ($globalDebug) {
2444 
+				echo "Add to DB...";
2445 
+			}
1984 2446 
 			$error = update_db::modes_fam();
1985 
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2447 
+		} else {
2448 
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2449 
+		}
1986 2450 
 		if ($error != '') {
1987 2451 
 			return $error;
1988 
-		} elseif ($globalDebug) echo "Done\n";
2452 
+		} elseif ($globalDebug) {
2453 
+			echo "Done\n";
2454 
+		}
1989 2455 
 		return '';
1990 2456 
 	}
1991 2457 
 	public static function update_owner_fam() {
1992 2458 
 		global $tmp_dir, $globalDebug, $globalOwner;
1993 
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2459 
+		if ($globalDebug) {
2460 
+			echo "owner from FlightAirMap website : Download...";
2461 
+		}
1994 2462 
 		if ($globalOwner === TRUE) {
1995 2463 
 			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
1996 2464 
 		} else {
1997 2465 
 			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
1998 2466 
 		}
1999 2467 
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
2000 
-			if ($globalDebug) echo "Gunzip...";
2468 
+			if ($globalDebug) {
2469 
+				echo "Gunzip...";
2470 
+			}
2001 2471 
 			update_db::gunzip($tmp_dir.'owners.tsv.gz');
2002 
-			if ($globalDebug) echo "Add to DB...";
2472 
+			if ($globalDebug) {
2473 
+				echo "Add to DB...";
2474 
+			}
2003 2475 
 			$error = update_db::owner_fam();
2004 
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2476 
+		} else {
2477 
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2478 
+		}
2005 2479 
 		if ($error != '') {
2006 2480 
 			return $error;
2007 
-		} elseif ($globalDebug) echo "Done\n";
2481 
+		} elseif ($globalDebug) {
2482 
+			echo "Done\n";
2483 
+		}
2008 2484 
 		return '';
2009 2485 
 	}
2010 2486 
 	public static function update_routes_fam() {
2011 2487 
 		global $tmp_dir, $globalDebug;
2012 
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
2488 
+		if ($globalDebug) {
2489 
+			echo "Routes from FlightAirMap website : Download...";
2490 
+		}
2013 2491 
 		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2014 2492 
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
2015 
-			if ($globalDebug) echo "Gunzip...";
2493 
+			if ($globalDebug) {
2494 
+				echo "Gunzip...";
2495 
+			}
2016 2496 
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
2017 
-			if ($globalDebug) echo "Add to DB...";
2497 
+			if ($globalDebug) {
2498 
+				echo "Add to DB...";
2499 
+			}
2018 2500 
 			$error = update_db::routes_fam();
2019 
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2501 
+		} else {
2502 
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2503 
+		}
2020 2504 
 		if ($error != '') {
2021 2505 
 			return $error;
2022 
-		} elseif ($globalDebug) echo "Done\n";
2506 
+		} elseif ($globalDebug) {
2507 
+			echo "Done\n";
2508 
+		}
2023 2509 
 		return '';
2024 2510 
 	}
2025 2511 
 	public static function update_marine_identity_fam() {
 
@@ -2029,14 +2515,22 @@  discard block
 
 block discarded – undo
2029 2515 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2030 2516 
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2031 2517 
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2032 
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
2518 
+				if ($globalDebug) {
2519 
+					echo "Marine identity from FlightAirMap website : Download...";
2520 
+				}
2033 2521 
 				update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2034 2522 
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2035 
-					if ($globalDebug) echo "Gunzip...";
2523 
+					if ($globalDebug) {
2524 
+						echo "Gunzip...";
2525 
+					}
2036 2526 
 					update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
2037 
-					if ($globalDebug) echo "Add to DB...";
2527 
+					if ($globalDebug) {
2528 
+						echo "Add to DB...";
2529 
+					}
2038 2530 
 					$error = update_db::marine_identity_fam();
2039 
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
2531 
+				} else {
2532 
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
2533 
+				}
2040 2534 
 				if ($error != '') {
2041 2535 
 					return $error;
2042 2536 
 				} elseif ($globalDebug) {
 
@@ -2049,17 +2543,25 @@  discard block
 
 block discarded – undo
2049 2543 
 	}
2050 2544 
 	public static function update_banned_fam() {
2051 2545 
 		global $tmp_dir, $globalDebug;
2052 
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
2546 
+		if ($globalDebug) {
2547 
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
2548 
+		}
2053 2549 
 		update_db::download('http://data.flightairmap.fr/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2054 2550 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2055 2551 
 			//if ($globalDebug) echo "Gunzip...";
2056 2552 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
2057 
-			if ($globalDebug) echo "Add to DB...";
2553 
+			if ($globalDebug) {
2554 
+				echo "Add to DB...";
2555 
+			}
2058 2556 
 			$error = update_db::banned_fam();
2059 
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
2557 
+		} else {
2558 
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
2559 
+		}
2060 2560 
 		if ($error != '') {
2061 2561 
 			return $error;
2062 
-		} elseif ($globalDebug) echo "Done\n";
2562 
+		} elseif ($globalDebug) {
2563 
+			echo "Done\n";
2564 
+		}
2063 2565 
 		return '';
2064 2566 
 	}
2065 2567 
 
@@ -2067,7 +2569,9 @@  discard block
 
 block discarded – undo
2067 2569 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2068 2570 
 		include_once('class.create_db.php');
2069 2571 
 		$error = '';
2070 
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
2572 
+		if ($globalDebug) {
2573 
+			echo "Airspace from FlightAirMap website : Download...";
2574 
+		}
2071 2575 
 		if ($globalDBdriver == 'mysql') {
2072 2576 
 			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2073 2577 
 		} else {
 
@@ -2083,9 +2587,13 @@  discard block
 
 block discarded – undo
2083 2587 
 					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
2084 2588 
 				}
2085 2589 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2086 
-					if ($globalDebug) echo "Gunzip...";
2590 
+					if ($globalDebug) {
2591 
+						echo "Gunzip...";
2592 
+					}
2087 2593 
 					update_db::gunzip($tmp_dir.'airspace.sql.gz');
2088 
-					if ($globalDebug) echo "Add to DB...";
2594 
+					if ($globalDebug) {
2595 
+						echo "Add to DB...";
2596 
+					}
2089 2597 
 					$Connection = new Connection();
2090 2598 
 					if ($Connection->tableExists('airspace')) {
2091 2599 
 						$query = 'DROP TABLE airspace';
 
@@ -2098,31 +2606,47 @@  discard block
 
 block discarded – undo
2098 2606 
 		    			}
2099 2607 
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
2100 2608 
 					update_db::insert_airspace_version($airspace_md5);
2101 
-				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2609 
+				} else {
2610 
+					$error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2611 
+				}
2102 2612 
 			}
2103 
-		} else $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2613 
+		} else {
2614 
+			$error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2615 
+		}
2104 2616 
 		if ($error != '') {
2105 2617 
 			return $error;
2106 
-		} elseif ($globalDebug) echo "Done\n";
2618 
+		} elseif ($globalDebug) {
2619 
+			echo "Done\n";
2620 
+		}
2107 2621 
 		return '';
2108 2622 
 	}
2109 2623
2110 2624 
 	public static function update_tle() {
2111 2625 
 		global $tmp_dir, $globalDebug;
2112 
-		if ($globalDebug) echo "Download TLE : Download...";
2626 
+		if ($globalDebug) {
2627 
+			echo "Download TLE : Download...";
2628 
+		}
2113 2629 
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2114 2630 
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2115 2631 
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
2116 2632 
 		foreach ($alltle as $filename) {
2117 
-			if ($globalDebug) echo "downloading ".$filename.'...';
2633 
+			if ($globalDebug) {
2634 
+				echo "downloading ".$filename.'...';
2635 
+			}
2118 2636 
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2119 2637 
 			if (file_exists($tmp_dir.$filename)) {
2120 
-				if ($globalDebug) echo "Add to DB ".$filename."...";
2638 
+				if ($globalDebug) {
2639 
+					echo "Add to DB ".$filename."...";
2640 
+				}
2121 2641 
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2122 
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2642 
+			} else {
2643 
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2644 
+			}
2123 2645 
 			if ($error != '') {
2124 2646 
 				echo $error."\n";
2125 
-			} elseif ($globalDebug) echo "Done\n";
2647 
+			} elseif ($globalDebug) {
2648 
+				echo "Done\n";
2649 
+			}
2126 2650 
 		}
2127 2651 
 		return '';
2128 2652 
 	}
 
@@ -2130,10 +2654,14 @@  discard block
 
 block discarded – undo
2130 2654 
 	public static function update_models() {
2131 2655 
 		global $tmp_dir, $globalDebug;
2132 2656 
 		$error = '';
2133 
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
2657 
+		if ($globalDebug) {
2658 
+			echo "Models from FlightAirMap website : Download...";
2659 
+		}
2134 2660 
 		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2135 2661 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2136 
-			if ($globalDebug) echo "Check files...\n";
2662 
+			if ($globalDebug) {
2663 
+				echo "Check files...\n";
2664 
+			}
2137 2665 
 			$newmodelsdb = array();
2138 2666 
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2139 2667 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2152,25 +2680,35 @@  discard block
 
 block discarded – undo
2152 2680 
 			}
2153 2681 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2154 2682 
 			foreach ($diff as $key => $value) {
2155 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
2683 
+				if ($globalDebug) {
2684 
+					echo 'Downloading model '.$key.' ...'."\n";
2685 
+				}
2156 2686 
 				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2157 2687
2158 2688 
 			}
2159 2689 
 			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2160 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2690 
+		} else {
2691 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2692 
+		}
2161 2693 
 		if ($error != '') {
2162 2694 
 			return $error;
2163 
-		} elseif ($globalDebug) echo "Done\n";
2695 
+		} elseif ($globalDebug) {
2696 
+			echo "Done\n";
2697 
+		}
2164 2698 
 		return '';
2165 2699 
 	}
2166 2700
2167 2701 
 	public static function update_space_models() {
2168 2702 
 		global $tmp_dir, $globalDebug;
2169 2703 
 		$error = '';
2170 
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
2704 
+		if ($globalDebug) {
2705 
+			echo "Space models from FlightAirMap website : Download...";
2706 
+		}
2171 2707 
 		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2172 2708 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2173 
-			if ($globalDebug) echo "Check files...\n";
2709 
+			if ($globalDebug) {
2710 
+				echo "Check files...\n";
2711 
+			}
2174 2712 
 			$newmodelsdb = array();
2175 2713 
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2176 2714 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2189,25 +2727,35 @@  discard block
 
 block discarded – undo
2189 2727 
 			}
2190 2728 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2191 2729 
 			foreach ($diff as $key => $value) {
2192 
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
2730 
+				if ($globalDebug) {
2731 
+					echo 'Downloading space model '.$key.' ...'."\n";
2732 
+				}
2193 2733 
 				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2194 2734
2195 2735 
 			}
2196 2736 
 			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2197 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2737 
+		} else {
2738 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2739 
+		}
2198 2740 
 		if ($error != '') {
2199 2741 
 			return $error;
2200 
-		} elseif ($globalDebug) echo "Done\n";
2742 
+		} elseif ($globalDebug) {
2743 
+			echo "Done\n";
2744 
+		}
2201 2745 
 		return '';
2202 2746 
 	}
2203 2747
2204 2748 
 	public static function update_vehicules_models() {
2205 2749 
 		global $tmp_dir, $globalDebug;
2206 2750 
 		$error = '';
2207 
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
2751 
+		if ($globalDebug) {
2752 
+			echo "Vehicules models from FlightAirMap website : Download...";
2753 
+		}
2208 2754 
 		update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2209 2755 
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2210 
-			if ($globalDebug) echo "Check files...\n";
2756 
+			if ($globalDebug) {
2757 
+				echo "Check files...\n";
2758 
+			}
2211 2759 
 			$newmodelsdb = array();
2212 2760 
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2213 2761 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2226,15 +2774,21 @@  discard block
 
 block discarded – undo
2226 2774 
 			}
2227 2775 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2228 2776 
 			foreach ($diff as $key => $value) {
2229 
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
2777 
+				if ($globalDebug) {
2778 
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
2779 
+				}
2230 2780 
 				update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2231 2781
2232 2782 
 			}
2233 2783 
 			update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2234 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2784 
+		} else {
2785 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2786 
+		}
2235 2787 
 		if ($error != '') {
2236 2788 
 			return $error;
2237 
-		} elseif ($globalDebug) echo "Done\n";
2789 
+		} elseif ($globalDebug) {
2790 
+			echo "Done\n";
2791 
+		}
2238 2792 
 		return '';
2239 2793 
 	}
2240 2794 
 
@@ -2277,7 +2831,9 @@  discard block
 
 block discarded – undo
2277 2831 
                 }
2278 2832
2279 2833 
 		$error = '';
2280 
-		if ($globalDebug) echo "Notam : Download...";
2834 
+		if ($globalDebug) {
2835 
+			echo "Notam : Download...";
2836 
+		}
2281 2837 
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2282 2838 
 		if (file_exists($tmp_dir.'notam.rss')) {
2283 2839 
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
 
@@ -2292,14 +2848,30 @@  discard block
 
 block discarded – undo
2292 2848 
 				$data['fir'] = $q[0];
2293 2849 
 				$data['code'] = $q[1];
2294 2850 
 				$ifrvfr = $q[2];
2295 
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2296 
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2297 
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2298 
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2299 
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2300 
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2301 
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2302 
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
2851 
+				if ($ifrvfr == 'IV') {
2852 
+					$data['rules'] = 'IFR/VFR';
2853 
+				}
2854 
+				if ($ifrvfr == 'I') {
2855 
+					$data['rules'] = 'IFR';
2856 
+				}
2857 
+				if ($ifrvfr == 'V') {
2858 
+					$data['rules'] = 'VFR';
2859 
+				}
2860 
+				if ($q[4] == 'A') {
2861 
+					$data['scope'] = 'Airport warning';
2862 
+				}
2863 
+				if ($q[4] == 'E') {
2864 
+					$data['scope'] = 'Enroute warning';
2865 
+				}
2866 
+				if ($q[4] == 'W') {
2867 
+					$data['scope'] = 'Navigation warning';
2868 
+				}
2869 
+				if ($q[4] == 'AE') {
2870 
+					$data['scope'] = 'Airport/Enroute warning';
2871 
+				}
2872 
+				if ($q[4] == 'AW') {
2873 
+					$data['scope'] = 'Airport/Navigation warning';
2874 
+				}
2303 2875 
 				//$data['scope'] = $q[4];
2304 2876 
 				$data['lower_limit'] = $q[5];
2305 2877 
 				$data['upper_limit'] = $q[6];
 
@@ -2307,8 +2879,12 @@  discard block
 
 block discarded – undo
2307 2879 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2308 2880 
 				$latitude = $Common->convertDec($las,'latitude');
2309 2881 
 				$longitude = $Common->convertDec($lns,'longitude');
2310 
-				if ($lac == 'S') $latitude = '-'.$latitude;
2311 
-				if ($lnc == 'W') $longitude = '-'.$longitude;
2882 
+				if ($lac == 'S') {
2883 
+					$latitude = '-'.$latitude;
2884 
+				}
2885 
+				if ($lnc == 'W') {
2886 
+					$longitude = '-'.$longitude;
2887 
+				}
2312 2888 
 				$data['center_latitude'] = $latitude;
2313 2889 
 				$data['center_longitude'] = $longitude;
2314 2890 
 				$data['radius'] = intval($radius);
 
@@ -2338,10 +2914,14 @@  discard block
 
 block discarded – undo
2338 2914 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2339 2915 
 				unset($data);
2340 2916 
 			}
2341 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2917 
+		} else {
2918 
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2919 
+		}
2342 2920 
 		if ($error != '') {
2343 2921 
 			return $error;
2344 
-		} elseif ($globalDebug) echo "Done\n";
2922 
+		} elseif ($globalDebug) {
2923 
+			echo "Done\n";
2924 
+		}
2345 2925 
 		return '';
2346 2926 
 	}
2347 2927 
 	
@@ -2366,7 +2946,9 @@  discard block
 
 block discarded – undo
2366 2946 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2367 2947 
 		$airspace_json = json_decode($airspace_lst,true);
2368 2948 
 		foreach ($airspace_json['records'] as $airspace) {
2369 
-			if ($globalDebug) echo $airspace['name']."...\n";
2949 
+			if ($globalDebug) {
2950 
+				echo $airspace['name']."...\n";
2951 
+			}
2370 2952 
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2371 2953 
 			if (file_exists($tmp_dir.$airspace['name'])) {
2372 2954 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 
@@ -2410,8 +2992,11 @@  discard block
 
 block discarded – undo
2410 2992 
                         return "error : ".$e->getMessage();
2411 2993 
                 }
2412 2994 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2413 
-                if ($row['nb'] > 0) return false;
2414 
-                else return true;
2995 
+                if ($row['nb'] > 0) {
2996 
+                	return false;
2997 
+                } else {
2998 
+                	return true;
2999 
+                }
2415 3000 
 	}
2416 3001
2417 3002 
 	public static function insert_last_update() {
 
@@ -2436,8 +3021,11 @@  discard block
 
 block discarded – undo
2436 3021 
                         return "error : ".$e->getMessage();
2437 3022 
                 }
2438 3023 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2439 
-                if ($row['nb'] > 0) return true;
2440 
-                else return false;
3024 
+                if ($row['nb'] > 0) {
3025 
+                	return true;
3026 
+                } else {
3027 
+                	return false;
3028 
+                }
2441 3029 
 	}
2442 3030
2443 3031 
 	public static function check_marine_identity_version($version) {
 
@@ -2450,8 +3038,11 @@  discard block
 
 block discarded – undo
2450 3038 
                         return "error : ".$e->getMessage();
2451 3039 
                 }
2452 3040 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2453 
-                if ($row['nb'] > 0) return true;
2454 
-                else return false;
3041 
+                if ($row['nb'] > 0) {
3042 
+                	return true;
3043 
+                } else {
3044 
+                	return false;
3045 
+                }
2455 3046 
 	}
2456 3047
2457 3048 
 
@@ -2494,8 +3085,11 @@  discard block
 
 block discarded – undo
2494 3085 
                         return "error : ".$e->getMessage();
2495 3086 
                 }
2496 3087 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2497 
-                if ($row['nb'] > 0) return false;
2498 
-                else return true;
3088 
+                if ($row['nb'] > 0) {
3089 
+                	return false;
3090 
+                } else {
3091 
+                	return true;
3092 
+                }
2499 3093 
 	}
2500 3094
2501 3095 
 	public static function insert_last_notam_update() {
 
@@ -2524,8 +3118,11 @@  discard block
 
 block discarded – undo
2524 3118 
                         return "error : ".$e->getMessage();
2525 3119 
                 }
2526 3120 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2527 
-                if ($row['nb'] > 0) return false;
2528 
-                else return true;
3121 
+                if ($row['nb'] > 0) {
3122 
+                	return false;
3123 
+                } else {
3124 
+                	return true;
3125 
+                }
2529 3126 
 	}
2530 3127
2531 3128 
 	public static function insert_last_airspace_update() {
 
@@ -2555,8 +3152,11 @@  discard block
 
 block discarded – undo
2555 3152 
                         return "error : ".$e->getMessage();
2556 3153 
                 }
2557 3154 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2558 
-                if ($row['nb'] > 0) return false;
2559 
-                else return true;
3155 
+                if ($row['nb'] > 0) {
3156 
+                	return false;
3157 
+                } else {
3158 
+                	return true;
3159 
+                }
2560 3160 
 	}
2561 3161
2562 3162 
 	public static function insert_last_owner_update() {
 
@@ -2585,8 +3185,11 @@  discard block
 
 block discarded – undo
2585 3185 
                         return "error : ".$e->getMessage();
2586 3186 
                 }
2587 3187 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2588 
-                if ($row['nb'] > 0) return false;
2589 
-                else return true;
3188 
+                if ($row['nb'] > 0) {
3189 
+                	return false;
3190 
+                } else {
3191 
+                	return true;
3192 
+                }
2590 3193 
 	}
2591 3194
2592 3195 
 	public static function insert_last_schedules_update() {
 
@@ -2615,8 +3218,11 @@  discard block
 
 block discarded – undo
2615 3218 
                         return "error : ".$e->getMessage();
2616 3219 
                 }
2617 3220 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2618 
-                if ($row['nb'] > 0) return false;
2619 
-                else return true;
3221 
+                if ($row['nb'] > 0) {
3222 
+                	return false;
3223 
+                } else {
3224 
+                	return true;
3225 
+                }
2620 3226 
 	}
2621 3227
2622 3228 
 	public static function insert_last_tle_update() {
 
@@ -2645,8 +3251,11 @@  discard block
 
 block discarded – undo
2645 3251 
                         return "error : ".$e->getMessage();
2646 3252 
                 }
2647 3253 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2648 
-                if ($row['nb'] > 0) return false;
2649 
-                else return true;
3254 
+                if ($row['nb'] > 0) {
3255 
+                	return false;
3256 
+                } else {
3257 
+                	return true;
3258 
+                }
2650 3259 
 	}
2651 3260
2652 3261 
 	public static function insert_last_marine_identity_update() {
Please login to merge, or discard this patch.